fix(HoverPopover): fix regression

fix #134
jcoreio · May 20, 2024 · 7643069 · 7643069
1 parent 33eb128
commit 7643069
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 34 deletions.
diff --git a/src/HoverMenu.tsx b/src/HoverMenu.tsx
@@ -6,23 +6,26 @@ const Menu = interopRequireDefault(_Menu)
 
 const HoverMenu: React.ComponentType<MenuProps> = React.forwardRef(
   function HoverMenu(props: MenuProps, ref): any {
-    const paperSlotProps = React.useCallback(
-      // eslint-disable-next-line @typescript-eslint/ban-types
-      (ownerProps: {}) => {
-        const base =
-          props.slotProps?.paper instanceof Function
-            ? props.slotProps?.paper(ownerProps)
-            : props.slotProps?.paper
-        return {
-          ...base,
-          style: {
-            pointerEvents: 'auto',
-            ...base?.style,
-          },
-        } as const
-      },
-      [props.slotProps?.paper]
-    )
+    const paperSlotProps = React.useMemo(() => {
+      const wrapped = props.slotProps?.paper
+      if (wrapped instanceof Function) {
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        return (ownerProps: {}) => {
+          const base = wrapped(ownerProps)
+          return {
+            ...base,
+            style: {
+              pointerEvents: 'auto',
+              ...base?.style,
+            },
+          } as const
+        }
+      }
+      return {
+        ...wrapped,
+        style: { pointerEvents: 'auto', ...wrapped?.style },
+      } as const
+    }, [props.slotProps?.paper])
 
     return (
       <Menu

diff --git a/src/HoverPopover.tsx b/src/HoverPopover.tsx
@@ -6,23 +6,26 @@ const Popover = interopRequireDefault(_Popover)
 
 const HoverPopover: React.ComponentType<PopoverProps> = React.forwardRef(
   function HoverPopover(props: PopoverProps, ref): any {
-    const paperSlotProps = React.useCallback(
-      // eslint-disable-next-line @typescript-eslint/ban-types
-      (ownerProps: {}) => {
-        const base =
-          props.slotProps?.paper instanceof Function
-            ? props.slotProps?.paper(ownerProps)
-            : props.slotProps?.paper
-        return {
-          ...base,
-          style: {
-            pointerEvents: 'auto',
-            ...base?.style,
-          },
-        } as const
-      },
-      [props.slotProps?.paper]
-    )
+    const paperSlotProps = React.useMemo(() => {
+      const wrapped = props.slotProps?.paper
+      if (wrapped instanceof Function) {
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        return (ownerProps: {}) => {
+          const base = wrapped(ownerProps)
+          return {
+            ...base,
+            style: {
+              pointerEvents: 'auto',
+              ...base?.style,
+            },
+          } as const
+        }
+      }
+      return {
+        ...wrapped,
+        style: { pointerEvents: 'auto', ...wrapped?.style },
+      } as const
+    }, [props.slotProps?.paper])
 
     return (
       <Popover