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

fix(MenuButton): 14063 Allow to pass popover classname as a prop. Fix passing className prop to MenuList, MenuPopover, DropdownPopover #100

Merged
merged 3 commits into from
Sep 11, 2024
Merged

fix(MenuButton): 14063 Allow to pass popover classname as a prop. Fix passing className prop to MenuList, MenuPopover, DropdownPopover #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc84192
fix(MenuButton): fix passing className prop to MenuList, MenuPopover,…
albaranau Sep 9, 2024
7f31539
feat(MenuButton): 14063 Allow passing className for MenuPopover
albaranau Sep 9, 2024
2008af1
chore: remove redundant prop definition
albaranau Sep 9, 2024
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
2 changes: 1 addition & 1 deletion packages/ui-kit/src/Dropdown/components/DropdownPopover/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const DropdownPopover = React.forwardRef(({ as: Comp = 'div', className,
props,
} = useDropdownPopover({ ...rest, ref: forwardedRef });

const dynamicClasses = cn({ [style.dropdownPopover]: true, [style.hidden]: props.hidden, className });
const dynamicClasses = cn({ [style.dropdownPopover]: true, [style.hidden]: props.hidden }, className);

return portal ? (
<Popover {...props} className={dynamicClasses} as={Comp} targetRef={targetRef as any} position={position} />
Expand Down
15 changes: 10 additions & 5 deletions packages/ui-kit/src/MenuButton/components/MenuList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,21 @@ import type { ForwardRefComponent } from '../../../utils/component-helpers/polym
export interface MenuListProps {
portal?: boolean;
children: React.ReactNode;
classes?: {
popover?: string;
};
}

export const MenuList = React.forwardRef(({ portal = true, className, ...props }, forwardedRef) => {
const dynamicClasses = cn({
[style.menuList]: true,
export const MenuList = React.forwardRef(({ portal = true, className, classes, ...props }, forwardedRef) => {
const dynamicClasses = cn(
{
[style.menuList]: true,
},
className,
});
);

return (
<MenuPopover portal={portal}>
<MenuPopover className={classes?.popover} portal={portal}>
<MenuItems {...props} ref={forwardedRef} className={dynamicClasses} />
</MenuPopover>
);
Expand Down
10 changes: 6 additions & 4 deletions packages/ui-kit/src/MenuButton/components/MenuPopover/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ export const MenuPopover = React.forwardRef(({ as: Comp = 'div', className, ...r
props,
} = useDropdownPopover({ ...rest, ref: forwardedRef });

const dynamicClasses = cn({
[style.menuPopover]: true,
[style.hidden]: props.hidden,
const dynamicClasses = cn(
{
[style.menuPopover]: true,
[style.hidden]: props.hidden,
},
className,
});
);

return portal ? (
<Popover {...props} as={Comp} targetRef={targetRef as any} position={position} className={dynamicClasses} />
Expand Down
8 changes: 5 additions & 3 deletions packages/ui-kit/src/Popover/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ const PopoverImpl = forwardRef(function PopoverImpl(

useSimulateTabNavigationForReactTree(targetRef as any, popoverRef);

const dynamicClasses = cn({
[style.popover]: true,
const dynamicClasses = cn(
{
[style.popover]: true,
},
className,
});
);

return (
<Comp
Expand Down
Loading