fix(dropdown-menu): fix pointer over label

snowball-tech · Mar 28, 2024 · 50c9ee0 · 50c9ee0
1 parent 81e53e7
commit 50c9ee0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/packages/fractal/src/components/Dropdown/SubDropdown.tsx b/packages/fractal/src/components/Dropdown/SubDropdown.tsx
@@ -181,8 +181,8 @@ export const SubDropdown = forwardRef<
  'alternatee',
  'flex w-full flex-row items-center gap-1',
  disabled
- ? `${PREFIX}-${GROUP_NAME}__sub-menu__label--disabled text-disabled`
- : '',
+ ? `${PREFIX}-${GROUP_NAME}__sub-menu__label--disabled cursor-not-allowed text-disabled`
+ : 'cursor-pointer',
  )}
  >
  {icon && (
@@ -196,7 +196,13 @@ export const SubDropdown = forwardRef<
  </div>
  )}
 
- <Typography className="flex-1" element="label">
+ <Typography
+ className={cj(
+ 'flex-1',
+ disabled ? `cursor-not-allowed` : 'cursor-pointer',
+ )}
+ element="label"
+ >
  {label}
  </Typography>
 

diff --git a/packages/fractal/src/components/Menu/SubMenu.tsx b/packages/fractal/src/components/Menu/SubMenu.tsx
@@ -113,6 +113,10 @@ export const SubMenu = forwardRef<SubMenuCombinedRefs, SubMenuProps>(
  handleOpenChange(false)
  }
 
+ const toggle = () => {
+ handleOpenChange(!isOpen)
+ }
+
  useEffect(() => {
  if (open === true && hasChildren) {
  display()
@@ -201,9 +205,12 @@ export const SubMenu = forwardRef<SubMenuCombinedRefs, SubMenuProps>(
  title={label}
  // eslint-disable-next-line no-nested-ternary
  {...(!popover
- ? { onClick: display }
+ ? { onClick: toggle }
  : triggerOnHover
- ? { onMouseEnter: handleMouseEnter }
+ ? {
+ onClick: (e) => e.preventDefault(),
+ onMouseEnter: handleMouseEnter,
+ }
  : {})}
  style={popup?.trigger?.style}
  onKeyDown={handleKeyDown}
@@ -219,7 +226,13 @@ export const SubMenu = forwardRef<SubMenuCombinedRefs, SubMenuProps>(
  </div>
  )}
 
- <Typography className="flex-1" element="label">
+ <Typography
+ className={cj(
+ 'flex-1',
+ disabled ? `cursor-not-allowed` : 'cursor-pointer',
+ )}
+ element="label"
+ >
  {label}
  </Typography>