@jobber/components-native 0.95.2-JOB-141866-990fa70.9 → 0.95.2-JOB-141866-a6ee36d.22

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jobber/components-native",
-    "version": "0.95.2-JOB-141866-990fa70.9+990fa7081",
+    "version": "0.95.2-JOB-141866-a6ee36d.22+a6ee36d10",
     "license": "MIT",
     "description": "React Native implementation of Atlantis",
     "repository": {
@@ -96,5 +96,5 @@
         "react-native-safe-area-context": "^5.4.0",
         "react-native-svg": ">=12.0.0"
     },
-    "gitHead": "990fa708191391b1d9f973c5eccd4dd8ec532424"
+    "gitHead": "a6ee36d10f2c1ba08f20ad6bb9019e274bcee16f"
 }

package/dist/src/ContentOverlay/ContentOverlay.js

@@ -2,10 +2,11 @@ import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, u
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AccessibilityInfo, Platform, View, findNodeHandle, useWindowDimensions, } from "react-native";
 import { Portal } from "react-native-portalize";
+import { useKeyboardVisibility } from "./hooks/useKeyboardVisibility";
 import { useStyles } from "./ContentOverlay.style";
 import { useViewLayoutHeight } from "./hooks/useViewLayoutHeight";
 import { UNSAFE_WrappedModalize } from "./UNSAFE_WrappedModalize";
-import { useIsScreenReaderEnabled, useKeyboardVisibility } from "../hooks";
+import { useIsScreenReaderEnabled } from "../hooks";
 import { IconButton } from "../IconButton";
 import { Heading } from "../Heading";
 import { useAtlantisI18n } from "../hooks/useAtlantisI18n";

package/dist/src/Form/Form.js

@@ -18,7 +18,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { useMemo, useState } from "react";
+import React, { useState } from "react";
 import { FormProvider } from "react-hook-form";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { Keyboard, Platform, View, findNodeHandle } from "react-native";
@@ -39,7 +39,7 @@ import { FormSaveButton } from "./components/FormSaveButton";
 import { useSaveButtonPosition } from "./hooks/useSaveButtonPosition";
 import { FormCache } from "./components/FormCache/FormCache";
 import { useAtlantisFormContext } from "./context/AtlantisFormContext";
-import { InputAccessoriesProvider, useInputAccessoriesContext, } from "../InputText";
+import { InputAccessoriesProvider } from "../InputText";
 import { tokens } from "../utils/design";
 import { ErrorMessageProvider } from "../ErrorMessageWrapper";
 export function Form(_a) {
@@ -49,12 +49,11 @@ export function Form(_a) {
         React.createElement(ErrorMessageProvider, null, child)));
 }
 // eslint-disable-next-line max-statements
-function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSubmitSuccess, bannerErrors, bannerMessages, initialValues, mode = "onTouched", reValidateMode = "onChange", formRef, saveButtonLabel, renderStickySection, localCacheKey, localCacheExclude, localCacheId, secondaryActions, saveButtonOffset, showStickySaveButton = false, renderFooter, UNSAFE_allowDiscardLocalCacheWhenOffline, }) {
+function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSubmitSuccess, bannerErrors, bannerMessages, initialValues, mode = "onTouched", reValidateMode = "onChange", formRef, saveButtonLabel, renderStickySection, localCacheKey, localCacheExclude, localCacheId, secondaryActions, saveButtonOffset, showStickySaveButton = false, disableKeyboardAwareScroll = false, renderFooter, UNSAFE_allowDiscardLocalCacheWhenOffline, }) {
     var _a;
     const { scrollViewRef, bottomViewRef, scrollToTop } = useFormViewRefs();
     const [saveButtonHeight, setSaveButtonHeight] = useState(0);
     const [messageBannerHeight, setMessageBannerHeight] = useState(0);
-    const { setIsScrolling } = useInputAccessoriesContext();
     const { formMethods, handleSubmit, isSubmitting, removeListenerRef, setLocalCache, } = useInternalForm({
         mode,
         reValidateMode,
@@ -82,11 +81,8 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
         keyboardScreenY,
     });
     const [isSecondaryActionLoading, setIsSecondaryActionLoading] = useState(false);
-    const { calculatedKeyboardHeight } = useMemo(() => {
-        return {
-            calculatedKeyboardHeight: keyboardHeight - (paddingBottom + KEYBOARD_SAVE_BUTTON_DISTANCE),
-        };
-    }, [paddingBottom, keyboardHeight]);
+    const extraViewHeight = paddingBottom + KEYBOARD_SAVE_BUTTON_DISTANCE;
+    const calculatedKeyboardHeight = keyboardHeight - extraViewHeight;
     useScrollToError({
         formState: formMethods.formState,
         refNode: findNodeHandle(scrollViewRef.current),
@@ -104,6 +100,9 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
             onKeyboardDidShow: handleKeyboardShow,
         },
     });
