Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tooltip 의 visible 로직 수정했다 #45

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Tooltip 의 visible 로직 수정했다 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions packages/co-design-core/src/components/Tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ export type TooltipStylesNames = ClassNames<typeof useStyles>;

export interface TooltipProps extends CoComponentProps<TooltipStylesNames>, React.ComponentPropsWithoutRef<'div'> {
/**
* true일 경우 Tooltip 컴포넌트를 보여줍니다.
* Tooltip 의 초기 visible 상태를 설정합니다
*/
initVisible?: boolean;
visible?: boolean;

/**
* true일 경우 Tooltip 컴포넌트를 보여줍니다.
* Tooltip 컴포넌트를 직접 제어할 경우 사용하는 속성입니다.
* Tooltip 의 open 상태를 자식 컴포넌트가 제어할 때 사용합니다.
* 만약 자식 컴포넌트에게 제어권을 주고, 강제로 open 상태를 toggle 하고 싶다면 flag 를 사용합니다.
*/
visible?: boolean;
flag?: boolean;

/** Tooltip 컴포넌트의 배경색 지정을 위한 ColorScheme 을 정합니다. */
colorScheme?: ColorScheme;
Expand Down Expand Up @@ -59,7 +60,7 @@ export interface TooltipProps extends CoComponentProps<TooltipStylesNames>, Reac
transitionTimingFunction?: string;

/** visible이 변경될 경우 실행됩니다. */
onChangeVisible?(visible: boolean): boolean;
onChangeVisible?(visible: boolean): void;
}

const getPositionStyle = (placement: TooltipPlacement, target?: HTMLElement) => {
Expand Down Expand Up @@ -89,8 +90,8 @@ const getPositionStyle = (placement: TooltipPlacement, target?: HTMLElement) =>

export const Tooltip = ({
children,
visible,
initVisible = false,
visible = false,
flag,
colorScheme,
title,
label,
Expand All @@ -117,7 +118,7 @@ export const Tooltip = ({
{ overrideStyles, name: 'Tooltip' },
);

const [currentVisible, setCurrentVisible] = useToggle(initVisible);
const [currentVisible, setCurrentVisible] = useToggle(visible);
const balloonRef = useRef<HTMLDivElement>(null);
const targetRef = useClickAway<HTMLDivElement>((e: MouseEvent) => {
if (
Expand Down Expand Up @@ -145,8 +146,8 @@ export const Tooltip = ({
const handleBlur = trigger === 'focus' ? () => setCurrentVisible(false) : undefined;

useUpdateEffect(() => {
setCurrentVisible(visible);
}, [visible]);
setCurrentVisible((prev) => !prev);
}, [flag]);

useUpdateEffect(() => {
onChangeVisible?.(currentVisible);
Expand Down
49 changes: 33 additions & 16 deletions packages/co-design-core/src/components/Tooltip/stories/Tooltip.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Tooltip } from '../Tooltip';
import { Popover } from '../../Popover';
import { Button } from '../../Button';
import { Menu } from '../../Menu';
import { useToggle } from '@co-design/hooks';

export default {
title: '@co-design/core/Tooltip',
Expand Down Expand Up @@ -72,24 +73,40 @@ export const WithTitle = {

export const WithPopover: StoryObj = {
render: (arg) => {
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
const [visibleFlag, toggleVisibleFlag] = useToggle(false);
const [visible, setVisible] = useState(false);

return (
<Popover
placement="bottom"
onOpen={() => setIsPopoverOpen(true)}
onClose={() => setIsPopoverOpen(false)}
content={
<Menu>
<Menu.Item>1</Menu.Item>
<Menu.Item>2</Menu.Item>
</Menu>
}
>
<Tooltip visible={!isPopoverOpen} label="Peek-A-Boo" {...arg}>
<Button>hello</Button>
</Tooltip>
</Popover>
<>
<Popover
placement="bottom"
content={
<Menu>
<Menu.Item>1</Menu.Item>
<Menu.Item>2</Menu.Item>
</Menu>
}
>
<Tooltip
flag={visibleFlag}
onChangeVisible={(currentVisible) => {
setVisible(currentVisible);
}}
label="Peek-A-Boo"
{...arg}
>
<Button
onClick={() => {
if (visible) {
toggleVisibleFlag();
}
}}
>
hello
</Button>
</Tooltip>
</Popover>
</>
);
},
};
Loading