@draftbit/theme 50.5.3 → 50.5.4-629c6c.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/DefaultTheme.js +1 -1
- package/lib/commonjs/Provider.js +1 -1
- package/lib/commonjs/createTheme.js +1 -1
- package/lib/commonjs/createThemeValuesProxy.js +1 -1
- package/lib/commonjs/types.js +1 -0
- package/lib/commonjs/validators.js +1 -1
- package/lib/typescript/src/DefaultTheme.js +38 -38
- package/lib/typescript/src/DefaultTheme.js.map +1 -1
- package/lib/typescript/src/Provider.js +14 -10
- package/lib/typescript/src/Provider.js.map +1 -1
- package/lib/typescript/src/createTheme.js +25 -3
- package/lib/typescript/src/createTheme.js.map +1 -1
- package/lib/typescript/src/createThemeValuesProxy.js +23 -19
- package/lib/typescript/src/createThemeValuesProxy.js.map +1 -1
- package/lib/typescript/src/types.d.ts +30 -2
- package/lib/typescript/src/validators.d.ts +3 -1
- package/lib/typescript/src/validators.js +81 -42
- package/lib/typescript/src/validators.js.map +1 -1
- package/lib/typescript/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/src/DefaultTheme.js +38 -38
- package/src/DefaultTheme.js.map +1 -1
- package/src/DefaultTheme.ts +38 -38
- package/src/Provider.js +14 -10
- package/src/Provider.js.map +1 -1
- package/src/Provider.tsx +20 -40
- package/src/createTheme.js +25 -3
- package/src/createTheme.js.map +1 -1
- package/src/createTheme.ts +30 -2
- package/src/createThemeValuesProxy.js +23 -19
- package/src/createThemeValuesProxy.js.map +1 -1
- package/src/createThemeValuesProxy.ts +32 -23
- package/src/types.ts +33 -2
- package/src/validators.js +81 -42
- package/src/validators.js.map +1 -1
- package/src/validators.ts +103 -46
package/src/DefaultTheme.js
CHANGED
|
@@ -61,84 +61,84 @@ const DraftbitTheme = createTheme({
|
|
|
61
61
|
},
|
|
62
62
|
},
|
|
63
63
|
typography: {
|
|
64
|
-
|
|
64
|
+
body1: {
|
|
65
65
|
...systemWeights.regular,
|
|
66
|
+
fontSize: 16,
|
|
67
|
+
letterSpacing: 0,
|
|
68
|
+
lineHeight: 26,
|
|
69
|
+
},
|
|
70
|
+
body2: {
|
|
71
|
+
...systemWeights.regular,
|
|
72
|
+
fontSize: 14,
|
|
73
|
+
letterSpacing: 0,
|
|
74
|
+
lineHeight: 22,
|
|
75
|
+
},
|
|
76
|
+
button: {
|
|
77
|
+
...systemWeights.bold,
|
|
78
|
+
fontSize: 14,
|
|
79
|
+
letterSpacing: 0,
|
|
80
|
+
lineHeight: 16,
|
|
81
|
+
},
|
|
82
|
+
caption: {
|
|
83
|
+
...systemWeights.regular,
|
|
84
|
+
fontSize: 12,
|
|
85
|
+
letterSpacing: 0,
|
|
86
|
+
lineHeight: 16,
|
|
87
|
+
},
|
|
88
|
+
headline1: {
|
|
89
|
+
...systemWeights.bold,
|
|
66
90
|
fontSize: 60,
|
|
67
91
|
letterSpacing: 0,
|
|
68
92
|
lineHeight: 71,
|
|
69
93
|
},
|
|
70
94
|
headline2: {
|
|
71
|
-
...systemWeights.
|
|
95
|
+
...systemWeights.bold,
|
|
72
96
|
fontSize: 48,
|
|
73
97
|
letterSpacing: 0,
|
|
74
98
|
lineHeight: 58,
|
|
75
99
|
},
|
|
76
100
|
headline3: {
|
|
77
|
-
...systemWeights.
|
|
101
|
+
...systemWeights.bold,
|
|
78
102
|
fontSize: 34,
|
|
79
103
|
letterSpacing: 0,
|
|
80
104
|
lineHeight: 40,
|
|
81
105
|
},
|
|
82
106
|
headline4: {
|
|
83
|
-
...systemWeights.
|
|
107
|
+
...systemWeights.bold,
|
|
84
108
|
fontSize: 24,
|
|
85
109
|
letterSpacing: 0,
|
|
86
110
|
lineHeight: 34,
|
|
87
111
|
},
|
|
88
112
|
headline5: {
|
|
89
|
-
...systemWeights.
|
|
113
|
+
...systemWeights.bold,
|
|
90
114
|
fontSize: 20,
|
|
91
115
|
letterSpacing: 0,
|
|
92
116
|
lineHeight: 26,
|
|
93
117
|
},
|
|
94
|
-
|
|
95
|
-
...systemWeights.
|
|
118
|
+
headline6: {
|
|
119
|
+
...systemWeights.bold,
|
|
96
120
|
fontSize: 16,
|
|
97
121
|
letterSpacing: 0,
|
|
98
|
-
lineHeight:
|
|
122
|
+
lineHeight: 24,
|
|
99
123
|
},
|
|
100
|
-
|
|
124
|
+
overline: {
|
|
101
125
|
...systemWeights.regular,
|
|
102
|
-
fontSize:
|
|
103
|
-
letterSpacing:
|
|
104
|
-
lineHeight:
|
|
126
|
+
fontSize: 12,
|
|
127
|
+
letterSpacing: 2,
|
|
128
|
+
lineHeight: 16,
|
|
105
129
|
},
|
|
106
|
-
|
|
130
|
+
subtitle1: {
|
|
107
131
|
...systemWeights.regular,
|
|
108
132
|
fontSize: 16,
|
|
109
133
|
letterSpacing: 0,
|
|
110
134
|
lineHeight: 26,
|
|
111
135
|
},
|
|
112
|
-
|
|
136
|
+
subtitle2: {
|
|
113
137
|
...systemWeights.regular,
|
|
114
138
|
fontSize: 14,
|
|
115
139
|
letterSpacing: 0,
|
|
116
140
|
lineHeight: 22,
|
|
117
141
|
},
|
|
118
|
-
button: {
|
|
119
|
-
...systemWeights.regular,
|
|
120
|
-
fontSize: 14,
|
|
121
|
-
letterSpacing: 0,
|
|
122
|
-
lineHeight: 16,
|
|
123
|
-
},
|
|
124
|
-
caption: {
|
|
125
|
-
...systemWeights.regular,
|
|
126
|
-
fontSize: 12,
|
|
127
|
-
letterSpacing: 0,
|
|
128
|
-
lineHeight: 16,
|
|
129
|
-
},
|
|
130
|
-
overline: {
|
|
131
|
-
...systemWeights.regular,
|
|
132
|
-
fontSize: 12,
|
|
133
|
-
letterSpacing: 2,
|
|
134
|
-
lineHeight: 16,
|
|
135
|
-
},
|
|
136
|
-
headline6: {
|
|
137
|
-
...systemWeights.regular,
|
|
138
|
-
fontSize: 16,
|
|
139
|
-
letterSpacing: 0,
|
|
140
|
-
lineHeight: 24,
|
|
141
|
-
},
|
|
142
142
|
},
|
|
143
143
|
},
|
|
144
144
|
});
|
package/src/DefaultTheme.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultTheme.js","sourceRoot":"","sources":["DefaultTheme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,MAAM,QAAQ,GAAkB;IAC9B,QAAQ,EAAE;QACR,OAAO,EAAE,kBAAkB;QAC3B,SAAS,EAAE,mBAAmB;QAC9B,QAAQ,EAAE,gBAAgB;QAC1B,UAAU,EAAE,wBAAwB;QACpC,KAAK,EAAE,uBAAuB;QAC9B,OAAO,EAAE,wBAAwB;QACjC,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,qBAAqB;QAC7B,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,SAAS;KAChB;CACF,CAAC;AAEF,MAAM,aAAa,GAAG,WAAW,CAAC;IAChC,WAAW,EAAE,EAAE;IACf,QAAQ;IACR,KAAK,EAAE;QACL,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE;YACN,QAAQ,EAAE;gBACR,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS;gBACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ;gBACpC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS;aACpC;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;gBAChC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;gBAChC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC9B,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAC9B,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;aAChC;YACD,UAAU,EAAE;gBACV,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU;gBACnC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI;gBAC5B,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;aAChC;YACD,UAAU,EAAE;gBACV,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAC9B,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;gBAC9B,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAChC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAChC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;aAChC;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAChC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAC/B,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;gBAClC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO;aAClC;SACF;QACD,UAAU,EAAE;YACV,
|
|
1
|
+
{"version":3,"file":"DefaultTheme.js","sourceRoot":"","sources":["DefaultTheme.ts"],"names":[],"mappings":"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"}
|
package/src/DefaultTheme.ts
CHANGED
|
@@ -64,84 +64,84 @@ const DraftbitTheme = createTheme({
|
|
|
64
64
|
},
|
|
65
65
|
},
|
|
66
66
|
typography: {
|
|
67
|
-
|
|
67
|
+
body1: {
|
|
68
68
|
...systemWeights.regular,
|
|
69
|
+
fontSize: 16,
|
|
70
|
+
letterSpacing: 0,
|
|
71
|
+
lineHeight: 26,
|
|
72
|
+
},
|
|
73
|
+
body2: {
|
|
74
|
+
...systemWeights.regular,
|
|
75
|
+
fontSize: 14,
|
|
76
|
+
letterSpacing: 0,
|
|
77
|
+
lineHeight: 22,
|
|
78
|
+
},
|
|
79
|
+
button: {
|
|
80
|
+
...systemWeights.bold,
|
|
81
|
+
fontSize: 14,
|
|
82
|
+
letterSpacing: 0,
|
|
83
|
+
lineHeight: 16,
|
|
84
|
+
},
|
|
85
|
+
caption: {
|
|
86
|
+
...systemWeights.regular,
|
|
87
|
+
fontSize: 12,
|
|
88
|
+
letterSpacing: 0,
|
|
89
|
+
lineHeight: 16,
|
|
90
|
+
},
|
|
91
|
+
headline1: {
|
|
92
|
+
...systemWeights.bold,
|
|
69
93
|
fontSize: 60,
|
|
70
94
|
letterSpacing: 0,
|
|
71
95
|
lineHeight: 71,
|
|
72
96
|
},
|
|
73
97
|
headline2: {
|
|
74
|
-
...systemWeights.
|
|
98
|
+
...systemWeights.bold,
|
|
75
99
|
fontSize: 48,
|
|
76
100
|
letterSpacing: 0,
|
|
77
101
|
lineHeight: 58,
|
|
78
102
|
},
|
|
79
103
|
headline3: {
|
|
80
|
-
...systemWeights.
|
|
104
|
+
...systemWeights.bold,
|
|
81
105
|
fontSize: 34,
|
|
82
106
|
letterSpacing: 0,
|
|
83
107
|
lineHeight: 40,
|
|
84
108
|
},
|
|
85
109
|
headline4: {
|
|
86
|
-
...systemWeights.
|
|
110
|
+
...systemWeights.bold,
|
|
87
111
|
fontSize: 24,
|
|
88
112
|
letterSpacing: 0,
|
|
89
113
|
lineHeight: 34,
|
|
90
114
|
},
|
|
91
115
|
headline5: {
|
|
92
|
-
...systemWeights.
|
|
116
|
+
...systemWeights.bold,
|
|
93
117
|
fontSize: 20,
|
|
94
118
|
letterSpacing: 0,
|
|
95
119
|
lineHeight: 26,
|
|
96
120
|
},
|
|
97
|
-
|
|
98
|
-
...systemWeights.
|
|
121
|
+
headline6: {
|
|
122
|
+
...systemWeights.bold,
|
|
99
123
|
fontSize: 16,
|
|
100
124
|
letterSpacing: 0,
|
|
101
|
-
lineHeight:
|
|
125
|
+
lineHeight: 24,
|
|
102
126
|
},
|
|
103
|
-
|
|
127
|
+
overline: {
|
|
104
128
|
...systemWeights.regular,
|
|
105
|
-
fontSize:
|
|
106
|
-
letterSpacing:
|
|
107
|
-
lineHeight:
|
|
129
|
+
fontSize: 12,
|
|
130
|
+
letterSpacing: 2,
|
|
131
|
+
lineHeight: 16,
|
|
108
132
|
},
|
|
109
|
-
|
|
133
|
+
subtitle1: {
|
|
110
134
|
...systemWeights.regular,
|
|
111
135
|
fontSize: 16,
|
|
112
136
|
letterSpacing: 0,
|
|
113
137
|
lineHeight: 26,
|
|
114
138
|
},
|
|
115
|
-
|
|
139
|
+
subtitle2: {
|
|
116
140
|
...systemWeights.regular,
|
|
117
141
|
fontSize: 14,
|
|
118
142
|
letterSpacing: 0,
|
|
119
143
|
lineHeight: 22,
|
|
120
144
|
},
|
|
121
|
-
button: {
|
|
122
|
-
...systemWeights.regular,
|
|
123
|
-
fontSize: 14,
|
|
124
|
-
letterSpacing: 0,
|
|
125
|
-
lineHeight: 16,
|
|
126
|
-
},
|
|
127
|
-
caption: {
|
|
128
|
-
...systemWeights.regular,
|
|
129
|
-
fontSize: 12,
|
|
130
|
-
letterSpacing: 0,
|
|
131
|
-
lineHeight: 16,
|
|
132
|
-
},
|
|
133
|
-
overline: {
|
|
134
|
-
...systemWeights.regular,
|
|
135
|
-
fontSize: 12,
|
|
136
|
-
letterSpacing: 2,
|
|
137
|
-
lineHeight: 16,
|
|
138
|
-
},
|
|
139
|
-
headline6: {
|
|
140
|
-
...systemWeights.regular,
|
|
141
|
-
fontSize: 16,
|
|
142
|
-
letterSpacing: 0,
|
|
143
|
-
lineHeight: 24,
|
|
144
|
-
},
|
|
145
145
|
},
|
|
146
146
|
},
|
|
147
147
|
});
|
package/src/Provider.js
CHANGED
|
@@ -28,16 +28,20 @@ const Provider = ({ themes, breakpoints, initialThemeName, children, }) => {
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
}, [themes, setCurrentTheme]);
|
|
31
|
-
const proxiedTheme = React.useMemo(() =>
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
const proxiedTheme = React.useMemo(() => {
|
|
32
|
+
const createProxiedThemeValue = (value) => createThemeValuesProxy(value, breakpoints, deviceWidth, Platform.OS, lightDarkSelection);
|
|
33
|
+
return {
|
|
34
|
+
...currentTheme,
|
|
35
|
+
colors: {
|
|
36
|
+
branding: createProxiedThemeValue(currentTheme.colors.branding),
|
|
37
|
+
text: createProxiedThemeValue(currentTheme.colors.text),
|
|
38
|
+
background: createProxiedThemeValue(currentTheme.colors.background),
|
|
39
|
+
foreground: createProxiedThemeValue(currentTheme.colors.foreground),
|
|
40
|
+
border: createProxiedThemeValue(currentTheme.colors.border),
|
|
41
|
+
},
|
|
42
|
+
typography: createProxiedThemeValue(currentTheme.typography),
|
|
43
|
+
};
|
|
44
|
+
}, [currentTheme, deviceWidth, breakpoints, lightDarkSelection]);
|
|
41
45
|
React.useEffect(() => {
|
|
42
46
|
const listener = Dimensions.addEventListener("change", ({ window }) => setDeviceWidth(window.width));
|
|
43
47
|
return () => {
|
package/src/Provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Provider.js","sourceRoot":"","sources":["Provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,YAAY,MAAM,2CAA2C,CAAC;AACrE,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,YAAY,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Provider.js","sourceRoot":"","sources":["Provider.tsx"],"names":[],"mappings":"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"}
|
package/src/Provider.tsx
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
Breakpoints,
|
|
8
8
|
ChangeThemeOptions,
|
|
9
9
|
ReadTheme,
|
|
10
|
+
ThemeValues,
|
|
10
11
|
ValidatedTheme,
|
|
11
12
|
} from "./types";
|
|
12
13
|
|
|
@@ -66,49 +67,28 @@ const Provider: React.FC<React.PropsWithChildren<ProviderProps>> = ({
|
|
|
66
67
|
[themes, setCurrentTheme]
|
|
67
68
|
);
|
|
68
69
|
|
|
69
|
-
const proxiedTheme: ReadTheme = React.useMemo(
|
|
70
|
-
() =>
|
|
70
|
+
const proxiedTheme: ReadTheme = React.useMemo(() => {
|
|
71
|
+
const createProxiedThemeValue = (value: ThemeValues | undefined) =>
|
|
72
|
+
createThemeValuesProxy(
|
|
73
|
+
value,
|
|
74
|
+
breakpoints,
|
|
75
|
+
deviceWidth,
|
|
76
|
+
Platform.OS,
|
|
77
|
+
lightDarkSelection
|
|
78
|
+
);
|
|
79
|
+
|
|
80
|
+
return {
|
|
71
81
|
...currentTheme,
|
|
72
82
|
colors: {
|
|
73
|
-
branding:
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
lightDarkSelection
|
|
79
|
-
),
|
|
80
|
-
text: createThemeValuesProxy(
|
|
81
|
-
currentTheme.colors.text,
|
|
82
|
-
breakpoints,
|
|
83
|
-
deviceWidth,
|
|
84
|
-
Platform.OS,
|
|
85
|
-
lightDarkSelection
|
|
86
|
-
),
|
|
87
|
-
background: createThemeValuesProxy(
|
|
88
|
-
currentTheme.colors.background,
|
|
89
|
-
breakpoints,
|
|
90
|
-
deviceWidth,
|
|
91
|
-
Platform.OS,
|
|
92
|
-
lightDarkSelection
|
|
93
|
-
),
|
|
94
|
-
foreground: createThemeValuesProxy(
|
|
95
|
-
currentTheme.colors.foreground,
|
|
96
|
-
breakpoints,
|
|
97
|
-
deviceWidth,
|
|
98
|
-
Platform.OS,
|
|
99
|
-
lightDarkSelection
|
|
100
|
-
),
|
|
101
|
-
border: createThemeValuesProxy(
|
|
102
|
-
currentTheme.colors.border,
|
|
103
|
-
breakpoints,
|
|
104
|
-
deviceWidth,
|
|
105
|
-
Platform.OS,
|
|
106
|
-
lightDarkSelection
|
|
107
|
-
),
|
|
83
|
+
branding: createProxiedThemeValue(currentTheme.colors.branding),
|
|
84
|
+
text: createProxiedThemeValue(currentTheme.colors.text),
|
|
85
|
+
background: createProxiedThemeValue(currentTheme.colors.background),
|
|
86
|
+
foreground: createProxiedThemeValue(currentTheme.colors.foreground),
|
|
87
|
+
border: createProxiedThemeValue(currentTheme.colors.border),
|
|
108
88
|
},
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
);
|
|
89
|
+
typography: createProxiedThemeValue(currentTheme.typography),
|
|
90
|
+
};
|
|
91
|
+
}, [currentTheme, deviceWidth, breakpoints, lightDarkSelection]);
|
|
112
92
|
|
|
113
93
|
React.useEffect(() => {
|
|
114
94
|
const listener = Dimensions.addEventListener("change", ({ window }) =>
|
package/src/createTheme.js
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { validateBreakpoints, validatePalettes, validateTheme, } from "./validators";
|
|
1
|
+
import { deepmergeCustom } from "deepmerge-ts";
|
|
2
|
+
import { isTextStyleObject, validateBreakpoints, validatePalettes, validateTheme, } from "./validators";
|
|
3
|
+
/**
|
|
4
|
+
* Custom deepmerge function to skip merging of typography/text style objects.
|
|
5
|
+
*
|
|
6
|
+
* The theme object allows for special keys that trigger variability depending
|
|
7
|
+
* on platform, breakpoint, color mode, etc.
|
|
8
|
+
*
|
|
9
|
+
* Text style objects can break this logic when merged with other objects.
|
|
10
|
+
* For example, if you merge a standard text style object with another object that
|
|
11
|
+
* has variability through the special keys, you get an object with both special
|
|
12
|
+
* keys and the keys of the style object which breaks how the proxy is able to
|
|
13
|
+
* return the correct value.
|
|
14
|
+
*/
|
|
15
|
+
const themeMerge = deepmergeCustom({
|
|
16
|
+
enableImplicitDefaultMerging: true,
|
|
17
|
+
mergeRecords(values, utils, meta) {
|
|
18
|
+
const firstValue = values[0];
|
|
19
|
+
if (isTextStyleObject(firstValue)) {
|
|
20
|
+
return utils.defaultMergeFunctions.mergeRecords(values.slice(1), utils, meta);
|
|
21
|
+
}
|
|
22
|
+
return utils.defaultMergeFunctions.mergeRecords(values, utils, meta);
|
|
23
|
+
},
|
|
24
|
+
});
|
|
3
25
|
export default function createTheme({ breakpoints, palettes, theme, baseTheme, }) {
|
|
4
26
|
validateBreakpoints(breakpoints);
|
|
5
27
|
validatePalettes(palettes);
|
|
@@ -7,7 +29,7 @@ export default function createTheme({ breakpoints, palettes, theme, baseTheme, }
|
|
|
7
29
|
let resultTheme = theme;
|
|
8
30
|
if (baseTheme) {
|
|
9
31
|
validateTheme(baseTheme);
|
|
10
|
-
resultTheme =
|
|
32
|
+
resultTheme = themeMerge(baseTheme, theme);
|
|
11
33
|
}
|
|
12
34
|
return {
|
|
13
35
|
...resultTheme,
|
package/src/createTheme.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTheme.js","sourceRoot":"","sources":["createTheme.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createTheme.js","sourceRoot":"","sources":["createTheme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAO/C,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,GACd,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,GAAG,eAAe,CAAC;IACjC,4BAA4B,EAAE,IAAI;IAClC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EACf,KAAK,EACL,IAAI,CACL,CAAC;SACH;QACD,OAAO,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACvE,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,WAAW,EACX,QAAQ,EACR,KAAK,EACL,SAAS,GAMV;IACC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACjC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3B,aAAa,CAAC,KAAK,CAAC,CAAC;IAErB,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,IAAI,SAAS,EAAE;QACb,aAAa,CAAC,SAAS,CAAC,CAAC;QACzB,WAAW,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC5C;IAED,OAAO;QACL,GAAG,WAAW;QACd,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC"}
|
package/src/createTheme.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { deepmergeCustom } from "deepmerge-ts";
|
|
2
2
|
import type {
|
|
3
3
|
Breakpoints,
|
|
4
4
|
Theme,
|
|
@@ -6,11 +6,39 @@ import type {
|
|
|
6
6
|
ColorPalettes,
|
|
7
7
|
} from "./types";
|
|
8
8
|
import {
|
|
9
|
+
isTextStyleObject,
|
|
9
10
|
validateBreakpoints,
|
|
10
11
|
validatePalettes,
|
|
11
12
|
validateTheme,
|
|
12
13
|
} from "./validators";
|
|
13
14
|
|
|
15
|
+
/**
|
|
16
|
+
* Custom deepmerge function to skip merging of typography/text style objects.
|
|
17
|
+
*
|
|
18
|
+
* The theme object allows for special keys that trigger variability depending
|
|
19
|
+
* on platform, breakpoint, color mode, etc.
|
|
20
|
+
*
|
|
21
|
+
* Text style objects can break this logic when merged with other objects.
|
|
22
|
+
* For example, if you merge a standard text style object with another object that
|
|
23
|
+
* has variability through the special keys, you get an object with both special
|
|
24
|
+
* keys and the keys of the style object which breaks how the proxy is able to
|
|
25
|
+
* return the correct value.
|
|
26
|
+
*/
|
|
27
|
+
const themeMerge = deepmergeCustom({
|
|
28
|
+
enableImplicitDefaultMerging: true,
|
|
29
|
+
mergeRecords(values, utils, meta) {
|
|
30
|
+
const firstValue = values[0];
|
|
31
|
+
if (isTextStyleObject(firstValue)) {
|
|
32
|
+
return utils.defaultMergeFunctions.mergeRecords(
|
|
33
|
+
values.slice(1),
|
|
34
|
+
utils,
|
|
35
|
+
meta
|
|
36
|
+
);
|
|
37
|
+
}
|
|
38
|
+
return utils.defaultMergeFunctions.mergeRecords(values, utils, meta);
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
|
|
14
42
|
export default function createTheme({
|
|
15
43
|
breakpoints,
|
|
16
44
|
palettes,
|
|
@@ -30,7 +58,7 @@ export default function createTheme({
|
|
|
30
58
|
|
|
31
59
|
if (baseTheme) {
|
|
32
60
|
validateTheme(baseTheme);
|
|
33
|
-
resultTheme =
|
|
61
|
+
resultTheme = themeMerge(baseTheme, theme);
|
|
34
62
|
}
|
|
35
63
|
|
|
36
64
|
return {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { asThemeValuesObject } from "./validators";
|
|
2
2
|
/**
|
|
3
3
|
* Creates a proxy for theme value objects to select a value whenever
|
|
4
4
|
* multiple values are provided for different platforms, breakpoints, and/or light/dark modes
|
|
@@ -13,30 +13,31 @@ export default function createThemeValuesProxy(value, breakpoints, deviceWidth,
|
|
|
13
13
|
return new Proxy(value, {
|
|
14
14
|
get: (target, key) => {
|
|
15
15
|
const currentValue = target[key];
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
16
|
+
const valueAsThemeValues = asThemeValuesObject(currentValue);
|
|
17
|
+
if (valueAsThemeValues) {
|
|
20
18
|
const platformKeys = ["ios", "android", "web", "macos", "windows"];
|
|
21
19
|
const breakpointKeys = Object.keys(breakpoints);
|
|
22
20
|
const lightDarkKeys = ["light", "dark"];
|
|
23
|
-
const keysType = getKeysType(
|
|
21
|
+
const keysType = getKeysType(valueAsThemeValues, platformKeys, breakpointKeys, lightDarkKeys);
|
|
24
22
|
if (keysType === "default") {
|
|
25
|
-
return createThemeValuesProxy(
|
|
23
|
+
return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
26
24
|
}
|
|
27
25
|
else if (keysType === "platform") {
|
|
28
|
-
return getPlatformValue(
|
|
26
|
+
return getPlatformValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
29
27
|
}
|
|
30
28
|
else if (keysType === "breakpoint") {
|
|
31
|
-
return getBreakpointValue(
|
|
29
|
+
return getBreakpointValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
32
30
|
}
|
|
33
31
|
else if (keysType === "lightDark") {
|
|
34
|
-
return getLightDarkValue(
|
|
32
|
+
return getLightDarkValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
35
33
|
}
|
|
36
34
|
else {
|
|
37
35
|
return undefined;
|
|
38
36
|
}
|
|
39
37
|
}
|
|
38
|
+
else {
|
|
39
|
+
return currentValue;
|
|
40
|
+
}
|
|
40
41
|
},
|
|
41
42
|
set: () => {
|
|
42
43
|
throw new Error("Theme is read only, cannot be modified at runtime");
|
|
@@ -78,11 +79,12 @@ function allFalse(a, b, c, d) {
|
|
|
78
79
|
function getPlatformValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
|
|
79
80
|
var _a;
|
|
80
81
|
const currentPlatformValue = (_a = value[devicePlatform]) !== null && _a !== void 0 ? _a : value.default;
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
const valueAsThemeValues = asThemeValuesObject(currentPlatformValue);
|
|
83
|
+
if (valueAsThemeValues) {
|
|
84
|
+
return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
83
85
|
}
|
|
84
86
|
else {
|
|
85
|
-
return
|
|
87
|
+
return currentPlatformValue;
|
|
86
88
|
}
|
|
87
89
|
}
|
|
88
90
|
function getBreakpointValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
|
|
@@ -96,21 +98,23 @@ function getBreakpointValue(value, breakpoints, deviceWidth, devicePlatform, cur
|
|
|
96
98
|
}
|
|
97
99
|
}
|
|
98
100
|
const currentBreakpointValue = (_a = value[currentBreakpointKey]) !== null && _a !== void 0 ? _a : value.default;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
+
const valueAsThemeValues = asThemeValuesObject(currentBreakpointValue);
|
|
102
|
+
if (valueAsThemeValues) {
|
|
103
|
+
return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
101
104
|
}
|
|
102
105
|
else {
|
|
103
|
-
return
|
|
106
|
+
return currentBreakpointValue;
|
|
104
107
|
}
|
|
105
108
|
}
|
|
106
109
|
function getLightDarkValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
|
|
107
110
|
var _a;
|
|
108
111
|
const currentLightDarkValue = (_a = value[currentLightDarkSelection]) !== null && _a !== void 0 ? _a : value.default;
|
|
109
|
-
|
|
110
|
-
|
|
112
|
+
const valueAsThemeValues = asThemeValuesObject(currentLightDarkValue);
|
|
113
|
+
if (valueAsThemeValues) {
|
|
114
|
+
return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
|
|
111
115
|
}
|
|
112
116
|
else {
|
|
113
|
-
return
|
|
117
|
+
return currentLightDarkValue;
|
|
114
118
|
}
|
|
115
119
|
}
|
|
116
120
|
//# sourceMappingURL=createThemeValuesProxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createThemeValuesProxy.js","sourceRoot":"","sources":["createThemeValuesProxy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createThemeValuesProxy.js","sourceRoot":"","sources":["createThemeValuesProxy.ts"],"names":[],"mappings":"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"}
|