@react-native-ama/forms 1.1.0 → 1.1.1

package/dist/components/FormField.js

@@ -41,7 +41,6 @@ const useFormField_1 = require("../hooks/useFormField");
 const FormField = (_a) => {
     var { children, wrapInsideAccessibleView = true } = _a, props = __rest(_a, ["children", "wrapInsideAccessibleView"]);
     const viewRef = React.useRef(null);
-    // @ts-ignore
     const formProps = (0, useFormField_1.useFormField)(Object.assign({ hasFocusCallback: false, ref: viewRef }, props));
     return wrapInsideAccessibleView ? (<react_native_1.TouchableWithoutFeedback {...props} ref={viewRef} {...formProps}>
       <react_native_1.View accessible>{children}</react_native_1.View>

package/dist/components/FormSwitch.d.ts

@@ -1,4 +1,4 @@
-import { SwitchListItemProps } from '@react-native-ama/react-native';
+import { type SwitchListItemProps } from '@react-native-ama/react-native';
 import React from 'react';
 export type FormSwitchProps = SwitchListItemProps;
 export declare const FormSwitch: (props: FormSwitchProps) => React.JSX.Element;

package/dist/components/TextInput.d.ts

@@ -1,26 +1,13 @@
 import * as React from 'react';
 import { TextInput as RNTextInput, TextInputProps as RNTextInputProps } from 'react-native';
-export type TextInputProps = RNTextInputProps & {
+import { UseTextInput } from '../hooks/useTextInput';
+export type TextInputProps = RNTextInputProps & Omit<UseTextInput, 'required' | 'accessibilityLabel'> & {
     labelComponent: JSX.Element;
     labelPosition?: 'beforeInput' | 'afterInput';
     nextFormField?: React.RefObject<RNTextInput>;
     id?: string;
     nextFieldId?: string;
-    hasValidation: boolean;
     errorComponent?: JSX.Element;
-    hasError?: boolean;
     errorPosition?: 'belowLabel' | 'afterInput';
-    errorMessage?: string;
 };
-export declare const TextInput: React.ForwardRefExoticComponent<RNTextInputProps & {
-    labelComponent: JSX.Element;
-    labelPosition?: "beforeInput" | "afterInput" | undefined;
-    nextFormField?: React.RefObject<RNTextInput> | undefined;
-    id?: string | undefined;
-    nextFieldId?: string | undefined;
-    hasValidation: boolean;
-    errorComponent?: JSX.Element | undefined;
-    hasError?: boolean | undefined;
-    errorPosition?: "afterInput" | "belowLabel" | undefined;
-    errorMessage?: string | undefined;
-} & React.RefAttributes<RNTextInput>>;
+export declare const TextInput: React.ForwardRefExoticComponent<Omit<TextInputProps, "ref"> & React.RefAttributes<RNTextInput>>;

package/dist/components/TextInput.js

@@ -49,12 +49,10 @@ exports.TextInput = React.forwardRef((_a, forwardedRef) => {
     React.useImperativeHandle(forwardedRef, () => inputRef.current);
     const showLabelBeforeInput = labelPosition === 'beforeInput';
     const accessibilityLabel = React.useMemo(() => (0, internal_2.maybeGenerateStringFromElement)(labelComponent, rest.accessibilityLabel), [labelComponent, rest.accessibilityLabel]);
-    // @ts-ignore
-    const textInputProps = (0, useTextInput_1.useTextInput)(Object.assign({ required: false, ref: inputRef, id,
+    const textInputProps = (0, useTextInput_1.useTextInput)(Object.assign(Object.assign({}, rest), { ref: inputRef, id,
         nextFieldId, nextFormFieldRef: nextFormField, hasError,
         hasValidation,
-        errorMessage,
-        accessibilityLabel }, rest));
+        errorMessage, required: false, accessibilityLabel }));
     const checks = __DEV__ ? core_2.useChecks === null || core_2.useChecks === void 0 ? void 0 : (0, core_2.useChecks)() : undefined;
     __DEV__ &&
         (checks === null || checks === void 0 ? void 0 : checks.noUndefinedProperty({

package/dist/hooks/useTextInput.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import type { LayoutChangeEvent, NativeSyntheticEvent, ReturnKeyTypeOptions, StyleProp, TextInputSubmitEditingEventData, TextStyle, ViewStyle } from 'react-native';
 import { UseFormField } from './useFormField';
-type UseTextInput = Omit<UseFormField, 'hasFocusCallback'> & {
+export type UseTextInput = Omit<UseFormField, 'hasFocusCallback'> & {
     onLayout?: (event: LayoutChangeEvent) => void;
     returnKeyType?: ReturnKeyTypeOptions;
     onSubmitEditing?: (event: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void;
@@ -40,7 +40,7 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     onPressOut?: ((e: NativeSyntheticEvent<import("react-native").NativeTouchEvent>) => void) | undefined;
     onFocus?: ((e: NativeSyntheticEvent<import("react-native").TextInputFocusEventData>) => void) | undefined;
     onSelectionChange?: ((e: NativeSyntheticEvent<import("react-native").TextInputSelectionChangeEventData>) => void) | undefined;
-    onSubmitEditing?: ((e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void) | undefined;
+    onSubmitEditing?: (((e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void) & ((event: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void)) | undefined;
     onScroll?: ((e: NativeSyntheticEvent<import("react-native").TextInputScrollEventData>) => void) | undefined;
     onKeyPress?: ((e: NativeSyntheticEvent<import("react-native").TextInputKeyPressEventData>) => void) | undefined;
     placeholder?: string | undefined;
@@ -64,7 +64,7 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     hitSlop?: number | import("react-native").Insets | null | undefined;
     id?: string | undefined;
     needsOffscreenAlphaCompositing?: boolean | undefined;
-    onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+    onLayout?: (((event: LayoutChangeEvent) => void) & ((event: LayoutChangeEvent) => void)) | undefined;
     pointerEvents?: "box-none" | "none" | "box-only" | "auto" | undefined;
     removeClippedSubviews?: boolean | undefined;
     nativeID?: string | undefined;
@@ -171,20 +171,21 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     textAlignVertical?: "center" | "auto" | "top" | "bottom" | undefined;
     showSoftInputOnFocus?: boolean | undefined;
     verticalAlign?: "auto" | "top" | "bottom" | "middle" | undefined;
+    ref?: React.RefObject<any> | React.ForwardedRef<any> | undefined;
+    suppressError?: boolean | undefined;
+    hasValidation: boolean;
+    hasError?: boolean | undefined;
+    nextFieldId?: string | undefined;
+    nextFormFieldRef?: React.RefObject<any> | undefined;
+    errorMessage?: string | undefined;
+    requiredMessage?: string | undefined;
     labelComponent?: JSX.Element | undefined;
     labelPosition?: "beforeInput" | "afterInput" | undefined;
     nextFormField?: React.RefObject<import("react-native").TextInput> | undefined;
-    nextFieldId?: string | undefined;
-    hasValidation: boolean;
     errorComponent?: JSX.Element | undefined;
-    hasError?: boolean | undefined;
     errorPosition?: "afterInput" | "belowLabel" | undefined;
-    errorMessage?: string | undefined;
     focusNextFormField: () => void;
     isLastField: () => boolean;
-    ref?: React.RefObject<any> | React.ForwardedRef<any> | undefined;
-    suppressError?: boolean | undefined;
-    nextFormFieldRef?: React.RefObject<any> | undefined;
 } | {
     allowFontScaling?: boolean | undefined;
     autoCapitalize?: "none" | "sentences" | "words" | "characters" | undefined;
@@ -210,7 +211,7 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     onPressOut?: ((e: NativeSyntheticEvent<import("react-native").NativeTouchEvent>) => void) | undefined;
     onFocus?: ((e: NativeSyntheticEvent<import("react-native").TextInputFocusEventData>) => void) | undefined;
     onSelectionChange?: ((e: NativeSyntheticEvent<import("react-native").TextInputSelectionChangeEventData>) => void) | undefined;
-    onSubmitEditing?: ((e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void) | undefined;
+    onSubmitEditing?: (((e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void) & ((event: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void)) | undefined;
     onScroll?: ((e: NativeSyntheticEvent<import("react-native").TextInputScrollEventData>) => void) | undefined;
     onKeyPress?: ((e: NativeSyntheticEvent<import("react-native").TextInputKeyPressEventData>) => void) | undefined;
     placeholder?: string | undefined;
@@ -225,7 +226,7 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
         end?: number | undefined;
     } | undefined;
     selectionColor?: import("react-native").ColorValue | undefined;
-    style?: false | "" | ViewStyle | import("react-native").RegisteredStyle<TextStyle> | import("react-native").RecursiveArray<import("react-native").Falsy | TextStyle | import("react-native").RegisteredStyle<TextStyle>> | null | undefined;
+    style?: ViewStyle | undefined;
     textAlign?: "center" | "left" | "right" | undefined;
     testID?: string | undefined;
     inputAccessoryViewID?: string | undefined;
@@ -235,7 +236,7 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     hitSlop?: number | import("react-native").Insets | null | undefined;
     id?: string | undefined;
     needsOffscreenAlphaCompositing?: boolean | undefined;
-    onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+    onLayout?: (((event: LayoutChangeEvent) => void) & ((event: LayoutChangeEvent) => void)) | undefined;
     pointerEvents?: "box-none" | "none" | "box-only" | "auto" | undefined;
     removeClippedSubviews?: boolean | undefined;
     nativeID?: string | undefined;
@@ -342,19 +343,19 @@ export declare const useTextInput: ({ onLayout, returnKeyType, onSubmitEditing,
     textAlignVertical?: "center" | "auto" | "top" | "bottom" | undefined;
     showSoftInputOnFocus?: boolean | undefined;
     verticalAlign?: "auto" | "top" | "bottom" | "middle" | undefined;
+    ref?: React.RefObject<any> | React.ForwardedRef<any> | undefined;
+    suppressError?: boolean | undefined;
+    hasValidation: boolean;
+    hasError?: boolean | undefined;
+    nextFieldId?: string | undefined;
+    nextFormFieldRef?: React.RefObject<any> | undefined;
+    errorMessage?: string | undefined;
+    requiredMessage?: string | undefined;
     labelComponent?: JSX.Element | undefined;
     labelPosition?: "beforeInput" | "afterInput" | undefined;
     nextFormField?: React.RefObject<import("react-native").TextInput> | undefined;
-    nextFieldId?: string | undefined;
-    hasValidation: boolean;
     errorComponent?: JSX.Element | undefined;
-    hasError?: boolean | undefined;
     errorPosition?: "afterInput" | "belowLabel" | undefined;
-    errorMessage?: string | undefined;
     focusNextFormField: () => void;
     isLastField: () => boolean;
-    ref?: React.RefObject<any> | React.ForwardedRef<any> | undefined;
-    suppressError?: boolean | undefined;
-    nextFormFieldRef?: React.RefObject<any> | undefined;
 };
-export {};

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { isFocused } from '@react-native-ama/internal';
-import { FormActions, FormProps } from './components/Form';
+import { FormActions, type FormProps } from './components/Form';
 import { FormField, FormFieldProps } from './components/FormField';
 import { FormSubmit, FormSubmitProps } from './components/FormSubmit';
 import { FormSwitch, FormSwitchProps } from './components/FormSwitch';
@@ -11,8 +11,8 @@ type FormComponent = React.FunctionComponent<FormProps> & {
 };
 declare const Form: FormComponent;
 export { Form, FormField, FormSubmit, FormSwitch };
-export { TextInput } from './components/TextInput';
-export { useFormField } from './hooks/useFormField';
-export { useTextInput } from './hooks/useTextInput';
+export { TextInput, type TextInputProps } from './components/TextInput';
+export { useFormField, type UseFormField } from './hooks/useFormField';
+export { useTextInput, type UseTextInput } from './hooks/useTextInput';
 export { isFocused };
 export { type FormProps, type FormActions, type FormFieldProps, type FormSubmitProps, type FormSwitchProps, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ama/forms",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "react-native": "src/index",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -23,9 +23,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@react-native-ama/core": "~1.1.0",
-    "@react-native-ama/internal": "~1.1.0",
-    "@react-native-ama/react-native": "~1.1.0"
+    "@react-native-ama/core": "~1.1.1",
+    "@react-native-ama/internal": "~1.1.1",
+    "@react-native-ama/react-native": "~1.1.1"
   },
   "peerDependencies": {
     "react": "*",

package/src/components/FormField.tsx

@@ -26,7 +26,6 @@ export const FormField = ({
     typeof TouchableWithoutFeedback
   > | null>(null);
 
-  // @ts-ignore
   const formProps = useFormField({
     hasFocusCallback: false,
     ref: viewRef,

package/src/components/FormSwitch.tsx

@@ -1,6 +1,6 @@
 import {
   SwitchListItem,
-  SwitchListItemProps,
+  type SwitchListItemProps,
 } from '@react-native-ama/react-native';
 import React from 'react';
 

package/src/components/TextInput.tsx

@@ -8,20 +8,18 @@ import {
   TextInputProps as RNTextInputProps,
 } from 'react-native';
 
-import { useTextInput } from '../hooks/useTextInput';
+import { UseTextInput, useTextInput } from '../hooks/useTextInput';
 
-export type TextInputProps = RNTextInputProps & {
-  labelComponent: JSX.Element;
-  labelPosition?: 'beforeInput' | 'afterInput';
-  nextFormField?: React.RefObject<RNTextInput>;
-  id?: string;
-  nextFieldId?: string;
-  hasValidation: boolean;
-  errorComponent?: JSX.Element;
-  hasError?: boolean;
-  errorPosition?: 'belowLabel' | 'afterInput';
-  errorMessage?: string;
-};
+export type TextInputProps = RNTextInputProps &
+  Omit<UseTextInput, 'required' | 'accessibilityLabel'> & {
+    labelComponent: JSX.Element;
+    labelPosition?: 'beforeInput' | 'afterInput';
+    nextFormField?: React.RefObject<RNTextInput>;
+    id?: string;
+    nextFieldId?: string;
+    errorComponent?: JSX.Element;
+    errorPosition?: 'belowLabel' | 'afterInput';
+  };
 
 export const TextInput = React.forwardRef<RNTextInput, TextInputProps>(
   (
@@ -55,9 +53,8 @@ export const TextInput = React.forwardRef<RNTextInput, TextInputProps>(
       [labelComponent, rest.accessibilityLabel],
     );
 
-    // @ts-ignore
     const textInputProps = useTextInput({
-      required: false,
+      ...rest,
       ref: inputRef,
       id,
       nextFieldId,
@@ -65,8 +62,8 @@ export const TextInput = React.forwardRef<RNTextInput, TextInputProps>(
       hasError,
       hasValidation,
       errorMessage,
+      required: false,
       accessibilityLabel,
-      ...rest,
     });
 
     const checks = __DEV__ ? useChecks?.() : undefined;

package/src/hooks/useTextInput.ts

@@ -14,7 +14,7 @@ import type {
 import { TextInputProps } from '../components/TextInput';
 import { UseFormField, useFormField } from './useFormField';
 
-type UseTextInput = Omit<UseFormField, 'hasFocusCallback'> & {
+export type UseTextInput = Omit<UseFormField, 'hasFocusCallback'> & {
   onLayout?: (event: LayoutChangeEvent) => void;
   returnKeyType?: ReturnKeyTypeOptions;
   onSubmitEditing?: (

package/src/index.ts

@@ -4,8 +4,8 @@ import { isFocused } from '@react-native-ama/internal';
 
 import {
   FormActions,
-  FormProps,
   Form as FormProvider,
+  type FormProps,
 } from './components/Form';
 import { FormField, FormFieldProps } from './components/FormField';
 import { FormSubmit, FormSubmitProps } from './components/FormSubmit';
@@ -26,11 +26,11 @@ Form.Switch = FormSwitch;
 export { Form, FormField, FormSubmit, FormSwitch };
 
 // Components
-export { TextInput } from './components/TextInput';
+export { TextInput, type TextInputProps } from './components/TextInput';
 
 // Hooks
-export { useFormField } from './hooks/useFormField';
-export { useTextInput } from './hooks/useTextInput';
+export { useFormField, type UseFormField } from './hooks/useFormField';
+export { useTextInput, type UseTextInput } from './hooks/useTextInput';
 
 // utils
 export { isFocused };