@lumx/react 3.6.5-alpha.4 → 3.6.5

package/index.js

@@ -4067,14 +4067,14 @@ const skipRender = (predicate, Component) => {
  */
 const OnBeforeUnmount = _ref => {
   let {
-    callback
+    callbackRef
   } = _ref;
   useLayoutEffect(() => {
     return () => {
-      var _callback$current;
+      var _callbackRef$current;
       // On unmount
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      (_callback$current = callback.current) === null || _callback$current === void 0 ? void 0 : _callback$current.call(callback);
+      (_callbackRef$current = callbackRef.current) === null || _callbackRef$current === void 0 ? void 0 : _callbackRef$current.call(callbackRef);
     };
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -4092,32 +4092,34 @@ function useRestoreFocusOnClose(_ref, popoverElement) {
     anchorRef,
     parentElement
   } = _ref;
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  const onBeforeUnmountRef = React.useRef(() => {});
-  const anchor = anchorRef.current;
-  const elementToFocus =
-  // Provided parent element
-  (parentElement === null || parentElement === void 0 ? void 0 : parentElement.current) || (
-  // Or first focusable element in anchor
-  anchor ? getFirstAndLastFocusable(anchor).first : undefined) ||
-  // Fallback to anchor
-  anchor;
+  const onBeforeUnmountRef = React.useRef();
   React.useEffect(() => {
-    if (!popoverElement || !focusAnchorOnClose || !elementToFocus) return;
+    if (!popoverElement || !focusAnchorOnClose) {
+      onBeforeUnmountRef.current = undefined;
+      return;
+    }
     onBeforeUnmountRef.current = () => {
       const isFocusWithin = popoverElement === null || popoverElement === void 0 ? void 0 : popoverElement.contains(document.activeElement);
       if (!isFocusWithin) return;
 
-      // Focus on next render
+      // On next render
       setTimeout(() => {
-        elementToFocus.focus({
+        const anchor = anchorRef.current;
+        const elementToFocus =
+        // Provided parent element
+        (parentElement === null || parentElement === void 0 ? void 0 : parentElement.current) || (
+        // Or first focusable element in anchor
+        anchor ? getFirstAndLastFocusable(anchor).first : undefined) ||
+        // Fallback to anchor
+        anchor;
+        elementToFocus === null || elementToFocus === void 0 ? void 0 : elementToFocus.focus({
           preventScroll: true
         });
       }, 0);
     };
-  }, [anchor, elementToFocus, focusAnchorOnClose, popoverElement]);
+  }, [anchorRef, focusAnchorOnClose, parentElement, popoverElement]);
   return /*#__PURE__*/React.createElement(OnBeforeUnmount, {
-    callback: onBeforeUnmountRef
+    callbackRef: onBeforeUnmountRef
   });
 }