@jobber/components-native 0.95.2-JOB-141866-990fa70.9 → 0.95.2-JOB-141866-ccf6ba8.10

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-ccf6ba8.10+ccf6ba8d6",
     "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": "ccf6ba8d6a687be9144debdfeab7c09525685fb0"
 }

package/dist/src/Form/Form.js

@@ -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) {
@@ -54,7 +54,6 @@ function InternalForm({ children, onBeforeSubmit, onSubmit, onSubmitError, onSub
     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,
@@ -111,11 +110,7 @@ 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: 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 }),
                     React.createElement(View, { onLayout: ({ nativeEvent }) => {
                             setFormContentHeight(nativeEvent.layout.height);
                         } },

package/dist/src/InputFieldWrapper/InputFieldWrapper.js

@@ -11,7 +11,7 @@ import { Text } from "../Text";
 import { ActivityIndicator } from "../ActivityIndicator";
 export const INPUT_FIELD_WRAPPER_GLIMMERS_TEST_ID = "ATL-InputFieldWrapper-Glimmers";
 export const INPUT_FIELD_WRAPPER_SPINNER_TEST_ID = "ATL-InputFieldWrapper-Spinner";
-export function InputFieldWrapper({ invalid, disabled, placeholder, assistiveText, prefix, suffix, placeholderMode = "normal", hasValue = false, error, focused = false, children, onClear, showClearAction = false, styleOverride, toolbar, toolbarVisibility = "while-editing", loading = false, loadingType = "spinner", }) {
+export function InputFieldWrapper({ invalid, disabled, placeholder, assistiveText, prefix, suffix, placeholderMode = "normal", hasValue = false, error, focused = false, children, onClear, showClearAction = false, styleOverride, toolbar, toolbarVisibility = "while-editing", loading = false, loadingType = "spinner", scrollViewHackOnLayout, }) {
     fieldAffixRequiredPropsCheck([prefix, suffix]);
     const handleClear = onClear !== null && onClear !== void 0 ? onClear : noopClear;
     warnIfClearActionWithNoOnClear(onClear, showClearAction);
@@ -29,7 +29,7 @@ export function InputFieldWrapper({ invalid, disabled, placeholder, assistiveTex
                 (Boolean(invalid) || error) && styles.inputInvalid,
                 disabled && styles.disabled,
                 styleOverride === null || styleOverride === void 0 ? void 0 : styleOverride.container,
-            ] },
+            ], onLayout: scrollViewHackOnLayout },
             React.createElement(View, { style: styles.field },
                 (prefix === null || prefix === void 0 ? void 0 : prefix.icon) && (React.createElement(PrefixIcon, { disabled: disabled, focused: focused, inputInvalid: inputInvalid, icon: prefix.icon })),
                 React.createElement(View, { style: [styles.inputContainer] },

package/dist/src/InputText/InputText.js

@@ -1,12 +1,21 @@
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState, } from "react";
+import React, { forwardRef, useDeferredValue, useEffect, useImperativeHandle, useMemo, useRef, useState, } from "react";
 import { Platform, TextInput } from "react-native";
 import identity from "lodash/identity";
 import { useShowClear } from "@jobber/hooks";
 import { useStyles } from "./InputText.style";
 import { useInputAccessoriesContext } from "./context";
-import { useFormController } from "../hooks";
+import { useFormController, useKeyboardVisibility } from "../hooks";
 import { InputFieldWrapper } from "../InputFieldWrapper";
 import { useCommonInputStyles } from "../InputFieldWrapper/CommonInputStyles.style";
+import { useScreenInformation } from "../Form/hooks/useScreenInformation";
+// import { useScreenInformation } from "../Form/hooks/useScreenInformation";
+/**
+ * Buffer zone in pixels for offscreen detection.
+ * This makes the detection more sensitive by marking the component as offscreen
+ * even if it's technically still visible but within this buffer distance from the edge.
+ */
+// 44 (accessory bar height) + 20 (buffer)
+const KEYBOARD_AWARE_DETECTION_BUFFER = 40;
 export const InputText = forwardRef(InputTextInternal);
 // eslint-disable-next-line max-statements
 function InputTextInternal({ invalid, disabled, readonly = false, name, placeholder, assistiveText, showMiniLabel = true, keyboard, value: controlledValue, defaultValue, autoFocus, autoComplete = "off", spellCheck, textContentType = "none", validations, onChangeText, onSubmitEditing, onFocus, accessibilityLabel, accessibilityHint, autoCorrect, autoCapitalize, onBlur, multiline = false, prefix, suffix, transform = {}, clearable = multiline ? "never" : "while-editing", testID, secureTextEntry, styleOverride, toolbar, toolbarVisibility, loading, loadingType, }, ref) {
@@ -40,7 +49,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 +84,21 @@ 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: [
+    const { headerHeight, windowHeight } = useScreenInformation();
+    const { keyboardHeight } = useKeyboardVisibility();
+    const maxHeight = useDeferredValue(windowHeight -
+        headerHeight -
+        keyboardHeight -
+        KEYBOARD_AWARE_DETECTION_BUFFER);
+    const [inputHeight, setInputHeight] = useState(0);
+    const enableScroll = useDeferredValue(inputHeight > maxHeight);
+    return (React.createElement(InputFieldWrapper, { scrollViewHackOnLayout: event => {
+            var _a;
+            (_a = event.target) === null || _a === void 0 ? void 0 : _a.measureInWindow((_, y, __, height) => {
+                setInputHeight(height);
+            });
+        }, 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, Object.assign({ inputAccessoryViewID: inputAccessoryID || undefined, testID: testID, autoCapitalize: autoCapitalize, autoCorrect: autoCorrect, spellCheck: spellCheck, style: [
                 commonInputStyles.input,
                 styles.inputPaddingTop,
                 !miniLabelActive && commonInputStyles.inputEmpty,
@@ -121,17 +111,12 @@ 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, 
+            ], 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 => {
+            scrollEnabled: Platform.OS === "ios" && enableScroll, 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,
     };
 }