react-native-unistyles 3.5.2 → 3.5.3

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.
Files changed (56) hide show
  1. package/android/src/main/java/com/unistyles/NativePlatform+android.kt +44 -7
  2. package/android/src/main/java/com/unistyles/NativePlatform+insets.kt +1 -1
  3. package/cxx/core/UnistylesRegistry.cpp +5 -5
  4. package/cxx/core/UnistylesRegistry.h +3 -3
  5. package/cxx/hybridObjects/HybridShadowRegistry.cpp +48 -14
  6. package/cxx/hybridObjects/HybridShadowRegistry.h +3 -2
  7. package/cxx/hybridObjects/HybridStyleSheet.cpp +3 -3
  8. package/cxx/parser/Parser.cpp +18 -2
  9. package/cxx/shadowTree/ShadowTreeManager.cpp +5 -5
  10. package/cxx/shadowTree/ShadowTreeManager.h +1 -1
  11. package/ios/NativePlatform+ios.swift +6 -4
  12. package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js +10 -0
  13. package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
  14. package/lib/commonjs/core/withUnistyles/withUnistyles.native.js +16 -15
  15. package/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map +1 -1
  16. package/lib/commonjs/specs/ShadowRegistry/index.js +66 -73
  17. package/lib/commonjs/specs/ShadowRegistry/index.js.map +1 -1
  18. package/lib/commonjs/web/css/core.js +30 -5
  19. package/lib/commonjs/web/css/core.js.map +1 -1
  20. package/lib/commonjs/web/css/state.js +4 -1
  21. package/lib/commonjs/web/css/state.js.map +1 -1
  22. package/lib/commonjs/web/registry.js +1 -1
  23. package/lib/commonjs/web/registry.js.map +1 -1
  24. package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js +10 -0
  25. package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
  26. package/lib/module/core/withUnistyles/withUnistyles.native.js +14 -14
  27. package/lib/module/core/withUnistyles/withUnistyles.native.js.map +1 -1
  28. package/lib/module/specs/ShadowRegistry/index.js +66 -73
  29. package/lib/module/specs/ShadowRegistry/index.js.map +1 -1
  30. package/lib/module/web/css/core.js +28 -4
  31. package/lib/module/web/css/core.js.map +1 -1
  32. package/lib/module/web/css/state.js +5 -2
  33. package/lib/module/web/css/state.js.map +1 -1
  34. package/lib/module/web/registry.js +1 -1
  35. package/lib/module/web/registry.js.map +1 -1
  36. package/lib/typescript/src/__tests__/web-child-selector.spec.d.ts +2 -0
  37. package/lib/typescript/src/__tests__/web-child-selector.spec.d.ts.map +1 -0
  38. package/lib/typescript/src/__tests__/web-pointer-events.spec.d.ts +2 -0
  39. package/lib/typescript/src/__tests__/web-pointer-events.spec.d.ts.map +1 -0
  40. package/lib/typescript/src/__tests__/withUnistyles.spec.d.ts +2 -0
  41. package/lib/typescript/src/__tests__/withUnistyles.spec.d.ts.map +1 -0
  42. package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts.map +1 -1
  43. package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts +6 -0
  44. package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map +1 -1
  45. package/lib/typescript/src/specs/ShadowRegistry/index.d.ts +2 -2
  46. package/lib/typescript/src/specs/ShadowRegistry/index.d.ts.map +1 -1
  47. package/lib/typescript/src/web/css/core.d.ts +1 -0
  48. package/lib/typescript/src/web/css/core.d.ts.map +1 -1
  49. package/lib/typescript/src/web/css/state.d.ts.map +1 -1
  50. package/package.json +1 -1
  51. package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts +11 -0
  52. package/src/core/withUnistyles/withUnistyles.native.tsx +22 -25
  53. package/src/specs/ShadowRegistry/index.ts +79 -89
  54. package/src/web/css/core.ts +29 -4
  55. package/src/web/css/state.ts +6 -2
  56. package/src/web/registry.ts +1 -1
@@ -32,107 +32,102 @@ const findShadowNodeForHandle = handle => {
32
32
  }
33
33
  return node;
34
34
  };
