Skip to content

Commit 01140ff

Browse files
authored
Modify BorderRadiusesLiterals types. (#1463)
* Modify BorderRadiusesLiterals types. * modify typescript to stable version
1 parent bf8d4b0 commit 01140ff

File tree

5 files changed

+24
-34
lines changed

5 files changed

+24
-34
lines changed

generatedTypes/src/commons/modifiers.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export declare function extractAlignmentsValues(props: Dictionary<any>): any;
8383
export declare function extractPositionStyle(props: Dictionary<any>): {} | undefined;
8484
export declare function extractFlexStyle(props: Dictionary<any>): Partial<Record<NativeFlexModifierKeyType, number>> | undefined;
8585
export declare function extractAccessibilityProps(props?: any): Partial<any>;
86-
export declare function extractAnimationProps(props?: any): Pick<any, "onAnimationEnd" | "animation" | "duration" | "delay" | "direction" | "easing" | "iterationCount" | "transition" | "onAnimationBegin" | "useNativeDriver">;
86+
export declare function extractAnimationProps(props?: any): Pick<any, "direction" | "onAnimationEnd" | "animation" | "duration" | "delay" | "easing" | "iterationCount" | "transition" | "onAnimationBegin" | "useNativeDriver">;
8787
export declare function extractBorderRadiusValue(props: Dictionary<any>): number | undefined;
8888
export declare function extractModifierProps(props: Dictionary<any>): _.Dictionary<any>;
8989
/**

generatedTypes/src/incubator/TextField/usePreset.d.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
1919
hint?: string | undefined;
2020
color?: import("./types").ColorType | undefined;
2121
placeholderTextColor?: import("./types").ColorType | undefined;
22-
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
22+
textAlign?: "left" | "right" | "center" | undefined;
2323
testID?: string | undefined;
24+
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
25+
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
2426
removeClippedSubviews?: boolean | undefined;
2527
onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined;
2628
onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
@@ -86,8 +88,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
8688
maxFontSizeMultiplier?: number | null | undefined;
8789
selectionColor?: import("react-native").ColorValue | undefined;
8890
textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined;
89-
textAlign?: "left" | "right" | "center" | undefined;
90-
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
9191
value?: string | undefined;
9292
autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined;
9393
autoCorrect?: boolean | undefined;
@@ -351,8 +351,10 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
351351
hint?: string | undefined;
352352
color?: import("./types").ColorType | undefined;
353353
placeholderTextColor?: import("./types").ColorType | undefined;
354-
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
354+
textAlign?: "left" | "right" | "center" | undefined;
355355
testID?: string | undefined;
356+
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
357+
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
356358
removeClippedSubviews?: boolean | undefined;
357359
onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined;
358360
onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
@@ -418,8 +420,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
418420
maxFontSizeMultiplier?: number | null | undefined;
419421
selectionColor?: import("react-native").ColorValue | undefined;
420422
textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined;
421-
textAlign?: "left" | "right" | "center" | undefined;
422-
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
423423
value?: string | undefined;
424424
autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined;
425425
autoCorrect?: boolean | undefined;
@@ -683,6 +683,9 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
683683
hint?: string | undefined;
684684
color?: import("./types").ColorType | undefined;
685685
placeholderTextColor?: import("./types").ColorType | undefined;
686+
textAlign?: "left" | "right" | "center" | undefined;
687+
testID?: string | undefined;
688+
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
686689
style: false | import("react-native").TextStyle | import("react-native").RegisteredStyle<import("react-native").TextStyle> | import("react-native").RecursiveArray<import("react-native").TextStyle | import("react-native").Falsy | import("react-native").RegisteredStyle<import("react-native").TextStyle>> | {
687690
lineHeight: undefined;
688691
height: number | undefined;
@@ -796,7 +799,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
796799
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
797800
includeFontPadding?: boolean | undefined;
798801
} | null;
799-
testID?: string | undefined;
800802
removeClippedSubviews?: boolean | undefined;
801803
onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined;
802804
onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
@@ -862,8 +864,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps):
862864
maxFontSizeMultiplier?: number | null | undefined;
863865
selectionColor?: import("react-native").ColorValue | undefined;
864866
textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined;
865-
textAlign?: "left" | "right" | "center" | undefined;
866-
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
867867
value?: string | undefined;
868868
autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined;
869869
autoCorrect?: boolean | undefined;
+6-21
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
export declare const BorderRadiusesLiterals: {
2-
br0: number;
3-
br10: number;
4-
br20: number;
5-
br30: number;
6-
br40: number;
7-
br50: number;
8-
br60: number;
9-
br100: number;
10-
};
1+
interface IBorderRadiusesLiterals {
2+
[key: `br${number}`]: number;
3+
}
4+
export declare const BorderRadiusesLiterals: IBorderRadiusesLiterals;
115
export declare class BorderRadiuses {
12-
loadBorders(borders: Dictionary<number>): void;
6+
loadBorders(borders: IBorderRadiusesLiterals): void;
137
getKeysPattern(): RegExp;
148
}
15-
declare const borderRadiusesInstance: BorderRadiuses & {
16-
br0: number;
17-
br10: number;
18-
br20: number;
19-
br30: number;
20-
br40: number;
21-
br50: number;
22-
br60: number;
23-
br100: number;
24-
};
9+
declare const borderRadiusesInstance: BorderRadiuses & IBorderRadiusesLiterals;
2510
export default borderRadiusesInstance;

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"react-native-svg-transformer": "^0.14.3",
114114
"react-test-renderer": "^17.0.1",
115115
"shell-utils": "^1.0.10",
116-
"typescript": "4.3.2"
116+
"typescript": "4.4.2"
117117
},
118118
"peerDependencies": {
119119
"react": ">=17.0.1",

src/style/borderRadiuses.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import _ from 'lodash';
22
import Constants from '../helpers/Constants';
33

4-
export const BorderRadiusesLiterals = {
4+
interface IBorderRadiusesLiterals {
5+
[key: `br${number}`]: number
6+
}
7+
8+
export const BorderRadiusesLiterals: IBorderRadiusesLiterals = {
59
br0: Constants.isIOS ? 0 : 0,
610
br10: Constants.isIOS ? 3 : 2,
711
br20: 6,
@@ -11,8 +15,9 @@ export const BorderRadiusesLiterals = {
1115
br60: 20,
1216
br100: 999
1317
};
18+
1419
export class BorderRadiuses {
15-
loadBorders(borders: Dictionary<number>) {
20+
loadBorders(borders: IBorderRadiusesLiterals) {
1621
_.forEach(borders, (value, key) => {
1722
//@ts-ignore
1823
this[key] = value;

0 commit comments

Comments
 (0)