Refactoring

fracht · Sep 12, 2023 · e0e5bf9 · e0e5bf9
1 parent 412823a
commit e0e5bf9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/packages/x/src/IntegerFieldI18n.tsx b/packages/x/src/IntegerFieldI18n.tsx
@@ -12,7 +12,7 @@ export const defaultIntegerFieldI18n: IntegerFieldI18n = {
 	required: 'Field is required',
 	invalidInput: 'Must be integer',
 	minValue: (min: number) => `Value should not be less than ${min.toFixed(0)}`,
-	maxValue: (max: number) => `Value should not be more than ${max.toFixed(0)}`,
+	maxValue: (max: number) => `Value should not be greater than ${max.toFixed(0)}`,
 };
 
 export const IntegerFieldI18nContext = createContext<IntegerFieldI18n>(defaultIntegerFieldI18n);

diff --git a/packages/x/src/useIntegerField.ts b/packages/x/src/useIntegerField.ts
@@ -4,11 +4,6 @@ import { FieldConfig, useFieldValidator } from '@reactive-forms/core';
 import { IntegerFieldI18nContext } from './IntegerFieldI18n';
 import { ConversionError, ConverterFieldBag, useConverterField } from './useConverterField';
 
-export const defaultRequiredError = 'Field is required';
-export const defaultInvalidInputError = 'Must be integer';
-export const defaultMinValueError = (min: number) => `Value should not be less than ${min.toFixed(0)}`;
-export const defaultMaxValueError = (max: number) => `Value should not be more than ${max.toFixed(0)}`;
-
 const INTEGER_REGEX = /^-?\d+$/;
 
 const formatInteger = (value: number | null | undefined) => {

diff --git a/packages/x/tests/useIntegerField.test.tsx b/packages/x/tests/useIntegerField.test.tsx
@@ -2,15 +2,8 @@ import React from 'react';
 import { ReactiveFormProvider, useForm } from '@reactive-forms/core';
 import { act, renderHook, waitFor } from '@testing-library/react';
 
-import { IntegerFieldI18n, IntegerFieldI18nContextProvider } from '../src/IntegerFieldI18n';
-import {
-	defaultInvalidInputError,
-	defaultMaxValueError,
-	defaultMinValueError,
-	defaultRequiredError,
-	IntegerFieldConfig,
-	useIntegerField,
-} from '../src/useIntegerField';
+import { defaultIntegerFieldI18n, IntegerFieldI18n, IntegerFieldI18nContextProvider } from '../src/IntegerFieldI18n';
+import { IntegerFieldConfig, useIntegerField } from '../src/useIntegerField';
 
 type Config = Omit<IntegerFieldConfig, 'name'> & {
 	initialValue?: number | null;
@@ -64,7 +57,7 @@ describe('Integer field', () => {
 
 		await waitFor(() => {
 			expect(result.current.value).toBe(0);
-			expect(result.current.meta.error?.$error).toBe(defaultInvalidInputError);
+			expect(result.current.meta.error?.$error).toBe(defaultIntegerFieldI18n.invalidInput);
 		});
 
 		act(() => {
@@ -73,7 +66,7 @@ describe('Integer field', () => {
 
 		await waitFor(() => {
 			expect(result.current.value).toBe(0);
-			expect(result.current.meta.error?.$error).toBe(defaultInvalidInputError);
+			expect(result.current.meta.error?.$error).toBe(defaultIntegerFieldI18n.invalidInput);
 		});
 
 		act(() => {
@@ -94,7 +87,7 @@ describe('Integer field', () => {
 		});
 
 		await waitFor(() => {
-			expect(result.current.meta.error?.$error).toBe(defaultRequiredError);
+			expect(result.current.meta.error?.$error).toBe(defaultIntegerFieldI18n.required);
 		});
 	});
 
@@ -106,7 +99,7 @@ describe('Integer field', () => {
 		});
 
 		await waitFor(() => {
-			expect(result.current.meta.error?.$error).toBe(defaultMinValueError(0));
+			expect(result.current.meta.error?.$error).toBe(defaultIntegerFieldI18n.minValue(0));
 		});
 
 		act(() => {
@@ -126,7 +119,7 @@ describe('Integer field', () => {
 		});
 
 		await waitFor(() => {
-			expect(result.current.meta.error?.$error).toBe(defaultMaxValueError(0));
+			expect(result.current.meta.error?.$error).toBe(defaultIntegerFieldI18n.maxValue(0));
 		});
 
 		act(() => {