From 23223a69e809e32363b057a8097e18725a6fb094 Mon Sep 17 00:00:00 2001 From: chenz24 Date: Tue, 30 Nov 2021 14:40:19 +0800 Subject: [PATCH 1/3] fix: Omit trigger if visible is set. --- packages/components/src/Dropdown/Dropdown.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/components/src/Dropdown/Dropdown.tsx b/packages/components/src/Dropdown/Dropdown.tsx index 1158bb32..01c3777a 100644 --- a/packages/components/src/Dropdown/Dropdown.tsx +++ b/packages/components/src/Dropdown/Dropdown.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react'; import styled from 'styled-components'; +import { isUndefined } from 'lodash'; import { Tooltip, TooltipProps } from '../Tooltip/Tooltip'; const StyledTooltip = styled(Tooltip)` @@ -37,11 +38,12 @@ export function Dropdown({ maxWidth = 210, animation = 'shift-away', content, + visible, ...rest }: DropdownProps) { const [instance, setInstance] = useState(false); const onDropdownClick = () => { - if (hideOnClick && instance) { + if (hideOnClick && instance && !visible) { // @ts-ignore instance.hide(); } @@ -56,18 +58,19 @@ export function Dropdown({ }; const popContent = {content}; + const triggerProps = isUndefined(visible) ? { trigger } : { visible }; return ( // @ts-ignore From 4f9b34890402a2a7a5001e550dd495b1bbb1a200 Mon Sep 17 00:00:00 2001 From: chenz24 Date: Tue, 30 Nov 2021 14:41:18 +0800 Subject: [PATCH 2/3] fix: Export Progress component. --- packages/components/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index 94113725..f06ea5bd 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -38,3 +38,4 @@ export { default as TimePicker } from './TimePicker/TimePicker'; export { Banner, BannerTip } from './Banner/Banner'; export { Notify, notify } from './Notify/Notify'; export * from './ActionConfirm/ActionConfirm'; +export * from './Progress/Progress'; From dc41c69b266e08345d7c43222bee5d1fabe10087 Mon Sep 17 00:00:00 2001 From: chenz24 Date: Tue, 30 Nov 2021 14:53:23 +0800 Subject: [PATCH 3/3] chore: Add changeset --- .changeset/cyan-beds-dream.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/cyan-beds-dream.md diff --git a/.changeset/cyan-beds-dream.md b/.changeset/cyan-beds-dream.md new file mode 100644 index 00000000..c4f71558 --- /dev/null +++ b/.changeset/cyan-beds-dream.md @@ -0,0 +1,6 @@ +[--- +'@kubed/components': patch +--- + +1. Export Progress component. +2. Omit trigger if visible is set.