@hoddy-ui/core 2.5.9 → 2.5.11

package/next/dist/index.mjs

@@ -890,13 +890,13 @@ import Animated2, {
   useSharedValue as useSharedValue2,
   withTiming as withTiming2
 } from "react-native-reanimated";
-import { ms as ms5, ScaledSheet as ScaledSheet7 } from "react-native-size-matters";
 import { useSafeAreaInsets as useSafeAreaInsets2 } from "react-native-safe-area-context";
+import { ms as ms5, ScaledSheet as ScaledSheet7 } from "react-native-size-matters";
 var Popup = ({
   title,
   sheet,
   bare = false,
-  keyboardVerticalOffset = -10,
+  keyboardVerticalOffset,
   children,
   open,
   onClose = () => {
@@ -908,9 +908,29 @@ var Popup = ({
   const theme = useTheme();
   const colors2 = useColors();
   const [modalVisible, setModalVisible] = useState3(false);
+  const [keyboardVisible, setKeyboardVisible] = useState3(false);
   const { bottom } = useSafeAreaInsets2();
   const backdropOpacity = useSharedValue2(0);
   const contentTranslateY = useSharedValue2(1e3);
+  const keyboardVerticalOffsetValue = Platform5.OS === "ios" ? -bottom : -bottom * 2;
+  useEffect2(() => {
+    const keyboardDidShowListener = Keyboard2.addListener(
+      "keyboardDidShow",
+      () => {
+        setKeyboardVisible(true);
+      }
+    );
+    const keyboardDidHideListener = Keyboard2.addListener(
+      "keyboardDidHide",
+      () => {
+        setKeyboardVisible(false);
+      }
+    );
+    return () => {
+      keyboardDidHideListener?.remove();
+      keyboardDidShowListener?.remove();
+    };
+  }, []);
   useEffect2(() => {
     if (open) {
       setModalVisible(true);
@@ -943,15 +963,17 @@ var Popup = ({
       justifyContent: sheet ? "flex-end" : "center"
     },
     keyboardView: {
-      flex: 1
+      flex: 1,
+      zIndex: 1e3
     },
     avoidingView: {
+      zIndex: 2,
       minHeight: typeof sheet === "number" ? sheet : void 0,
       maxHeight: "90%",
-      zIndex: 1e3,
       alignSelf: "center",
       maxWidth: sheet ? void 0 : "90%",
-      width: sheet ? "100%" : void 0
+      width: sheet ? "100%" : void 0,
+      marginBottom: Platform5.OS === "android" && keyboardVisible ? bottom : 0
     },
     container: {
       paddingBottom: sheet && !bare ? bottom + ms5(10) : void 0,
@@ -997,40 +1019,33 @@ var Popup = ({
       visible: modalVisible,
       onRequestClose: closeAction
     },
-    /* @__PURE__ */ React11.createElement(UIThemeProvider, null, /* @__PURE__ */ React11.createElement(
+    /* @__PURE__ */ React11.createElement(UIThemeProvider, null, /* @__PURE__ */ React11.createElement(Animated2.View, { style: [styles2.backdrop, backdropAnimatedStyle] }), /* @__PURE__ */ React11.createElement(
       KeyboardAvoidingView2,
       {
         style: styles2.keyboardView,
         behavior: Platform5.OS === "ios" ? "padding" : "height",
-        keyboardVerticalOffset
+        keyboardVerticalOffset: keyboardVerticalOffset || keyboardVerticalOffsetValue
       },
-      /* @__PURE__ */ React11.createElement(TouchableWithoutFeedback2, { onPress: Keyboard2.dismiss }, /* @__PURE__ */ React11.createElement(View5, { style: styles2.root }, /* @__PURE__ */ React11.createElement(Animated2.View, { style: [styles2.backdrop, backdropAnimatedStyle] }), open && /* @__PURE__ */ React11.createElement(
+      /* @__PURE__ */ React11.createElement(TouchableWithoutFeedback2, { onPress: Keyboard2.dismiss }, /* @__PURE__ */ React11.createElement(View5, { style: styles2.root }, open && /* @__PURE__ */ React11.createElement(
         Pressable,
         {
-          style: [StyleSheet2.absoluteFill, { zIndex: 2 }],
+          style: [StyleSheet2.absoluteFill, { zIndex: 1 }],
           onPress: closeAction
         }
       ), /* @__PURE__ */ React11.createElement(
         Animated2.View,
         {
           style: [styles2.avoidingView, contentAnimatedStyle],
-          layout: LinearTransition
+          layout: LinearTransition.springify().stiffness(200).mass(0.5).damping(100)
         },
-        /* @__PURE__ */ React11.createElement(
-          Animated2.View,
+        /* @__PURE__ */ React11.createElement(View5, { style: styles2.container }, !bare && /* @__PURE__ */ React11.createElement(View5, { style: styles2.title }, /* @__PURE__ */ React11.createElement(View5, { style: styles2.titleIcon }, /* @__PURE__ */ React11.createElement(
+          IconButton,
           {
-            style: styles2.container
-          },
-          !bare && /* @__PURE__ */ React11.createElement(View5, { style: styles2.title }, /* @__PURE__ */ React11.createElement(View5, { style: styles2.titleIcon }, /* @__PURE__ */ React11.createElement(
-            IconButton,
-            {
-              size: 20,
-              icon: "close",
-              onPress: closeAction
-            }
-          )), /* @__PURE__ */ React11.createElement(Typography_default, { align: "center", fontWeight: 500 }, title)),
-          /* @__PURE__ */ React11.createElement(View5, { style: styles2.content }, children)
-        )
+            size: 20,
+            icon: "close",
+            onPress: closeAction
+          }
+        )), /* @__PURE__ */ React11.createElement(Typography_default, { align: "center", fontWeight: 500 }, title)), /* @__PURE__ */ React11.createElement(View5, { style: styles2.content }, children))
       )))
     ))
   );