@hoddy-ui/core 2.5.12 → 2.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoddy-ui/core",
-  "version": "2.5.12",
+  "version": "2.5.14",
   "description": "Core rich react native components written in typescript",
   "main": "index.ts",
   "repository": {

package/src/Components/FormWrapper.tsx

@@ -8,6 +8,7 @@ import {
 } from "react-native";
 import { ScaledSheet } from "react-native-size-matters";
 import { FormWrapperProps } from "../types";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 export const FormWrapper: React.FC<FormWrapperProps> = ({
   children,
   behavior = Platform.OS === "ios" ? "padding" : "height",
@@ -17,6 +18,9 @@ export const FormWrapper: React.FC<FormWrapperProps> = ({
   style = {},
   onScroll,
 }) => {
+  const { bottom } = useSafeAreaInsets();
+
+  const defaultOffset = Platform.OS === "ios" ? -bottom : -bottom * 2;
   const styles = ScaledSheet.create({
     root: {
       width: "100%",
@@ -24,13 +28,14 @@ export const FormWrapper: React.FC<FormWrapperProps> = ({
       ...style,
     },
   });
+
   return mode === "static" ? (
     <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
       <KeyboardAvoidingView
         style={styles.root}
         behavior={behavior}
         contentContainerStyle={styles.root}
-        keyboardVerticalOffset={keyboardVerticalOffset}
+        keyboardVerticalOffset={keyboardVerticalOffset || defaultOffset}
       >
         {children}
       </KeyboardAvoidingView>
@@ -39,7 +44,7 @@ export const FormWrapper: React.FC<FormWrapperProps> = ({
     <KeyboardAvoidingView
       behavior={behavior}
       style={styles.root}
-      keyboardVerticalOffset={keyboardVerticalOffset}
+      keyboardVerticalOffset={keyboardVerticalOffset || defaultOffset}
     >
       <ScrollView
         onScroll={onScroll}

package/src/Components/SafeAreaView.tsx

@@ -1,23 +1,20 @@
-import { SafeAreaView as Safe } from "react-native-safe-area-context";
 import React from "react";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-import { Platform, StyleSheet } from "react-native";
-import { moderateScale } from "react-native-size-matters";
+import { StyleSheet, View } from "react-native";
 import { SafeAreaViewProps } from "../types";
 
-/**
- * @deprecated This component is deprecated. Please use the SafeAreaView from react-native-safe-area-context instead.
- */
-
-const styles = StyleSheet.create({
-  droidSafeArea: {
-    flex: 1,
-  },
-});
-
 export const SafeAreaView: React.FC<SafeAreaViewProps> = ({
   children,
   style,
 }) => {
-  return <Safe style={{ ...styles.droidSafeArea, ...style }}>{children}</Safe>;
+  const { top, bottom } = useSafeAreaInsets();
+  const styles = StyleSheet.create({
+    root: {
+      paddingTop: top,
+      paddingBottom: bottom,
+      flex: 1,
+    },
+  });
+  return <View style={[styles.root, style]}>{children}</View>;
 };