@jobber/components-native 0.84.2-CLEANUPus-25aa17e.18 → 0.84.2-JOB-131715-ce60f9e.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/dist/package.json +22 -6
  2. package/dist/src/Banner/Banner.js +2 -0
  3. package/dist/src/Banner/components/BannerIcon/BannerIcon.style.js +3 -0
  4. package/dist/src/Form/components/FormCache/FormCache.js +1 -0
  5. package/dist/src/FormatFile/utils/createUseCreateThumbnail.js +1 -1
  6. package/dist/src/InputCurrency/InputCurrency.js +42 -30
  7. package/dist/src/InputEmail/InputEmail.js +12 -4
  8. package/dist/src/InputFieldWrapper/InputFieldWrapper.style.js +1 -1
  9. package/dist/src/InputNumber/InputNumber.js +10 -4
  10. package/dist/src/InputSearch/InputSearch.js +1 -1
  11. package/dist/src/hooks/useAtlantisI18n/locales/en.json +1 -0
  12. package/dist/src/hooks/useAtlantisI18n/locales/es.json +1 -0
  13. package/dist/src/hooks/useFormController.js +5 -14
  14. package/dist/tsconfig.build.json +7 -0
  15. package/dist/tsconfig.build.tsbuildinfo +1 -0
  16. package/dist/tsconfig.json +5 -6
  17. package/dist/types/src/Banner/components/BannerIcon/BannerIcon.style.d.ts +3 -0
  18. package/dist/types/src/Banner/types.d.ts +1 -1
  19. package/dist/types/src/Form/components/FormCache/FormCache.d.ts +2 -2
  20. package/dist/types/src/Form/context/types.d.ts +2 -2
  21. package/dist/types/src/Form/hooks/useInternalForm.d.ts +2 -2
  22. package/dist/types/src/Form/types.d.ts +3 -3
  23. package/dist/types/src/InputFieldWrapper/InputFieldWrapper.style.d.ts +1 -1
  24. package/package.json +22 -6
  25. package/src/Banner/Banner.test.tsx +12 -0
  26. package/src/Banner/Banner.tsx +2 -0
  27. package/src/Banner/components/BannerIcon/BannerIcon.style.ts +3 -0
  28. package/src/Banner/types.ts +1 -1
  29. package/src/Button/Button.stories.tsx +30 -0
  30. package/src/Form/components/FormCache/FormCache.tsx +4 -3
  31. package/src/Form/context/types.ts +2 -2
  32. package/src/Form/hooks/useInternalForm.ts +2 -1
  33. package/src/Form/types.ts +3 -4
  34. package/src/FormatFile/utils/createUseCreateThumbnail.ts +1 -1
  35. package/src/InputCurrency/InputCurrency.tsx +71 -57
  36. package/src/InputEmail/InputEmail.tsx +15 -8
  37. package/src/InputFieldWrapper/InputFieldWrapper.style.ts +1 -1
  38. package/src/InputNumber/InputNumber.tsx +11 -7
  39. package/src/InputSearch/InputSearch.tsx +1 -1
  40. package/src/hooks/useAtlantisI18n/locales/en.json +1 -0
  41. package/src/hooks/useAtlantisI18n/locales/es.json +1 -0
  42. package/src/hooks/useFormController.ts +6 -13
  43. package/dist/tsconfig.tsbuildinfo +0 -1
@@ -8,8 +8,11 @@
8
8
  "declarationDir": "./dist/types",
9
9
  "resolveJsonModule": true,
10
10
  "paths": {
11
+ "@jobber/hooks": [
12
+ "../hooks/src/index.ts"
13
+ ],
11
14
  "@jobber/hooks/*": [
12
- "../../packages/hooks/src/*"
15
+ "../hooks/src/*"
13
16
  ]
14
17
  },
15
18
  "types": [
@@ -29,12 +32,8 @@
29
32
  "node_modules",
30
33
  "dist/**/*",
31
34
  "tsconfig.eslint.json",
35
+ "**/*.stories.tsx",
32
36
  "**/*.test.ts",
33
37
  "**/*.test.tsx",
34
- ],
35
- "references": [
36
- {
37
- "path": "../hooks"
38
- }
39
38
  ]
