@jobber/components-native 0.88.1 → 0.89.1-JOB-139857-8c5bc05.6

package/dist/types/src/BottomSheet/BottomSheet.d.ts

@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 import React from "react";
-import { Modalize } from "react-native-modalize";
+import type { Modalize } from "react-native-modalize";
 export interface BottomSheetProps {
     readonly children: ReactNode;
     /**

package/dist/types/src/ContentOverlay/UNSAFE_WrappedModalize.d.ts

@@ -1,3 +1,3 @@
 import React from "react";
 import type { IHandles } from "react-native-modalize/lib/options";
-export declare const UNSAFE_WrappedModalize: React.ForwardRefExoticComponent<Omit<import("react-native-modalize/lib/options").IProps<any> & React.RefAttributes<string | number | boolean | {} | React.ReactPortal | React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | React.ReactNodeArray | undefined>, "ref"> & React.RefAttributes<IHandles>>;
+export declare const UNSAFE_WrappedModalize: React.ForwardRefExoticComponent<Omit<import("react-native-modalize/lib/options").IProps<any> & React.RefAttributes<string | number | boolean | {} | React.ReactPortal | React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | React.ReactNodeArray | undefined>, "ref"> & React.RefAttributes<IHandles | undefined>>;

package/dist/types/src/Form/context/AtlantisFormContext.d.ts

@@ -5,6 +5,7 @@ export declare const atlantisFormContextDefaultValues: {
         setLocalCache: () => undefined;
         removeLocalCache: () => undefined;
     };
+    edgeToEdgeEnabled: boolean;
 };
 export declare const AtlantisFormContext: import("react").Context<AtlantisFormContextProps>;
 export declare function useAtlantisFormContext(): AtlantisFormContextProps;

package/dist/types/src/Form/context/types.d.ts

@@ -21,5 +21,6 @@ export interface AtlantisFormContextProps {
         setLocalCache: (data: DeepPartial<TData>) => void;
         removeLocalCache: () => void;
     };
+    edgeToEdgeEnabled?: boolean;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components-native",
-  "version": "0.88.1",
+  "version": "0.89.1-JOB-139857-8c5bc05.6+8c5bc0598",
   "license": "MIT",
   "description": "React Native implementation of Atlantis",
   "repository": {
@@ -94,5 +94,5 @@
     "react-native-safe-area-context": "^5.4.0",
     "react-native-svg": ">=12.0.0"
   },
-  "gitHead": "02b60328dca8a6166794f853db3219e7b3f9bca1"
+  "gitHead": "8c5bc059898a016ab5b77d38f44c1b6818bc0416"
 }

package/src/BottomSheet/BottomSheet.tsx

@@ -1,10 +1,11 @@
 import type { ReactNode, Ref, RefObject } from "react";
 import React, { forwardRef, useState } from "react";
-import { Modalize } from "react-native-modalize";
+import type { Modalize } from "react-native-modalize";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Keyboard, View } from "react-native";
 import { BottomSheetOption } from "./components/BottomSheetOption";
 import { useStyles } from "./BottomSheet.style";
+import { UNSAFE_WrappedModalize } from "../ContentOverlay/UNSAFE_WrappedModalize";
 import { useIsScreenReaderEnabled } from "../hooks";
 import { Divider } from "../Divider";
 import { Heading } from "../Heading";
@@ -61,7 +62,7 @@ function BottomSheetInternal(
   return (
     <>
       {open && <Overlay styles={styles} />}
-      <Modalize
+      <UNSAFE_WrappedModalize
         ref={ref}
         adjustToContentHeight={true}
         modalStyle={styles.modal}
@@ -90,7 +91,7 @@ function BottomSheetInternal(
         >
           {children}
         </View>
-      </Modalize>
+      </UNSAFE_WrappedModalize>
     </>
   );
 

package/src/ContentOverlay/UNSAFE_WrappedModalize.tsx

@@ -9,7 +9,7 @@ import type { IHandles } from "react-native-modalize/lib/options";
 
 type Props = React.ComponentProps<typeof Modalize>;
 
-export const UNSAFE_WrappedModalize = forwardRef<IHandles, Props>(
+export const UNSAFE_WrappedModalize = forwardRef<IHandles | undefined, Props>(
   (props, ref) => {
     const innerRef = useRef<IHandles | null>(null);
     const [openRenderId, setOpenRenderId] = useState(0);

package/src/Form/Form.tsx

@@ -26,6 +26,7 @@ import { useScrollToError } from "./hooks/useScrollToError";
 import { FormSaveButton } from "./components/FormSaveButton";
 import { useSaveButtonPosition } from "./hooks/useSaveButtonPosition";
 import { FormCache } from "./components/FormCache/FormCache";
+import { useAtlantisFormContext } from "./context/AtlantisFormContext";
 import { InputAccessoriesProvider } from "../InputText";
 import { tokens } from "../utils/design";
 import { ErrorMessageProvider } from "../ErrorMessageWrapper";
@@ -134,6 +135,8 @@ function InternalForm<T extends FieldValues, S>({
 
   const styles = useStyles();
 
+  const { edgeToEdgeEnabled } = useAtlantisFormContext();
+
   return (
     <FormProvider {...formMethods}>
       <>
@@ -161,6 +164,7 @@ function InternalForm<T extends FieldValues, S>({
           <KeyboardAwareScrollView
             enableResetScrollToCoords={false}
             enableAutomaticScroll={true}
+            enableOnAndroid={edgeToEdgeEnabled}
             keyboardOpeningTime={
               Platform.OS === "ios" ? tokens["timing-slowest"] : 0
             }
@@ -168,6 +172,7 @@ function InternalForm<T extends FieldValues, S>({
             ref={scrollViewRef}
             {...keyboardProps}
             extraHeight={headerHeight}
+            extraScrollHeight={edgeToEdgeEnabled ? tokens["space-large"] : 0}
             contentContainerStyle={
               !keyboardHeight && styles.scrollContentContainer
             }

package/src/Form/context/AtlantisFormContext.tsx

@@ -11,6 +11,7 @@ export const atlantisFormContextDefaultValues = {
     setLocalCache: () => undefined,
     removeLocalCache: () => undefined,
   }),
+  edgeToEdgeEnabled: false,
 };
 
 export const AtlantisFormContext = createContext<AtlantisFormContextProps>(

package/src/Form/context/types.ts

@@ -30,4 +30,5 @@ export interface AtlantisFormContextProps {
     setLocalCache: (data: DeepPartial<TData>) => void;
     removeLocalCache: () => void;
   };
+  edgeToEdgeEnabled?: boolean;
 }