Skip to content

Modify BorderRadiusesLiterals types. #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generatedTypes/src/commons/modifiers.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export declare function extractPositionStyle(props: Dictionary<any>): {
} | undefined;
export declare function extractFlexStyle(props: Dictionary<any>): Partial<Record<NativeFlexModifierKeyType, number>> | undefined;
export declare function extractAccessibilityProps(props?: any): Partial<any>;
export declare function extractAnimationProps(props?: any): Pick<any, "onAnimationEnd" | "animation" | "duration" | "delay" | "direction" | "easing" | "iterationCount" | "transition" | "onAnimationBegin" | "useNativeDriver">;
export declare function extractAnimationProps(props?: any): Pick<any, "direction" | "onAnimationEnd" | "animation" | "duration" | "delay" | "easing" | "iterationCount" | "transition" | "onAnimationBegin" | "useNativeDriver">;
export declare function extractBorderRadiusValue(props: Dictionary<any>): number | undefined;
export declare function extractModifierProps(props: Dictionary<any>): _.Dictionary<any>;
/**
Expand Down
18 changes: 9 additions & 9 deletions generatedTypes/src/incubator/TextField/usePreset.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<import("react-native").TextStyle>;
textAlign?: "left" | "right" | "center" | undefined;
testID?: string | undefined;
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
removeClippedSubviews?: boolean | undefined;
onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined;
onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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<import("react-native").TextStyle>;
textAlign?: "left" | "right" | "center" | undefined;
testID?: string | undefined;
textAlignVertical?: "auto" | "center" | "top" | "bottom" | undefined;
style?: import("react-native").StyleProp<import("react-native").TextStyle>;
removeClippedSubviews?: boolean | undefined;
onLayout?: ((event: import("react-native").LayoutChangeEvent) => void) | undefined;
onContentSizeChange?: ((e: import("react-native").NativeSyntheticEvent<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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").TextStyle> | import("react-native").RecursiveArray<import("react-native").TextStyle | import("react-native").Falsy | import("react-native").RegisteredStyle<import("react-native").TextStyle>> | {
lineHeight: undefined;
height: number | undefined;
Expand Down Expand Up @@ -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<import("react-native").TextInputContentSizeChangeEventData>) => void) | undefined;
Expand Down Expand Up @@ -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;
Expand Down
27 changes: 6 additions & 21 deletions generatedTypes/src/style/borderRadiuses.d.ts
Original file line number Diff line number Diff line change
@@ -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<number>): 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;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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.4.2"
},
"peerDependencies": {
"react": ">=17.0.1",
Expand Down
9 changes: 7 additions & 2 deletions src/style/borderRadiuses.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -11,8 +15,9 @@ export const BorderRadiusesLiterals = {
br60: 20,
br100: 999
};

export class BorderRadiuses {
loadBorders(borders: Dictionary<number>) {
loadBorders(borders: IBorderRadiusesLiterals) {
_.forEach(borders, (value, key) => {
//@ts-ignore
this[key] = value;
Expand Down