40
39
  }
@@ -12,4 +12,7 @@ export declare const useStyles: () => {
12
12
  notice: {
13
13
  backgroundColor: string;
14
14
  };
15
+ success: {
16
+ backgroundColor: string;
17
+ };
15
18
  };
@@ -1,7 +1,7 @@
1
1
  import type { IconNames } from "@jobber/design";
2
2
  import type { ReactElement } from "react";
3
3
  import type { StyleProp, ViewStyle } from "react-native";
4
- export type BannerTypes = "error" | "warning" | "notice";
4
+ export type BannerTypes = "error" | "warning" | "notice" | "success";
5
5
  export interface BannerStyleProps {
6
6
  /**
7
7
  * Styles applied to the main view of the banner. Styles are grabbed from Banner.style.ts file
@@ -1,9 +1,9 @@
1
- import type { FieldValues } from "react-hook-form";
1
+ import type { DeepPartial, FieldValues } from "react-hook-form";
2
2
  interface FormCacheProps<T extends FieldValues> {
3
3
  readonly localCacheId?: string | string[];
4
4
  readonly localCacheKey?: string;
5
5
  readonly localCacheExclude?: string[];
6
- readonly setLocalCache: (data: T) => void;
6
+ readonly setLocalCache: (data: DeepPartial<T>) => void;
7
7
  }
8
8
  export declare function FormCache<T extends FieldValues>({ localCacheExclude, localCacheKey, setLocalCache, }: FormCacheProps<T>): JSX.Element;
9
9
  export {};
@@ -1,5 +1,5 @@
1
1
  import type { MutableRefObject } from "react";
2
- import type { FieldValues, UseFormReturn } from "react-hook-form";
2
+ import type { DeepPartial, FieldValues, UseFormReturn } from "react-hook-form";
3
3
  export interface UseConfirmBeforeBackProps {
4
4
  alwaysPreventBack: boolean;
5
5
  onAcceptEvent?: () => void;
@@ -18,7 +18,7 @@ interface LocalCacheOptions {
18
18
  export interface AtlantisFormContextProps {
19
19
  useConfirmBeforeBack: (props: UseConfirmBeforeBackProps) => MutableRefObject<() => void>;
20
20
  useInternalFormLocalCache: <TData extends FieldValues>(formMethods: UseFormReturn<TData>, cacheKey?: string, options?: LocalCacheOptions) => {
21
- setLocalCache: (data: TData) => void;
21
+ setLocalCache: (data: DeepPartial<TData>) => void;
22
22
  removeLocalCache: () => void;
23
23
  };
24
24
  }
@@ -1,4 +1,4 @@
1
- import type { FieldValues, UseFormHandleSubmit, UseFormReturn } from "react-hook-form";
1
+ import type { DeepPartial, FieldValues, UseFormHandleSubmit, UseFormReturn } from "react-hook-form";
2
2
  import type { MutableRefObject, RefObject } from "react";
3
3
  import type { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
4
4
  import type { InternalFormProps } from "../types";
@@ -13,7 +13,7 @@ interface UseInternalForm<T extends FieldValues> {
13
13
  readonly isSubmitting: boolean;
14
14
  readonly isDirty: boolean;
15
15
  readonly removeListenerRef: MutableRefObject<() => void>;
16
- readonly setLocalCache: (data: T) => void;
16
+ readonly setLocalCache: (data: DeepPartial<T>) => void;
17
17
  }
18
18
  export declare function useInternalForm<T extends FieldValues, SubmitResponseType>({ mode, reValidateMode, initialValues, formRef, localCacheKey, localCacheId, scrollViewRef, saveButtonHeight, messageBannerHeight, }: UseInternalFormProps<T, SubmitResponseType>): UseInternalForm<T>;
19
19
  export {};
@@ -1,8 +1,8 @@
1
1
  import type { MutableRefObject, RefObject } from "react";
2
- import type { ControllerProps, DeepPartial, FieldPath, FieldValues, Mode, UnpackNestedValue, UseFormReturn } from "react-hook-form";
2
+ import type { ControllerProps, DefaultValues, FieldPath, FieldValues, Mode, UseFormReturn } from "react-hook-form";
3
3
  import type { IconNames } from "@jobber/design";
4
4
  import type { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
5
- export type FormValues<T> = UnpackNestedValue<T>;
5
+ export type FormValues<T> = T;
6
6
  export type FormErrors = FormNetworkErrors | FormUserErrors;
7
7
  export type FormBannerMessage = FormWarningMessage | FormNoticeMessage;
8
8
  export declare enum FormSubmitErrorType {
@@ -81,7 +81,7 @@ export interface FormProps<T extends FieldValues, SubmitResponseType> {
81
81
  * The initial values of the form inputs
82
82
  * This should be available as soon as initialLoading is set to false
83
83
  */
84
- initialValues?: FormValues<DeepPartial<T>>;
84
+ initialValues?: DefaultValues<T>;
85
85
  /**
86
86
  * When the validation should happen.
87
87
  * Possible values are "onBlur", "onChange", "onSubmit", "onTouched", and "all".
@@ -23,6 +23,7 @@ export declare const useStyles: () => {
23
23
  right: number;
24
24
  bottom: number;
25
25
  left: number;
26
+ zIndex: number;
26
27
  };
27
28
  miniLabel: {
28
29
  top: number;
@@ -30,7 +31,6 @@ export declare const useStyles: () => {
30
31
  backgroundColor: string;
31
32
  marginRight: number;
32
33
  maxHeight: number;
33
- zIndex: number;
34
34
  };
35
35
  miniLabelShowClearAction: {
36
36
  backgroundColor: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jobber/components-native",
3
- "version": "0.84.2-CLEANUPus-25aa17e.18+25aa17e57",
3
+ "version": "0.84.2-JOB-131715-ce60f9e.1+ce60f9ee0",
4
4
  "license": "MIT",
5
5
  "description": "React Native implementation of Atlantis",
6
6
  "repository": {
@@ -32,8 +32,10 @@
32
32
  "build": "npm run build:clean && npm run compile",
33
33
  "bootstrap": "npm run build",
34
34
  "prepack": "npm run build",
35
- "compile": "tsc -b",
36
- "build:clean": "rm -rf ./dist"
35
+ "compile": "tsc -p tsconfig.build.json",
36
+ "build:clean": "rm -rf ./dist",
37
+ "storybook": "storybook dev -p 6008 --disable-telemetry",
38
+ "storybook:build": "storybook build --disable-telemetry"
37
39
  },
38
40
  "dependencies": {
39
41
  "@react-native-clipboard/clipboard": "^1.11.2",
@@ -41,7 +43,7 @@
41
43
  "autolinker": "^4.0.0",
42
44
  "deepmerge": "^4.2.2",
43
45
  "lodash": "^4.17.21",
44
- "react-hook-form": "^7.30.0",
46
+ "react-hook-form": "^7.52.0",
45
47
  "react-intl": "^6.4.2",
46
48
  "react-native-keyboard-aware-scroll-view": "^0.9.5",
47
49
  "react-native-modalize": "^2.0.13",
@@ -51,6 +53,10 @@
51
53
  "ts-xor": "^1.1.0"
52
54
  },
53
55
  "devDependencies": {
56
+ "@react-native-community/datetimepicker": "^7.1.0",
57
+ "@storybook/addon-a11y": "^9.1.2",
58
+ "@storybook/react": "^9.1.2",
59
+ "@storybook/react-native-web-vite": "^9.1.2",
54
60
  "@testing-library/jest-native": "^5.4.2",
55
61
  "@testing-library/react-native": "^12.0.1",
56
62
  "@types/lodash.chunk": "^4.2.7",
@@ -58,8 +64,18 @@
58
64
  "@types/lodash.identity": "^3.0.7",
59
65
  "@types/react": "^18.0.28",
60
66
  "@types/react-native-uuid": "^1.4.0",
67
+ "date-fns": "^2.30.0",
68
+ "date-fns-tz": "^2.0.0",
61
69
  "metro-react-native-babel-preset": "^0.76.0",
62
- "react-test-renderer": "^18.2.0"
70
+ "react-native": "^0.77.0",
71
+ "react-native-gesture-handler": "^2.10.2",
72
+ "react-native-modal-datetime-picker": "^15.0.1",
73
+ "react-native-reanimated": "^3.7.1",
74
+ "react-native-safe-area-context": "^5.4.0",
75
+ "react-native-svg": "^15.1.0",
76
+ "react-native-web": "^0.20.0",
77
+ "react-test-renderer": "^18.2.0",
78
+ "storybook": "^9.1.2"
63
79
  },
64
80
  "peerDependencies": {
65
81
  "@babel/core": "^7.4.5",
@@ -79,5 +95,5 @@
79
95
  "react-native-safe-area-context": "^5.4.0",
80
96
  "react-native-svg": ">=12.0.0"
81
97
  },
82
- "gitHead": "25aa17e577de48cee529c707be8c057a0cb8f605"
98
+ "gitHead": "ce60f9ee02282bd47a7403980d0780ff4398ca08"
83
99
  }
@@ -35,6 +35,18 @@ describe("Banner", () => {
35
35
  expect(getByText("Notice me")).toBeDefined();
36
36
  expect(icon.props.children.props.name).toBe("starburst");
37
37
  });
38
+
39
+ it("renders a success Banner", () => {
40
+ const { getByText, getByTestId } = render(
41
+ <Banner type="success">
42
+ <Text>Your import is complete</Text>
43
+ </Banner>,
44
+ );
45
+
46
+ const icon = getByTestId("ATL-Banner-Icon");
47
+ expect(getByText("Your import is complete")).toBeDefined();
48
+ expect(icon.props.children.props.name).toBe("checkmark");
49
+ });
38
50
  });
39
51
 
40
52
  describe("Children", () => {
@@ -97,5 +97,7 @@ function getBannerIcon(type: BannerTypes): IconNames | undefined {
97
97
  return "help";
98
98
  case "error":
99
99
  return "alert";
100
+ case "success":
101
+ return "checkmark";
100
102
  }
101
103
  }
@@ -15,5 +15,8 @@ export const useStyles = buildThemedStyles(tokens => {
15
15
  notice: {
16
16
  backgroundColor: tokens["color-informative"],
17
17
  },
18
+ success: {
19
+ backgroundColor: tokens["color-success"],
20
+ },
18
21
  };
19
22
  });
@@ -2,7 +2,7 @@ import type { IconNames } from "@jobber/design";
2
2
  import type { ReactElement } from "react";
3
3
  import type { StyleProp, ViewStyle } from "react-native";
4
4
 
5
- export type BannerTypes = "error" | "warning" | "notice";
5
+ export type BannerTypes = "error" | "warning" | "notice" | "success";
6
6
 
7
7
  export interface BannerStyleProps {
8
8
  /**
@@ -0,0 +1,30 @@
1
+ import React from "react";
2
+ import type { Meta, StoryObj } from "@storybook/react-native-web-vite";
3
+ import { fn } from "storybook/test";
4
+ import { Button } from "@jobber/components-native";
5
+
6
+ const meta = {
7
+ title: "Components/Actions/Button",
8
+ component: Button,
9
+ } satisfies Meta<typeof Button>;
10
+ export default meta;
11
+ type Story = StoryObj<typeof meta>;
12
+
13
+ const BasicTemplate = (args: Story["args"]) => <Button {...args} />;
14
+
15
+ export const Basic: Story = {
16
+ render: BasicTemplate,
17
+ args: {
18
+ label: "New Job",
19
+ onPress: fn(),
20
+ },
21
+ };
22
+
23
+ export const Cancel: Story = {
24
+ render: BasicTemplate,
25
+ args: {
26
+ label: "Cancel",
27
+ variation: "cancel",
28
+ onPress: fn(),
29
+ },
30
+ };
@@ -1,5 +1,5 @@
1
1
  import React, { useEffect, useMemo } from "react";
2
- import type { FieldValues } from "react-hook-form";
2
+ import type { DeepPartial, FieldValues } from "react-hook-form";
3
3
  import { useFormContext, useWatch } from "react-hook-form";
4
4
  import omit from "lodash/omit";
5
5
 
@@ -7,7 +7,7 @@ interface FormCacheProps<T extends FieldValues> {
7
7
  readonly localCacheId?: string | string[];
8
8
  readonly localCacheKey?: string;
9
9
  readonly localCacheExclude?: string[];
10
- readonly setLocalCache: (data: T) => void;
10
+ readonly setLocalCache: (data: DeepPartial<T>) => void;
11
11
  }
12
12
 
13
13
  export function FormCache<T extends FieldValues>({
@@ -18,7 +18,7 @@ export function FormCache<T extends FieldValues>({
18
18
  const { control, formState } = useFormContext<T>();
19
19
  const { isDirty } = formState;
20
20
 
21
- const formData = useWatch<T>({ control });
21
+ const formData = useWatch({ control });
22
22
  const shouldExclude = useMemo(() => {
23
23
  return Array.isArray(localCacheExclude) && localCacheExclude.length > 0;
24
24
  }, [localCacheExclude]);
@@ -46,5 +46,6 @@ export function FormCache<T extends FieldValues>({
46
46
  }
47
47
  }, [formData, isDirty, localCacheExclude, setLocalCache, shouldExclude]);
48
48
 
49
+ // eslint-disable-next-line react/jsx-no-useless-fragment
49
50
  return <></>;
50
51
  }
@@ -1,5 +1,5 @@
1
1
  import type { MutableRefObject } from "react";
2
- import type { FieldValues, UseFormReturn } from "react-hook-form";
2
+ import type { DeepPartial, FieldValues, UseFormReturn } from "react-hook-form";
3
3
 
4
4
  export interface UseConfirmBeforeBackProps {
5
5
  alwaysPreventBack: boolean;
@@ -27,7 +27,7 @@ export interface AtlantisFormContextProps {
27
27
  cacheKey?: string,
28
28
  options?: LocalCacheOptions,
29
29
  ) => {
30
- setLocalCache: (data: TData) => void;
30
+ setLocalCache: (data: DeepPartial<TData>) => void;
31
31
  removeLocalCache: () => void;
32
32
  };
33
33
  }
@@ -1,4 +1,5 @@
1
1
  import type {
2
+ DeepPartial,
2
3
  FieldValues,
3
4
  UseFormHandleSubmit,
4
5
  UseFormReturn,
@@ -31,7 +32,7 @@ interface UseInternalForm<T extends FieldValues> {
31
32
  readonly isSubmitting: boolean;
32
33
  readonly isDirty: boolean;
33
34
  readonly removeListenerRef: MutableRefObject<() => void>;
34
- readonly setLocalCache: (data: T) => void;
35
+ readonly setLocalCache: (data: DeepPartial<T>) => void;
35
36
  }
36
37
 
37
38
  export function useInternalForm<T extends FieldValues, SubmitResponseType>({
package/src/Form/types.ts CHANGED
@@ -1,17 +1,16 @@
1
1
  import type { MutableRefObject, RefObject } from "react";
2
2
  import type {
3
3
  ControllerProps,
4
- DeepPartial,
4
+ DefaultValues,
5
5
  FieldPath,
6
6
  FieldValues,
7
7
  Mode,
8
- UnpackNestedValue,
9
8
  UseFormReturn,
10
9
  } from "react-hook-form";
11
10
  import type { IconNames } from "@jobber/design";
12
11
  import type { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
13
12
 
14
- export type FormValues<T> = UnpackNestedValue<T>;
13
+ export type FormValues<T> = T;
15
14
  export type FormErrors = FormNetworkErrors | FormUserErrors;
16
15
  export type FormBannerMessage = FormWarningMessage | FormNoticeMessage;
17
16
 
@@ -109,7 +108,7 @@ export interface FormProps<T extends FieldValues, SubmitResponseType> {
109
108
  * The initial values of the form inputs
110
109
  * This should be available as soon as initialLoading is set to false
111
110
  */
112
- initialValues?: FormValues<DeepPartial<T>>;
111
+ initialValues?: DefaultValues<T>;
113
112
 
114
113
  /**
115
114
  * When the validation should happen.
@@ -1,4 +1,4 @@
1
- import { useIsMounted } from "@jobber/hooks/useIsMounted";
1
+ import { useIsMounted } from "@jobber/hooks";
2
2
  import { useCallback, useEffect, useState } from "react";
3
3
  import type { UseCreateThumbnail } from "../context/types";
4
4
  import type { CreateThumbnail, FormattedFile } from "../types";
@@ -80,6 +80,56 @@ const getKeyboard = (props: InputCurrencyProps) => {
80
80
  }
81
81
  };
82
82
 
83
+ const computeDisplayFromNumericInput = (
84
+ numberedValue: number,
85
+ decimalNumbers: string,
86
+ decimalCount: number,
87
+ maxLength: number,
88
+ maxDecimalPlaces: number,
89
+ decimalPlaces: number,
90
+ formatNumber: (
91
+ value: number,
92
+ opts?: FormatNumberOptions | undefined,
93
+ ) => string,
94
+ ): {
95
+ onChangeValue: number | string;
96
+ displayValue: string;
97
+ } => {
98
+ const transformedValue = limitInputWholeDigits(numberedValue, maxLength);
99
+ const stringValue =
100
+ decimalNumbers !== ""
101
+ ? transformedValue.toString() + "." + decimalNumbers.slice(1)
102
+ : transformedValue.toString();
103
+
104
+ if (checkLastChar(stringValue)) {
105
+ const roundedDecimal = configureDecimal(
106
+ decimalCount,
107
+ maxDecimalPlaces,
108
+ stringValue,
109
+ decimalPlaces,
110
+ );
111
+ const internationalizedValueToDisplay = formatNumber(roundedDecimal, {
112
+ maximumFractionDigits: maxDecimalPlaces,
113
+ });
114
+
115
+ return {
116
+ onChangeValue: roundedDecimal,
117
+ displayValue: internationalizedValueToDisplay,
118
+ };
119
+ } else {
120
+ const internationalizedValueToDisplay =
121
+ formatNumber(transformedValue, {
122
+ maximumFractionDigits: maxDecimalPlaces,
123
+ }) + decimalNumbers;
124
+
125
+ return {
126
+ onChangeValue:
127
+ transformedValue.toString() + "." + decimalNumbers.slice(1),
128
+ displayValue: internationalizedValueToDisplay,
129
+ };
130
+ }
131
+ };
132
+
83
133
  export function InputCurrency(props: InputCurrencyProps): JSX.Element {
84
134
  const {
85
135
  showCurrencySymbol = true,
@@ -99,54 +149,6 @@ export function InputCurrency(props: InputCurrencyProps): JSX.Element {
99
149
  internalValue,
100
150
  );
101
151
 
102
- const setOnChangeAndDisplayValues = (
103
- onChangeValue: number | string | undefined,
104
- valueToDisplay: string | undefined,
105
- ) => {
106
- props.onChange?.(onChangeValue);
107
- setDisplayValue(valueToDisplay);
108
- };
109
-
110
- const checkDecimalAndI18nOfDisplayValue = (
111
- numberedValue: number,
112
- decimalNumbers: string,
113
- decimalCount: number,
114
- ) => {
115
- const transformedValue = limitInputWholeDigits(numberedValue, maxLength);
116
- const stringValue =
117
- decimalNumbers !== ""
118
- ? transformedValue.toString() + "." + decimalNumbers.slice(1)
119
- : transformedValue.toString();
120
-
121
- if (checkLastChar(stringValue)) {
122
- const roundedDecimal = configureDecimal(
123
- decimalCount,
124
- maxDecimalPlaces,
125
- stringValue,
126
- decimalPlaces,
127
- );
128
- const internationalizedValueToDisplay = intl.formatNumber(
129
- roundedDecimal,
130
- {
131
- maximumFractionDigits: maxDecimalPlaces,
132
- },
133
- );
134
- setOnChangeAndDisplayValues(
135
- roundedDecimal,
136
- internationalizedValueToDisplay,
137
- );
138
- } else {
139
- const internationalizedValueToDisplay =
140
- intl.formatNumber(transformedValue, {
141
- maximumFractionDigits: maxDecimalPlaces,
142
- }) + decimalNumbers;
143
- setOnChangeAndDisplayValues(
144
- transformedValue.toString() + "." + decimalNumbers.slice(1),
145
- internationalizedValueToDisplay,
146
- );
147
- }
148
- };
149
-
150
152
  const handleChange = (newValue: string | undefined) => {
151
153
  const [decimalCount, wholeIntegerValue, decimalNumbers] = parseGivenInput(
152
154
  newValue,
@@ -158,19 +160,37 @@ export function InputCurrency(props: InputCurrencyProps): JSX.Element {
158
160
  : wholeIntegerValue;
159
161
 
160
162
  if (isValidNumber(numberedValue) && typeof numberedValue === "number") {
161
- checkDecimalAndI18nOfDisplayValue(
163
+ const result = computeDisplayFromNumericInput(
162
164
  numberedValue,
163
165
  decimalNumbers,
164
166
  decimalCount,
167
+ maxLength,
168
+ maxDecimalPlaces,
169
+ decimalPlaces,
170
+ intl.formatNumber,
165
171
  );
172
+ const { onChangeValue, displayValue: valueToDisplay } = result;
173
+ props.onChange?.(onChangeValue);
174
+ setDisplayValue(valueToDisplay);
166
175
  } else {
167
176
  const value = numberedValue?.toString() + decimalNumbers;
168
- setOnChangeAndDisplayValues(value, value);
177
+ props.onChange?.(value);
178
+ setDisplayValue(value);
169
179
  }
170
180
  };
171
181
 
172
182
  const { t } = useAtlantisI18n();
173
183
 
184
+ const defaultValidations = {
185
+ pattern: {
186
+ value: NUMBER_VALIDATION_REGEX,
187
+ message: t("errors.notANumber"),
188
+ },
189
+ } as const;
190
+ const mergedValidations = props.validations
191
+ ? Object.assign({}, defaultValidations, props.validations)
192
+ : defaultValidations;
193
+
174
194
  return (
175
195
  <InputText
176
196
  {...props}
@@ -187,13 +207,7 @@ export function InputCurrency(props: InputCurrencyProps): JSX.Element {
187
207
  .replace(floatSeparators.decimal, ".");
188
208
  },
189
209
  }}
190
- validations={{
191
- pattern: {
192
- value: NUMBER_VALIDATION_REGEX,
193
- message: t("errors.notANumber"),
194
- },
195
- ...props.validations,
196
- }}
210
+ validations={mergedValidations}
197
211
  onBlur={() => {
198
212
  props.onBlur?.();
199
213
 
@@ -2,11 +2,25 @@ import type { Ref } from "react";
2
2
  import React, { forwardRef } from "react";
3
3
  import type { InputTextProps, InputTextRef } from "../InputText";
4
4
  import { InputText } from "../InputText";
5
+ import { useAtlantisI18n } from "../hooks/useAtlantisI18n";
5
6
 
6
7
  export const InputEmail = forwardRef(InputEmailInternal);
7
8
  type InputEmailProps = Omit<InputTextProps, "keyboard">;
8
9
 
9
10
  function InputEmailInternal(props: InputEmailProps, ref: Ref<InputTextRef>) {
11
+ const { t } = useAtlantisI18n();
12
+
13
+ const defaultValidations = {
14
+ pattern: {
15
+ value:
16
+ /[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?/,
17
+ message: t("InputEmail.enterEmail"),
18
+ },
19
+ } as const;
20
+ const mergedValidations = props.validations
21
+ ? Object.assign({}, defaultValidations, props.validations)
22
+ : defaultValidations;
23
+
10
24
  return (
11
25
  <InputText
12
26
  {...props}
@@ -14,14 +28,7 @@ function InputEmailInternal(props: InputEmailProps, ref: Ref<InputTextRef>) {
14
28
  autoCapitalize="none"
15
29
  autoCorrect={false}
16
30
  keyboard={"email-address"}
17
- validations={{
18
- pattern: {
19
- value:
20
- /[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?/,
21
- message: "Enter a valid email address (email@example.com)",
22
- },
23
- ...props.validations,
24
- }}
31
+ validations={mergedValidations}
25
32
  />
26
33
  );
27
34
  }
@@ -43,6 +43,7 @@ export const useStyles = buildThemedStyles(tokens => {
43
43
  right: 0,
44
44
  bottom: 0,
45
45
  left: 0,
46
+ zIndex: 1,
46
47
  },
47
48
 
48
49
  miniLabel: {
@@ -53,7 +54,6 @@ export const useStyles = buildThemedStyles(tokens => {
53
54
  maxHeight:
54
55
  (typographyStyles.defaultSize.lineHeight || 0) +
55
56
  tokens["space-smaller"],
56
- zIndex: 1,
57
57
  },
58
58
  // Prevents the miniLabel from cutting off the ClearAction button
59
59
  miniLabelShowClearAction: {
@@ -46,6 +46,16 @@ function InputNumberInternal(props: InputNumberProps, ref: Ref<InputTextRef>) {
46
46
  const { inputTransform: convertToString, outputTransform: convertToNumber } =
47
47
  useNumberTransform(props.value);
48
48
 
49
+ const defaultValidations = {
50
+ pattern: {
51
+ value: NUMBER_VALIDATION_REGEX,
52
+ message: t("errors.notANumber"),
53
+ },
54
+ } as const;
55
+ const mergedValidations = props.validations
56
+ ? Object.assign({}, defaultValidations, props.validations)
57
+ : defaultValidations;
58
+
49
59
  return (
50
60
  <InputText
51
61
  {...props}
@@ -58,13 +68,7 @@ function InputNumberInternal(props: InputNumberProps, ref: Ref<InputTextRef>) {
58
68
  value={props.value?.toString()}
59
69
  defaultValue={props.defaultValue?.toString()}
60
70
  onChangeText={handleChange}
61
- validations={{
62
- pattern: {
63
- value: NUMBER_VALIDATION_REGEX,
64
- message: t("errors.notANumber"),
65
- },
66
- ...props.validations,
67
- }}
71
+ validations={mergedValidations}
68
72
  />
69
73
  );
70
74
  }
@@ -1,7 +1,7 @@
1
1
  import type { Ref } from "react";
2
2
  import React, { forwardRef, useEffect } from "react";
3
3
  import { View } from "react-native";
4
- import { useDebounce } from "@jobber/hooks/useDebounce";
4
+ import { useDebounce } from "@jobber/hooks";
5
5
  import { styles } from "./InputSearch.style";
6
6
  import type { InputTextProps, InputTextRef } from "../InputText";
7
7
  import { InputText } from "../InputText";
@@ -18,6 +18,7 @@
18
18
  "goBack": "Go back",
19
19
  "InputFieldWrapper.clear": "Clear input",
20
20
  "InputPassword.enterPassword": "Enter a password",
21
+ "InputEmail.enterEmail": "Enter a valid email address (email@example.com)",
21
22
  "loading": "Loading",
22
23
  "menu": "Menu",
23
24
  "more": "More",
@@ -18,6 +18,7 @@
18
18
  "goBack": "Volver",
19
19
  "InputFieldWrapper.clear": "Borrar",
20
20
  "InputPassword.enterPassword": "Escriba una contraseña",
21
+ "InputEmail.enterEmail": "Introduzca una dirección de correo electrónico válida (email@example.com)",
21
22
  "loading": "Cargando",
22
23
  "menu": "Menú",
23
24
  "more": "Más",