35
- const getNativeTag = handle => findFiberForHandle(handle)?.stateNode?.canonical?.nativeTag;
36
-
37
- // by native tag, weak: views unmounted while frozen never unlink, their dead refs are dropped when the map doubles
38
- const linkedHandles = new Map();
39
- const MIN_SWEEP_SIZE = 256;
40
- let sweepSize = MIN_SWEEP_SIZE;
41
- const sweepUnmountedHandles = () => {
42
- linkedHandles.forEach((ref, tag) => {
43
- if (!ref.deref()) {
44
- linkedHandles.delete(tag);
45
- }
46
- });
47
- sweepSize = Math.max(MIN_SWEEP_SIZE, linkedHandles.size * 2);
48
- };
49
- const trackHandle = handle => {
50
- const tag = getNativeTag(handle);
51
-
52
- // views re-link on every render
53
- if (tag === undefined || linkedHandles.get(tag)?.deref() === handle) {
54
- return;
55
- }
56
- linkedHandles.set(tag, new WeakRef(handle));
57
- if (linkedHandles.size >= sweepSize) {
58
- sweepUnmountedHandles();
59
- }
60
- };
61
- const untrackHandle = handle => {
62
- const tag = getNativeTag(handle);
63
- if (tag !== undefined && linkedHandles.get(tag)?.deref() === handle) {
64
- linkedHandles.delete(tag);
65
- }
66
- };
67
35
 
68
36
  // React re-attaches an untouched subtree through its root's node and only follows clones made on the JS thread.
69
37
  // Once a node was cloned elsewhere (state updates, Reanimated), React would commit a subtree from before a Unistyles
70
38
  // update, so after a Unistyles commit the committed nodes and their host ancestors must point at the committed tree
