@tamagui/web 1.59.4 → 1.60.0
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/dist/cjs/hooks/useMedia.js +19 -3
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useProps.js +2 -1
- package/dist/cjs/hooks/useProps.js.map +1 -1
- package/dist/esm/hooks/useMedia.js +19 -3
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useProps.js +2 -1
- package/dist/esm/hooks/useProps.js.map +1 -1
- package/package.json +9 -9
- package/src/hooks/useMedia.tsx +29 -4
- package/src/hooks/useProps.tsx +2 -0
- package/src/hooks/useTheme.tsx +1 -1
- package/types/hooks/useMedia.d.ts +2 -0
- package/types/hooks/useMedia.d.ts.map +1 -1
- package/types/hooks/useProps.d.ts +1 -0
- package/types/hooks/useProps.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
|
@@ -44,6 +44,7 @@ var import_config = require("../config");
|
|
|
44
44
|
var import_createProxy = require("../helpers/createProxy");
|
|
45
45
|
var import_matchMedia = require("../helpers/matchMedia");
|
|
46
46
|
var import_pseudoDescriptors = require("../helpers/pseudoDescriptors");
|
|
47
|
+
var import_useTheme = require("./useTheme");
|
|
47
48
|
let mediaState = (
|
|
48
49
|
// development only safeguard
|
|
49
50
|
process.env.NODE_ENV === "development" ? (0, import_createProxy.createProxy)(
|
|
@@ -192,6 +193,8 @@ function useMedia(uid) {
|
|
|
192
193
|
}
|
|
193
194
|
function useMediaPropsActive(props, opts) {
|
|
194
195
|
const media = useMedia();
|
|
196
|
+
const resolveThemeValueOpt = opts == null ? void 0 : opts.resolveThemeValues;
|
|
197
|
+
const theme = resolveThemeValueOpt ? (0, import_useTheme.useTheme)() : null;
|
|
195
198
|
const shouldExpandShorthands = opts == null ? void 0 : opts.expandShorthands;
|
|
196
199
|
return (0, import_react.useMemo)(() => {
|
|
197
200
|
const config = (0, import_config.getConfig)();
|
|
@@ -210,7 +213,7 @@ function useMediaPropsActive(props, opts) {
|
|
|
210
213
|
const subKeys = Object.keys(val);
|
|
211
214
|
for (let j = subKeys.length; j--; j >= 0) {
|
|
212
215
|
let subKey = subKeys[j];
|
|
213
|
-
const value = val[subKey];
|
|
216
|
+
const value = getThemeValue(val[subKey], theme, resolveThemeValueOpt);
|
|
214
217
|
if (shouldExpandShorthands) {
|
|
215
218
|
subKey = config.shorthands[subKey] || subKey;
|
|
216
219
|
}
|
|
@@ -221,12 +224,25 @@ function useMediaPropsActive(props, opts) {
|
|
|
221
224
|
if (shouldExpandShorthands) {
|
|
222
225
|
key = config.shorthands[key] || key;
|
|
223
226
|
}
|
|
224
|
-
mergeMediaByImportance(
|
|
227
|
+
mergeMediaByImportance(
|
|
228
|
+
next,
|
|
229
|
+
"",
|
|
230
|
+
key,
|
|
231
|
+
getThemeValue(val, theme, resolveThemeValueOpt),
|
|
232
|
+
importancesUsed,
|
|
233
|
+
true
|
|
234
|
+
);
|
|
225
235
|
}
|
|
226
236
|
}
|
|
227
237
|
return next;
|
|
228
|
-
}, [media, props]);
|
|
238
|
+
}, [media, props, theme, resolveThemeValueOpt]);
|
|
229
239
|
}
|
|
240
|
+
const getThemeValue = (value, theme, resolveThemeValueOpt) => {
|
|
241
|
+
if (!resolveThemeValueOpt || !theme || !(value in theme))
|
|
242
|
+
return value;
|
|
243
|
+
const themeValue = theme[value];
|
|
244
|
+
return resolveThemeValueOpt === "value" ? themeValue.val : themeValue.get();
|
|
245
|
+
};
|
|
230
246
|
const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed, isSizeMedia) => {
|
|
231
247
|
const conf = (0, import_config.getConfig)();
|
|
232
248
|
const importance = isSizeMedia && !conf.settings.mediaPropOrder ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C;AAC1C,mBAAsD;AAEtD,oBAA0B;AAC1B,yBAA4B;AAC5B,wBAA2B;AAC3B,+BAAkC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["update"]
|
|
6
6
|
}
|
|
@@ -24,7 +24,8 @@ module.exports = __toCommonJS(useProps_exports);
|
|
|
24
24
|
var import_useMedia = require("./useMedia");
|
|
25
25
|
function useProps(props, opts) {
|
|
26
26
|
return (0, import_useMedia.useMediaPropsActive)(props, {
|
|
27
|
-
expandShorthands: !(opts == null ? void 0 : opts.disableExpandShorthands)
|
|
27
|
+
expandShorthands: !(opts == null ? void 0 : opts.disableExpandShorthands),
|
|
28
|
+
resolveThemeValues: opts == null ? void 0 : opts.resolveThemeValues
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
31
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useProps.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAoC;AAQ7B,SAAS,SACd,OACA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAoC;AAQ7B,SAAS,SACd,OACA,MAOA;AACA,aAAO,qCAAoB,OAAO;AAAA,IAChC,kBAAkB,EAAC,6BAAM;AAAA,IACzB,oBAAoB,6BAAM;AAAA,EAC5B,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,6 +4,7 @@ import { getConfig } from "../config";
|
|
|
4
4
|
import { createProxy } from "../helpers/createProxy";
|
|
5
5
|
import { matchMedia } from "../helpers/matchMedia";
|
|
6
6
|
import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
|
|
7
|
+
import { useTheme } from "./useTheme";
|
|
7
8
|
let mediaState = (
|
|
8
9
|
// development only safeguard
|
|
9
10
|
process.env.NODE_ENV === "development" ? createProxy(
|
|
@@ -151,6 +152,8 @@ function useMedia(uid) {
|
|
|
151
152
|
}
|
|
152
153
|
function useMediaPropsActive(props, opts) {
|
|
153
154
|
const media = useMedia();
|
|
155
|
+
const resolveThemeValueOpt = opts == null ? void 0 : opts.resolveThemeValues;
|
|
156
|
+
const theme = resolveThemeValueOpt ? useTheme() : null;
|
|
154
157
|
const shouldExpandShorthands = opts == null ? void 0 : opts.expandShorthands;
|
|
155
158
|
return useMemo(() => {
|
|
156
159
|
const config = getConfig();
|
|
@@ -169,7 +172,7 @@ function useMediaPropsActive(props, opts) {
|
|
|
169
172
|
const subKeys = Object.keys(val);
|
|
170
173
|
for (let j = subKeys.length; j--; j >= 0) {
|
|
171
174
|
let subKey = subKeys[j];
|
|
172
|
-
const value = val[subKey];
|
|
175
|
+
const value = getThemeValue(val[subKey], theme, resolveThemeValueOpt);
|
|
173
176
|
if (shouldExpandShorthands) {
|
|
174
177
|
subKey = config.shorthands[subKey] || subKey;
|
|
175
178
|
}
|
|
@@ -180,12 +183,25 @@ function useMediaPropsActive(props, opts) {
|
|
|
180
183
|
if (shouldExpandShorthands) {
|
|
181
184
|
key = config.shorthands[key] || key;
|
|
182
185
|
}
|
|
183
|
-
mergeMediaByImportance(
|
|
186
|
+
mergeMediaByImportance(
|
|
187
|
+
next,
|
|
188
|
+
"",
|
|
189
|
+
key,
|
|
190
|
+
getThemeValue(val, theme, resolveThemeValueOpt),
|
|
191
|
+
importancesUsed,
|
|
192
|
+
true
|
|
193
|
+
);
|
|
184
194
|
}
|
|
185
195
|
}
|
|
186
196
|
return next;
|
|
187
|
-
}, [media, props]);
|
|
197
|
+
}, [media, props, theme, resolveThemeValueOpt]);
|
|
188
198
|
}
|
|
199
|
+
const getThemeValue = (value, theme, resolveThemeValueOpt) => {
|
|
200
|
+
if (!resolveThemeValueOpt || !theme || !(value in theme))
|
|
201
|
+
return value;
|
|
202
|
+
const themeValue = theme[value];
|
|
203
|
+
return resolveThemeValueOpt === "value" ? themeValue.val : themeValue.get();
|
|
204
|
+
};
|
|
189
205
|
const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed, isSizeMedia) => {
|
|
190
206
|
const conf = getConfig();
|
|
191
207
|
const importance = isSizeMedia && !conf.settings.mediaPropOrder ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,iCAAiC;AAC1C,SAAS,SAAS,QAAQ,4BAA4B;AAEtD,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["update"]
|
|
6
6
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { useMediaPropsActive } from "./useMedia";
|
|
2
2
|
function useProps(props, opts) {
|
|
3
3
|
return useMediaPropsActive(props, {
|
|
4
|
-
expandShorthands: !(opts == null ? void 0 : opts.disableExpandShorthands)
|
|
4
|
+
expandShorthands: !(opts == null ? void 0 : opts.disableExpandShorthands),
|
|
5
|
+
resolveThemeValues: opts == null ? void 0 : opts.resolveThemeValues
|
|
5
6
|
});
|
|
6
7
|
}
|
|
7
8
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useProps.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,2BAA2B;AAQ7B,SAAS,SACd,OACA,
|
|
4
|
+
"mappings": "AAAA,SAAS,2BAA2B;AAQ7B,SAAS,SACd,OACA,MAOA;AACA,SAAO,oBAAoB,OAAO;AAAA,IAChC,kBAAkB,EAAC,6BAAM;AAAA,IACzB,oBAAoB,6BAAM;AAAA,EAC5B,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.60.0",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.
|
|
31
|
-
"@tamagui/constants": "1.
|
|
32
|
-
"@tamagui/helpers": "1.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.
|
|
34
|
-
"@tamagui/timer": "1.
|
|
35
|
-
"@tamagui/use-did-finish-ssr": "1.
|
|
36
|
-
"@tamagui/use-force-update": "1.
|
|
30
|
+
"@tamagui/compose-refs": "1.60.0",
|
|
31
|
+
"@tamagui/constants": "1.60.0",
|
|
32
|
+
"@tamagui/helpers": "1.60.0",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.60.0",
|
|
34
|
+
"@tamagui/timer": "1.60.0",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.60.0",
|
|
36
|
+
"@tamagui/use-force-update": "1.60.0"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.
|
|
42
|
+
"@tamagui/build": "1.60.0",
|
|
43
43
|
"@testing-library/react": "^14.0.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -12,6 +12,7 @@ import type {
|
|
|
12
12
|
MediaQueryState,
|
|
13
13
|
TamaguiInternalConfig,
|
|
14
14
|
} from '../types'
|
|
15
|
+
import { UseThemeResult, useTheme } from './useTheme'
|
|
15
16
|
|
|
16
17
|
export let mediaState: MediaQueryState =
|
|
17
18
|
// development only safeguard
|
|
@@ -231,6 +232,8 @@ export function useMedia(uid?: any): UseMediaState {
|
|
|
231
232
|
})
|
|
232
233
|
}
|
|
233
234
|
|
|
235
|
+
export type ResolveThemeValueOpt = boolean | 'value'
|
|
236
|
+
|
|
234
237
|
/**
|
|
235
238
|
*
|
|
236
239
|
* @deprecated use useProps instead which is the same but also expands shorthands (which you can disable)
|
|
@@ -243,12 +246,17 @@ export function useMedia(uid?: any): UseMediaState {
|
|
|
243
246
|
* */
|
|
244
247
|
export function useMediaPropsActive<A extends Object>(
|
|
245
248
|
props: A,
|
|
246
|
-
opts?: {
|
|
249
|
+
opts?: {
|
|
250
|
+
expandShorthands?: boolean
|
|
251
|
+
resolveThemeValues?: ResolveThemeValueOpt
|
|
252
|
+
}
|
|
247
253
|
): {
|
|
248
254
|
// remove all media
|
|
249
255
|
[Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key]
|
|
250
256
|
} {
|
|
251
257
|
const media = useMedia()
|
|
258
|
+
const resolveThemeValueOpt = opts?.resolveThemeValues
|
|
259
|
+
const theme = resolveThemeValueOpt ? useTheme() : null
|
|
252
260
|
const shouldExpandShorthands = opts?.expandShorthands
|
|
253
261
|
|
|
254
262
|
return useMemo(() => {
|
|
@@ -268,7 +276,7 @@ export function useMediaPropsActive<A extends Object>(
|
|
|
268
276
|
const subKeys = Object.keys(val)
|
|
269
277
|
for (let j = subKeys.length; j--; j >= 0) {
|
|
270
278
|
let subKey = subKeys[j]
|
|
271
|
-
const value = val[subKey]
|
|
279
|
+
const value = getThemeValue(val[subKey], theme, resolveThemeValueOpt)
|
|
272
280
|
if (shouldExpandShorthands) {
|
|
273
281
|
subKey = config.shorthands[subKey] || subKey
|
|
274
282
|
}
|
|
@@ -279,12 +287,29 @@ export function useMediaPropsActive<A extends Object>(
|
|
|
279
287
|
if (shouldExpandShorthands) {
|
|
280
288
|
key = config.shorthands[key] || key
|
|
281
289
|
}
|
|
282
|
-
mergeMediaByImportance(
|
|
290
|
+
mergeMediaByImportance(
|
|
291
|
+
next,
|
|
292
|
+
'',
|
|
293
|
+
key,
|
|
294
|
+
getThemeValue(val, theme, resolveThemeValueOpt),
|
|
295
|
+
importancesUsed,
|
|
296
|
+
true
|
|
297
|
+
)
|
|
283
298
|
}
|
|
284
299
|
}
|
|
285
300
|
|
|
286
301
|
return next
|
|
287
|
-
}, [media, props])
|
|
302
|
+
}, [media, props, theme, resolveThemeValueOpt])
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
const getThemeValue = (
|
|
306
|
+
value?: any,
|
|
307
|
+
theme?: UseThemeResult | null,
|
|
308
|
+
resolveThemeValueOpt?: ResolveThemeValueOpt
|
|
309
|
+
) => {
|
|
310
|
+
if (!resolveThemeValueOpt || !theme || !(value in theme)) return value
|
|
311
|
+
const themeValue = theme[value]
|
|
312
|
+
return resolveThemeValueOpt === 'value' ? themeValue.val : themeValue.get()
|
|
288
313
|
}
|
|
289
314
|
|
|
290
315
|
export const getMediaImportanceIfMoreImportant = (
|
package/src/hooks/useProps.tsx
CHANGED
|
@@ -10,6 +10,7 @@ export function useProps<A extends Object>(
|
|
|
10
10
|
props: A,
|
|
11
11
|
opts?: {
|
|
12
12
|
disableExpandShorthands?: boolean
|
|
13
|
+
resolveThemeValues?: boolean | 'value'
|
|
13
14
|
}
|
|
14
15
|
): {
|
|
15
16
|
// remove all media
|
|
@@ -17,5 +18,6 @@ export function useProps<A extends Object>(
|
|
|
17
18
|
} {
|
|
18
19
|
return useMediaPropsActive(props, {
|
|
19
20
|
expandShorthands: !opts?.disableExpandShorthands,
|
|
21
|
+
resolveThemeValues: opts?.resolveThemeValues,
|
|
20
22
|
})
|
|
21
23
|
}
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -18,6 +18,7 @@ type UpdateState = {
|
|
|
18
18
|
};
|
|
19
19
|
export declare function setMediaShouldUpdate(ref: any, props: UpdateState): WeakMap<any, UpdateState>;
|
|
20
20
|
export declare function useMedia(uid?: any): UseMediaState;
|
|
21
|
+
export type ResolveThemeValueOpt = boolean | 'value';
|
|
21
22
|
/**
|
|
22
23
|
*
|
|
23
24
|
* @deprecated use useProps instead which is the same but also expands shorthands (which you can disable)
|
|
@@ -30,6 +31,7 @@ export declare function useMedia(uid?: any): UseMediaState;
|
|
|
30
31
|
* */
|
|
31
32
|
export declare function useMediaPropsActive<A extends Object>(props: A, opts?: {
|
|
32
33
|
expandShorthands?: boolean;
|
|
34
|
+
resolveThemeValues?: ResolveThemeValueOpt;
|
|
33
35
|
}): {
|
|
34
36
|
[Key in keyof A extends `$${string}` ? never : keyof A]?: A[Key];
|
|
35
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,YAKL,CAAA;AAIjC,eAAO,MAAM,oBAAoB,uBAEhC,CAAA;AAOD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAID,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAc3D,CAAA;AAaD,wBAAgB,mBAAmB,SA+BlC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,QAM9D;AAiBD,KAAK,aAAa,GAAG;KAClB,GAAG,IAAI,aAAa,GAAG,OAAO;CAChC,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAYD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,aAAa,CA6CjD;AAED,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,OAAO,CAAA;AAEpD;;;;;;;;;KASK;AACL,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IACL,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,oBAAoB,CAAA;CAC1C,GACA;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CA+CA;AAYD,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,CAAA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,WAAW,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,WAiBxB;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAEA;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvC,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IACL,uBAAuB,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"useProps.d.ts","sourceRoot":"","sources":["../../src/hooks/useProps.tsx"],"names":[],"mappings":"AAEA;;;;;KAKK;AACL,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvC,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IACL,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CACvC,GACA;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAKA"}
|
|
@@ -10,7 +10,7 @@ export type ChangedThemeResponse = {
|
|
|
10
10
|
type ThemeGettable<Val> = Val & {
|
|
11
11
|
get: () => string | (Val extends Variable<infer X> ? X extends VariableValGeneric ? any : Exclude<X, Variable> : Val extends VariableVal ? string | number : unknown);
|
|
12
12
|
};
|
|
13
|
-
type UseThemeResult = {
|
|
13
|
+
export type UseThemeResult = {
|
|
14
14
|
[Key in keyof ThemeParsed]: ThemeGettable<ThemeParsed[Key]>;
|
|
15
15
|
};
|
|
16
16
|
export declare const useTheme: (props?: ThemeProps) => UseThemeResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAe,MAAM,mBAAmB,CAAA;AAEzD,OAAO,EACL,YAAY,EACZ,iBAAiB,EAElB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAGjB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,iBAAiB,CAAA;IACxB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAaD,KAAK,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IAC9B,GAAG,EAAE,MACD,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACvB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACjB,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAe,MAAM,mBAAmB,CAAA;AAEzD,OAAO,EACL,YAAY,EACZ,iBAAiB,EAElB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAGjB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,iBAAiB,CAAA;IACxB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAaD,KAAK,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IAC9B,GAAG,EAAE,MACD,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACvB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;KAC1B,GAAG,IAAI,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;CAC5D,CAAA;AAED,eAAO,MAAM,QAAQ,WAAW,UAAU,mBAIzC,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,UAAU,KAChB,CAAC,oBAAoB,EAAE,WAAW,CAqDpC,CAAA;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,EAClB,YAAY,CAAC,EAAE,YAAY,EAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,EACf,KAAK,CAAC,EAAE,SAAS,GAChB,cAAc,CAwDhB;AAED,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAE1D,eAAO,MAAM,oBAAoB,UACxB,UAAU,yBAEV,MAAM,EAAE,iBACA,MAAM,OAAO,GAAG,SAAS,KACvC,oBAmPF,CAAA"}
|