react-native-unistyles 3.0.0-alpha.21 → 3.0.0-alpha.22

package/lib/module/web/convert/style.js

@@ -1,7 +1,8 @@
 "use strict";
 
 import { keyInObject } from '../utils';
-const stylesToSkip = ['borderCurve', 'elevation', 'textAlignVertical', 'includeFontPadding', 'overlayColor', 'tintColor'];
+const SKIP_STYLES = ['borderCurve', 'elevation', 'textAlignVertical', 'includeFontPadding', 'overlayColor', 'tintColor'];
+const CSS_NUMBER_KEYS = ['animationIterationCount', 'borderImageOutset', 'borderImageSlice', 'borderImageWidth', 'boxFlex', 'boxFlexGroup', 'boxOrdinalGroup', 'columnCount', 'columns', 'counterIncrement', 'counterReset', 'flex', 'flexGrow', 'flexPositive', 'flexShrink', 'flexNegative', 'flexOrder', 'fontWeight', 'gridArea', 'gridColumn', 'gridColumnEnd', 'gridColumnSpan', 'gridColumnStart', 'gridRow', 'gridRowEnd', 'gridRowSpan', 'gridRowStart', 'line-clamp', 'line-height', 'opacity', 'order', 'orphans', 'tabSize', 'widows', 'zIndex', 'zoom', 'fillOpacity', 'floodOpacity', 'stopOpacity', 'strokeDasharray', 'strokeDashoffset', 'strokeMiterlimit', 'strokeOpacity', 'strokeWidth'];
 const convertMap = {
   marginHorizontal: value => ({
     marginInline: value
@@ -65,20 +66,23 @@ const convertMap = {
   }),
   resizeMode: value => ({
     backgroundSize: value
-  }),
-  lineHeight: value => ({
-    lineHeight: `${value}px`
   })
 };
+const convertNumber = (key, value) => {
+  if (typeof value === 'number') {
+    return CSS_NUMBER_KEYS.includes(key, value) ? value : `${value}px`;
+  }
+  return value;
+};
 export const getStyle = (key, value) => {
-  if (stylesToSkip.includes(key)) {
+  if (SKIP_STYLES.includes(key)) {
     return {};
   }
   if (keyInObject(convertMap, key)) {
-    return convertMap[key]?.(value) ?? {};
+    return convertMap[key]?.(convertNumber(key, value)) ?? {};
   }
   return {
-    [key]: value
+    [key]: convertNumber(key, value)
   };
 };
 //# sourceMappingURL=style.js.map

package/lib/module/web/convert/style.js.map

@@ -1 +1 @@
-{"version":3,"names":["keyInObject","stylesToSkip","convertMap","marginHorizontal","value","marginInline","marginVertical","marginBlock","paddingHorizontal","paddingInline","paddingVertical","paddingBlock","writingDirection","direction","borderBottomEndRadius","borderBottomRightRadius","borderBottomStartRadius","borderBottomLeftRadius","borderEndColor","borderInlineEndColor","borderStartColor","borderInlineStartColor","borderTopEndRadius","borderTopRightRadius","borderTopStartRadius","borderTopLeftRadius","borderEndWidth","borderInlineEndWidth","borderStartWidth","borderInlineStartWidth","end","right","start","left","marginEnd","marginRight","marginStart","marginLeft","paddingEnd","paddingRight","paddingStart","paddingLeft","transformMatrix","transform","join","resizeMode","backgroundSize","lineHeight","getStyle","key","includes"],"sourceRoot":"../../../../src","sources":["web/convert/style.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,UAAU;AAGtC,MAAMC,YAAY,GAAG,CACjB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,WAAW,CACd;AAED,MAAMC,UAAU,GAAG;EACfC,gBAAgB,EAAGC,KAAa,KAAM;IAClCC,YAAY,EAAED;EAClB,CAAC,CAAC;EACFE,cAAc,EAAGF,KAAa,KAAM;IAChCG,WAAW,EAAEH;EACjB,CAAC,CAAC;EACFI,iBAAiB,EAAGJ,KAAa,KAAM;IACnCK,aAAa,EAAEL;EACnB,CAAC,CAAC;EACFM,eAAe,EAAGN,KAAa,KAAM;IACjCO,YAAY,EAAEP;EAClB,CAAC,CAAC;EACFQ,gBAAgB,EAAGR,KAAa,KAAM;IAClCS,SAAS,EAAET;EACf,CAAC,CAAC;EACFU,qBAAqB,EAAGV,KAAa,KAAM;IACvCW,uBAAuB,EAAEX;EAC7B,CAAC,CAAC;EACFY,uBAAuB,EAAGZ,KAAa,KAAM;IACzCa,sBAAsB,EAAEb;EAC5B,CAAC,CAAC;EACFc,cAAc,EAAGd,KAAa,KAAM;IAChCe,oBAAoB,EAAEf;EAC1B,CAAC,CAAC;EACFgB,gBAAgB,EAAGhB,KAAa,KAAM;IAClCiB,sBAAsB,EAAEjB;EAC5B,CAAC,CAAC;EACFkB,kBAAkB,EAAGlB,KAAa,KAAM;IACpCmB,oBAAoB,EAAEnB;EAC1B,CAAC,CAAC;EACFoB,oBAAoB,EAAGpB,KAAa,KAAM;IACtCqB,mBAAmB,EAAErB;EACzB,CAAC,CAAC;EACFsB,cAAc,EAAGtB,KAAa,KAAM;IAChCuB,oBAAoB,EAAEvB;EAC1B,CAAC,CAAC;EACFwB,gBAAgB,EAAGxB,KAAa,KAAM;IAClCyB,sBAAsB,EAAEzB;EAC5B,CAAC,CAAC;EACF0B,GAAG,EAAG1B,KAAa,KAAM;IACrB2B,KAAK,EAAE3B;EACX,CAAC,CAAC;EACF4B,KAAK,EAAG5B,KAAa,KAAM;IACvB6B,IAAI,EAAE7B;EACV,CAAC,CAAC;EACF8B,SAAS,EAAG9B,KAAa,KAAM;IAC3B+B,WAAW,EAAE/B;EACjB,CAAC,CAAC;EACFgC,WAAW,EAAGhC,KAAa,KAAM;IAC7BiC,UAAU,EAAEjC;EAChB,CAAC,CAAC;EACFkC,UAAU,EAAGlC,KAAa,KAAM;IAC5BmC,YAAY,EAAEnC;EAClB,CAAC,CAAC;EACFoC,YAAY,EAAGpC,KAAa,KAAM;IAC9BqC,WAAW,EAAErC;EACjB,CAAC,CAAC;EACFsC,eAAe,EAAGtC,KAAoB,KAAM;IACxCuC,SAAS,EAAE,UAAUvC,KAAK,CAACwC,IAAI,CAAC,IAAI,CAAC;EACzC,CAAC,CAAC;EACFC,UAAU,EAAGzC,KAAa,KAAM;IAC5B0C,cAAc,EAAE1C;EACpB,CAAC,CAAC;EACF2C,UAAU,EAAG3C,KAAa,KAAM;IAC5B2C,UAAU,EAAE,GAAG3C,KAAK;EACxB,CAAC;AACL,CAA6D;AAE7D,OAAO,MAAM4C,QAAQ,GAAGA,CAACC,GAAW,EAAE7C,KAAU,KAAK;EACjD,IAAIH,YAAY,CAACiD,QAAQ,CAACD,GAAG,CAAC,EAAE;IAC5B,OAAO,CAAC,CAAC;EACb;EAEA,IAAIjD,WAAW,CAACE,UAAU,EAAE+C,GAAG,CAAC,EAAE;IAC9B,OAAO/C,UAAU,CAAC+C,GAAG,CAAC,GAAG7C,KAAK,CAAC,IAAI,CAAC,CAAC;EACzC;EAEA,OAAO;IACH,CAAC6C,GAAG,GAAG7C;EACX,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["keyInObject","SKIP_STYLES","CSS_NUMBER_KEYS","convertMap","marginHorizontal","value","marginInline","marginVertical","marginBlock","paddingHorizontal","paddingInline","paddingVertical","paddingBlock","writingDirection","direction","borderBottomEndRadius","borderBottomRightRadius","borderBottomStartRadius","borderBottomLeftRadius","borderEndColor","borderInlineEndColor","borderStartColor","borderInlineStartColor","borderTopEndRadius","borderTopRightRadius","borderTopStartRadius","borderTopLeftRadius","borderEndWidth","borderInlineEndWidth","borderStartWidth","borderInlineStartWidth","end","right","start","left","marginEnd","marginRight","marginStart","marginLeft","paddingEnd","paddingRight","paddingStart","paddingLeft","transformMatrix","transform","join","resizeMode","backgroundSize","convertNumber","key","includes","getStyle"],"sourceRoot":"../../../../src","sources":["web/convert/style.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/convert/textShadow.js

@@ -1,9 +1,7 @@
 "use strict";
 
-import { media } from 'typestyle';
 import { deepMergeObjects, warn } from '../utils';
 import { validateShadow } from './shadow';
-import { convertBreakpoint } from './breakpoint';
 import { TEXT_SHADOW_STYLES } from './types';
 import { extractShadowValue, normalizeColor, normalizeNumericValue } from './utils';
 const createTextShadowValue = style => {
@@ -50,16 +48,18 @@ export const getTextShadowStyle = styles => {
       height
     } = extractShadowValue('textShadowOffset', breakpoint, styles);
     const radius = extractShadowValue('textShadowRadius', breakpoint, styles);
-    return media(convertBreakpoint(breakpoint), {
-      textShadow: createTextShadowValue({
-        textShadowColor: color,
-        textShadowOffset: {
-          width,
-          height
-        },
-        textShadowRadius: radius
-      })
-    });
+    return {
+      [breakpoint]: {
+        textShadow: createTextShadowValue({
+          textShadowColor: color,
+          textShadowOffset: {
+            width,
+            height
+          },
+          textShadowRadius: radius
+        })
+      }
+    };
   });
 
   // Merge all breakpoints styles into one

package/lib/module/web/convert/textShadow.js.map

@@ -1 +1 @@
-{"version":3,"names":["media","deepMergeObjects","warn","validateShadow","convertBreakpoint","TEXT_SHADOW_STYLES","extractShadowValue","normalizeColor","normalizeNumericValue","createTextShadowValue","style","textShadowColor","textShadowOffset","textShadowRadius","offsetX","width","offsetY","height","radius","color","getTextShadowStyle","styles","missingStyles","filter","key","length","join","breakpointsSet","Set","error","breakpoints","Array","from","textShadow","breakpointStyles","map","breakpoint"],"sourceRoot":"../../../../src","sources":["web/convert/textShadow.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,WAAW;AAEjC,SAASC,gBAAgB,EAAEC,IAAI,QAAQ,UAAU;AACjD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,iBAAiB,QAAQ,cAAc;AAChD,SAASC,kBAAkB,QAAyB,SAAS;AAC7D,SAASC,kBAAkB,EAAEC,cAAc,EAAEC,qBAAqB,QAAQ,SAAS;AAEnF,MAAMC,qBAAqB,GAAIC,KAAiB,IAAK;EACjD,MAAM;IAAEC,eAAe;IAAEC,gBAAgB;IAAEC;EAAiB,CAAC,GAAGH,KAAK;EACrE,MAAMI,OAAO,GAAGN,qBAAqB,CAACI,gBAAgB,CAACG,KAAK,CAAC;EAC7D,MAAMC,OAAO,GAAGR,qBAAqB,CAACI,gBAAgB,CAACK,MAAM,CAAC;EAC9D,MAAMC,MAAM,GAAGV,qBAAqB,CAACK,gBAAgB,CAAC;EACtD,MAAMM,KAAK,GAAGZ,cAAc,CAACI,eAAyB,CAAC;EAEvD,OAAO,GAAGG,OAAO,IAAIE,OAAO,IAAIE,MAAM,IAAIC,KAAK,EAAE;AACrD,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAAIC,MAA2B,IAA0B;EACpF,MAAMC,aAAa,GAAGjB,kBAAkB,CAACkB,MAAM,CAACC,GAAG,IAAI,EAAEA,GAAG,IAAIH,MAAM,CAAC,CAAC;EAExE,IAAIC,aAAa,CAACG,MAAM,EAAE;IACtBvB,IAAI,CAAC,yDAAyDoB,aAAa,CAACI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAEzF,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAAS,CAAC;EAExC,IAAI;IACAzB,cAAc,CAACE,kBAAkB,EAAEgB,MAAM,EAAEM,cAAc,CAAC;EAC9D,CAAC,CAAC,OAAOE,KAAK,EAAE;IACZ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC3B3B,IAAI,CAAC2B,KAAK,CAAC;IACf;IAEA,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,WAAW,GAAGC,KAAK,CAACC,IAAI,CAACL,cAAc,CAAC;;EAE9C;EACA,IAAIG,WAAW,CAACL,MAAM,KAAK,CAAC,EAAE;IAC1B,OAAO;MACHQ,UAAU,EAAExB,qBAAqB,CAACY,MAAoB;IAC1D,CAAC;EACL;;EAEA;EACA,MAAMa,gBAAgB,GAAGJ,WAAW,CAACK,GAAG,CAACC,UAAU,IAAI;IACnD,MAAMjB,KAAK,GAAGb,kBAAkB,CAAC,iBAAiB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IACvE,MAAM;MAAEN,KAAK;MAAEE;IAAO,CAAC,GAAGX,kBAAkB,CAAC,kBAAkB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IACpF,MAAMH,MAAM,GAAGZ,kBAAkB,CAAC,kBAAkB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IAEzE,OAAOrB,KAAK,CAACI,iBAAiB,CAACgC,UAAU,CAAC,EAAE;MACxCH,UAAU,EAAExB,qBAAqB,CAAC;QAC9BE,eAAe,EAAEQ,KAAK;QACtBP,gBAAgB,EAAE;UACdG,KAAK;UACLE;QACJ,CAAC;QACDJ,gBAAgB,EAAEK;MACtB,CAAC;IACL,CAAC,CAAC;EACN,CAAC,CAAC;;EAEF;EACA,OAAOjB,gBAAgB,CAAC,GAAGiC,gBAAgB,CAAC;AAChD,CAAC","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","warn","validateShadow","TEXT_SHADOW_STYLES","extractShadowValue","normalizeColor","normalizeNumericValue","createTextShadowValue","style","textShadowColor","textShadowOffset","textShadowRadius","offsetX","width","offsetY","height","radius","color","getTextShadowStyle","styles","missingStyles","filter","key","length","join","breakpointsSet","Set","error","breakpoints","Array","from","textShadow","breakpointStyles","map","breakpoint"],"sourceRoot":"../../../../src","sources":["web/convert/textShadow.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,IAAI,QAAQ,UAAU;AACjD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,kBAAkB,QAAyB,SAAS;AAC7D,SAASC,kBAAkB,EAAEC,cAAc,EAAEC,qBAAqB,QAAQ,SAAS;AAEnF,MAAMC,qBAAqB,GAAIC,KAAiB,IAAK;EACjD,MAAM;IAAEC,eAAe;IAAEC,gBAAgB;IAAEC;EAAiB,CAAC,GAAGH,KAAK;EACrE,MAAMI,OAAO,GAAGN,qBAAqB,CAACI,gBAAgB,CAACG,KAAK,CAAC;EAC7D,MAAMC,OAAO,GAAGR,qBAAqB,CAACI,gBAAgB,CAACK,MAAM,CAAC;EAC9D,MAAMC,MAAM,GAAGV,qBAAqB,CAACK,gBAAgB,CAAC;EACtD,MAAMM,KAAK,GAAGZ,cAAc,CAACI,eAAyB,CAAC;EAEvD,OAAO,GAAGG,OAAO,IAAIE,OAAO,IAAIE,MAAM,IAAIC,KAAK,EAAE;AACrD,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAAIC,MAA2B,IAAK;EAC/D,MAAMC,aAAa,GAAGjB,kBAAkB,CAACkB,MAAM,CAACC,GAAG,IAAI,EAAEA,GAAG,IAAIH,MAAM,CAAC,CAAC;EAExE,IAAIC,aAAa,CAACG,MAAM,EAAE;IACtBtB,IAAI,CAAC,yDAAyDmB,aAAa,CAACI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAEzF,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,cAAc,GAAG,IAAIC,GAAG,CAAS,CAAC;EAExC,IAAI;IACAxB,cAAc,CAACC,kBAAkB,EAAEgB,MAAM,EAAEM,cAAc,CAAC;EAC9D,CAAC,CAAC,OAAOE,KAAK,EAAE;IACZ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MAC3B1B,IAAI,CAAC0B,KAAK,CAAC;IACf;IAEA,OAAO,CAAC,CAAC;EACb;EAEA,MAAMC,WAAW,GAAGC,KAAK,CAACC,IAAI,CAACL,cAAc,CAAC;;EAE9C;EACA,IAAIG,WAAW,CAACL,MAAM,KAAK,CAAC,EAAE;IAC1B,OAAO;MACHQ,UAAU,EAAExB,qBAAqB,CAACY,MAAoB;IAC1D,CAAC;EACL;;EAEA;EACA,MAAMa,gBAAgB,GAAGJ,WAAW,CAACK,GAAG,CAACC,UAAU,IAAI;IACnD,MAAMjB,KAAK,GAAGb,kBAAkB,CAAC,iBAAiB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IACvE,MAAM;MAAEN,KAAK;MAAEE;IAAO,CAAC,GAAGX,kBAAkB,CAAC,kBAAkB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IACpF,MAAMH,MAAM,GAAGZ,kBAAkB,CAAC,kBAAkB,EAAE8B,UAAU,EAAEf,MAAM,CAAC;IAEzE,OAAO;MACH,CAACe,UAAU,GAAG;QACVH,UAAU,EAAExB,qBAAqB,CAAC;UAC9BE,eAAe,EAAEQ,KAAK;UACtBP,gBAAgB,EAAE;YACdG,KAAK;YACLE;UACJ,CAAC;UACDJ,gBAAgB,EAAEK;QACtB,CAAC;MACL;IACJ,CAAC;EACL,CAAC,CAAC;;EAEF;EACA,OAAOhB,gBAAgB,CAAC,GAAGgC,gBAAgB,CAAC;AAChD,CAAC","ignoreList":[]}

package/lib/module/web/convert/transform.js

@@ -1,9 +1,7 @@
 "use strict";
 
-import { media } from 'typestyle';
 import { deepMergeObjects, keyInObject } from '../utils';
 import { normalizeNumericValue } from './utils';
-import { convertBreakpoint } from './breakpoint';
 const normalizeTransform = (key, value) => {
   if (key.includes('scale')) {
     return value;
@@ -56,9 +54,11 @@ export const getTransformStyle = transforms => {
       }
       return [];
     });
-    return media(convertBreakpoint(breakpoint), {
-      transform: createTransformValue(transformsPerBreakpoint)
-    });
+    return [{
+      [breakpoint]: {
+        transform: createTransformValue(transformsPerBreakpoint)
+      }
+    }];
   });
   return deepMergeObjects({
     transform: createTransformValue(normalTransforms)

package/lib/module/web/convert/transform.js.map

@@ -1 +1 @@
-{"version":3,"names":["media","deepMergeObjects","keyInObject","normalizeNumericValue","convertBreakpoint","normalizeTransform","key","value","includes","createTransformValue","transforms","map","transform","Object","keys","undefined","join","filter","Boolean","getTransformStyle","breakpoints","Set","normalTransforms","forEach","property","Array","isArray","breakpoint","add","push","breakpointTransforms","from","flatMap","transformsPerBreakpoint"],"sourceRoot":"../../../../src","sources":["web/convert/transform.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["deepMergeObjects","keyInObject","normalizeNumericValue","normalizeTransform","key","value","includes","createTransformValue","transforms","map","transform","Object","keys","undefined","join","filter","Boolean","getTransformStyle","breakpoints","Set","normalTransforms","forEach","property","Array","isArray","breakpoint","add","push","breakpointTransforms","from","flatMap","transformsPerBreakpoint"],"sourceRoot":"../../../../src","sources":["web/convert/transform.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/{listener/listener.js → listener.js}

@@ -1,7 +1,7 @@
 "use strict";
 
-import { UnistyleDependency } from '../../specs/NativePlatform';
-import { UnistylesRuntime } from '../runtime';
+import { UnistyleDependency } from '../specs/NativePlatform';
+import { UnistylesRuntime } from './runtime';
 class UnistylesListenerBuilder {
   isInitialized = false;
   listeners = Array.from({

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

@@ -0,0 +1 @@
+{"version":3,"names":["UnistyleDependency","UnistylesRuntime","UnistylesListenerBuilder","isInitialized","listeners","Array","from","length","Object","keys","Set","emitChange","dependency","forEach","listener","initListeners","darkMedia","addEventListener","ColorScheme","lightMedia","window","Orientation","Dimensions","addListeners","dependencies","add","delete","UnistylesListener"],"sourceRoot":"../../../src","sources":["web/listener.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,yBAAyB;AAC5D,SAASC,gBAAgB,QAAQ,WAAW;AAE5C,MAAMC,wBAAwB,CAAC;EACnBC,aAAa,GAAG,KAAK;EACrBC,SAAS,GAAGC,KAAK,CAACC,IAAI,CAAC;IAAEC,MAAM,EAAEC,MAAM,CAACC,IAAI,CAACT,kBAAkB,CAAC,CAACO,MAAM,GAAG;EAAE,CAAC,EAAE,MAAM,IAAIG,GAAG,CAAe,CAAC,CAAC;EAErHC,UAAU,GAAIC,UAA8B,IAAK;IAC7C,IAAI,CAACR,SAAS,CAACQ,UAAU,CAAC,EAAEC,OAAO,CAACC,QAAQ,IAAIA,QAAQ,CAAC,CAAC,CAAC;EAC/D,CAAC;EAEDC,aAAa,GAAGA,CAAA,KAAM;IAClB,IAAI,IAAI,CAACZ,aAAa,EAAE;MACpB;IACJ;IAEA,IAAI,CAACA,aAAa,GAAG,IAAI;IACzBF,gBAAgB,CAACe,SAAS,EAAEC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAACN,UAAU,CAACX,kBAAkB,CAACkB,WAAW,CAAC,CAAC;IAC7GjB,gBAAgB,CAACkB,UAAU,EAAEF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAACN,UAAU,CAACX,kBAAkB,CAACkB,WAAW,CAAC,CAAC;IAC9GE,MAAM,CAACH,gBAAgB,CAAC,mBAAmB,EAAE,MAAM,IAAI,CAACN,UAAU,CAACX,kBAAkB,CAACqB,WAAW,CAAC,CAAC;IACnGD,MAAM,CAACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,CAACN,UAAU,CAACX,kBAAkB,CAACsB,UAAU,CAAC,CAAC;EAC3F,CAAC;EAEDC,YAAY,GAAGA,CAACC,YAAuC,EAAEV,QAAsB,KAAK;IAChFU,YAAY,CAACX,OAAO,CAACD,UAAU,IAAI,IAAI,CAACR,SAAS,CAACQ,UAAU,CAAC,EAAEa,GAAG,CAACX,QAAQ,CAAC,CAAC;IAE7E,OAAO,MAAM;MACTU,YAAY,CAACX,OAAO,CAACD,UAAU,IAAI,IAAI,CAACR,SAAS,CAACQ,UAAU,CAAC,EAAEc,MAAM,CAACZ,QAAQ,CAAC,CAAC;IACpF,CAAC;EACL,CAAC;AACL;AAEA,OAAO,MAAMa,iBAAiB,GAAG,IAAIzB,wBAAwB,CAAC,CAAC","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"names":["IS_UNISTYLES_REGEX","UNISTYLES_WIDTH_REGEX","UNISTYLES_HEIGHT_REGEX","parseMq","mq","width","fromW","toW","exec","height","fromH","toH","minWidth","undefined","Number","maxWidth","minHeight","maxHeight","isUnistylesMq","test"],"sourceRoot":"../../../src","sources":["web/mq.ts"],"mappings":";;AAEA,MAAMA,kBAAkB,GAAG,wCAAwC;AACnE,MAAMC,qBAAqB,GAAG,qCAAqC;AACnE,MAAMC,sBAAsB,GAAG,qCAAqC;AAEpE,OAAO,MAAMC,OAAO,GAAIC,EAAU,IAAiB;EAC/C,MAAM,GAAGC,KAAK,EAAEC,KAAK,EAAEC,GAAG,CAAC,GAAGN,qBAAqB,CAACO,IAAI,CAACJ,EAAE,CAAC,IAAI,EAAE;EAClE,MAAM,GAAGK,MAAM,EAAEC,KAAK,EAAEC,GAAG,CAAC,GAAGT,sBAAsB,CAACM,IAAI,CAACJ,EAAE,CAAC,IAAI,EAAE;EAEpE,OAAO;IACHQ,QAAQ,EAAE,CAACP,KAAK,IAAIC,KAAK,KAAK,UAAU,GAAGO,SAAS,GAAGC,MAAM,CAACR,KAAK,CAAC;IACpES,QAAQ,EAAE,CAACV,KAAK,IAAIE,GAAG,KAAK,UAAU,GAAGM,SAAS,GAAGC,MAAM,CAACP,GAAG,CAAC;IAChES,SAAS,EAAE,CAACP,MAAM,IAAIC,KAAK,KAAK,UAAU,GAAGG,SAAS,GAAGC,MAAM,CAACJ,KAAK,CAAC;IACtEO,SAAS,EAAE,CAACR,MAAM,IAAIE,GAAG,KAAK,UAAU,GAAGE,SAAS,GAAGC,MAAM,CAACH,GAAG;EACrE,CAAC;AACL,CAAC;AAED,OAAO,MAAMO,aAAa,GAAId,EAAU,IAAKJ,kBAAkB,CAACmB,IAAI,CAACf,EAAE,CAAC","ignoreList":[]}
+{"version":3,"names":["IS_UNISTYLES_REGEX","UNISTYLES_WIDTH_REGEX","UNISTYLES_HEIGHT_REGEX","parseMq","mq","width","fromW","toW","exec","height","fromH","toH","minWidth","undefined","Number","maxWidth","minHeight","maxHeight","isUnistylesMq","test"],"sourceRoot":"../../../src","sources":["web/mq.ts"],"mappings":";;AAAA,MAAMA,kBAAkB,GAAG,wCAAwC;AACnE,MAAMC,qBAAqB,GAAG,qCAAqC;AACnE,MAAMC,sBAAsB,GAAG,qCAAqC;AAEpE,OAAO,MAAMC,OAAO,GAAIC,EAAU,IAAK;EACnC,MAAM,GAAGC,KAAK,EAAEC,KAAK,EAAEC,GAAG,CAAC,GAAGN,qBAAqB,CAACO,IAAI,CAACJ,EAAE,CAAC,IAAI,EAAE;EAClE,MAAM,GAAGK,MAAM,EAAEC,KAAK,EAAEC,GAAG,CAAC,GAAGT,sBAAsB,CAACM,IAAI,CAACJ,EAAE,CAAC,IAAI,EAAE;EAEpE,OAAO;IACHQ,QAAQ,EAAE,CAACP,KAAK,IAAIC,KAAK,KAAK,UAAU,GAAGO,SAAS,GAAGC,MAAM,CAACR,KAAK,CAAC;IACpES,QAAQ,EAAE,CAACV,KAAK,IAAIE,GAAG,KAAK,UAAU,GAAGM,SAAS,GAAGC,MAAM,CAACP,GAAG,CAAC;IAChES,SAAS,EAAE,CAACP,MAAM,IAAIC,KAAK,KAAK,UAAU,GAAGG,SAAS,GAAGC,MAAM,CAACJ,KAAK,CAAC;IACtEO,SAAS,EAAE,CAACR,MAAM,IAAIE,GAAG,KAAK,UAAU,GAAGE,SAAS,GAAGC,MAAM,CAACH,GAAG;EACrE,CAAC;AACL,CAAC;AAED,OAAO,MAAMO,aAAa,GAAId,EAAU,IAAKJ,kBAAkB,CAACmB,IAAI,CAACf,EAAE,CAAC","ignoreList":[]}

package/lib/module/web/registry.js

@@ -1,12 +1,27 @@
 "use strict";
 
-import { createTypeStyle } from 'typestyle';
-import { convertToTypeStyle } from './convert';
 import { UnistylesRuntime } from './runtime';
-import { keyInObject } from './utils';
+import { extractMediaQueryValue, keyInObject, getMediaQuery, generateHash, extractUnistyleDependencies } from './utils';
 import { UnistylesListener } from './listener';
+import { convertUnistyles } from './convert';
+import { getVariants } from './variants';
 class UnistylesRegistryBuilder {
   stylesheets = new Map();
+  stylesCounter = new Map();
+  #styleTag = null;
+  disposeListenersMap = new Map();
+  dependenciesMap = new Map();
+  get styleTag() {
+    const tag = this.#styleTag;
+    if (!tag) {
+      const newTag = document.createElement('style');
+      newTag.id = 'unistyles-web';
+      this.#styleTag = newTag;
+      document.head.appendChild(newTag);
+      return newTag;
+    }
+    return tag;
+  }
   getComputedStylesheet = stylesheet => {
     if (typeof stylesheet !== 'function') {
       return stylesheet;
@@ -16,30 +31,153 @@ class UnistylesRegistryBuilder {
       return computedStylesheet;
     }
     const createdStylesheet = stylesheet(UnistylesRuntime.theme, UnistylesRuntime.miniRuntime);
-    // @ts-expect-error uni__dependencies is hidden
-    const dependencies = Object.values(createdStylesheet).flatMap(value => keyInObject(value, 'uni__dependencies') ? value.uni__dependencies : []);
-    UnistylesListener.addListeners(dependencies, () => {
+    const dependencies = Object.values(createdStylesheet).flatMap(value => extractUnistyleDependencies(value));
+    this.addDependenciesToStylesheet(stylesheet, dependencies);
+    this.stylesheets.set(stylesheet, createdStylesheet);
+    return createdStylesheet;
+  };
+  addDependenciesToStylesheet = (stylesheet, dependencies) => {
+    this.disposeListenersMap.get(stylesheet)?.();
+    const dependenciesMap = this.dependenciesMap.get(stylesheet) ?? new Set(dependencies);
+    dependencies.forEach(dependency => dependenciesMap.add(dependency));
+    const dispose = UnistylesListener.addListeners(Array.from(dependenciesMap), () => {
       const newComputedStylesheet = stylesheet(UnistylesRuntime.theme, UnistylesRuntime.miniRuntime);
       this.stylesheets.set(stylesheet, newComputedStylesheet);
     });
-    this.stylesheets.set(stylesheet, createdStylesheet);
-    return createdStylesheet;
+    this.dependenciesMap.set(stylesheet, dependenciesMap);
+    this.disposeListenersMap.set(stylesheet, dispose);
+  };
+  add = ({
+    key,
+    value,
+    stylesheet,
+    args,
+    variants
+  }) => {
+    const hash = generateHash(value);
+    const existingCounter = this.stylesCounter.get(hash);
+    if (!existingCounter || existingCounter.size === 0) {
+      const counter = new Set();
+      const dependencies = extractUnistyleDependencies(value);
+      counter.add(value);
+      this.stylesCounter.set(hash, counter);
+      this.applyStyles(hash, convertUnistyles(value));
+      UnistylesListener.addListeners(dependencies, async () => {
+        // Move this callback to the end of the event loop
+        await Promise.resolve();
+        const newComputedStyleSheet = this.getComputedStylesheet(stylesheet);
+        const newValue = newComputedStyleSheet[key];
+        const result = typeof newValue === 'function' ? newValue(...args) : newValue;
+        const {
+          variantsResult
+        } = Object.fromEntries(getVariants({
+          variantsResult: result
+        }, variants));
+        const resultWithVariants = {
+          ...result,
+          ...variantsResult
+        };
+        this.applyStyles(hash, convertUnistyles(resultWithVariants));
+      });
+      return hash;
+    }
+    existingCounter.add(value);
+    return hash;
   };
-  createStyles = (stylesheet, key) => {
-    const unistyles = createTypeStyle();
-    const typestyleStylesheet = convertToTypeStyle(stylesheet);
-    const className = unistyles.style({
-      $debugName: `${key}-${Math.random().toString(16).slice(10)}`
-    }, typestyleStylesheet);
-    return {
-      className,
-      unistyles
-    };
+  applyStyles = (hash, styles) => {
+    Object.entries(styles).forEach(([key, value]) => {
+      if (!this.styleTag.sheet) {
+        return;
+      }
+      if (typeof value === 'object' && !key.startsWith('_')) {
+        const mediaQuery = getMediaQuery(key);
+        const cssRules = Array.from(this.styleTag.sheet.cssRules);
+        let queryRule = cssRules.find(rule => {
+          if (!(rule instanceof CSSMediaRule)) {
+            return false;
+          }
+          return rule.media.item(0)?.includes(mediaQuery);
+        }) ?? null;
+        if (!queryRule) {
+          const mediaQueryValue = extractMediaQueryValue(mediaQuery);
+          const ruleIndex = mediaQueryValue ? cssRules.reduce((acc, rule, ruleIndex) => {
+            if (!(rule instanceof CSSMediaRule)) {
+              return acc;
+            }
+            const ruleMediaQueryValue = extractMediaQueryValue(rule.conditionText);
+            if (ruleMediaQueryValue === undefined) {
+              return;
+            }
+            return ruleMediaQueryValue > mediaQueryValue ? ruleIndex : acc;
+          }, cssRules.length) : undefined;
+          queryRule = this.styleTag.sheet.cssRules.item(this.styleTag.sheet.insertRule(`@media ${mediaQuery} {.${hash} {}}`, ruleIndex));
+        }
+        if (queryRule instanceof CSSMediaRule) {
+          Object.entries(value).forEach(([mqKey, mqValue]) => {
+            this.applyRule({
+              hash,
+              key: mqKey,
+              value: mqValue,
+              sheet: queryRule
+            });
+          });
+        }
+        return;
+      }
+
+      // Pseudo
+      if (typeof value === 'object') {
+        Object.entries(value).forEach(([pseudoKey, pseudoValue]) => {
+          this.applyRule({
+            hash: `${hash}${key.replace('_', ':')}`,
+            key: pseudoKey,
+            value: pseudoValue,
+            sheet: this.styleTag.sheet
+          });
+        });
+        return;
+      }
+      this.applyRule({
+        hash,
+        key,
+        value,
+        sheet: this.styleTag.sheet
+      });
+    });
+  };
+  applyRule = ({
+    hash,
+    key,
+    value,
+    sheet
+  }) => {
+    let rule = Array.from(sheet.cssRules).find(rule => {
+      if (!(rule instanceof CSSStyleRule)) {
+        return false;
+      }
+
+      // In unistyles pseudos are prefixed with ':' but in css some of them are prefixed with '::'
+      return rule.selectorText.replace('::', ':').includes(hash);
+    }) ?? null;
+    if (!rule) {
+      rule = sheet.cssRules.item(sheet.insertRule(`.${hash} {}`));
+    }
+    if (!(rule instanceof CSSStyleRule) || !keyInObject(rule.style, key)) {
+      return;
+    }
+    rule.style[key] = value;
   };
-  updateStyles = (unistyles, stylesheet, className) => {
-    const typestyleStylesheet = convertToTypeStyle(stylesheet);
-    unistyles.reinit();
-    unistyles.cssRule(`.${className}`, typestyleStylesheet);
+  remove = value => {
+    const hash = generateHash(value);
+    const existingStyles = this.stylesCounter.get(hash);
+    if (!existingStyles) {
+      return;
+    }
+    existingStyles.delete(value);
+    if (existingStyles.size === 0) {
+      const ruleIndex = Array.from(this.styleTag.sheet?.cssRules ?? []).findIndex(rule => rule.cssText.includes(`.${hash}`));
+      this.styleTag.sheet?.deleteRule(ruleIndex);
+    }
   };
 }
 export const UnistylesRegistry = new UnistylesRegistryBuilder();

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

@@ -1 +1 @@
-{"version":3,"names":["createTypeStyle","convertToTypeStyle","UnistylesRuntime","keyInObject","UnistylesListener","UnistylesRegistryBuilder","stylesheets","Map","getComputedStylesheet","stylesheet","computedStylesheet","get","createdStylesheet","theme","miniRuntime","dependencies","Object","values","flatMap","value","uni__dependencies","addListeners","newComputedStylesheet","set","createStyles","key","unistyles","typestyleStylesheet","className","style","$debugName","Math","random","toString","slice","updateStyles","reinit","cssRule","UnistylesRegistry"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAmB,WAAW;AAEtD,SAASC,kBAAkB,QAAQ,WAAW;AAE9C,SAASC,gBAAgB,QAAQ,WAAW;AAC5C,SAASC,WAAW,QAAQ,SAAS;AACrC,SAASC,iBAAiB,QAAQ,YAAY;AAE9C,MAAMC,wBAAwB,CAAC;EACnBC,WAAW,GAAG,IAAIC,GAAG,CAAoD,CAAC;EAElFC,qBAAqB,GAAIC,UAAiD,IAAK;IAC3E,IAAI,OAAOA,UAAU,KAAK,UAAU,EAAE;MAClC,OAAOA,UAAU;IACrB;IAEA,MAAMC,kBAAkB,GAAG,IAAI,CAACJ,WAAW,CAACK,GAAG,CAACF,UAAU,CAAC;IAE3D,IAAIC,kBAAkB,EAAE;MACpB,OAAOA,kBAAkB;IAC7B;IAEA,MAAME,iBAAiB,GAAGH,UAAU,CAACP,gBAAgB,CAACW,KAAK,EAAEX,gBAAgB,CAACY,WAAW,CAAC;IAC1F;IACA,MAAMC,YAAY,GAAGC,MAAM,CAACC,MAAM,CAACL,iBAAiB,CAAC,CAACM,OAAO,CAACC,KAAK,IAAIhB,WAAW,CAACgB,KAAK,EAAE,mBAAmB,CAAC,GAAGA,KAAK,CAACC,iBAAiB,GAAG,EAAE,CAAC;IAE9IhB,iBAAiB,CAACiB,YAAY,CAACN,YAAY,EAAE,MAAM;MAC/C,MAAMO,qBAAqB,GAAGb,UAAU,CAACP,gBAAgB,CAACW,KAAK,EAAEX,gBAAgB,CAACY,WAAW,CAAC;MAE9F,IAAI,CAACR,WAAW,CAACiB,GAAG,CAACd,UAAU,EAAEa,qBAAqB,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,CAAChB,WAAW,CAACiB,GAAG,CAACd,UAAU,EAAEG,iBAAiB,CAAC;IAEnD,OAAOA,iBAAiB;EAC5B,CAAC;EAEDY,YAAY,GAAGA,CAACf,UAA2B,EAAEgB,GAAW,KAAK;IACzD,MAAMC,SAAS,GAAG1B,eAAe,CAAC,CAAC;IACnC,MAAM2B,mBAAmB,GAAG1B,kBAAkB,CAACQ,UAAU,CAAC;IAE1D,MAAMmB,SAAS,GAAGF,SAAS,CAACG,KAAK,CAAC;MAC9BC,UAAU,EAAE,GAAGL,GAAG,IAAIM,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,EAAE,CAAC;IAC9D,CAAC,EAAEP,mBAAmB,CAAC;IAEvB,OAAO;MACHC,SAAS;MACTF;IACJ,CAAC;EACL,CAAC;EAEDS,YAAY,GAAGA,CAACT,SAAoB,EAAEjB,UAA2B,EAAEmB,SAAiB,KAAK;IACrF,MAAMD,mBAAmB,GAAG1B,kBAAkB,CAACQ,UAAU,CAAC;IAE1DiB,SAAS,CAACU,MAAM,CAAC,CAAC;IAClBV,SAAS,CAACW,OAAO,CAAC,IAAIT,SAAS,EAAE,EAAED,mBAAmB,CAAC;EAC3D,CAAC;AACL;AAEA,OAAO,MAAMW,iBAAiB,GAAG,IAAIjC,wBAAwB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["UnistylesRuntime","extractMediaQueryValue","keyInObject","getMediaQuery","generateHash","extractUnistyleDependencies","UnistylesListener","convertUnistyles","getVariants","UnistylesRegistryBuilder","stylesheets","Map","stylesCounter","styleTag","disposeListenersMap","dependenciesMap","tag","newTag","document","createElement","id","head","appendChild","getComputedStylesheet","stylesheet","computedStylesheet","get","createdStylesheet","theme","miniRuntime","dependencies","Object","values","flatMap","value","addDependenciesToStylesheet","set","Set","forEach","dependency","add","dispose","addListeners","Array","from","newComputedStylesheet","key","args","variants","hash","existingCounter","size","counter","applyStyles","Promise","resolve","newComputedStyleSheet","newValue","result","variantsResult","fromEntries","resultWithVariants","styles","entries","sheet","startsWith","mediaQuery","cssRules","queryRule","find","rule","CSSMediaRule","media","item","includes","mediaQueryValue","ruleIndex","reduce","acc","ruleMediaQueryValue","conditionText","undefined","length","insertRule","mqKey","mqValue","applyRule","pseudoKey","pseudoValue","replace","CSSStyleRule","selectorText","style","remove","existingStyles","delete","findIndex","cssText","deleteRule","UnistylesRegistry"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/shadowRegistry.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import { listenToDependencies } from './listener';
 import { UnistylesRegistry } from './registry';
-import { createDoubleMap, extractHiddenProperties, extractSecrets, isInDocument } from './utils';
+import { createDoubleMap, equal, extractSecrets, extractUnistyleDependencies, isInDocument } from './utils';
 import { getVariants } from './variants';
 class UnistylesShadowRegistryBuilder {
   // MOCKS
@@ -13,9 +12,8 @@ class UnistylesShadowRegistryBuilder {
   dispose = () => {};
   // END MOCKS
 
-  webUnistylesMap = createDoubleMap();
-  disposeMap = createDoubleMap();
-  stylesMap = createDoubleMap();
+  resultsMap = createDoubleMap();
+  classNamesMap = createDoubleMap();
   add = (ref, _style, _variants, _args) => {
     // Style is not provided
     if (!_style) {
@@ -37,13 +35,19 @@ class UnistylesShadowRegistryBuilder {
     if (ref === null) {
       const secrets = extractSecrets(_style);
       secrets.forEach(({
-        __uni__refs
+        __uni__refs,
+        __uni__key
       }) => {
         __uni__refs.forEach(ref => {
           if (isInDocument(ref)) {
             return;
           }
-          this.remove(ref, _style);
+          const oldResult = this.resultsMap.get(ref, __uni__key);
+          this.resultsMap.delete(ref, __uni__key);
+          this.classNamesMap.delete(ref, __uni__key);
+          if (oldResult) {
+            UnistylesRegistry.remove(oldResult);
+          }
         });
       });
       return;
@@ -57,63 +61,61 @@ class UnistylesShadowRegistryBuilder {
       const {
         __uni__key,
         __uni__stylesheet,
-        __uni__refs,
         __uni__variants,
-        __uni__args = []
+        __uni__args = [],
+        __uni__refs
       } = secret;
       const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
       const style = newComputedStylesheet[__uni__key];
       const args = _args ?? __uni__args;
-      const resultHidden = typeof style === 'function' ? style(...args) : style;
-      const result = extractHiddenProperties(resultHidden);
+      const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
+      const result = typeof style === 'function' ? style(...args) : style;
       const {
-        variants
+        variantsResult
       } = Object.fromEntries(getVariants({
-        variants: result
-      }, _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants));
+        variantsResult: result
+      }, variants));
       const resultWithVariants = {
         ...result,
-        ...variants
+        ...variantsResult
       };
-      const storedWebUnistyle = this.webUnistylesMap.get(ref, __uni__key);
-      const webUnistyle = storedWebUnistyle ?? UnistylesRegistry.createStyles(resultWithVariants, __uni__key);
-      this.webUnistylesMap.set(ref, __uni__key, webUnistyle);
-      this.disposeMap.get(ref, __uni__key)?.();
-      this.disposeMap.set(ref, __uni__key, listenToDependencies({
+      const oldResult = this.resultsMap.get(ref, __uni__key);
+
+      // If results are the same do nothing
+      if (equal(oldResult, resultWithVariants)) {
+        return;
+      }
+      const oldClassNames = this.classNamesMap.get(ref, __uni__key);
+
+      // Remove old styles
+      if (oldResult) {
+        UnistylesRegistry.remove(oldResult);
+      }
+
+      // Remove old classnames from the ref
+      oldClassNames?.forEach(className => ref.classList.remove(className));
+      this.resultsMap.set(ref, __uni__key, resultWithVariants);
+      const className = UnistylesRegistry.add({
         key: __uni__key,
-        stylesheet: __uni__stylesheet,
         args,
-        className: webUnistyle.className,
-        unistyles: webUnistyle.unistyles
-      }));
-      if (!storedWebUnistyle) {
-        const styleTag = document.createElement('style');
-        const additionalClasses = resultWithVariants?._web?._classNames;
-        if (additionalClasses) {
-          ref.classList.add(...(Array.isArray(additionalClasses) ? additionalClasses : [additionalClasses]));
-        }
-        ref.classList.add(webUnistyle.className);
-        webUnistyle.unistyles.setStylesTarget(styleTag);
-        document.head.appendChild(styleTag);
-        __uni__refs.add(ref);
-        this.stylesMap.set(ref, __uni__key, styleTag);
-      }
-      if (storedWebUnistyle) {
-        UnistylesRegistry.updateStyles(webUnistyle.unistyles, resultWithVariants, webUnistyle.className);
+        stylesheet: __uni__stylesheet,
+        value: resultWithVariants,
+        variants
+      });
+      const injectedClassNames = resultWithVariants?._web?._classNames ?? [];
+      const newClassNames = injectedClassNames.concat(className);
+      const dependencies = extractUnistyleDependencies(resultWithVariants);
+      if (typeof __uni__stylesheet === 'function') {
+        // Add dependencies from dynamic styles to stylesheet
+        UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
       }
+      __uni__refs.add(ref);
+      this.classNamesMap.set(ref, __uni__key, newClassNames);
+      // Add new classnames to the ref
+      ref.classList.add(...newClassNames);
     });
   };
-  remove = (ref, style) => {
-    extractSecrets(style).forEach(({
-      __uni__key
-    }) => {
-      this.webUnistylesMap.delete(ref, __uni__key);
-      this.disposeMap.get(ref, __uni__key)?.();
-      this.disposeMap.delete(ref, __uni__key);
-      this.stylesMap.get(ref, __uni__key)?.remove();
-      this.stylesMap.delete(ref, __uni__key);
-    });
-  };
+  remove = () => {};
 }
 export const UnistylesShadowRegistry = new UnistylesShadowRegistryBuilder();
 //# sourceMappingURL=shadowRegistry.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["listenToDependencies","UnistylesRegistry","createDoubleMap","extractHiddenProperties","extractSecrets","isInDocument","getVariants","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","webUnistylesMap","disposeMap","stylesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","__uni__refs","remove","HTMLElement","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","args","resultHidden","result","variants","fromEntries","length","resultWithVariants","storedWebUnistyle","get","webUnistyle","createStyles","set","stylesheet","className","unistyles","styleTag","document","createElement","additionalClasses","_web","_classNames","classList","setStylesTarget","head","appendChild","updateStyles","delete","UnistylesShadowRegistry"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["UnistylesRegistry","createDoubleMap","equal","extractSecrets","extractUnistyleDependencies","isInDocument","getVariants","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","classNamesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","__uni__refs","__uni__key","oldResult","get","delete","remove","HTMLElement","secret","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","args","variants","length","result","variantsResult","fromEntries","resultWithVariants","oldClassNames","className","classList","set","stylesheet","value","injectedClassNames","_web","_classNames","newClassNames","concat","dependencies","addDependenciesToStylesheet","UnistylesShadowRegistry"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}