@hoddy-ui/core 2.5.9 → 2.5.11

package/next/dist/index.js

@@ -926,13 +926,13 @@ var import_react_native_size_matters10 = require("react-native-size-matters");
 var import_react_native11 = require("react-native");
 var import_react11 = __toESM(require("react"));
 var import_react_native_reanimated2 = __toESM(require("react-native-reanimated"));
-var import_react_native_size_matters9 = require("react-native-size-matters");
 var import_react_native_safe_area_context3 = require("react-native-safe-area-context");
+var import_react_native_size_matters9 = require("react-native-size-matters");
 var Popup = ({
   title,
   sheet,
   bare = false,
-  keyboardVerticalOffset = -10,
+  keyboardVerticalOffset,
   children,
   open,
   onClose = () => {
@@ -944,9 +944,29 @@ var Popup = ({
   const theme = useTheme();
   const colors2 = useColors();
   const [modalVisible, setModalVisible] = (0, import_react11.useState)(false);
+  const [keyboardVisible, setKeyboardVisible] = (0, import_react11.useState)(false);
   const { bottom } = (0, import_react_native_safe_area_context3.useSafeAreaInsets)();
   const backdropOpacity = (0, import_react_native_reanimated2.useSharedValue)(0);
   const contentTranslateY = (0, import_react_native_reanimated2.useSharedValue)(1e3);
+  const keyboardVerticalOffsetValue = import_react_native11.Platform.OS === "ios" ? -bottom : -bottom * 2;
+  (0, import_react11.useEffect)(() => {
+    const keyboardDidShowListener = import_react_native11.Keyboard.addListener(
+      "keyboardDidShow",
+      () => {
+        setKeyboardVisible(true);
+      }
+    );
+    const keyboardDidHideListener = import_react_native11.Keyboard.addListener(
+      "keyboardDidHide",
+      () => {
+        setKeyboardVisible(false);
+      }
+    );
+    return () => {
+      keyboardDidHideListener?.remove();
+      keyboardDidShowListener?.remove();
+    };
+  }, []);
   (0, import_react11.useEffect)(() => {
     if (open) {
       setModalVisible(true);
@@ -979,15 +999,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: import_react_native11.Platform.OS === "android" && keyboardVisible ? bottom : 0
     },
     container: {
       paddingBottom: sheet && !bare ? bottom + (0, import_react_native_size_matters9.ms)(10) : void 0,
@@ -1033,40 +1055,33 @@ var Popup = ({
       visible: modalVisible,
       onRequestClose: closeAction
     },
-    /* @__PURE__ */ import_react11.default.createElement(UIThemeProvider, null, /* @__PURE__ */ import_react11.default.createElement(
+    /* @__PURE__ */ import_react11.default.createElement(UIThemeProvider, null, /* @__PURE__ */ import_react11.default.createElement(import_react_native_reanimated2.default.View, { style: [styles2.backdrop, backdropAnimatedStyle] }), /* @__PURE__ */ import_react11.default.createElement(
       import_react_native11.KeyboardAvoidingView,
       {
         style: styles2.keyboardView,
         behavior: import_react_native11.Platform.OS === "ios" ? "padding" : "height",
-        keyboardVerticalOffset
+        keyboardVerticalOffset: keyboardVerticalOffset || keyboardVerticalOffsetValue
       },
-      /* @__PURE__ */ import_react11.default.createElement(import_react_native11.TouchableWithoutFeedback, { onPress: import_react_native11.Keyboard.dismiss }, /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.root }, /* @__PURE__ */ import_react11.default.createElement(import_react_native_reanimated2.default.View, { style: [styles2.backdrop, backdropAnimatedStyle] }), open && /* @__PURE__ */ import_react11.default.createElement(
+      /* @__PURE__ */ import_react11.default.createElement(import_react_native11.TouchableWithoutFeedback, { onPress: import_react_native11.Keyboard.dismiss }, /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.root }, open && /* @__PURE__ */ import_react11.default.createElement(
         import_react_native11.Pressable,
         {
-          style: [import_react_native11.StyleSheet.absoluteFill, { zIndex: 2 }],
+          style: [import_react_native11.StyleSheet.absoluteFill, { zIndex: 1 }],
           onPress: closeAction
         }
       ), /* @__PURE__ */ import_react11.default.createElement(
         import_react_native_reanimated2.default.View,
         {
           style: [styles2.avoidingView, contentAnimatedStyle],
-          layout: import_react_native_reanimated2.LinearTransition
+          layout: import_react_native_reanimated2.LinearTransition.springify().stiffness(200).mass(0.5).damping(100)
         },
-        /* @__PURE__ */ import_react11.default.createElement(
-          import_react_native_reanimated2.default.View,
+        /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.container }, !bare && /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.title }, /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.titleIcon }, /* @__PURE__ */ import_react11.default.createElement(
+          IconButton,
           {
-            style: styles2.container
-          },
-          !bare && /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.title }, /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.titleIcon }, /* @__PURE__ */ import_react11.default.createElement(
-            IconButton,
-            {
-              size: 20,
-              icon: "close",
-              onPress: closeAction
-            }
-          )), /* @__PURE__ */ import_react11.default.createElement(Typography_default, { align: "center", fontWeight: 500 }, title)),
-          /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.content }, children)
-        )
+            size: 20,
+            icon: "close",
+            onPress: closeAction
+          }
+        )), /* @__PURE__ */ import_react11.default.createElement(Typography_default, { align: "center", fontWeight: 500 }, title)), /* @__PURE__ */ import_react11.default.createElement(import_react_native11.View, { style: styles2.content }, children))
       )))
     ))
   );