From 8f98ac3df9cae3899315d47f2c0a20bbcae20f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=9D=B1=E6=BE=94?= Date: Tue, 10 Aug 2021 16:38:27 +0800 Subject: [PATCH 1/2] Modify BorderRadiusesLiterals types. --- generatedTypes/commons/modifiers.d.ts | 2 +- .../incubator/TextField/usePreset.d.ts | 18 ++++++------- generatedTypes/style/borderRadiuses.d.ts | 27 +++++-------------- package.json | 2 +- src/style/borderRadiuses.ts | 9 +++++-- 5 files changed, 24 insertions(+), 34 deletions(-) diff --git a/generatedTypes/commons/modifiers.d.ts b/generatedTypes/commons/modifiers.d.ts index 1a0a816bae..3a3a8235bf 100644 --- a/generatedTypes/commons/modifiers.d.ts +++ b/generatedTypes/commons/modifiers.d.ts @@ -85,7 +85,7 @@ export declare function extractPositionStyle(props: Dictionary): { } | undefined; export declare function extractFlexStyle(props: Dictionary): Partial> | undefined; export declare function extractAccessibilityProps(props?: any): Partial; -export declare function extractAnimationProps(props?: any): Pick; +export declare function extractAnimationProps(props?: any): Pick; export declare function extractBorderRadiusValue(props: Dictionary): number | undefined; export declare function extractModifierProps(props: Dictionary): _.Dictionary; /** diff --git a/generatedTypes/incubator/TextField/usePreset.d.ts b/generatedTypes/incubator/TextField/usePreset.d.ts index 42eedd724e..ac69b9e49b 100644 --- a/generatedTypes/incubator/TextField/usePreset.d.ts +++ b/generatedTypes/incubator/TextField/usePreset.d.ts @@ -19,8 +19,10 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): hint?: string | undefined; color?: import("./types").ColorType | undefined; placeholderTextColor?: import("./types").ColorType | undefined; - style?: import("react-native").StyleProp; + textAlign?: "left" | "right" | "center" | undefined; testID?: string | undefined; + textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; + style?: import("react-native").StyleProp; removeClippedSubviews?: boolean | undefined; onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined; onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent) => void) | undefined; @@ -86,8 +88,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): maxFontSizeMultiplier?: number | null | undefined; selectionColor?: import("react-native").ColorValue | undefined; textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined; - textAlign?: "left" | "right" | "center" | undefined; - textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; value?: string | undefined; autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined; autoCorrect?: boolean | undefined; @@ -351,8 +351,10 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): hint?: string | undefined; color?: import("./types").ColorType | undefined; placeholderTextColor?: import("./types").ColorType | undefined; - style?: import("react-native").StyleProp; + textAlign?: "left" | "right" | "center" | undefined; testID?: string | undefined; + textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; + style?: import("react-native").StyleProp; removeClippedSubviews?: boolean | undefined; onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined; onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent) => void) | undefined; @@ -418,8 +420,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): maxFontSizeMultiplier?: number | null | undefined; selectionColor?: import("react-native").ColorValue | undefined; textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined; - textAlign?: "left" | "right" | "center" | undefined; - textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; value?: string | undefined; autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined; autoCorrect?: boolean | undefined; @@ -683,6 +683,9 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): hint?: string | undefined; color?: import("./types").ColorType | undefined; placeholderTextColor?: import("./types").ColorType | undefined; + textAlign?: "left" | "right" | "center" | undefined; + testID?: string | undefined; + textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; style: false | import("react-native").TextStyle | import("react-native").RegisteredStyle | import("react-native").RecursiveArray> | { lineHeight: undefined; height: number | undefined; @@ -796,7 +799,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; includeFontPadding?: boolean | undefined; } | null; - testID?: string | undefined; removeClippedSubviews?: boolean | undefined; onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined; onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent) => void) | undefined; @@ -862,8 +864,6 @@ export default function usePreset({ preset, ...props }: InternalTextFieldProps): maxFontSizeMultiplier?: number | null | undefined; selectionColor?: import("react-native").ColorValue | undefined; textBreakStrategy?: "simple" | "highQuality" | "balanced" | undefined; - textAlign?: "left" | "right" | "center" | undefined; - textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined; value?: string | undefined; autoCapitalize?: "none" | "characters" | "sentences" | "words" | undefined; autoCorrect?: boolean | undefined; diff --git a/generatedTypes/style/borderRadiuses.d.ts b/generatedTypes/style/borderRadiuses.d.ts index 1562dc9f23..dc167f3d18 100644 --- a/generatedTypes/style/borderRadiuses.d.ts +++ b/generatedTypes/style/borderRadiuses.d.ts @@ -1,25 +1,10 @@ -export declare const BorderRadiusesLiterals: { - br0: number; - br10: number; - br20: number; - br30: number; - br40: number; - br50: number; - br60: number; - br100: number; -}; +interface IBorderRadiusesLiterals { + [key: `br${number}`]: number; +} +export declare const BorderRadiusesLiterals: IBorderRadiusesLiterals; export declare class BorderRadiuses { - loadBorders(borders: Dictionary): void; + loadBorders(borders: IBorderRadiusesLiterals): void; getKeysPattern(): RegExp; } -declare const borderRadiusesInstance: BorderRadiuses & { - br0: number; - br10: number; - br20: number; - br30: number; - br40: number; - br50: number; - br60: number; - br100: number; -}; +declare const borderRadiusesInstance: BorderRadiuses & IBorderRadiusesLiterals; export default borderRadiusesInstance; diff --git a/package.json b/package.json index 52c0cd2c9f..b668590f20 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "react-native-svg-transformer": "^0.14.3", "react-test-renderer": "^17.0.1", "shell-utils": "^1.0.10", - "typescript": "4.3.2" + "typescript": "4.5.0-dev.20210810" }, "peerDependencies": { "react": ">=17.0.1", diff --git a/src/style/borderRadiuses.ts b/src/style/borderRadiuses.ts index 1703f3b5db..2d7f2d2748 100644 --- a/src/style/borderRadiuses.ts +++ b/src/style/borderRadiuses.ts @@ -1,7 +1,11 @@ import _ from 'lodash'; import Constants from '../helpers/Constants'; -export const BorderRadiusesLiterals = { +interface IBorderRadiusesLiterals { + [key: `br${number}`]: number +} + +export const BorderRadiusesLiterals: IBorderRadiusesLiterals = { br0: Constants.isIOS ? 0 : 0, br10: Constants.isIOS ? 3 : 2, br20: 6, @@ -11,8 +15,9 @@ export const BorderRadiusesLiterals = { br60: 20, br100: 999 }; + export class BorderRadiuses { - loadBorders(borders: Dictionary) { + loadBorders(borders: IBorderRadiusesLiterals) { _.forEach(borders, (value, key) => { //@ts-ignore this[key] = value; From 7b592ef17d95af7785fa62909baad7f922d95f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=9D=B1=E6=BE=94?= Date: Sat, 28 Aug 2021 22:56:27 +0800 Subject: [PATCH 2/2] modify typescript to stable version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b668590f20..cbaccc6217 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "react-native-svg-transformer": "^0.14.3", "react-test-renderer": "^17.0.1", "shell-utils": "^1.0.10", - "typescript": "4.5.0-dev.20210810" + "typescript": "4.4.2" }, "peerDependencies": { "react": ">=17.0.1",