react-native-unistyles 3.0.0-nightly-20250320 → 3.0.0-nightly-20250325

package/README.md

@@ -29,7 +29,7 @@ yarn add react-native-edge-to-edge react-native-nitro-modules@0.25.2
 | react-native-unistyles | react-native-nitro-modules |
 |------------------------|----------------------------|
 | 3.0.0.beta.8           | 0.24.1, 0.25.2             |
-| 3.0.0-nightly-20250319 | 0.24.1, 0.25.2             |
+| 3.0.0-nightly-20250324 | 0.24.1, 0.25.2             |
 
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 

package/lib/commonjs/web/registry.js

@@ -43,7 +43,7 @@ class UnistylesRegistry {
     const dependenciesMap = this.dependenciesMap.get(stylesheet) ?? new Set(dependencies);
     dependencies.forEach(dependency => dependenciesMap.add(dependency));
     const dispose = this.services.listener.addStylesheetListeners(Array.from(dependenciesMap), () => {
-      const newComputedStylesheet = stylesheet(this.services.runtime.theme, this.services.runtime.miniRuntime);
+      const newComputedStylesheet = stylesheet(this.services.runtime.getTheme(this.services.runtime.themeName, this.services.state.CSSVars), this.services.runtime.miniRuntime);
       this.stylesheets.set(stylesheet, newComputedStylesheet);
     });
     this.dependenciesMap.set(stylesheet, dependenciesMap);
@@ -59,16 +59,17 @@ class UnistylesRegistry {
     stylesCounter.delete(ref);
     if (stylesCounter.size === 0) {
       // Move this to the end of the event loop so the element is removed from the DOM
-      Promise.resolve().then(() => {
+      return Promise.resolve().then(() => {
+        // Check if element is still in the DOM
         if (document.querySelector(`.${hash}`)) {
-          return;
+          return false;
         }
         this.css.remove(hash);
         this.stylesCache.delete(hash);
+        return true;
       });
-      return true;
     }
-    return false;
+    return Promise.resolve(false);
   };
   add = (value, forChild) => {
     const generatedHash = (0, _utils.generateHash)(value);

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

@@ -1 +1 @@
-{"version":3,"names":["_css","require","_utils","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","css","CSSState","constructor","services","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","theme","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":";;;;;;AAGA,IAAAA,IAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAEO,MAAME,iBAAiB,CAAC;EACVC,WAAW,GAAG,IAAIC,GAAG,CAAoD,CAAC;EAC1EC,WAAW,GAAG,IAAIC,GAAG,CAAS,CAAC;EAC/BC,aAAa,GAAG,IAAIH,GAAG,CAA2B,CAAC;EACnDI,mBAAmB,GAAG,IAAIJ,GAAG,CAAuB,CAAC;EACrDK,eAAe,GAAG,IAAIL,GAAG,CAAiE,CAAC;EACnGM,GAAG,GAAG,IAAIC,aAAQ,CAAC,CAAC;EAE7BC,WAAWA,CAASC,QAA2B,EAAE;IAAA,KAA7BA,QAA2B,GAA3BA,QAA2B;EAAG;EAElDC,qBAAqB,GAAGA,CAACC,UAAiD,EAAEC,eAAgC,KAAK;IAC7G,IAAI,OAAOD,UAAU,KAAK,UAAU,EAAE;MAClC,OAAOA,UAAU;IACrB;IAEA,IAAIC,eAAe,EAAE;MACjB,MAAMC,WAAW,GAAG,IAAI,CAACJ,QAAQ,CAACK,OAAO,CAACC,QAAQ,CAACH,eAAe,CAAC;MAEnE,IAAI,CAACC,WAAW,EAAE;QACd,MAAM,IAAAG,YAAK,EAAC,iDAAiDJ,eAAe,6BAA6B,CAAC;MAC9G;MAEA,OAAOD,UAAU,CAACE,WAAW,EAAE,IAAI,CAACJ,QAAQ,CAACK,OAAO,CAACG,WAAW,CAAC;IACrE;IAEA,MAAMC,kBAAkB,GAAG,IAAI,CAACnB,WAAW,CAACoB,GAAG,CAACR,UAAU,CAAC;IAE3D,IAAIO,kBAAkB,EAAE;MACpB,OAAOA,kBAAkB;IAC7B;IAEA,MAAME,YAAY,GAAG,IAAI,CAACX,QAAQ,CAACK,OAAO,CAACC,QAAQ,CAAC,IAAI,CAACN,QAAQ,CAACK,OAAO,CAACO,SAAS,EAAE,IAAI,CAACZ,QAAQ,CAACa,KAAK,CAACC,OAAO,CAAC;IACjH,MAAMC,iBAAiB,GAAGb,UAAU,CAACS,YAAY,EAAE,IAAI,CAACX,QAAQ,CAACK,OAAO,CAACG,WAAW,CAAC;IACrF,MAAMQ,YAAY,GAAGC,MAAM,CAACC,MAAM,CAACH,iBAAiB,CAAC,CAACI,OAAO,CAACC,KAAK,IAAI,IAAAC,kCAA2B,EAACD,KAAK,CAAC,CAAC;IAE1G,IAAI,CAACE,2BAA2B,CAACpB,UAAU,EAAEc,YAAY,CAAC;IAC1D,IAAI,CAAC1B,WAAW,CAACiC,GAAG,CAACrB,UAAU,EAAEa,iBAAiB,CAAC;IAEnD,OAAOA,iBAAiB;EAC5B,CAAC;EAEDO,2BAA2B,GAAGA,CAACpB,UAAoF,EAAEc,YAAuC,KAAK;IAC7J,IAAI,CAACrB,mBAAmB,CAACe,GAAG,CAACR,UAAU,CAAC,GAAG,CAAC;IAE5C,MAAMN,eAAe,GAAG,IAAI,CAACA,eAAe,CAACc,GAAG,CAACR,UAAU,CAAC,IAAI,IAAIT,GAAG,CAACuB,YAAY,CAAC;IAErFA,YAAY,CAACQ,OAAO,CAACC,UAAU,IAAI7B,eAAe,CAAC8B,GAAG,CAACD,UAAU,CAAC,CAAC;IAEnE,MAAME,OAAO,GAAG,IAAI,CAAC3B,QAAQ,CAAC4B,QAAQ,CAACC,sBAAsB,CAACC,KAAK,CAACC,IAAI,CAACnC,eAAe,CAAC,EAAE,MAAM;MAC7F,MAAMoC,qBAAqB,GAAG9B,UAAU,CAAC,IAAI,CAACF,QAAQ,CAACK,OAAO,CAAC4B,KAAK,EAAE,IAAI,CAACjC,QAAQ,CAACK,OAAO,CAACG,WAAW,CAAC;MAExG,IAAI,CAAClB,WAAW,CAACiC,GAAG,CAACrB,UAAU,EAAE8B,qBAAqB,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,CAACpC,eAAe,CAAC2B,GAAG,CAACrB,UAAU,EAAEN,eAAe,CAAC;IACrD,IAAI,CAACD,mBAAmB,CAAC4B,GAAG,CAACrB,UAAU,EAAEyB,OAAO,CAAC;EACrD,CAAC;EAEDO,OAAO,GAAGA,CAACC,GAAgB,EAAEC,IAAY,KAAK;IAC1C,MAAM1C,aAAa,GAAG,IAAI,CAACA,aAAa,CAACgB,GAAG,CAAC0B,IAAI,CAAC,IAAI,IAAI3C,GAAG,CAAC,CAAC;IAE/DC,aAAa,CAACgC,GAAG,CAACS,GAAG,CAAC;IACtB,IAAI,CAACzC,aAAa,CAAC6B,GAAG,CAACa,IAAI,EAAE1C,aAAa,CAAC;EAC/C,CAAC;EAED2C,MAAM,GAAGA,CAACF,GAAgB,EAAEC,IAAY,KAAK;IACzC,MAAM1C,aAAa,GAAG,IAAI,CAACA,aAAa,CAACgB,GAAG,CAAC0B,IAAI,CAAC,IAAI,IAAI3C,GAAG,CAAC,CAAC;IAE/DC,aAAa,CAAC4C,MAAM,CAACH,GAAG,CAAC;IAEzB,IAAIzC,aAAa,CAAC6C,IAAI,KAAK,CAAC,EAAE;MAC1B;MACAC,OAAO,CAACC,OAAO,CAAC,CAAC,CAACC,IAAI,CAAC,MAAM;QACzB,IAAIC,QAAQ,CAACC,aAAa,CAAC,IAAIR,IAAI,EAAE,CAAC,EAAE;UACpC;QACJ;QAEA,IAAI,CAACvC,GAAG,CAACwC,MAAM,CAACD,IAAI,CAAC;QACrB,IAAI,CAAC5C,WAAW,CAAC8C,MAAM,CAACF,IAAI,CAAC;MACjC,CAAC,CAAC;MAEF,OAAO,IAAI;IACf;IAEA,OAAO,KAAK;EAChB,CAAC;EAEDV,GAAG,GAAGA,CAACN,KAAsB,EAAEyB,QAAkB,KAAK;IAClD,MAAMC,aAAa,GAAG,IAAAC,mBAAY,EAAC3B,KAAK,CAAC;IACzC,MAAMgB,IAAI,GAAGS,QAAQ,GACf,GAAGC,aAAa,MAAM,GACtBA,aAAa;IAEnB,IAAI,CAAC,IAAI,CAACtD,WAAW,CAACwD,GAAG,CAACZ,IAAI,CAAC,EAAE;MAC7B,IAAI,CAACa,WAAW,CAACb,IAAI,EAAEhB,KAAK,CAAC;MAC7B,IAAI,CAAC5B,WAAW,CAACkC,GAAG,CAACU,IAAI,CAAC;MAE1B,OAAO;QAAEA,IAAI;QAAEc,YAAY,EAAE;MAAM,CAAC;IACxC;IAEA,OAAO;MAAEd,IAAI;MAAEc,YAAY,EAAE;IAAK,CAAC;EACvC,CAAC;EAEDD,WAAW,GAAGA,CAACb,IAAY,EAAEhB,KAAsB,KAAK;IACpD,IAAI,CAACvB,GAAG,CAAC6B,GAAG,CAACU,IAAI,EAAEhB,KAAK,CAAC;EAC7B,CAAC;EAED+B,KAAK,GAAGA,CAAA,KAAM;IACV,IAAI,CAACtD,GAAG,CAACsD,KAAK,CAAC,CAAC;IAChB,IAAI,CAAC3D,WAAW,CAAC4D,KAAK,CAAC,CAAC;IACxB,IAAI,CAACxD,eAAe,CAACwD,KAAK,CAAC,CAAC;IAC5B,IAAI,CAACzD,mBAAmB,CAACyD,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC1D,aAAa,CAAC0D,KAAK,CAAC,CAAC;EAC9B,CAAC;AACL;AAACC,OAAA,CAAAhE,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["_css","require","_utils","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","css","CSSState","constructor","services","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

@@ -88,11 +88,13 @@ class UnistylesShadowRegistry {
     if (!(ref instanceof HTMLElement) || !hash) {
       return;
     }
-    const removed = this.services.registry.remove(ref, hash);
-    if (removed) {
+    this.services.registry.remove(ref, hash).then(removed => {
+      if (!removed) {
+        return;
+      }
       this.disposeMap.get(hash)?.();
       this.disposeMap.delete(hash);
-    }
+    });
   };
 }
 exports.UnistylesShadowRegistry = UnistylesShadowRegistry;

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

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

package/lib/module/web/registry.js

@@ -39,7 +39,7 @@ export class UnistylesRegistry {
     const dependenciesMap = this.dependenciesMap.get(stylesheet) ?? new Set(dependencies);
     dependencies.forEach(dependency => dependenciesMap.add(dependency));
     const dispose = this.services.listener.addStylesheetListeners(Array.from(dependenciesMap), () => {
-      const newComputedStylesheet = stylesheet(this.services.runtime.theme, this.services.runtime.miniRuntime);
+      const newComputedStylesheet = stylesheet(this.services.runtime.getTheme(this.services.runtime.themeName, this.services.state.CSSVars), this.services.runtime.miniRuntime);
       this.stylesheets.set(stylesheet, newComputedStylesheet);
     });
     this.dependenciesMap.set(stylesheet, dependenciesMap);
@@ -55,16 +55,17 @@ export class UnistylesRegistry {
     stylesCounter.delete(ref);
     if (stylesCounter.size === 0) {
       // Move this to the end of the event loop so the element is removed from the DOM
-      Promise.resolve().then(() => {
+      return Promise.resolve().then(() => {
+        // Check if element is still in the DOM
         if (document.querySelector(`.${hash}`)) {
-          return;
+          return false;
         }
         this.css.remove(hash);
         this.stylesCache.delete(hash);
+        return true;
       });
-      return true;
     }
-    return false;
+    return Promise.resolve(false);
   };
   add = (value, forChild) => {
     const generatedHash = generateHash(value);

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

@@ -1 +1 @@
-{"version":3,"names":["CSSState","error","extractUnistyleDependencies","generateHash","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","css","constructor","services","getComputedStylesheet","stylesheet","scopedThemeName","scopedTheme","runtime","getTheme","miniRuntime","computedStylesheet","get","currentTheme","themeName","state","CSSVars","createdStylesheet","dependencies","Object","values","flatMap","value","addDependenciesToStylesheet","set","forEach","dependency","add","dispose","listener","addStylesheetListeners","Array","from","newComputedStylesheet","theme","connect","ref","hash","remove","delete","size","Promise","resolve","then","document","querySelector","forChild","generatedHash","has","applyStyles","existingHash","reset","clear"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["CSSState","error","extractUnistyleDependencies","generateHash","UnistylesRegistry","stylesheets","Map","stylesCache","Set","stylesCounter","disposeListenersMap","dependenciesMap","css","constructor","services","getComputedStylesheet","stylesheet","scopedThemeName","scopedTheme","runtime","getTheme","miniRuntime","computedStylesheet","get","currentTheme","themeName","state","CSSVars","createdStylesheet","dependencies","Object","values","flatMap","value","addDependenciesToStylesheet","set","forEach","dependency","add","dispose","listener","addStylesheetListeners","Array","from","newComputedStylesheet","connect","ref","hash","remove","delete","size","Promise","resolve","then","document","querySelector","forChild","generatedHash","has","applyStyles","existingHash","reset","clear"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/shadowRegistry.js

@@ -84,11 +84,13 @@ export class UnistylesShadowRegistry {
     if (!(ref instanceof HTMLElement) || !hash) {
       return;
     }
-    const removed = this.services.registry.remove(ref, hash);
-    if (removed) {
+    this.services.registry.remove(ref, hash).then(removed => {
+      if (!removed) {
+        return;
+      }
       this.disposeMap.get(hash)?.();
       this.disposeMap.delete(hash);
-    }
+    });
   };
 }
 //# sourceMappingURL=shadowRegistry.js.map

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

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

package/lib/typescript/src/web/registry.d.ts

@@ -15,7 +15,7 @@ export declare class UnistylesRegistry {
     getComputedStylesheet: (stylesheet: StyleSheetWithSuperPowers<StyleSheet>, scopedThemeName?: UnistylesTheme) => StyleSheet;
     addDependenciesToStylesheet: (stylesheet: (theme: UnistylesTheme, miniRuntime: UnistylesMiniRuntime) => StyleSheet, dependencies: Array<UnistyleDependency>) => void;
     connect: (ref: HTMLElement, hash: string) => void;
-    remove: (ref: HTMLElement, hash: string) => boolean;
+    remove: (ref: HTMLElement, hash: string) => Promise<boolean>;
     add: (value: UnistylesValues, forChild?: boolean) => {
         hash: string;
         existingHash: boolean;

package/lib/typescript/src/web/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAGhD,qBAAa,iBAAiB;IAQd,OAAO,CAAC,QAAQ;IAP5B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+D;IAC3F,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;IACpE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAC5G,QAAQ,CAAC,GAAG,WAAiB;gBAET,QAAQ,EAAE,iBAAiB;IAE/C,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,oBAAoB,cAAc,gBA6B3G;IAED,2BAA2B,eAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,KAAK,UAAU,gBAAgB,KAAK,CAAC,kBAAkB,CAAC,UAe3J;IAED,OAAO,QAAS,WAAW,QAAQ,MAAM,UAKxC;IAED,MAAM,QAAS,WAAW,QAAQ,MAAM,aAoBvC;IAED,GAAG,UAAW,eAAe,aAAa,OAAO;;;MAchD;IAED,WAAW,SAAU,MAAM,SAAS,eAAe,UAElD;IAED,KAAK,aAMJ;CACJ"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAGhD,qBAAa,iBAAiB;IAQd,OAAO,CAAC,QAAQ;IAP5B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+D;IAC3F,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;IACpE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAC5G,QAAQ,CAAC,GAAG,WAAiB;gBAET,QAAQ,EAAE,iBAAiB;IAE/C,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,oBAAoB,cAAc,gBA6B3G;IAED,2BAA2B,eAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,KAAK,UAAU,gBAAgB,KAAK,CAAC,kBAAkB,CAAC,UAkB3J;IAED,OAAO,QAAS,WAAW,QAAQ,MAAM,UAKxC;IAED,MAAM,QAAS,WAAW,QAAQ,MAAM,sBAqBvC;IAED,GAAG,UAAW,eAAe,aAAa,OAAO;;;MAchD;IAED,WAAW,SAAU,MAAM,SAAS,eAAe,UAElD;IAED,KAAK,aAMJ;CACJ"}

package/lib/typescript/src/web/shadowRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAIhD,qBAAa,uBAAuB;IAYpB,OAAO,CAAC,QAAQ;IAV5B,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAkC;gBAEhC,QAAQ,EAAE,iBAAiB;IAE/C,GAAG,QAAS,GAAG,SAAS,MAAM,UAM7B;IAED,SAAS,cAAe,KAAK,CAAC,eAAe,CAAC,aAAa,OAAO;;;MAqDjE;IAED,cAAc,WAAY,cAAc,UAEvC;IAED,cAAc,kBAAyB;IAEvC,MAAM,QAAS,GAAG,SAAS,MAAM,UAWhC;CACJ"}
+{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAIhD,qBAAa,uBAAuB;IAYpB,OAAO,CAAC,QAAQ;IAV5B,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAkC;gBAEhC,QAAQ,EAAE,iBAAiB;IAE/C,GAAG,QAAS,GAAG,SAAS,MAAM,UAM7B;IAED,SAAS,cAAe,KAAK,CAAC,eAAe,CAAC,aAAa,OAAO;;;MAqDjE;IAED,cAAc,WAAY,cAAc,UAEvC;IAED,cAAc,kBAAyB;IAEvC,MAAM,QAAS,GAAG,SAAS,MAAM,UAchC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-nightly-20250320",
+  "version": "3.0.0-nightly-20250325",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",

package/plugin/index.js

@@ -362,8 +362,7 @@ function getStylesDependenciesFromObject(path) {
     return acc;
   }, {});
 }
-function getStylesDependenciesFromFunction(path) {
-  const funcPath = path.get("arguments.0");
+function getStylesDependenciesFromFunction(funcPath) {
   if (!funcPath) {
     return;
   }
@@ -778,7 +777,7 @@ function index_default() {
         }
         state.file.hasAnyUnistyle = true;
         addStyleSheetTag(path, state);
-        const arg = path.node.arguments[0];
+        const arg = t6.isAssignmentExpression(path.node.arguments[0]) ? path.node.arguments[0].right : path.node.arguments[0];
         if (t6.isObjectExpression(arg)) {
           const detectedDependencies = getStylesDependenciesFromObject(path);
           if (detectedDependencies) {
@@ -792,7 +791,8 @@ function index_default() {
           }
         }
         if (t6.isArrowFunctionExpression(arg) || t6.isFunctionExpression(arg)) {
-          const detectedDependencies = getStylesDependenciesFromFunction(path);
+          const funcPath = t6.isAssignmentExpression(path.node.arguments[0]) ? path.get("arguments.0.right") : path.get("arguments.0");
+          const detectedDependencies = getStylesDependenciesFromFunction(funcPath);
           if (detectedDependencies) {
             const body = t6.isBlockStatement(arg.body) ? arg.body.body.find((statement) => t6.isReturnStatement(statement))?.argument : arg.body;
             if (t6.isObjectExpression(body)) {

package/src/web/registry.ts

@@ -54,7 +54,10 @@ export class UnistylesRegistry {
         dependencies.forEach(dependency => dependenciesMap.add(dependency))
 
         const dispose = this.services.listener.addStylesheetListeners(Array.from(dependenciesMap), () => {
-            const newComputedStylesheet = stylesheet(this.services.runtime.theme, this.services.runtime.miniRuntime)
+            const newComputedStylesheet = stylesheet(
+                this.services.runtime.getTheme(this.services.runtime.themeName, this.services.state.CSSVars),
+                this.services.runtime.miniRuntime
+            )
 
             this.stylesheets.set(stylesheet, newComputedStylesheet)
         })
@@ -77,19 +80,20 @@ export class UnistylesRegistry {
 
         if (stylesCounter.size === 0) {
             // Move this to the end of the event loop so the element is removed from the DOM
-            Promise.resolve().then(() => {
+            return Promise.resolve().then(() => {
+                // Check if element is still in the DOM
                 if (document.querySelector(`.${hash}`)) {
-                    return
+                    return false
                 }
 
                 this.css.remove(hash)
                 this.stylesCache.delete(hash)
-            })
 
-            return true
+                return true
+            })
         }
 
-        return false
+        return Promise.resolve(false)
     }
 
     add = (value: UnistylesValues, forChild?: boolean) => {

package/src/web/shadowRegistry.ts

@@ -93,11 +93,14 @@ export class UnistylesShadowRegistry {
             return
         }
 
-        const removed = this.services.registry.remove(ref, hash)
+        this.services.registry.remove(ref, hash)
+            .then(removed => {
+                if (!removed) {
+                    return
+                }
 
-        if (removed) {
-            this.disposeMap.get(hash)?.()
-            this.disposeMap.delete(hash)
-        }
+                this.disposeMap.get(hash)?.()
+                this.disposeMap.delete(hash)
+            })
     }
 }