+    const onLayout = (event) => {
+        setMessageBannerHeight(event.nativeEvent.layout.height);
+    };
     const styles = useStyles();
     const { edgeToEdgeEnabled } = useAtlantisFormContext();
     return (React.createElement(FormProvider, Object.assign({}, formMethods),
@@ -111,17 +110,11 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
             (isSubmitting || isSecondaryActionLoading) && React.createElement(FormMask, null),
             React.createElement(FormCache, { localCacheKey: localCacheKey, localCacheExclude: localCacheExclude, setLocalCache: setLocalCache }),
             React.createElement(FormBody, { keyboardHeight: calculateSaveButtonOffset(), submit: handleSubmit(internalSubmit), isFormSubmitting: isSubmitting, saveButtonLabel: saveButtonLabel, shouldRenderActionBar: saveButtonPosition === "sticky", renderStickySection: renderStickySection, secondaryActions: secondaryActions, setSecondaryActionLoading: setIsSecondaryActionLoading, setSaveButtonHeight: setSaveButtonHeight, saveButtonOffset: saveButtonOffset },
-                React.createElement(KeyboardAwareScrollView, Object.assign({ enableResetScrollToCoords: false, enableAutomaticScroll: true, enableOnAndroid: edgeToEdgeEnabled, keyboardOpeningTime: Platform.OS === "ios" ? tokens["timing-slowest"] : 0, keyboardShouldPersistTaps: "handled", ref: scrollViewRef }, keyboardProps, { extraHeight: headerHeight, extraScrollHeight: edgeToEdgeEnabled ? tokens["space-large"] : 0, contentContainerStyle: !keyboardHeight && styles.scrollContentContainer, onScrollBeginDrag: () => {
-                        setIsScrolling(true);
-                    }, onScrollEndDrag: () => {
-                        setIsScrolling(false);
-                    } }),
+                React.createElement(KeyboardAwareScrollView, Object.assign({ enableResetScrollToCoords: false, enableAutomaticScroll: !disableKeyboardAwareScroll, enableOnAndroid: edgeToEdgeEnabled, keyboardOpeningTime: Platform.OS === "ios" ? tokens["timing-slowest"] : 0, keyboardShouldPersistTaps: "handled", ref: scrollViewRef }, keyboardProps, { extraHeight: headerHeight, extraScrollHeight: edgeToEdgeEnabled ? tokens["space-large"] : 0, contentContainerStyle: !keyboardHeight && styles.scrollContentContainer }),
                     React.createElement(View, { onLayout: ({ nativeEvent }) => {
                             setFormContentHeight(nativeEvent.layout.height);
                         } },
-                        React.createElement(View, { onLayout: ({ nativeEvent }) => {
-                                setMessageBannerHeight(nativeEvent.layout.height);
-                            } },
+                        React.createElement(View, { onLayout: onLayout },
                             React.createElement(FormMessageBanner, { bannerMessages: bannerMessages }),
                             React.createElement(FormErrorBanner, { networkError: bannerErrors === null || bannerErrors === void 0 ? void 0 : bannerErrors.networkError, bannerError: bannerErrors === null || bannerErrors === void 0 ? void 0 : bannerErrors.bannerError })),
                         React.createElement(View, { style: styles.formChildContainer },

package/dist/src/InputText/InputText.js

@@ -40,7 +40,7 @@ function InputTextInternal({ invalid, disabled, readonly = false, name, placehol
         placeholderTextColor: "transparent",
     }));
     const _name = name !== null && name !== void 0 ? name : field.name;
-    const { inputAccessoryID, register, unregister, setFocusedInput, canFocusNext, isScrolling, onFocusNext, } = useInputAccessoriesContext();
+    const { inputAccessoryID, register, unregister, setFocusedInput, canFocusNext, onFocusNext, } = useInputAccessoriesContext();
     useEffect(() => {
         _name &&
             register(_name, () => {
@@ -75,40 +75,8 @@ function InputTextInternal({ invalid, disabled, readonly = false, name, placehol
     }
     const styles = useStyles();
     const commonInputStyles = useCommonInputStyles();
-    // const { headerHeight, windowHeight } = useScreenInformation();
-    // State to track if the InputText component can fully fit on screen
-    // (i.e., it's completely visible). Use this state to handle visibility issues.
-    // const [canFullyFitOnScreen, setCanFullyFitOnScreen] = useState(true);
     return (React.createElement(InputFieldWrapper, { prefix: prefix, suffix: suffix, hasValue: hasValue, placeholderMode: placeholderMode, assistiveText: assistiveText, focused: focused, error: error, invalid: invalid, placeholder: placeholder, disabled: disabled, onClear: handleClear, showClearAction: showClear, styleOverride: styleOverride, toolbar: toolbar, toolbarVisibility: toolbarVisibility, loading: loading, loadingType: loadingType },
-        React.createElement(TextInput
-        // onLayout={(event: LayoutChangeEvent) => {
-        //   event.target?.measureInWindow((_, y, __, height) => {
-        //     // Check if component can't fully fit on screen (height only)
-        //     // Account for headerHeight at the top of the screen and buffer zone
-        //     const visibleTop = headerHeight + KEYBOARD_AWARE_DETECTION_BUFFER; // Top of visible area (below header) with buffer
-        //     const visibleBottom =
-        //       windowHeight - KEYBOARD_AWARE_DETECTION_BUFFER; // Bottom of visible area with buffer
-        //     const isOffScreen =
-        //       y < visibleTop || // Top edge is behind or above the header (with buffer)
-        //       y + height > visibleBottom; // Bottom edge is below the window (with buffer)
-        //     setCanFullyFitOnScreen(!isOffScreen);
-        //   });
-        // }}
-        , Object.assign({ 
-            // onLayout={(event: LayoutChangeEvent) => {
-            //   event.target?.measureInWindow((_, y, __, height) => {
-            //     // Check if component can't fully fit on screen (height only)
-            //     // Account for headerHeight at the top of the screen and buffer zone
-            //     const visibleTop = headerHeight + KEYBOARD_AWARE_DETECTION_BUFFER; // Top of visible area (below header) with buffer
-            //     const visibleBottom =
-            //       windowHeight - KEYBOARD_AWARE_DETECTION_BUFFER; // Bottom of visible area with buffer
-            //     const isOffScreen =
-            //       y < visibleTop || // Top edge is behind or above the header (with buffer)
-            //       y + height > visibleBottom; // Bottom edge is below the window (with buffer)
-            //     setCanFullyFitOnScreen(!isOffScreen);
-            //   });
-            // }}
-            inputAccessoryViewID: inputAccessoryID || undefined, testID: testID, autoCapitalize: autoCapitalize, autoCorrect: autoCorrect, spellCheck: spellCheck, style: [
+        React.createElement(TextInput, Object.assign({ inputAccessoryViewID: inputAccessoryID || undefined, testID: testID, autoCapitalize: autoCapitalize, autoCorrect: autoCorrect, spellCheck: spellCheck, style: [
                 commonInputStyles.input,
                 styles.inputPaddingTop,
                 !miniLabelActive && commonInputStyles.inputEmpty,
@@ -121,17 +89,7 @@ function InputTextInternal({ invalid, disabled, readonly = false, name, placehol
                     styles.multilineWithoutMiniLabel,
                 styleOverride === null || styleOverride === void 0 ? void 0 : styleOverride.inputText,
                 loading && loadingType === "glimmer" && { color: "transparent" },
-            ], 
-            // Prevent focus during scroll for multiline inputs to avoid
-            // the input focusing when the user is trying to scroll the form
-            readOnly: readonly || (multiline && isScrolling && !focused), 
-            // readOnly={readonly}
-            editable: !disabled, keyboardType: keyboard, value: inputTransform(internalValue), autoFocus: autoFocus, autoComplete: autoComplete, multiline: multiline, 
-            // Makes sure it doesn't jump to the top of the screen when the keyboard is shown and a new line is added.
-            // State for tracking if the input should be scrollable.
-            // This is tech debt related to an issue where keyboard aware scrollview doesn't work if `scrollEnabled` is true. However,
-            // when `scrollEnabled` is false it causes an issue where super long text inputs will jump to the top when a new line is added to the bottom of the input.
-            scrollEnabled: Platform.OS === "ios", textContentType: textContentType, onChangeText: handleChangeText, onSubmitEditing: handleOnSubmitEditing, returnKeyType: returnKeyType, blurOnSubmit: shouldBlurOnSubmit, accessibilityLabel: accessibilityLabel || placeholder, accessibilityHint: accessibilityHint, accessibilityState: { busy: loading }, secureTextEntry: secureTextEntry }, androidA11yProps, { onFocus: event => {
+            ], readOnly: readonly, editable: !disabled, keyboardType: keyboard, value: inputTransform(internalValue), autoFocus: autoFocus, autoComplete: autoComplete, multiline: multiline, scrollEnabled: false, textContentType: textContentType, onChangeText: handleChangeText, onSubmitEditing: handleOnSubmitEditing, returnKeyType: returnKeyType, blurOnSubmit: shouldBlurOnSubmit, accessibilityLabel: accessibilityLabel || placeholder, accessibilityHint: accessibilityHint, accessibilityState: { busy: loading }, secureTextEntry: secureTextEntry }, androidA11yProps, { onFocus: event => {
                 _name && setFocusedInput(_name);
                 setFocused(true);
                 onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);

package/dist/src/InputText/context/InputAccessoriesContext.js

@@ -10,8 +10,6 @@ const inputAccessoriesContextDefaultValues = {
     onFocusNext: () => undefined,
     onFocusPrevious: () => undefined,
     setFocusedInput: () => undefined,
-    isScrolling: false,
-    setIsScrolling: () => undefined,
 };
 export const InputAccessoriesContext = createContext(inputAccessoriesContextDefaultValues);
 export function useInputAccessoriesContext() {

package/dist/src/InputText/context/InputAccessoriesProvider.js

@@ -5,7 +5,7 @@ import { InputAccessoriesContext } from "./InputAccessoriesContext";
 import { useStyles } from "./InputAccessoriesProvider.style";
 export function InputAccessoriesProvider({ children, }) {
     const inputAccessoryID = useRef(v4()).current;
-    const { focusedInput, setFocusedInput, canFocusNext, canFocusPrevious, elements, setElements, previousKey, nextKey, isScrolling, setIsScrolling, } = useInputAccessoriesProviderState();
+    const { focusedInput, setFocusedInput, canFocusNext, canFocusPrevious, elements, setElements, previousKey, nextKey, } = useInputAccessoriesProviderState();
     const colorScheme = useColorScheme();
     const styles = useStyles();
     return (React.createElement(InputAccessoriesContext.Provider, { value: {
@@ -19,8 +19,6 @@ export function InputAccessoriesProvider({ children, }) {
             onFocusNext,
             onFocusPrevious,
             setFocusedInput,
-            isScrolling,
-            setIsScrolling,
         } },
         children,
         Platform.OS === "ios" && (React.createElement(InputAccessoryView, { nativeID: inputAccessoryID },
@@ -51,7 +49,6 @@ function useInputAccessoriesProviderState() {
     const [canFocusNext, setCanFocusNext] = useState(false);
     const [canFocusPrevious, setCanFocusPrevious] = useState(false);
     const [elements, setElements] = useState({});
-    const [isScrolling, setIsScrolling] = useState(false);
     const keys = Object.keys(elements);
     const selectedIndex = keys.findIndex(key => key === focusedInput);
     const nextKey = keys[selectedIndex + 1];
@@ -71,7 +68,5 @@ function useInputAccessoriesProviderState() {
         setCanFocusPrevious,
         elements,
         setElements,
-        isScrolling,
-        setIsScrolling,
     };
 }

package/dist/src/hooks/index.js

@@ -1,3 +1,2 @@
 export * from "./useFormController";
 export * from "./useIsScreenReaderEnabled";
-export * from "./useKeyboardVisibility";