71
39
  const refreshReactNodes = () => {
72
- const tags = HybridShadowRegistry.takeCommittedTags();
73
- if (tags.length === 0) {
40
+ const fibers = HybridShadowRegistry.takeCommittedInstanceHandles();
41
+ if (fibers.length === 0) {
74
42
  return;
75
43
  }
76
- const nodes = new Set();
77
- const visited = new Set();
78
- for (const tag of tags) {
79
- const handle = linkedHandles.get(tag)?.deref();
80
- if (!handle) {
44
+ const nodes = [];
45
+ const refreshedTags = new Set();
46
+ const hostFibers = [];
47
+ for (const fiber of fibers) {
48
+ // collected, unmounted since
49
+ if (!fiber) {
81
50
  continue;
82
51
  }
83
- const fiber = findFiberForHandle(handle);
52
+ let isHidden = false;
53
+ hostFibers.length = 0;
54
+ for (let current = fiber; current; current = current.return) {
55
+ // hidden by Suspense or a frozen screen
56
+ if ((current.tag === SUSPENSE_TAG || current.tag === OFFSCREEN_TAG) && current.memoizedState !== null) {
57
+ isHidden = true;
58
+ }
59
+ if (current.tag !== HOST_COMPONENT_TAG) {
60
+ continue;
61
+ }
84
62
 
85
- // hidden by Suspense or a frozen screen
86
- if (!fiber || isInsideSuspendedBoundary(fiber)) {
63
+ // its ancestors are visible and already collected
64
+ if (refreshedTags.has(current.stateNode?.canonical?.nativeTag)) {
65
+ break;
66
+ }
67
+ hostFibers.push(current);
68
+ }
69
+ if (isHidden) {
87
70
  continue;
88
71
  }
89
- for (let current = fiber; current && !visited.has(current); current = current.return) {
90
- visited.add(current);
91
- if (current.alternate) {
92
- visited.add(current.alternate);
72
+ for (const hostFiber of hostFibers) {
73
+ const node = hostFiber.stateNode?.node;
74
+ const alternateNode = hostFiber.alternate?.stateNode?.node;
75
+ const hostTag = hostFiber.stateNode?.canonical?.nativeTag;
76
+ if (hostTag !== undefined) {
77
+ refreshedTags.add(hostTag);
93
78
  }
94
- if (current.tag !== HOST_COMPONENT_TAG) {
95
- continue;
79
+ if (node) {
80
+ nodes.push(node);
96
81
  }
97
- for (const target of [current, current.alternate]) {
98
- const node = target?.stateNode?.node;
99
- if (node) {
100
- nodes.add(node);
101
- }
82
+ if (alternateNode && alternateNode !== node) {
83
+ nodes.push(alternateNode);
102
84
  }
103
85
  }
104
86
  }
105
- if (nodes.size > 0) {
106
- HybridShadowRegistry.refreshReactNodes(Array.from(nodes));
87
+ if (nodes.length > 0) {
88
+ HybridShadowRegistry.refreshReactNodes(nodes);
107
89
  }
108
90
  };
109
91
  _StyleSheet.StyleSheet.addChangeListener(refreshReactNodes);
110
92
 
111
- // runs for every style on every link, so it allocates only for the rare merged style (eg. flattened by Animated)
112
- const splitMergedUnistyles = style => {
113
- let hasUnistyle = false;
114
- for (const key in style) {
115
- if (!key.startsWith('unistyles_') || !Object.prototype.hasOwnProperty.call(style, key)) {
116
- continue;
93
+ // skips empty styles and splits a style merged from many unistyles (eg. flattened by Animated) into one per unistyle
94
+ // runs for every style on every link, so it reads the keys once and allocates only for the rare merged style
95
+ const collectStyle = (style, collected) => {
96
+ if (!style) {
97
+ return;
98
+ }
99
+ const keys = Object.keys(style);
100
+ let unistylesCount = 0;
101
+ for (const key of keys) {
102
+ if (key.startsWith('unistyles_')) {
103
+ unistylesCount++;
117
104
  }
118
- if (hasUnistyle) {
119
- return Object.keys(style).filter(unistyleKey => unistyleKey.startsWith('unistyles_')).map(unistyleKey => ({
120
- [unistyleKey]: style[unistyleKey]
121
- }));
105
+ }
106
+ if (unistylesCount < 2) {
107
+ if (keys.length > 0) {
108
+ collected.push(style);
109
+ }
110
+ return;
111
+ }
112
+ for (const key of keys) {
113
+ if (key.startsWith('unistyles_')) {
114
+ collected.push({
115
+ [key]: style[key]
116
+ });
122
117
  }
123
- hasUnistyle = true;
124
118
  }
125
- return style;
126
119
  };
127
120
  HybridShadowRegistry.add = (handle, styles, scope) => {
128
121
  // virtualized nodes can be null
129
122
  if (!handle || !styles) {
130
123
  return;
131
124
  }
132
- const stylesArray = Array.isArray(styles) ? styles.flat(Infinity) : [styles];
133
-
134
- // filter styles that are undefined or with no keys
135
- const filteredStyles = stylesArray.filter(style => style && Object.keys(style).length > 0).filter(Boolean).flatMap(splitMergedUnistyles);
125
+ const filteredStyles = [];
126
+ if (Array.isArray(styles)) {
127
+ styles.flat(Infinity).forEach(style => collectStyle(style, filteredStyles));
128
+ } else {
129
+ collectStyle(styles, filteredStyles);
130
+ }
136
131
  if (filteredStyles.length > 0) {
137
132
  const node = findShadowNodeForHandle(handle);
138
133
  if (!node) {
@@ -148,7 +143,6 @@ HybridShadowRegistry.add = (handle, styles, scope) => {
148
143
  if (scope) {
149
144
  HybridShadowRegistry.setScopedTheme(previousScopedTheme);
150
145
  }
151
- trackHandle(handle);
152
146
  }
153
147
  };
154
148
  HybridShadowRegistry.remove = handle => {
@@ -162,7 +156,6 @@ HybridShadowRegistry.remove = handle => {
162
156
  HybridShadowRegistry.suspend(maybeNode);
163
157
  } else {
164
158
  HybridShadowRegistry.unlink(maybeNode);
165
- untrackHandle(handle);
166
159
  }
167
160
  }
168
161
  };
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNativeNitroModules","require","_StyleSheet","HybridShadowRegistry","NitroModules","createHybridObject","HOST_COMPONENT_TAG","SUSPENSE_TAG","OFFSCREEN_TAG","isInsideSuspendedBoundary","fiber","current","return","tag","memoizedState","findFiberForHandle","handle","__internalInstanceHandle","getScrollResponder","getNativeScrollRef","_viewRef","viewRef","_nativeRef","findShadowNodeForHandle","node","stateNode","props","horizontal","constructor","name","Error","getNativeTag","canonical","nativeTag","linkedHandles","Map","MIN_SWEEP_SIZE","sweepSize","sweepUnmountedHandles","forEach","ref","deref","delete","Math","max","size","trackHandle","undefined","get","set","WeakRef","untrackHandle","refreshReactNodes","tags","takeCommittedTags","length","nodes","Set","visited","has","add","alternate","target","Array","from","StyleSheet","addChangeListener","splitMergedUnistyles","style","hasUnistyle","key","startsWith","Object","prototype","hasOwnProperty","call","keys","filter","unistyleKey","map","styles","scope","stylesArray","isArray","flat","Infinity","filteredStyles","Boolean","flatMap","previousScopedTheme","getScopedTheme","setScopedTheme","link","remove","maybeNode","suspend","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNativeNitroModules","require","_StyleSheet","HybridShadowRegistry","NitroModules","createHybridObject","HOST_COMPONENT_TAG","SUSPENSE_TAG","OFFSCREEN_TAG","isInsideSuspendedBoundary","fiber","current","return","tag","memoizedState","findFiberForHandle","handle","__internalInstanceHandle","getScrollResponder","getNativeScrollRef","_viewRef","viewRef","_nativeRef","findShadowNodeForHandle","node","stateNode","props","horizontal","constructor","name","Error","refreshReactNodes","fibers","takeCommittedInstanceHandles","length","nodes","refreshedTags","Set","hostFibers","isHidden","has","canonical","nativeTag","push","hostFiber","alternateNode","alternate","hostTag","undefined","add","StyleSheet","addChangeListener","collectStyle","style","collected","keys","Object","unistylesCount","key","startsWith","styles","scope","filteredStyles","Array","isArray","flat","Infinity","forEach","previousScopedTheme","getScopedTheme","setScopedTheme","link","remove","maybeNode","suspend","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":"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","ignoreList":[]}
@@ -3,9 +3,34 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.convertToCSS = void 0;
6
+ exports.getChildrenClassName = exports.convertToCSS = void 0;
7
7
  var _pseudo = require("../convert/pseudo");
8
8
  var _utils = require("../utils");
9
+ // box-none and box-only aren't CSS values, polyfill them like react-native-web: [element, children]
10
+ const POINTER_EVENTS = {
11
+ 'box-none': ['none', 'auto'],
12
+ 'box-only': ['auto', 'none']
13
+ };
14
+ const getChildrenClassName = className => `:where(.${className})>*`;
15
+ exports.getChildrenClassName = getChildrenClassName;
16
+ const setStyle = (state, props) => {
17
+ if (props.propertyKey !== 'pointerEvents') {
18
+ state.set(props);
19
+ return;
20
+ }
21
+ const [value, childrenValue] = POINTER_EVENTS[props.value] ?? [props.value];
22
+ state.set({
23
+ ...props,
24
+ value
25
+ });
26
+ // :where() has no specificity, so a child's own pointerEvents always wins
27
+ // set it for every value, so re-applying the style can't leave a stale children rule
28
+ state.set({
29
+ ...props,
30
+ className: getChildrenClassName(props.className),
31
+ value: childrenValue
32
+ });
33
+ };
9
34
  const convertToCSS = (hash, value, state) => {
10
35
  Object.entries(value).forEach(([styleKey, styleValue]) => {
11
36
  if (styleKey[0] === '_') {
@@ -16,7 +41,7 @@ const convertToCSS = (hash, value, state) => {
16
41
  const allBreakpoints = Object.keys(styleValue);
17
42
  Object.entries(pseudoStyleValue).forEach(([breakpointStyleKey, breakpointStyleValue]) => {
18
43
  const mediaQuery = (0, _utils.getMediaQuery)(pseudoStyleKey, allBreakpoints);
19
- state.set({
44
+ setStyle(state, {
20
45
  mediaQuery,
21
46
  className: pseudoClassName,
22
47
  propertyKey: breakpointStyleKey,
@@ -25,7 +50,7 @@ const convertToCSS = (hash, value, state) => {
25
50
  });
26
51
  return;
27
52
  }
28
- state.set({
53
+ setStyle(state, {
29
54
  className: pseudoClassName,
30
55
  propertyKey: pseudoStyleKey,
31
56
  value: pseudoStyleValue
@@ -42,7 +67,7 @@ const convertToCSS = (hash, value, state) => {
42
67
  return breakpointStyleKey in value;
43
68
  }).map(([key]) => key);
44
69
  const mediaQuery = (0, _utils.getMediaQuery)(styleKey, allBreakpoints);
45
- state.set({
70
+ setStyle(state, {
46
71
  mediaQuery,
47
72
  className: hash,
48
73
  propertyKey: breakpointStyleKey,
@@ -51,7 +76,7 @@ const convertToCSS = (hash, value, state) => {
51
76
  });
52
77
  return;
53
78
  }
54
- state.set({
79
+ setStyle(state, {
55
80
  className: hash,
56
81
  propertyKey: styleKey,
57
82
  value: styleValue
@@ -1 +1 @@
1
- {"version":3,"names":["_pseudo","require","_utils","convertToCSS","hash","value","state","Object","entries","forEach","styleKey","styleValue","isStylePseudoClass","isPseudoClass","pseudoClassName","slice","pseudoStyleKey","pseudoStyleValue","allBreakpoints","keys","breakpointStyleKey","breakpointStyleValue","mediaQuery","getMediaQuery","set","className","propertyKey","filter","_","map","key","exports"],"sourceRoot":"../../../../src","sources":["web/css/core.ts"],"mappings":";;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEO,MAAME,YAAY,GAAGA,CAACC,IAAY,EAAEC,KAA0B,EAAEC,KAAe,KAAK;EACvFC,MAAM,CAACC,OAAO,CAACH,KAAK,CAAC,CAACI,OAAO,CAAC,CAAC,CAACC,QAAQ,EAAEC,UAAU,CAAC,KAAK;IACtD,IAAID,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;MACrB,MAAME,kBAAkB,GAAG,IAAAC,qBAAa,EAACH,QAAQ,CAAC;MAClD,MAAMI,eAAe,GAAG,GAAGV,IAAI,GAAGQ,kBAAkB,GAAG,GAAG,GAAG,IAAI,GAAGF,QAAQ,CAACK,KAAK,CAAC,CAAC,CAAC,EAAE;MAEvFR,MAAM,CAACC,OAAO,CAACG,UAAU,CAAC,CAACF,OAAO,CAAC,CAAC,CAACO,cAAc,EAAEC,gBAAgB,CAAC,KAAK;QACvE,IAAI,OAAOA,gBAAgB,KAAK,QAAQ,IAAIA,gBAAgB,KAAK,IAAI,EAAE;UACnE,MAAMC,cAAc,GAAGX,MAAM,CAACY,IAAI,CAACR,UAAU,CAAC;UAC9CJ,MAAM,CAACC,OAAO,CAACS,gBAAgB,CAAC,CAACR,OAAO,CAAC,CAAC,CAACW,kBAAkB,EAAEC,oBAAoB,CAAC,KAAK;YACrF,MAAMC,UAAU,GAAG,IAAAC,oBAAa,EAACP,cAAc,EAAEE,cAAc,CAAC;YAEhEZ,KAAK,CAACkB,GAAG,CAAC;cACNF,UAAU;cACVG,SAAS,EAAEX,eAAe;cAC1BY,WAAW,EAAEN,kBAAkB;cAC/Bf,KAAK,EAAEgB;YACX,CAAC,CAAC;UACN,CAAC,CAAC;UAEF;QACJ;QAEAf,KAAK,CAACkB,GAAG,CAAC;UACNC,SAAS,EAAEX,eAAe;UAC1BY,WAAW,EAAEV,cAAc;UAC3BX,KAAK,EAAEY;QACX,CAAC,CAAC;MACN,CAAC,CAAC;MAEF;IACJ;IAEA,IAAI,OAAON,UAAU,KAAK,QAAQ,EAAE;MAChCJ,MAAM,CAACC,OAAO,CAACG,UAAU,CAAC,CAACF,OAAO,CAAC,CAAC,CAACW,kBAAkB,EAAEC,oBAAoB,CAAC,KAAK;QAC/E,MAAMH,cAAc,GAAGX,MAAM,CAACC,OAAO,CAACH,KAAK,CAAC,CACvCsB,MAAM,CAAC,CAAC,CAACC,CAAC,EAAEvB,KAAK,CAAC,KAAK;UACpB,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,KAAK,IAAI,EAAE;YAC7C,OAAO,KAAK;UAChB;UAEA,OAAOe,kBAAkB,IAAIf,KAAK;QACtC,CAAC,CAAC,CACDwB,GAAG,CAAC,CAAC,CAACC,GAAG,CAAC,KAAKA,GAAG,CAAC;QACxB,MAAMR,UAAU,GAAG,IAAAC,oBAAa,EAACb,QAAQ,EAAEQ,cAAc,CAAC;QAE1DZ,KAAK,CAACkB,GAAG,CAAC;UACNF,UAAU;UACVG,SAAS,EAAErB,IAAI;UACfsB,WAAW,EAAEN,kBAAkB;UAC/Bf,KAAK,EAAEgB;QACX,CAAC,CAAC;MACN,CAAC,CAAC;MAEF;IACJ;IAEAf,KAAK,CAACkB,GAAG,CAAC;MACNC,SAAS,EAAErB,IAAI;MACfsB,WAAW,EAAEhB,QAAQ;MACrBL,KAAK,EAAEM;IACX,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAAAoB,OAAA,CAAA5B,YAAA,GAAAA,YAAA","ignoreList":[]}
1
+ {"version":3,"names":["_pseudo","require","_utils","POINTER_EVENTS","getChildrenClassName","className","exports","setStyle","state","props","propertyKey","set","value","childrenValue","convertToCSS","hash","Object","entries","forEach","styleKey","styleValue","isStylePseudoClass","isPseudoClass","pseudoClassName","slice","pseudoStyleKey","pseudoStyleValue","allBreakpoints","keys","breakpointStyleKey","breakpointStyleValue","mediaQuery","getMediaQuery","filter","_","map","key"],"sourceRoot":"../../../../src","sources":["web/css/core.ts"],"mappings":"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","ignoreList":[]}
@@ -76,11 +76,14 @@ class CSSState {
76
76
  this.themesCSS.set(theme, `:root.${theme},:root.${theme} [data-unistyles-reset],[data-unistyles-theme="${theme}"]{${themeVars}}`);
77
77
  };
78
78
  remove = hash => {
79
+ const childrenClassName = (0, _core.getChildrenClassName)(hash);
79
80
  this.mainMap.forEach(styles => {
80
81
  styles.delete(hash);
82
+ styles.delete(childrenClassName);
81
83
  });
82
84
  this.mqMap.forEach(styles => {
83
85
  styles.delete(hash);
86
+ styles.delete(childrenClassName);
84
87
  });
85
88
  this.recreate();
86
89
  };
@@ -93,7 +96,7 @@ class CSSState {
93
96
  styles += `${mediaQuery}{`;
94
97
  }
95
98
  for (const [className, thirdLevelMap] of secondLevelMap) {
96
- styles += `.${className}{`;
99
+ styles += className[0] === ':' ? `${className}{` : `.${className}{`;
97
100
  for (const [propertyKey, value] of thirdLevelMap) {
98
101
  if (value === undefined) {
99
102
  continue;
@@ -1 +1 @@
1
- {"version":3,"names":["_convert","require","_utils","_core","safeGetMap","map","key","nextLevelMap","get","newMap","Map","set","CSSState","mainMap","mqMap","styleTag","themesCSS","constructor","services","isServer","ssrTag","document","getElementById","createElement","id","head","appendChild","className","propertyKey","value","mediaQuery","isMq","firstLevelMap","secondLevelMap","thirdLevelMap","add","hash","values","convertToCSS","convertUnistyles","runtime","recreate","innerText","getStyles","addTheme","theme","themeVars","prev","Object","entries","forEach","nestedKey","nestedValue","hyphenate","remove","styles","delete","Array","from","reduce","acc","themeCss","generate","undefined","getState","classNames","style","property","mainState","mqState","config","state","getConfig","hydrate","hydrateState","reset","clear","exports"],"sourceRoot":"../../../../src","sources":["web/css/state.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_convert","require","_utils","_core","safeGetMap","map","key","nextLevelMap","get","newMap","Map","set","CSSState","mainMap","mqMap","styleTag","themesCSS","constructor","services","isServer","ssrTag","document","getElementById","createElement","id","head","appendChild","className","propertyKey","value","mediaQuery","isMq","firstLevelMap","secondLevelMap","thirdLevelMap","add","hash","values","convertToCSS","convertUnistyles","runtime","recreate","innerText","getStyles","addTheme","theme","themeVars","prev","Object","entries","forEach","nestedKey","nestedValue","hyphenate","remove","childrenClassName","getChildrenClassName","styles","delete","Array","from","reduce","acc","themeCss","generate","undefined","getState","classNames","style","property","mainState","mqState","config","state","getConfig","hydrate","hydrateState","reset","clear","exports"],"sourceRoot":"../../../../src","sources":["web/css/state.ts"],"mappings":"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","ignoreList":[]}
@@ -76,7 +76,7 @@ class UnistylesRegistry {
76
76
  };
77
77
  add = (value, forChild) => {
78
78
  const generatedHash = (0, _utils.generateHash)(value);
79
- const hash = forChild ? `${generatedHash} > *` : generatedHash;
79
+ const hash = forChild ? `${generatedHash}_child > *` : generatedHash;
80
80
  if (!this.stylesCache.has(hash)) {
81
81
  this.applyStyles(hash, value);
82
82
  this.stylesCache.add(hash);
@@ -1 +1 @@
1
- {"version":3,"names":["_css","require","_utils","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","constructor","services","css","CSSState","getComputedStylesheet","stylesheet","scopedThemeName","scopedTheme","runtime","getTheme","error","miniRuntime","computedStylesheet","get","currentTheme","themeName","state","CSSVars","createdStylesheet","dependencies","Object","values","flatMap","value","extractUnistyleDependencies","addDependenciesToStylesheet","set","forEach","dependency","add","dispose","listener","addStylesheetListeners","Array","from","newComputedStylesheet","connect","ref","hash","remove","delete","size","Promise","resolve","then","document","querySelector","forChild","generatedHash","generateHash","has","applyStyles","existingHash","reset","clear","exports"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_css","require","_utils","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","constructor","services","css","CSSState","getComputedStylesheet","stylesheet","scopedThemeName","scopedTheme","runtime","getTheme","error","miniRuntime","computedStylesheet","get","currentTheme","themeName","state","CSSVars","createdStylesheet","dependencies","Object","values","flatMap","value","extractUnistyleDependencies","addDependenciesToStylesheet","set","forEach","dependency","add","dispose","listener","addStylesheetListeners","Array","from","newComputedStylesheet","connect","ref","hash","remove","delete","size","Promise","resolve","then","document","querySelector","forChild","generatedHash","generateHash","has","applyStyles","existingHash","reset","clear","exports"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":"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","ignoreList":[]}
@@ -35,6 +35,7 @@ export const useProxifiedUnistyles = () => {
35
35
  const disposeRef = useRef(undefined);
36
36
  const syncedDependenciesSizeRef = useRef(-1);
37
37
  const syncedScopedThemeRef = useRef(undefined);
38
+ const wasDisposedRef = useRef(false);
38
39
  const reinitListener = () => {
39
40
  disposeRef.current?.();
40
41
  disposeRef.current = listener({
@@ -52,11 +53,20 @@ export const useProxifiedUnistyles = () => {
52
53
  runtimeChanged();
53
54
  }
54
55
  });
56
+
57
+ // <Activity> cleans up effects, a theme change made while hidden was missed (#1297)
58
+ if (wasDisposedRef.current) {
59
+ wasDisposedRef.current = false;
60
+ if (!scopedTheme) {
61
+ setTheme(UnistylesRuntime.getTheme());
62
+ }
63
+ }
55
64
  };
56
65
  useEffect(() => {
57
66
  return () => {
58
67
  disposeRef.current?.();
59
68
  syncedDependenciesSizeRef.current = -1;
69
+ wasDisposedRef.current = true;
60
70
  };
61
71
  }, [disposeRef]);
62
72
 
@@ -1 +1 @@
1
- {"version":3,"names":["useContext","useEffect","useLayoutEffect","useReducer","useRef","useState","ScopedThemeContext","UnistylesRuntime","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","scope","scopedTheme","setScopedTheme","name","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","undefined","syncedDependenciesSizeRef","syncedScopedThemeRef","reinitListener","current","Array","from","updateTheme","updateRuntime","hasThemeNameChange","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","sameDeps","size","sameScopedTheme","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["useContext","useEffect","useLayoutEffect","useReducer","useRef","useState","ScopedThemeContext","UnistylesRuntime","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","scope","scopedTheme","setScopedTheme","name","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","undefined","syncedDependenciesSizeRef","syncedScopedThemeRef","wasDisposedRef","reinitListener","current","Array","from","updateTheme","updateRuntime","hasThemeNameChange","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","sameDeps","size","sameScopedTheme","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
@@ -11,21 +11,21 @@ import { maybeWarnAboutMultipleUnistyles } from '../warn';
11
11
 
12
12
  // @ts-expect-error
13
13
  import { jsx as _jsx } from "react/jsx-runtime";
14
- export const withUnistyles = (Component, mappings) => {
15
- const getSecrets = (styleProps = {}) => {
16
- const styles = Array.isArray(styleProps) ? styleProps.flat() : [styleProps];
17
- const secrets = styles.filter(Boolean).reduce((acc, style) => {
18
- const unistyleKey = Object.keys(style).find(key => key.startsWith('unistyles_'));
19
- return acc.concat([unistyleKey ? style[unistyleKey] : {
20
- uni__getStyles: () => style,
21
- uni__dependencies: []
22
- }]);
23
- }, []);
24
- return {
25
- styles: secrets.reduce((acc, secret) => Object.assign(acc, secret.uni__getStyles()), {}),
26
- dependencies: secrets.flatMap(secret => secret.uni__dependencies)
27
- };
14
+ export const getSecrets = (styleProps = {}) => {
15
+ const styles = Array.isArray(styleProps) ? styleProps.flat(Infinity) : [styleProps];
16
+ const secrets = styles.filter(Boolean).reduce((acc, style) => {
17
+ const unistyleKey = Object.keys(style).find(key => key.startsWith('unistyles_'));
18
+ return acc.concat([unistyleKey ? style[unistyleKey] : {
19
+ uni__getStyles: () => style,
20
+ uni__dependencies: []
21
+ }]);
22
+ }, []);
23
+ return {
24
+ styles: secrets.reduce((acc, secret) => Object.assign(acc, secret.uni__getStyles()), {}),
25
+ dependencies: secrets.flatMap(secret => secret.uni__dependencies)
28
26
  };
27
+ };
28
+ export const withUnistyles = (Component, mappings) => {
29
29
  return /*#__PURE__*/forwardRef((props, ref) => {
30
30
  const narrowedProps = props;
31
31
  const NativeComponent = Component;
@@ -1 +1 @@
1
- {"version":3,"names":["React","forwardRef","useContext","useEffect","ScopedThemeContext","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","flat","secrets","filter","Boolean","reduce","acc","style","unistyleKey","Object","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","props","ref","narrowedProps","NativeComponent","displayName","name","contentContainerStyle","scope","proxifiedRuntime","proxifiedTheme","addDependencies","__uni","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","previousScopedTheme","getScopedTheme","undefined","setScopedTheme","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","forwardRef","useContext","useEffect","ScopedThemeContext","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","getSecrets","styleProps","styles","Array","isArray","flat","Infinity","secrets","filter","Boolean","reduce","acc","style","unistyleKey","Object","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","withUnistyles","Component","mappings","props","ref","narrowedProps","NativeComponent","displayName","name","contentContainerStyle","scope","proxifiedRuntime","proxifiedTheme","addDependencies","__uni","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","previousScopedTheme","getScopedTheme","undefined","setScopedTheme","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}