@mustmove/overlay-kit-rn 1.0.86 → 1.0.88

package/dist/index.d.mts

@@ -147,7 +147,6 @@ type BottomSheetControllerProps<T = any> = {
     isLoading?: boolean;
     emptyText?: string;
     extraData?: any;
-    keyboardHeight?: number;
 };
 type BottomSheetControllerComponent<T = any> = FC<BottomSheetControllerProps<T>>;
 

package/dist/index.d.ts

@@ -147,7 +147,6 @@ type BottomSheetControllerProps<T = any> = {
     isLoading?: boolean;
     emptyText?: string;
     extraData?: any;
-    keyboardHeight?: number;
 };
 type BottomSheetControllerComponent<T = any> = FC<BottomSheetControllerProps<T>>;
 

package/dist/index.js

@@ -111,6 +111,7 @@ var import_react8 = __toESM(require("react"));
 var import_bottom_sheet = __toESM(require("@gorhom/bottom-sheet"));
 var import_react_native = require("react-native");
 var import_react_native_reanimated = require("react-native-reanimated");
+var import_react_native_keyboard_controller = require("react-native-keyboard-controller");
 
 // node_modules/@gorhom/portal/lib/module/components/portal/Portal.js
 var import_react4 = require("react");
@@ -397,8 +398,8 @@ var ContentBottomSheetController = (0, import_react8.memo)(
   }) => {
     const bottomSheetRef = (0, import_react8.useRef)(null);
     const reducedMotion = (0, import_react_native_reanimated.useReducedMotion)();
-    const [keyboardHeight, setKeyboardHeight] = (0, import_react8.useState)(0);
-    const isKeyboardActiveRef = (0, import_react8.useRef)(false);
+    const isClosingRef = (0, import_react8.useRef)(false);
+    const { height: keyboardHeight } = (0, import_react_native_keyboard_controller.useReanimatedKeyboardAnimation)();
     const getZIndex = () => {
       const index = overlayOrderList.indexOf(overlayId);
       return 1e3 + index;
@@ -430,26 +431,6 @@ var ContentBottomSheetController = (0, import_react8.memo)(
       "closeAllOnGestureClose",
       "closeFunction"
     ]);
-    (0, import_react8.useEffect)(() => {
-      const keyboardWillShowListener = import_react_native.Keyboard.addListener(
-        import_react_native.Platform.OS === "ios" ? "keyboardWillShow" : "keyboardDidShow",
-        (e) => {
-          isKeyboardActiveRef.current = true;
-          setKeyboardHeight(e.endCoordinates.height);
-        }
-      );
-      const keyboardWillHideListener = import_react_native.Keyboard.addListener(
-        import_react_native.Platform.OS === "ios" ? "keyboardWillHide" : "keyboardDidHide",
-        () => {
-          isKeyboardActiveRef.current = false;
-          setKeyboardHeight(0);
-        }
-      );
-      return () => {
-        keyboardWillShowListener.remove();
-        keyboardWillHideListener.remove();
-      };
-    }, []);
     (0, import_react8.useEffect)(() => {
       if (isOpen) {
         const rafId = requestAnimationFrame(() => {
@@ -462,7 +443,11 @@ var ContentBottomSheetController = (0, import_react8.memo)(
       }
     }, [isOpen, overlayDispatch, overlayId]);
     const handleClose = (0, import_react8.useCallback)(() => {
-      if (isKeyboardActiveRef.current) {
+      if (isClosingRef.current) {
+        return;
+      }
+      isClosingRef.current = true;
+      if (keyboardHeight.value > 0) {
         import_react_native.Keyboard.dismiss();
         setTimeout(() => {
           if (closeAllOnGestureClose) {
@@ -473,10 +458,10 @@ var ContentBottomSheetController = (0, import_react8.memo)(
           if (closeFunction) {
             closeFunction();
           }
-        }, 100);
+        }, 50);
         return;
       }
-      setTimeout(() => {
+      requestAnimationFrame(() => {
         if (closeAllOnGestureClose) {
           overlayDispatch({ type: "REMOVE_ALL" });
         } else {
@@ -485,8 +470,14 @@ var ContentBottomSheetController = (0, import_react8.memo)(
         if (closeFunction) {
           closeFunction();
         }
-      }, 50);
-    }, [overlayDispatch, overlayId, closeAllOnGestureClose, closeFunction]);
+      });
+    }, [
+      overlayDispatch,
+      overlayId,
+      closeAllOnGestureClose,
+      closeFunction,
+      keyboardHeight
+    ]);
     const renderBackdrop = (0, import_react8.useCallback)(
       (props) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
         import_bottom_sheet.BottomSheetBackdrop,
@@ -516,7 +507,6 @@ var ContentBottomSheetController = (0, import_react8.memo)(
         snapPoints: enableDynamicSizing ? void 0 : snapPoints,
         enablePanDownToClose,
         onClose: handleClose,
-        bottomInset: import_react_native.Platform.OS === "android" ? keyboardHeight : void 0,
         keyboardBlurBehavior,
         backdropComponent: enableBackdrop ? renderBackdrop : void 0,
         backgroundStyle: [
@@ -545,8 +535,7 @@ var ContentBottomSheetController = (0, import_react8.memo)(
           snapPoints,
           enablePanDownToClose,
           close: () => overlayDispatch({ type: "CLOSE", overlayId }),
-          unmount: () => overlayDispatch({ type: "REMOVE", overlayId }),
-          keyboardHeight
+          unmount: () => overlayDispatch({ type: "REMOVE", overlayId })
         }, restOptions))
       }
     ) });
@@ -571,11 +560,13 @@ var ContentModalController = (0, import_react9.memo)(
       modalType = "center",
       backdropOpacity = 0.5,
       animationType = "fade",
-      swipeDirection
+      swipeDirection,
+      closeFunction
     } = options;
     const [backdropAnimation] = (0, import_react9.useState)(new import_react_native2.Animated.Value(0));
     const [contentAnimation] = (0, import_react9.useState)(new import_react_native2.Animated.Value(0));
     const [mounted, setMounted] = (0, import_react9.useState)(isOpen);
+    const [isClosing, setIsClosing] = (0, import_react9.useState)(false);
     (0, import_react9.useEffect)(() => {
       if (isOpen) {
         if (!mounted) setMounted(true);
@@ -613,10 +604,17 @@ var ContentModalController = (0, import_react9.memo)(
       }
     }, [isOpen]);
     const handleClose = () => {
+      if (isClosing) {
+        return;
+      }
+      setIsClosing(true);
       import_react_native2.Keyboard.dismiss();
-      setTimeout(() => {
+      requestAnimationFrame(() => {
         overlayDispatch({ type: "REMOVE", overlayId });
-      }, 100);
+        if (closeFunction) {
+          closeFunction();
+        }
+      });
     };
     const getLayerIndex = () => {
       return Math.max(0, overlayOrderList.indexOf(overlayId));