Skip to content

Commit 5c7ff8b

Browse files
committed
Revert #1442 PR - border radius modifiers typings
1 parent 6ae6ebc commit 5c7ff8b

File tree

2 files changed

+27
-11
lines changed

2 files changed

+27
-11
lines changed
Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
interface IBorderRadiusesLiterals {
2-
[key: `br${number}`]: number;
3-
}
4-
export declare const BorderRadiusesLiterals: IBorderRadiusesLiterals;
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+
};
511
export declare class BorderRadiuses {
6-
loadBorders(borders: IBorderRadiusesLiterals): void;
12+
loadBorders(borders: Dictionary<number>): void;
713
getKeysPattern(): RegExp;
814
}
9-
declare const borderRadiusesInstance: BorderRadiuses & IBorderRadiusesLiterals;
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+
};
1025
export default borderRadiusesInstance;

src/style/borderRadiuses.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import _ from 'lodash';
22
import Constants from '../helpers/Constants';
33

4-
interface IBorderRadiusesLiterals {
5-
[key: `br${number}`]: number
6-
}
4+
// TODO: enable template type after we're ready to use TS 4.4.0
5+
// interface IBorderRadiusesLiterals {
6+
// [key: `br${number}`]: number
7+
// }
78

8-
export const BorderRadiusesLiterals: IBorderRadiusesLiterals = {
9+
export const BorderRadiusesLiterals/* : IBorderRadiusesLiterals */ = {
910
br0: Constants.isIOS ? 0 : 0,
1011
br10: Constants.isIOS ? 3 : 2,
1112
br20: 6,
@@ -17,7 +18,7 @@ export const BorderRadiusesLiterals: IBorderRadiusesLiterals = {
1718
};
1819

1920
export class BorderRadiuses {
20-
loadBorders(borders: IBorderRadiusesLiterals) {
21+
loadBorders(borders: Dictionary<number>/* IBorderRadiusesLiterals */) {
2122
_.forEach(borders, (value, key) => {
2223
//@ts-ignore
2324
this[key] = value;

0 commit comments

Comments
 (0)