Skip to content

Commit 5a04d3e

Browse files
authored
Add migration to TextField errorMessage and fix validationMessagePosition type (wix#2498)
1 parent 541ad96 commit 5a04d3e

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

src/components/textField/TextFieldMigrator.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const propsMigrationMap: Dictionary<string> = {
1717
titleStyle: 'labelStyle',
1818
/* CHAR COUNTER */
1919
showCharacterCounter: 'showCharCounter',
20-
transformer: 'formatter'
20+
transformer: 'formatter',
21+
errorMessage: 'validationMessage'
2122
};
2223

2324
const specialMigrationMap: Dictionary<string> = {

src/incubator/TextField/index.tsx

+7-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,13 @@ const TextField = (props: InternalTextFieldProps) => {
213213
TextField.displayName = 'Incubator.TextField';
214214
TextField.validationMessagePositions = ValidationMessagePosition;
215215

216-
export {TextFieldProps, FieldContextType, StaticMembers as TextFieldStaticMembers, TextFieldMethods};
216+
export {
217+
TextFieldProps,
218+
FieldContextType,
219+
StaticMembers as TextFieldStaticMembers,
220+
TextFieldMethods,
221+
ValidationMessagePosition as TextFieldValidationMessagePosition
222+
};
217223
export default asBaseComponent<TextFieldProps, StaticMembers>(forwardRef(TextField as any), {
218224
modifiersOptions: {
219225
margins: true,

src/incubator/TextField/types.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ export enum ValidationMessagePosition {
2626
BOTTOM = 'bottom'
2727
}
2828

29+
type ValidationMessagePositionType = `${ValidationMessagePosition}` | ValidationMessagePosition;
30+
2931
export type Validator = Function | keyof typeof formValidators;
3032

3133
export interface FieldStateProps extends InputProps {
@@ -63,7 +65,7 @@ export interface LabelProps {
6365
* Pass extra props to the label Text element
6466
*/
6567
labelProps?: TextProps;
66-
validationMessagePosition?: ValidationMessagePosition;
68+
validationMessagePosition?: ValidationMessagePositionType;
6769
floatingPlaceholder?: boolean;
6870
testID?: string;
6971
}
@@ -85,7 +87,7 @@ export interface FloatingPlaceholderProps {
8587
* Should placeholder float on focus or when start typing
8688
*/
8789
floatOnFocus?: boolean;
88-
validationMessagePosition?: ValidationMessagePosition;
90+
validationMessagePosition?: ValidationMessagePositionType;
8991
extraOffset?: number;
9092
defaultValue?: TextInputProps['defaultValue'];
9193
testID: string;
@@ -205,7 +207,7 @@ export type TextFieldProps = MarginModifiers &
205207
/**
206208
* The position of the validation message (top/bottom)
207209
*/
208-
validationMessagePosition?: ValidationMessagePosition;
210+
validationMessagePosition?: ValidationMessagePositionType;
209211
/**
210212
* Internal style for the field container
211213
*/

src/incubator/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// export {default as Calendar} from './Calendar';
22
export {default as ExpandableOverlay} from './expandableOverlay';
33
// @ts-ignore
4-
export {default as TextField, TextFieldProps, FieldContextType, TextFieldMethods} from './TextField';
4+
export {default as TextField, TextFieldProps, FieldContextType, TextFieldMethods, TextFieldValidationMessagePosition} from './TextField';
55
export {default as Toast, ToastProps, ToastPresets} from './toast';
66
export {default as TouchableOpacity, TouchableOpacityProps} from './TouchableOpacity';
77
export {default as PanView, PanViewProps, PanViewDirections, PanViewDismissThreshold} from './panView';

src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import * as Incubator from './incubator';
2929
export {
3030
TextFieldProps,
3131
TextFieldMethods,
32+
TextFieldValidationMessagePosition,
3233
FieldContextType,
3334
ToastProps,
3435
ToastPresets,

0 commit comments

Comments
 (0)