diff --git a/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx b/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx index 51f629b75b..0eda011d15 100644 --- a/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx +++ b/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx @@ -96,7 +96,7 @@ export const DropdownMenuButton: FC = ({ onlyIconTrigger={onlyIconTrigger} triggerIcon={triggerIcon} triggerSize={triggerSize} - className={styles.triggerWrapper} + wrapperStyle={styles.triggerWrapper} buttonStyle={styles.triggerButton} /> @@ -111,24 +111,21 @@ export const DropdownMenuButton: FC = ({ const MemoizedTriggerButton = React.memo< Pick & ElementProps & { wrapperStyle: string; buttonStyle: string } ->( - ({ onlyIconTrigger, triggerSize, label, triggerIcon, wrapperStyle, buttonStyle, ...rest }) => ( - - - - ), - [], -) - -const TriggerLabel = React.memo>( +>(({ onlyIconTrigger, triggerSize, label, triggerIcon, wrapperStyle, buttonStyle, ...rest }) => ( + + + +)) + +const TriggerLabelText = React.memo>( ({ label, onlyIconTrigger, triggerIcon }) => { if (!onlyIconTrigger) { return label diff --git a/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuGroup.tsx b/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuGroup.tsx index 77e7ac9da6..01d8255e3c 100644 --- a/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuGroup.tsx +++ b/packages/smarthr-ui/src/components/Dropdown/DropdownMenuButton/DropdownMenuGroup.tsx @@ -47,19 +47,17 @@ export const DropdownMenuGroup: React.FC = ({ return (
  • - {name && ( - - {name} - - )} + {name}
      {renderButtonList(children)}
  • ) } + +const NameText = React.memo>( + ({ children, className }) => + children && ( + + {children} + + ), +)