react-native-unistyles 3.5.1 → 3.5.3

package/lib/commonjs/specs/ShadowRegistry/index.js

@@ -32,114 +32,117 @@ const findShadowNodeForHandle = handle => {
   }
   return node;
 };
-const getNativeTag = handle => findFiberForHandle(handle)?.stateNode?.canonical?.nativeTag;
-
-// by native tag, weak: views unmounted while frozen never unlink, their dead refs are dropped when the map doubles
-const linkedHandles = new Map();
-const MIN_SWEEP_SIZE = 256;
-let sweepSize = MIN_SWEEP_SIZE;
-const sweepUnmountedHandles = () => {
-  linkedHandles.forEach((ref, tag) => {
-    if (!ref.deref()) {
-      linkedHandles.delete(tag);
-    }
-  });
-  sweepSize = Math.max(MIN_SWEEP_SIZE, linkedHandles.size * 2);
-};
-const trackHandle = handle => {
-  const tag = getNativeTag(handle);
-
-  // views re-link on every render
-  if (tag === undefined || linkedHandles.get(tag)?.deref() === handle) {
-    return;
-  }
-  linkedHandles.set(tag, new WeakRef(handle));
-  if (linkedHandles.size >= sweepSize) {
-    sweepUnmountedHandles();
-  }
-};
-const untrackHandle = handle => {
-  const tag = getNativeTag(handle);
-  if (tag !== undefined && linkedHandles.get(tag)?.deref() === handle) {
-    linkedHandles.delete(tag);
-  }
-};
 
 // React re-attaches an untouched subtree through its root's node and only follows clones made on the JS thread.
 // Once a node was cloned elsewhere (state updates, Reanimated), React would commit a subtree from before a Unistyles
 // update, so after a Unistyles commit the committed nodes and their host ancestors must point at the committed tree
 const refreshReactNodes = () => {
-  const tags = HybridShadowRegistry.takeCommittedTags();
-  if (tags.length === 0) {
+  const fibers = HybridShadowRegistry.takeCommittedInstanceHandles();
+  if (fibers.length === 0) {
     return;
   }
-  const nodes = new Set();
-  const visited = new Set();
-  for (const tag of tags) {
-    const handle = linkedHandles.get(tag)?.deref();
-    if (!handle) {
+  const nodes = [];
+  const refreshedTags = new Set();
+  const hostFibers = [];
+  for (const fiber of fibers) {
+    // collected, unmounted since
+    if (!fiber) {
       continue;
     }
-    const fiber = findFiberForHandle(handle);
+    let isHidden = false;
+    hostFibers.length = 0;
+    for (let current = fiber; current; current = current.return) {
+      // hidden by Suspense or a frozen screen
+      if ((current.tag === SUSPENSE_TAG || current.tag === OFFSCREEN_TAG) && current.memoizedState !== null) {
+        isHidden = true;
+      }
+      if (current.tag !== HOST_COMPONENT_TAG) {
+        continue;
+      }
 
-    // hidden by Suspense or a frozen screen
-    if (!fiber || isInsideSuspendedBoundary(fiber)) {
+      // its ancestors are visible and already collected
+      if (refreshedTags.has(current.stateNode?.canonical?.nativeTag)) {
+        break;
+      }
+      hostFibers.push(current);
+    }
+    if (isHidden) {
       continue;
     }
-    for (let current = fiber; current && !visited.has(current); current = current.return) {
-      visited.add(current);
-      if (current.alternate) {
-        visited.add(current.alternate);
+    for (const hostFiber of hostFibers) {
+      const node = hostFiber.stateNode?.node;
+      const alternateNode = hostFiber.alternate?.stateNode?.node;
+      const hostTag = hostFiber.stateNode?.canonical?.nativeTag;
+      if (hostTag !== undefined) {
+        refreshedTags.add(hostTag);
       }
-      if (current.tag !== HOST_COMPONENT_TAG) {
-        continue;
+      if (node) {
+        nodes.push(node);
       }
-      for (const target of [current, current.alternate]) {
-        const node = target?.stateNode?.node;
-        if (node) {
-          nodes.add(node);
-        }
+      if (alternateNode && alternateNode !== node) {
+        nodes.push(alternateNode);
       }
     }
   }
-  if (nodes.size > 0) {
-    HybridShadowRegistry.refreshReactNodes(Array.from(nodes));
+  if (nodes.length > 0) {
+    HybridShadowRegistry.refreshReactNodes(nodes);
   }
 };
 _StyleSheet.StyleSheet.addChangeListener(refreshReactNodes);
 
-// runs for every style on every link, so it allocates only for the rare merged style (eg. flattened by Animated)
-const splitMergedUnistyles = style => {
-  let hasUnistyle = false;
-  for (const key in style) {
-    if (!key.startsWith('unistyles_') || !Object.prototype.hasOwnProperty.call(style, key)) {
-      continue;
+// skips empty styles and splits a style merged from many unistyles (eg. flattened by Animated) into one per unistyle
+// runs for every style on every link, so it reads the keys once and allocates only for the rare merged style
+const collectStyle = (style, collected) => {
+  if (!style) {
+    return;
+  }
+  const keys = Object.keys(style);
+  let unistylesCount = 0;
+  for (const key of keys) {
+    if (key.startsWith('unistyles_')) {
+      unistylesCount++;
     }
-    if (hasUnistyle) {
-      return Object.keys(style).filter(unistyleKey => unistyleKey.startsWith('unistyles_')).map(unistyleKey => ({
-        [unistyleKey]: style[unistyleKey]
-      }));
+  }
+  if (unistylesCount < 2) {
+    if (keys.length > 0) {
+      collected.push(style);
+    }
+    return;
+  }
+  for (const key of keys) {
+    if (key.startsWith('unistyles_')) {
+      collected.push({
+        [key]: style[key]
+      });
     }
-    hasUnistyle = true;
   }
-  return style;
 };
-HybridShadowRegistry.add = (handle, styles) => {
+HybridShadowRegistry.add = (handle, styles, scope) => {
   // virtualized nodes can be null
   if (!handle || !styles) {
     return;
   }
-  const stylesArray = Array.isArray(styles) ? styles.flat() : [styles];
-
-  // filter styles that are undefined or with no keys
-  const filteredStyles = stylesArray.filter(style => style && Object.keys(style).length > 0).flat().filter(Boolean).flatMap(splitMergedUnistyles);
+  const filteredStyles = [];
+  if (Array.isArray(styles)) {
+    styles.flat(Infinity).forEach(style => collectStyle(style, filteredStyles));
+  } else {
+    collectStyle(styles, filteredStyles);
+  }
   if (filteredStyles.length > 0) {
     const node = findShadowNodeForHandle(handle);
     if (!node) {
       throw new Error(`Unistyles: Could not find shadow node for one of your components of type ${handle?.constructor?.name ?? 'unknown'}`);
     }
+
+    // the view can link after its ScopedTheme rendered, when the registry is already restored
+    const previousScopedTheme = scope ? HybridShadowRegistry.getScopedTheme() : undefined;
+    if (scope) {
+      HybridShadowRegistry.setScopedTheme(scope.name);
+    }
     HybridShadowRegistry.link(node, filteredStyles);
-    trackHandle(handle);
+    if (scope) {
+      HybridShadowRegistry.setScopedTheme(previousScopedTheme);
+    }
   }
 };
 HybridShadowRegistry.remove = handle => {
@@ -153,7 +156,6 @@ HybridShadowRegistry.remove = handle => {
       HybridShadowRegistry.suspend(maybeNode);
     } else {
       HybridShadowRegistry.unlink(maybeNode);
-      untrackHandle(handle);
     }
   }
 };

package/lib/commonjs/specs/ShadowRegistry/index.js.map

@@ -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","stylesArray","isArray","flat","filteredStyles","Boolean","flatMap","link","remove","maybeNode","suspend","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":"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","ignoreList":[]}
+{"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":[]}

package/lib/commonjs/web/css/core.js

@@ -3,9 +3,34 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertToCSS = void 0;
+exports.getChildrenClassName = exports.convertToCSS = void 0;
 var _pseudo = require("../convert/pseudo");
 var _utils = require("../utils");
+// box-none and box-only aren't CSS values, polyfill them like react-native-web: [element, children]
+const POINTER_EVENTS = {
+  'box-none': ['none', 'auto'],
+  'box-only': ['auto', 'none']
+};
+const getChildrenClassName = className => `:where(.${className})>*`;
+exports.getChildrenClassName = getChildrenClassName;
+const setStyle = (state, props) => {
+  if (props.propertyKey !== 'pointerEvents') {
+    state.set(props);
+    return;
+  }
+  const [value, childrenValue] = POINTER_EVENTS[props.value] ?? [props.value];
+  state.set({
+    ...props,
+    value
+  });
+  // :where() has no specificity, so a child's own pointerEvents always wins
+  // set it for every value, so re-applying the style can't leave a stale children rule
+  state.set({
+    ...props,
+    className: getChildrenClassName(props.className),
+    value: childrenValue
+  });
+};
 const convertToCSS = (hash, value, state) => {
   Object.entries(value).forEach(([styleKey, styleValue]) => {
     if (styleKey[0] === '_') {
@@ -16,7 +41,7 @@ const convertToCSS = (hash, value, state) => {
           const allBreakpoints = Object.keys(styleValue);
           Object.entries(pseudoStyleValue).forEach(([breakpointStyleKey, breakpointStyleValue]) => {
             const mediaQuery = (0, _utils.getMediaQuery)(pseudoStyleKey, allBreakpoints);
-            state.set({
+            setStyle(state, {
               mediaQuery,
               className: pseudoClassName,
               propertyKey: breakpointStyleKey,
@@ -25,7 +50,7 @@ const convertToCSS = (hash, value, state) => {
           });
           return;
         }
-        state.set({
+        setStyle(state, {
           className: pseudoClassName,
           propertyKey: pseudoStyleKey,
           value: pseudoStyleValue
@@ -42,7 +67,7 @@ const convertToCSS = (hash, value, state) => {
           return breakpointStyleKey in value;
         }).map(([key]) => key);
         const mediaQuery = (0, _utils.getMediaQuery)(styleKey, allBreakpoints);
-        state.set({
+        setStyle(state, {
           mediaQuery,
           className: hash,
           propertyKey: breakpointStyleKey,
@@ -51,7 +76,7 @@ const convertToCSS = (hash, value, state) => {
       });
       return;
     }
-    state.set({
+    setStyle(state, {
       className: hash,
       propertyKey: styleKey,
       value: styleValue

package/lib/commonjs/web/css/core.js.map

@@ -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":[]}
+{"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":[]}

package/lib/commonjs/web/css/state.js

@@ -67,17 +67,23 @@ class CSSState {
       }
     };
     Object.entries(values).forEach(([key, value]) => convertToCSS(key, value));
+
+    // ScopedTheme renders an element with data-unistyles-theme (or data-unistyles-reset for `reset`),
+    // so the variables follow the closest scope and styles don't need to know it while they render
     if (theme === 'light' || theme === 'dark') {
-      this.themesCSS.set(`media ${theme}`, `@media (prefers-color-scheme: ${theme}){:root{${themeVars}}}`);
+      this.themesCSS.set(`media ${theme}`, `@media (prefers-color-scheme: ${theme}){:root,[data-unistyles-reset]{${themeVars}}}`);
     }
-    this.themesCSS.set(theme, `:root.${theme}{${themeVars}}`);
+    this.themesCSS.set(theme, `:root.${theme},:root.${theme} [data-unistyles-reset],[data-unistyles-theme="${theme}"]{${themeVars}}`);
   };
   remove = hash => {
+    const childrenClassName = (0, _core.getChildrenClassName)(hash);
     this.mainMap.forEach(styles => {
       styles.delete(hash);
+      styles.delete(childrenClassName);
     });
     this.mqMap.forEach(styles => {
       styles.delete(hash);
+      styles.delete(childrenClassName);
     });
     this.recreate();
   };
@@ -90,7 +96,7 @@ class CSSState {
         styles += `${mediaQuery}{`;
       }
       for (const [className, thirdLevelMap] of secondLevelMap) {
-        styles += `.${className}{`;
+        styles += className[0] === ':' ? `${className}{` : `.${className}{`;
         for (const [propertyKey, value] of thirdLevelMap) {
           if (value === undefined) {
             continue;

package/lib/commonjs/web/css/state.js.map

@@ -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":[]}
+{"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":[]}

package/lib/commonjs/web/registry.js

@@ -76,7 +76,7 @@ class UnistylesRegistry {
   };
   add = (value, forChild) => {
     const generatedHash = (0, _utils.generateHash)(value);
-    const hash = forChild ? `${generatedHash} > *` : generatedHash;
+    const hash = forChild ? `${generatedHash}_child > *` : generatedHash;
     if (!this.stylesCache.has(hash)) {
       this.applyStyles(hash, value);
       this.stylesCache.add(hash);

package/lib/commonjs/web/registry.js.map

@@ -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":[]}
+{"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":[]}

package/lib/commonjs/web/shadowRegistry.js

@@ -96,7 +96,9 @@ class UnistylesShadowRegistry {
     };
   };
   setScopedTheme = theme => {
-    this.scopedTheme = theme;
+    // With CSS variables, the closest ScopedTheme element picks the theme, so styles are the same in every scope.
+    // Keeping no scope here also means a suspended ScopedTheme can't leave it behind
+    this.scopedTheme = this.services.state.CSSVars ? undefined : theme;
   };
   getScopedTheme = () => this.scopedTheme;
   remove = (ref, hash) => {

package/lib/commonjs/web/shadowRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["_NativePlatform","require","_utils","_utils2","_variants","UnistylesShadowRegistry","name","__type","equals","toString","dispose","scopedTheme","undefined","disposeMap","Map","constructor","services","add","ref","hash","isServer","HTMLElement","registry","connect","addStyles","unistyles","forChild","firstStyle","isGeneratedUnistyle","getParsedStyles","allStyles","map","unistyle","secrets","extractSecrets","Object","keys","length","__uni__key","__uni__stylesheet","__uni__args","__stylesheetVariants","variants","newComputedStylesheet","getComputedStylesheet","style","result","variantsResult","getVariants","resultWithVariants","deepMergeObjects","dependencies","extractUnistyleDependencies","addDependenciesToStylesheet","_web","parsedStyles","existingHash","injectedClassNames","_classNames","injectedClassName","Array","isArray","join","filteredDependencies","state","CSSVars","filter","dependency","UnistyleDependency","Theme","set","listener","addListeners","applyStyles","hashClassname","replace","setScopedTheme","theme","getScopedTheme","remove","then","removed","get","delete","reset","forEach","clear","flush","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_NativePlatform","require","_utils","_utils2","_variants","UnistylesShadowRegistry","name","__type","equals","toString","dispose","scopedTheme","undefined","disposeMap","Map","constructor","services","add","ref","hash","isServer","HTMLElement","registry","connect","addStyles","unistyles","forChild","firstStyle","isGeneratedUnistyle","getParsedStyles","allStyles","map","unistyle","secrets","extractSecrets","Object","keys","length","__uni__key","__uni__stylesheet","__uni__args","__stylesheetVariants","variants","newComputedStylesheet","getComputedStylesheet","style","result","variantsResult","getVariants","resultWithVariants","deepMergeObjects","dependencies","extractUnistyleDependencies","addDependenciesToStylesheet","_web","parsedStyles","existingHash","injectedClassNames","_classNames","injectedClassName","Array","isArray","join","filteredDependencies","state","CSSVars","filter","dependency","UnistyleDependency","Theme","set","listener","addListeners","applyStyles","hashClassname","replace","setScopedTheme","theme","getScopedTheme","remove","then","removed","get","delete","reset","forEach","clear","flush","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/AdaptiveTheme.js

@@ -1,9 +1,11 @@
 "use strict";
 
-import React, { useLayoutEffect } from 'react';
+import React, { useLayoutEffect, useMemo } from 'react';
 import { useUnistyles } from '../core';
 import { UnistylesShadowRegistry } from '../specs';
 import { ApplyScopedTheme } from './ApplyScopedTheme';
+import { scopeChildren } from './scopeChildren';
+import { ScopedThemeContext } from './ScopedThemeContext';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const AdaptiveTheme = ({
   children,
@@ -13,9 +15,15 @@ export const AdaptiveTheme = ({
     rt
   } = useUnistyles();
   const name = rt.colorScheme === 'dark' ? 'light' : 'dark';
+  const scope = useMemo(() => ({
+    name
+  }), [name]);
   const mappedChildren = [/*#__PURE__*/_jsx(ApplyScopedTheme, {
     name: name
-  }, name), children, /*#__PURE__*/_jsx(ApplyScopedTheme, {
+  }, name), /*#__PURE__*/_jsx(ScopedThemeContext.Provider, {
+    value: scope,
+    children: scopeChildren(name, children)
+  }, "scope"), /*#__PURE__*/_jsx(ApplyScopedTheme, {
     name: previousScopedTheme
   }, "dispose")];
   useLayoutEffect(() => {

package/lib/module/components/AdaptiveTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLayoutEffect","useUnistyles","UnistylesShadowRegistry","ApplyScopedTheme","jsx","_jsx","AdaptiveTheme","children","previousScopedTheme","rt","name","colorScheme","mappedChildren","flush","Fragment"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;AAEA,OAAOA,KAAK,IAAIC,eAAe,QAAQ,OAAO;AAI9C,SAASC,YAAY,QAAQ,SAAS;AACtC,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,oBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,OAAO,MAAMC,aAA0D,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAM;IAAEC;EAAG,CAAC,GAAGR,YAAY,CAAC,CAAC;EAC7B,MAAMS,IAAI,GAAID,EAAE,CAACE,WAAW,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EACpF,MAAMC,cAAc,GAAG,cACnBP,IAAA,CAACF,gBAAgB;IAAYO,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAC3CH,QAAQ,eACRF,IAAA,CAACF,gBAAgB;IAAeO,IAAI,EAAEF;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAEDR,eAAe,CAAC,MAAM;IAClB;IACAE,uBAAuB,CAACW,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAOR,IAAA,CAACN,KAAK,CAACe,QAAQ;IAAAP,QAAA,EAAaK;EAAc,GAArBF,IAAsC,CAAC;AACvE,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useLayoutEffect","useMemo","useUnistyles","UnistylesShadowRegistry","ApplyScopedTheme","scopeChildren","ScopedThemeContext","jsx","_jsx","AdaptiveTheme","children","previousScopedTheme","rt","name","colorScheme","scope","mappedChildren","Provider","value","flush","Fragment"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;AAEA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,OAAO,QAAQ,OAAO;AAIvD,SAASC,YAAY,QAAQ,SAAS;AACtC,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,kBAAkB,QAAQ,sBAAsB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,MAAMC,aAA0D,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAM;IAAEC;EAAG,CAAC,GAAGV,YAAY,CAAC,CAAC;EAC7B,MAAMW,IAAI,GAAID,EAAE,CAACE,WAAW,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EACpF,MAAMC,KAAK,GAAGd,OAAO,CAAC,OAAO;IAAEY;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,MAAMG,cAAc,GAAG,cACnBR,IAAA,CAACJ,gBAAgB;IAAYS,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,eAC3CL,IAAA,CAACF,kBAAkB,CAACW,QAAQ;IAAaC,KAAK,EAAEH,KAAM;IAAAL,QAAA,EACjDL,aAAa,CAACQ,IAAI,EAAEH,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9BF,IAAA,CAACJ,gBAAgB;IAAeS,IAAI,EAAEF;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAEDX,eAAe,CAAC,MAAM;IAClB;IACAG,uBAAuB,CAACgB,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAOX,IAAA,CAACT,KAAK,CAACqB,QAAQ;IAAAV,QAAA,EAAaM;EAAc,GAArBH,IAAsC,CAAC;AACvE,CAAC","ignoreList":[]}

package/lib/module/components/NamedTheme.js

@@ -1,17 +1,25 @@
 "use strict";
 
-import React, { useLayoutEffect } from 'react';
+import React, { useLayoutEffect, useMemo } from 'react';
 import { UnistylesShadowRegistry } from '../specs';
 import { ApplyScopedTheme } from './ApplyScopedTheme';
+import { scopeChildren } from './scopeChildren';
+import { ScopedThemeContext } from './ScopedThemeContext';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const NamedTheme = ({
   name,
   children,
   previousScopedTheme
 }) => {
+  const scope = useMemo(() => ({
+    name
+  }), [name]);
   const mappedChildren = [/*#__PURE__*/_jsx(ApplyScopedTheme, {
     name: name
-  }, "apply"), children, /*#__PURE__*/_jsx(ApplyScopedTheme, {
+  }, "apply"), /*#__PURE__*/_jsx(ScopedThemeContext.Provider, {
+    value: scope,
+    children: scopeChildren(name, children)
+  }, "scope"), /*#__PURE__*/_jsx(ApplyScopedTheme, {
     name: previousScopedTheme
   }, "dispose")];
   useLayoutEffect(() => {

package/lib/module/components/NamedTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLayoutEffect","UnistylesShadowRegistry","ApplyScopedTheme","jsx","_jsx","NamedTheme","name","children","previousScopedTheme","mappedChildren","flush","Fragment"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;AAEA,OAAOA,KAAK,IAAIC,eAAe,QAAQ,OAAO;AAI9C,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,oBAAoB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAOrD,OAAO,MAAMC,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,cAAc,GAAG,cACnBL,IAAA,CAACF,gBAAgB;IAAaI,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,EAC5CC,QAAQ,eACRH,IAAA,CAACF,gBAAgB;IAAeI,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAEDR,eAAe,CAAC,MAAM;IAClB;IACAC,uBAAuB,CAACS,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAON,IAAA,CAACL,KAAK,CAACY,QAAQ;IAAAJ,QAAA,EAAEE;EAAc,CAAiB,CAAC;AAC5D,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useLayoutEffect","useMemo","UnistylesShadowRegistry","ApplyScopedTheme","scopeChildren","ScopedThemeContext","jsx","_jsx","NamedTheme","name","children","previousScopedTheme","scope","mappedChildren","Provider","value","flush","Fragment"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;AAEA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,OAAO,QAAQ,OAAO;AAIvD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,kBAAkB,QAAQ,sBAAsB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAOzD,OAAO,MAAMC,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,KAAK,GAAGX,OAAO,CAAC,OAAO;IAAEQ;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,MAAMI,cAAc,GAAG,cACnBN,IAAA,CAACJ,gBAAgB;IAAaM,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,eAC5CF,IAAA,CAACF,kBAAkB,CAACS,QAAQ;IAAaC,KAAK,EAAEH,KAAM;IAAAF,QAAA,EACjDN,aAAa,CAACK,IAAI,EAAEC,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9BH,IAAA,CAACJ,gBAAgB;IAAeM,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAEDX,eAAe,CAAC,MAAM;IAClB;IACAE,uBAAuB,CAACc,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAOT,IAAA,CAACR,KAAK,CAACkB,QAAQ;IAAAP,QAAA,EAAEG;EAAc,CAAiB,CAAC;AAC5D,CAAC","ignoreList":[]}

package/lib/module/components/ScopedThemeContext.js

@@ -0,0 +1,5 @@
+"use strict";
+
+import { createContext } from 'react';
+export const ScopedThemeContext = /*#__PURE__*/createContext(null);
+//# sourceMappingURL=ScopedThemeContext.js.map

package/lib/module/components/ScopedThemeContext.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createContext","ScopedThemeContext"],"sourceRoot":"../../../src","sources":["components/ScopedThemeContext.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,OAAO;AAQrC,OAAO,MAAMC,kBAAkB,gBAAGD,aAAa,CAAe,IAAI,CAAC","ignoreList":[]}