@fluentui-react-native/use-tokens 0.6.8 → 0.6.9
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/CHANGELOG.json +15 -0
- package/CHANGELOG.md +9 -1
- package/lib/applyPropsToTokens.d.ts +2 -2
- package/lib/applyPropsToTokens.d.ts.map +1 -1
- package/lib/applyPropsToTokens.js.map +1 -1
- package/lib/applyPropsToTokens.test.js +3 -3
- package/lib/applyPropsToTokens.test.js.map +1 -1
- package/lib/applyTokenLayers.d.ts +2 -2
- package/lib/applyTokenLayers.d.ts.map +1 -1
- package/lib/applyTokenLayers.js.map +1 -1
- package/lib/buildUseTokens.d.ts +2 -2
- package/lib/buildUseTokens.d.ts.map +1 -1
- package/lib/buildUseTokens.js.map +1 -1
- package/lib/patchTokens.d.ts +2 -2
- package/lib/patchTokens.d.ts.map +1 -1
- package/lib/patchTokens.js.map +1 -1
- package/lib-commonjs/applyPropsToTokens.d.ts +2 -2
- package/lib-commonjs/applyPropsToTokens.d.ts.map +1 -1
- package/lib-commonjs/applyPropsToTokens.js.map +1 -1
- package/lib-commonjs/applyPropsToTokens.test.js +2 -2
- package/lib-commonjs/applyPropsToTokens.test.js.map +1 -1
- package/lib-commonjs/applyTokenLayers.d.ts +2 -2
- package/lib-commonjs/applyTokenLayers.d.ts.map +1 -1
- package/lib-commonjs/applyTokenLayers.js.map +1 -1
- package/lib-commonjs/buildUseTokens.d.ts +2 -2
- package/lib-commonjs/buildUseTokens.d.ts.map +1 -1
- package/lib-commonjs/buildUseTokens.js.map +1 -1
- package/lib-commonjs/patchTokens.d.ts +2 -2
- package/lib-commonjs/patchTokens.d.ts.map +1 -1
- package/lib-commonjs/patchTokens.js.map +1 -1
- package/package.json +2 -2
- package/src/applyPropsToTokens.test.ts +3 -3
- package/src/applyPropsToTokens.ts +3 -3
- package/src/applyTokenLayers.ts +4 -4
- package/src/buildUseTokens.ts +5 -5
- package/src/patchTokens.ts +3 -3
package/CHANGELOG.json
CHANGED
|
@@ -1,6 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/use-tokens",
|
|
3
3
|
"entries": [
|
|
4
|
+
{
|
|
5
|
+
"date": "Wed, 23 Jul 2025 00:18:14 GMT",
|
|
6
|
+
"version": "0.6.9",
|
|
7
|
+
"tag": "@fluentui-react-native/use-tokens_v0.6.9",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "jasonmo@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/use-tokens",
|
|
13
|
+
"commit": "dd4d507b4ebca7f13757f54cb36f762a3a50d9cc",
|
|
14
|
+
"comment": "fix types in memo-cache as well as a codescan security issue"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
4
19
|
{
|
|
5
20
|
"date": "Wed, 16 Jul 2025 20:06:44 GMT",
|
|
6
21
|
"version": "0.6.7",
|
package/CHANGELOG.md
CHANGED
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/use-tokens
|
|
2
2
|
|
|
3
|
-
<!-- This log was last generated on Wed,
|
|
3
|
+
<!-- This log was last generated on Wed, 23 Jul 2025 00:18:14 GMT and should not be manually modified. -->
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.6.9
|
|
8
|
+
|
|
9
|
+
Wed, 23 Jul 2025 00:18:14 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- fix types in memo-cache as well as a codescan security issue (jasonmo@microsoft.com)
|
|
14
|
+
|
|
7
15
|
## 0.6.7
|
|
8
16
|
|
|
9
17
|
Wed, 16 Jul 2025 20:06:44 GMT
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function applyPropsToTokens<TProps, TTokens>(props: TProps, tokens: TTokens, cache:
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
|
+
export declare function applyPropsToTokens<TProps, TTokens>(props: TProps, tokens: TTokens, cache: GetTypedMemoValue<TTokens>, keys: (keyof TTokens)[]): [TTokens, GetTypedMemoValue<TTokens>];
|
|
3
3
|
//# sourceMappingURL=applyPropsToTokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.d.ts","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.d.ts","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAChD,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,GACtB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAOvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.js","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAChC,KAAa,EACb,MAAe,EACf,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.js","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAChC,KAAa,EACb,MAAe,EACf,KAAiC,EACjC,IAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAa,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,WAAW,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QACvE,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC/G;IACD,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getTypedMemoCache } from '@fluentui-react-native/framework-base';
|
|
2
2
|
import { applyPropsToTokens } from './applyPropsToTokens';
|
|
3
3
|
const tokenProps = ['dos', 'quatro', 'cinco'];
|
|
4
4
|
const themeTokens = {
|
|
@@ -13,7 +13,7 @@ const props1 = { dos: 'two', quatro: 'four', cinco: false, foo: 'foo', bar: 'bar
|
|
|
13
13
|
// const props3: Props = { foo: 'foo', bar: 'bar' };
|
|
14
14
|
describe('applyPropsToTokens tests', () => {
|
|
15
15
|
test('props get copied', () => {
|
|
16
|
-
const cache =
|
|
16
|
+
const cache = getTypedMemoCache();
|
|
17
17
|
const [tokens] = applyPropsToTokens(props1, themeTokens, cache, tokenProps);
|
|
18
18
|
expect(tokens).not.toBe(themeTokens);
|
|
19
19
|
for (const key of tokenProps) {
|
|
@@ -21,7 +21,7 @@ describe('applyPropsToTokens tests', () => {
|
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
23
|
test('no copied props does not change tokens', () => {
|
|
24
|
-
const cache =
|
|
24
|
+
const cache = getTypedMemoCache();
|
|
25
25
|
const [tokens] = applyPropsToTokens({}, themeTokens, cache, tokenProps);
|
|
26
26
|
expect(tokens).toBe(themeTokens);
|
|
27
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.test.js","sourceRoot":"","sources":["../src/applyPropsToTokens.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.test.js","sourceRoot":"","sources":["../src/applyPropsToTokens.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAW1D,MAAM,UAAU,GAAyB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAOpE,MAAM,WAAW,GAAW;IAC1B,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,MAAM,GAAU,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAC3F,wCAAwC;AACxC,oDAAoD;AAEpD,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC5B,MAAM,KAAK,GAAG,iBAAiB,EAAU,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAClD,MAAM,KAAK,GAAG,iBAAiB,EAAU,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/**
|
|
3
3
|
* alternatively look them up with a passed in function
|
|
4
4
|
*/
|
|
@@ -12,5 +12,5 @@ export type HasLayer = (name: string) => boolean;
|
|
|
12
12
|
* @param subCache - cache scoped to the root object with no layers applied
|
|
13
13
|
* @param hasLayer - a function which returns whether a given layer should be applied
|
|
14
14
|
*/
|
|
15
|
-
export declare function applyTokenLayers<TTokens>(tokens: TTokens, states: string[], subCache:
|
|
15
|
+
export declare function applyTokenLayers<TTokens>(tokens: TTokens, states: string[], subCache: GetTypedMemoValue<TTokens>, hasLayer: HasLayer): [TTokens, GetTypedMemoValue<TTokens>];
|
|
16
16
|
//# sourceMappingURL=applyTokenLayers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyTokenLayers.d.ts","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"applyTokenLayers.d.ts","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EACtC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACpC,QAAQ,EAAE,QAAQ,GACjB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAiBvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyTokenLayers.js","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQvE;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAe,EACf,MAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"applyTokenLayers.js","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQvE;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAe,EACf,MAAgB,EAChB,QAAoC,EACpC,QAAkB;IAGlB,IAAI,KAAK,GAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IACjD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,sGAAsG;QACtG,KAAK,GAAG,MAAM;aACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,QAAwB,EAAE,SAAiB,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAC1C,GAAG,EAAE,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EACrG,CAAC,KAAK,CAAC,CACR,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC9B,CAAC,EAAE,KAAK,CAAC,CAAC;KACb;IACD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC"}
|
package/lib/buildUseTokens.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/** A function to generate tokens based on a theme */
|
|
3
3
|
export type TokensFromTheme<TTokens, TTheme> = (theme: TTheme) => TTokens;
|
|
4
4
|
/**
|
|
@@ -13,7 +13,7 @@ export type TokenSettings<TTokens, TTheme> = string | TTokens | TokensFromTheme<
|
|
|
13
13
|
* as well as a sub-cache, specific to this particular theme, that can be used for caching various styles
|
|
14
14
|
* or values that are theme specific
|
|
15
15
|
*/
|
|
16
|
-
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens,
|
|
16
|
+
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens, GetTypedMemoValue<TTokens>];
|
|
17
17
|
/**
|
|
18
18
|
* The full signature also includes a customize function that returns an updated version of useTokens
|
|
19
19
|
* that captures both the previous values, and layers in the new values specified
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildUseTokens.d.ts","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"buildUseTokens.d.ts","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG/E,qDAAqD;AACrD,MAAM,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,GAAG,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAEjG;;;;GAIG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtG;;;GAGG;AACH,MAAM,MAAM,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG;IACxE,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,KAAK,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CACxF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AA6B5H;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAC5C,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,SAAS,EAC/D,GAAG,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,GAC1C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAkB5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildUseTokens.js","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAiCrE;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CAClB,UAA+D,EAC/D,KAAa,EACb,gBAA+D;IAE/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,UAAU,GAAG,CAAC,gBAAgB,IAAK,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAa,CAAC,IAAK,EAAc,CAAC;KACxG;IACD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;QACpC,UAAU,GAAI,UAA+C,CAAC,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,
|
|
1
|
+
{"version":3,"file":"buildUseTokens.js","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAiCrE;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CAClB,UAA+D,EAC/D,KAAa,EACb,gBAA+D;IAE/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,UAAU,GAAG,CAAC,gBAAgB,IAAK,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAa,CAAC,IAAK,EAAc,CAAC;KACxG;IACD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;QACpC,UAAU,GAAI,UAA+C,CAAC,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,gBAA+D,EAC/D,GAAG,MAAwC;IAE3C,4EAA4E;IAC5E,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;IAE7B,0HAA0H;IAC1H,sGAAsG;IACtG,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;QACtC,+FAA+F;QAC/F,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC,cAAc,CAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9H,CAAC,CAAC;IAEF,oDAAoD;IACpD,aAAa,CAAC,SAAS,GAAG,CAAC,GAAG,SAA2C,EAAE,EAAE;QAC3E,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;QAC/C,OAAO,cAAc,CAAkB,gBAAgB,EAAE,GAAG,YAAY,CAAC,CAAC;IAC5E,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
package/lib/patchTokens.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/**
|
|
3
3
|
* Take a set of tokens (and a memo-cache) and apply changes to those tokens from an additional set of tokens. Only keys which are
|
|
4
4
|
* not undefined will be applied and if no changes are detected the token object will be unchanged.
|
|
@@ -8,5 +8,5 @@ import type { GetMemoValue } from '@fluentui-react-native/framework-base';
|
|
|
8
8
|
* @param patchValues - new values to apply, values will be obtained via keys in the object
|
|
9
9
|
* @returns - a tuple consisting of a new tokens object and a new memo-cache
|
|
10
10
|
*/
|
|
11
|
-
export declare function patchTokens<TTokens>(tokens: TTokens, cache:
|
|
11
|
+
export declare function patchTokens<TTokens>(tokens: TTokens, cache: GetTypedMemoValue<TTokens>, patchValues: TTokens): [TTokens, GetTypedMemoValue<TTokens>];
|
|
12
12
|
//# sourceMappingURL=patchTokens.d.ts.map
|
package/lib/patchTokens.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchTokens.d.ts","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"patchTokens.d.ts","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,OAAO,EACjC,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,WAAW,EAAE,OAAO,GACnB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAcvC"}
|
package/lib/patchTokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchTokens.js","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,UAAU,WAAW,CACzB,MAAe,EACf,
|
|
1
|
+
{"version":3,"file":"patchTokens.js","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,UAAU,WAAW,CACzB,MAAe,EACf,KAAiC,EACjC,WAAoB;IAEpB,2GAA2G;IAC3G,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;SAC3C,IAAI,EAAE,CAAC;IAEV,iHAAiH;IACjH,2GAA2G;IAC3G,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAClG;IAED,uEAAuE;IACvE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function applyPropsToTokens<TProps, TTokens>(props: TProps, tokens: TTokens, cache:
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
|
+
export declare function applyPropsToTokens<TProps, TTokens>(props: TProps, tokens: TTokens, cache: GetTypedMemoValue<TTokens>, keys: (keyof TTokens)[]): [TTokens, GetTypedMemoValue<TTokens>];
|
|
3
3
|
//# sourceMappingURL=applyPropsToTokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.d.ts","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.d.ts","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAChD,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,GACtB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAOvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.js","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAChC,KAAa,EACb,MAAe,EACf,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.js","sourceRoot":"","sources":["../src/applyPropsToTokens.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAChC,KAAa,EACb,MAAe,EACf,KAAiC,EACjC,IAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAa,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,WAAW,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QACvE,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC/G;IACD,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzB,CAAC;AAZD,gDAYC"}
|
|
@@ -15,7 +15,7 @@ const props1 = { dos: 'two', quatro: 'four', cinco: false, foo: 'foo', bar: 'bar
|
|
|
15
15
|
// const props3: Props = { foo: 'foo', bar: 'bar' };
|
|
16
16
|
describe('applyPropsToTokens tests', () => {
|
|
17
17
|
test('props get copied', () => {
|
|
18
|
-
const cache = (0, framework_base_1.
|
|
18
|
+
const cache = (0, framework_base_1.getTypedMemoCache)();
|
|
19
19
|
const [tokens] = (0, applyPropsToTokens_1.applyPropsToTokens)(props1, themeTokens, cache, tokenProps);
|
|
20
20
|
expect(tokens).not.toBe(themeTokens);
|
|
21
21
|
for (const key of tokenProps) {
|
|
@@ -23,7 +23,7 @@ describe('applyPropsToTokens tests', () => {
|
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
25
|
test('no copied props does not change tokens', () => {
|
|
26
|
-
const cache = (0, framework_base_1.
|
|
26
|
+
const cache = (0, framework_base_1.getTypedMemoCache)();
|
|
27
27
|
const [tokens] = (0, applyPropsToTokens_1.applyPropsToTokens)({}, themeTokens, cache, tokenProps);
|
|
28
28
|
expect(tokens).toBe(themeTokens);
|
|
29
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPropsToTokens.test.js","sourceRoot":"","sources":["../src/applyPropsToTokens.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"applyPropsToTokens.test.js","sourceRoot":"","sources":["../src/applyPropsToTokens.test.ts"],"names":[],"mappings":";;AAAA,0EAA0E;AAE1E,6DAA0D;AAW1D,MAAM,UAAU,GAAyB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAOpE,MAAM,WAAW,GAAW;IAC1B,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,MAAM,GAAU,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;AAC3F,wCAAwC;AACxC,oDAAoD;AAEpD,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC5B,MAAM,KAAK,GAAG,IAAA,kCAAiB,GAAU,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,uCAAkB,EAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAClD,MAAM,KAAK,GAAG,IAAA,kCAAiB,GAAU,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,uCAAkB,EAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/**
|
|
3
3
|
* alternatively look them up with a passed in function
|
|
4
4
|
*/
|
|
@@ -12,5 +12,5 @@ export type HasLayer = (name: string) => boolean;
|
|
|
12
12
|
* @param subCache - cache scoped to the root object with no layers applied
|
|
13
13
|
* @param hasLayer - a function which returns whether a given layer should be applied
|
|
14
14
|
*/
|
|
15
|
-
export declare function applyTokenLayers<TTokens>(tokens: TTokens, states: string[], subCache:
|
|
15
|
+
export declare function applyTokenLayers<TTokens>(tokens: TTokens, states: string[], subCache: GetTypedMemoValue<TTokens>, hasLayer: HasLayer): [TTokens, GetTypedMemoValue<TTokens>];
|
|
16
16
|
//# sourceMappingURL=applyTokenLayers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyTokenLayers.d.ts","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"applyTokenLayers.d.ts","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EACtC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACpC,QAAQ,EAAE,QAAQ,GACjB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAiBvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyTokenLayers.js","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":";;;AAAA,0EAAuE;AAQvE;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAC9B,MAAe,EACf,MAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"applyTokenLayers.js","sourceRoot":"","sources":["../src/applyTokenLayers.ts"],"names":[],"mappings":";;;AAAA,0EAAuE;AAQvE;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAC9B,MAAe,EACf,MAAgB,EAChB,QAAoC,EACpC,QAAkB;IAGlB,IAAI,KAAK,GAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IACjD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,sGAAsG;QACtG,KAAK,GAAG,MAAM;aACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,QAAwB,EAAE,SAAiB,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAC1C,GAAG,EAAE,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EACrG,CAAC,KAAK,CAAC,CACR,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC9B,CAAC,EAAE,KAAK,CAAC,CAAC;KACb;IACD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAtBD,4CAsBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/** A function to generate tokens based on a theme */
|
|
3
3
|
export type TokensFromTheme<TTokens, TTheme> = (theme: TTheme) => TTokens;
|
|
4
4
|
/**
|
|
@@ -13,7 +13,7 @@ export type TokenSettings<TTokens, TTheme> = string | TTokens | TokensFromTheme<
|
|
|
13
13
|
* as well as a sub-cache, specific to this particular theme, that can be used for caching various styles
|
|
14
14
|
* or values that are theme specific
|
|
15
15
|
*/
|
|
16
|
-
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens,
|
|
16
|
+
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens, GetTypedMemoValue<TTokens>];
|
|
17
17
|
/**
|
|
18
18
|
* The full signature also includes a customize function that returns an updated version of useTokens
|
|
19
19
|
* that captures both the previous values, and layers in the new values specified
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildUseTokens.d.ts","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"buildUseTokens.d.ts","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG/E,qDAAqD;AACrD,MAAM,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,GAAG,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAEjG;;;;GAIG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtG;;;GAGG;AACH,MAAM,MAAM,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG;IACxE,SAAS,EAAE,CAAC,GAAG,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,KAAK,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CACxF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AA6B5H;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAC5C,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,SAAS,EAC/D,GAAG,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,GAC1C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAkB5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildUseTokens.js","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":";;;AAAA,0EAAuE;AAEvE,0EAAqE;AAiCrE;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CAClB,UAA+D,EAC/D,KAAa,EACb,gBAA+D;IAE/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,UAAU,GAAG,CAAC,gBAAgB,IAAK,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAa,CAAC,IAAK,EAAc,CAAC;KACxG;IACD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;QACpC,UAAU,GAAI,UAA+C,CAAC,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,
|
|
1
|
+
{"version":3,"file":"buildUseTokens.js","sourceRoot":"","sources":["../src/buildUseTokens.ts"],"names":[],"mappings":";;;AAAA,0EAAuE;AAEvE,0EAAqE;AAiCrE;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CAClB,UAA+D,EAC/D,KAAa,EACb,gBAA+D;IAE/D,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,UAAU,GAAG,CAAC,gBAAgB,IAAK,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAa,CAAC,IAAK,EAAc,CAAC;KACxG;IACD,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;QACpC,UAAU,GAAI,UAA+C,CAAC,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,gBAA+D,EAC/D,GAAG,MAAwC;IAE3C,4EAA4E;IAC5E,MAAM,KAAK,GAAG,IAAA,6BAAY,GAAE,CAAC;IAE7B,0HAA0H;IAC1H,sGAAsG;IACtG,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;QACtC,+FAA+F;QAC/F,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,+BAAc,EAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9H,CAAC,CAAC;IAEF,oDAAoD;IACpD,aAAa,CAAC,SAAS,GAAG,CAAC,GAAG,SAA2C,EAAE,EAAE;QAC3E,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;QAC/C,OAAO,cAAc,CAAkB,gBAAgB,EAAE,GAAG,YAAY,CAAC,CAAC;IAC5E,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC;AArBD,wCAqBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
/**
|
|
3
3
|
* Take a set of tokens (and a memo-cache) and apply changes to those tokens from an additional set of tokens. Only keys which are
|
|
4
4
|
* not undefined will be applied and if no changes are detected the token object will be unchanged.
|
|
@@ -8,5 +8,5 @@ import type { GetMemoValue } from '@fluentui-react-native/framework-base';
|
|
|
8
8
|
* @param patchValues - new values to apply, values will be obtained via keys in the object
|
|
9
9
|
* @returns - a tuple consisting of a new tokens object and a new memo-cache
|
|
10
10
|
*/
|
|
11
|
-
export declare function patchTokens<TTokens>(tokens: TTokens, cache:
|
|
11
|
+
export declare function patchTokens<TTokens>(tokens: TTokens, cache: GetTypedMemoValue<TTokens>, patchValues: TTokens): [TTokens, GetTypedMemoValue<TTokens>];
|
|
12
12
|
//# sourceMappingURL=patchTokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchTokens.d.ts","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"patchTokens.d.ts","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,OAAO,EACjC,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,WAAW,EAAE,OAAO,GACnB,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAcvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchTokens.js","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,SAAgB,WAAW,CACzB,MAAe,EACf,
|
|
1
|
+
{"version":3,"file":"patchTokens.js","sourceRoot":"","sources":["../src/patchTokens.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,SAAgB,WAAW,CACzB,MAAe,EACf,KAAiC,EACjC,WAAoB;IAEpB,2GAA2G;IAC3G,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;SAC3C,IAAI,EAAE,CAAC;IAEV,iHAAiH;IACjH,2GAA2G;IAC3G,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAClG;IAED,uEAAuE;IACvE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACzB,CAAC;AAlBD,kCAkBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/use-tokens",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.9",
|
|
4
4
|
"description": "Utilities and hook function for getting themed tokens for a component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"author": "",
|
|
36
36
|
"license": "MIT",
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@fluentui-react-native/framework-base": "0.1.
|
|
38
|
+
"@fluentui-react-native/framework-base": "0.1.3",
|
|
39
39
|
"tslib": "^2.3.1"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getTypedMemoCache } from '@fluentui-react-native/framework-base';
|
|
2
2
|
|
|
3
3
|
import { applyPropsToTokens } from './applyPropsToTokens';
|
|
4
4
|
|
|
@@ -32,7 +32,7 @@ const props1: Props = { dos: 'two', quatro: 'four', cinco: false, foo: 'foo', ba
|
|
|
32
32
|
|
|
33
33
|
describe('applyPropsToTokens tests', () => {
|
|
34
34
|
test('props get copied', () => {
|
|
35
|
-
const cache =
|
|
35
|
+
const cache = getTypedMemoCache<Tokens>();
|
|
36
36
|
const [tokens] = applyPropsToTokens(props1, themeTokens, cache, tokenProps);
|
|
37
37
|
expect(tokens).not.toBe(themeTokens);
|
|
38
38
|
for (const key of tokenProps) {
|
|
@@ -41,7 +41,7 @@ describe('applyPropsToTokens tests', () => {
|
|
|
41
41
|
});
|
|
42
42
|
|
|
43
43
|
test('no copied props does not change tokens', () => {
|
|
44
|
-
const cache =
|
|
44
|
+
const cache = getTypedMemoCache<Tokens>();
|
|
45
45
|
const [tokens] = applyPropsToTokens({}, themeTokens, cache, tokenProps);
|
|
46
46
|
expect(tokens).toBe(themeTokens);
|
|
47
47
|
});
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
|
|
3
3
|
export function applyPropsToTokens<TProps, TTokens>(
|
|
4
4
|
props: TProps,
|
|
5
5
|
tokens: TTokens,
|
|
6
|
-
cache:
|
|
6
|
+
cache: GetTypedMemoValue<TTokens>,
|
|
7
7
|
keys: (keyof TTokens)[],
|
|
8
|
-
): [TTokens,
|
|
8
|
+
): [TTokens, GetTypedMemoValue<TTokens>] {
|
|
9
9
|
for (const key of keys) {
|
|
10
10
|
const sourceValue = props[key as string];
|
|
11
11
|
const setValue = sourceValue === tokens[key] ? undefined : sourceValue;
|
package/src/applyTokenLayers.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { immutableMerge } from '@fluentui-react-native/framework-base';
|
|
2
|
-
import type {
|
|
2
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* alternatively look them up with a passed in function
|
|
@@ -18,10 +18,10 @@ export type HasLayer = (name: string) => boolean;
|
|
|
18
18
|
export function applyTokenLayers<TTokens>(
|
|
19
19
|
tokens: TTokens,
|
|
20
20
|
states: string[],
|
|
21
|
-
subCache:
|
|
21
|
+
subCache: GetTypedMemoValue<TTokens>,
|
|
22
22
|
hasLayer: HasLayer,
|
|
23
|
-
): [TTokens,
|
|
24
|
-
type TokensAndCache = { tokens: TTokens; subCache:
|
|
23
|
+
): [TTokens, GetTypedMemoValue<TTokens>] {
|
|
24
|
+
type TokensAndCache = { tokens: TTokens; subCache: GetTypedMemoValue<TTokens> };
|
|
25
25
|
let final: TokensAndCache = { tokens, subCache };
|
|
26
26
|
if (states && states.length > 0) {
|
|
27
27
|
// now walk the overrides that are set, merging in props, caching results, and getting a new sub cache
|
package/src/buildUseTokens.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { immutableMerge } from '@fluentui-react-native/framework-base';
|
|
2
|
-
import type {
|
|
2
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
3
3
|
import { getMemoCache } from '@fluentui-react-native/framework-base';
|
|
4
4
|
|
|
5
5
|
/** A function to generate tokens based on a theme */
|
|
@@ -18,7 +18,7 @@ export type TokenSettings<TTokens, TTheme> = string | TTokens | TokensFromTheme<
|
|
|
18
18
|
* as well as a sub-cache, specific to this particular theme, that can be used for caching various styles
|
|
19
19
|
* or values that are theme specific
|
|
20
20
|
*/
|
|
21
|
-
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens,
|
|
21
|
+
export type UseTokensCore<TTokens, TTheme> = (theme: TTheme) => [TTokens, GetTypedMemoValue<TTokens>];
|
|
22
22
|
|
|
23
23
|
/**
|
|
24
24
|
* The full signature also includes a customize function that returns an updated version of useTokens
|
|
@@ -50,14 +50,14 @@ function mapToTokens<TTokens, TTheme>(
|
|
|
50
50
|
tokenEntry: TTokens | string | TokensFromTheme<TTokens, TTheme>,
|
|
51
51
|
theme: TTheme,
|
|
52
52
|
getComponentInfo: GetComponentInfo<TTokens, TTheme> | undefined,
|
|
53
|
-
):
|
|
53
|
+
): TTokens {
|
|
54
54
|
if (typeof tokenEntry === 'string') {
|
|
55
55
|
tokenEntry = (getComponentInfo && (getComponentInfo(theme, tokenEntry) as TTokens)) || ({} as TTokens);
|
|
56
56
|
}
|
|
57
57
|
if (typeof tokenEntry === 'function') {
|
|
58
58
|
tokenEntry = (tokenEntry as TokensFromTheme<TTokens, TTheme>)(theme);
|
|
59
59
|
}
|
|
60
|
-
return tokenEntry
|
|
60
|
+
return tokenEntry;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
/**
|
|
@@ -77,7 +77,7 @@ export function buildUseTokens<TTokens, TTheme>(
|
|
|
77
77
|
// theme functions. This turns the tokens into an array of token objects that then get merged together
|
|
78
78
|
const useTokensCore = (theme: TTheme) => {
|
|
79
79
|
// get the base styles all merged together, these will only depend on internal tokens and theme
|
|
80
|
-
return cache(() => immutableMerge(...tokens.map((value) => mapToTokens(value, theme, getComponentInfo))), [theme]);
|
|
80
|
+
return cache(() => immutableMerge<TTokens>(...tokens.map((value) => mapToTokens(value, theme, getComponentInfo))), [theme]);
|
|
81
81
|
};
|
|
82
82
|
|
|
83
83
|
// attach a customize function to generate a new use
|
package/src/patchTokens.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { GetTypedMemoValue } from '@fluentui-react-native/framework-base';
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* Take a set of tokens (and a memo-cache) and apply changes to those tokens from an additional set of tokens. Only keys which are
|
|
@@ -11,9 +11,9 @@ import type { GetMemoValue } from '@fluentui-react-native/framework-base';
|
|
|
11
11
|
*/
|
|
12
12
|
export function patchTokens<TTokens>(
|
|
13
13
|
tokens: TTokens,
|
|
14
|
-
cache:
|
|
14
|
+
cache: GetTypedMemoValue<TTokens>,
|
|
15
15
|
patchValues: TTokens,
|
|
16
|
-
): [TTokens,
|
|
16
|
+
): [TTokens, GetTypedMemoValue<TTokens>] {
|
|
17
17
|
// reduce the patch values to the set of keys that are defined, and sort them to ensure consistent ordering
|
|
18
18
|
const keys = Object.keys(patchValues)
|
|
19
19
|
.filter((v) => patchValues[v] !== undefined)
|