@hanzogui/web 7.3.2 → 8.0.0

package/dist/cjs/helpers/normalizeStyle.cjs

@@ -30,25 +30,46 @@ var import_expandStyles = require("./expandStyles.cjs");
 var import_isObj = require("./isObj.cjs");
 var import_normalizeValueWithProperty = require("./normalizeValueWithProperty.cjs");
 var import_pseudoDescriptors = require("./pseudoDescriptors.cjs");
+var import_styleOriginalValues = require("./styleOriginalValues.cjs");
 function normalizeStyle(style, disableNormalize = false) {
   const res = {};
+  const originalValues = import_styleOriginalValues.styleOriginalValues.get(style);
+  let nextOriginalValues;
   for (let key in style) {
     const prop = style[key];
     if (prop == null) continue;
+    const originalValue = originalValues?.[key];
     if (key in import_pseudoDescriptors.pseudoDescriptors ||
     // this should capture all parent-based styles like media, group, etc
     key[0] === "$" && (0, import_isObj.isObj)(prop)) {
       res[key] = normalizeStyle(prop, disableNormalize);
+      if (originalValue !== void 0) {
+        nextOriginalValues ||= {};
+        nextOriginalValues[key] = originalValue;
+      }
       continue;
     }
     const value = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key);
     const out = (0, import_expandStyle.expandStyle)(key, value);
     if (out) {
-      Object.assign(res, Object.fromEntries(out));
+      for (const [nextKey, nextValue] of out) {
+        res[nextKey] = nextValue;
+        if (originalValue !== void 0) {
+          nextOriginalValues ||= {};
+          nextOriginalValues[nextKey] = originalValue;
+        }
+      }
     } else {
       res[key] = value;
+      if (originalValue !== void 0) {
+        nextOriginalValues ||= {};
+        nextOriginalValues[key] = originalValue;
+      }
     }
   }
   (0, import_expandStyles.fixStyles)(res);
+  if (nextOriginalValues) {
+    import_styleOriginalValues.styleOriginalValues.set(res, nextOriginalValues);
+  }
   return res;
 }

package/dist/cjs/helpers/normalizeStyle.native.js

@@ -32,27 +32,67 @@ var import_expandStyles = require("./expandStyles.native.js");
 var import_isObj = require("./isObj.native.js");
 var import_normalizeValueWithProperty = require("./normalizeValueWithProperty.native.js");
 var import_pseudoDescriptors = require("./pseudoDescriptors.native.js");
+var import_styleOriginalValues = require("./styleOriginalValues.native.js");
 function normalizeStyle(style) {
   var disableNormalize = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
   var res = {};
+  var originalValues = import_styleOriginalValues.styleOriginalValues.get(style);
+  var nextOriginalValues;
   for (var key in style) {
     var prop = style[key];
     if (prop == null) continue;
+    var originalValue = originalValues === null || originalValues === void 0 ? void 0 : originalValues[key];
     if (key in import_pseudoDescriptors.pseudoDescriptors ||
     // this should capture all parent-based styles like media, group, etc
     key[0] === "$" && (0, import_isObj.isObj)(prop)) {
       res[key] = normalizeStyle(prop, disableNormalize);
+      if (originalValue !== void 0) {
+        nextOriginalValues || (nextOriginalValues = {});
+        nextOriginalValues[key] = originalValue;
+      }
       continue;
     }
     var value = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key);
     var out = (0, import_expandStyle.expandStyle)(key, value);
     if (out) {
-      Object.assign(res, Object.fromEntries(out));
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = out[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var [nextKey, nextValue] = _step.value;
+          res[nextKey] = nextValue;
+          if (originalValue !== void 0) {
+            nextOriginalValues || (nextOriginalValues = {});
+            nextOriginalValues[nextKey] = originalValue;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
     } else {
       res[key] = value;
+      if (originalValue !== void 0) {
+        nextOriginalValues || (nextOriginalValues = {});
+        nextOriginalValues[key] = originalValue;
+      }
     }
   }
   (0, import_expandStyles.fixStyles)(res);
+  if (nextOriginalValues) {
+    import_styleOriginalValues.styleOriginalValues.set(res, nextOriginalValues);
+  }
   return res;
 }
 //# sourceMappingURL=normalizeStyle.native.js.map

package/dist/cjs/helpers/normalizeStyle.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","normalizeStyle_exports","__export","normalizeStyle","module","exports","import_expandStyle","require","import_expandStyles","import_isObj","import_normalizeValueWithProperty","import_pseudoDescriptors","style","disableNormalize","arguments","length","res","key","prop","pseudoDescriptors","isObj","normalizeValueWithProperty","out","expandStyle","Object","assign","fromEntries","fixStyles"],"sources":["../../../src/helpers/normalizeStyle.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA4B,CAAAK,sBAAA;AAC5B,IAAAK,kBAAA,GAAAC,OAA0B;AAC1B,IAAAC,mBAAsB,GAAAD,OAAA;AACtB,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,iCAAkC,GAAAH,OAAA;AAU3B,IAAAI,wBAAwB,GAA4BJ,OAAA,gCAA0B;AACnF,SAAMJ,cAA4BA,CAAAS,KAAA;EAElC,IAAAC,gBAAgB,GAAOC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EACrB,IAAAE,GAAA,GAAM;EACN,SAAIC,GAAA,IAAQL,KAAM;IAClB,IACEM,IAAA,GAAON,KAAA,CAAAK,GAAA;IAEN,IAAIC,IAAC,IAAM;IAEZ,IAAAD,GAAI,IAAGN,wBAAyB,CAAAQ,iBAAgB;IAAA;IAChDF,GAAA,mBAAAR,YAAA,CAAAW,KAAA,EAAAF,IAAA;MACFF,GAAA,CAAAC,GAAA,IAAAd,cAAA,CAAAe,IAAA,EAAAL,gBAAA;MACA;IAEA;IACA,IAAIb,KAAK,GAAAa,gBAAA,GAAAK,IAAA,OAAAR,iCAAA,CAAAW,0BAAA,EAAAH,IAAA,EAAAD,GAAA;IACP,IAAAK,GAAA,GAAO,IAAAhB,kBAAmB,CAAAiB,WAAgB,EAAAN,GAAA,EAAAjB,KAAA;IAC5C,IAAAsB,GAAO;MACLE,MAAI,CAAGC,MAAI,CAAAT,GAAA,EAAAQ,MAAA,CAAAE,WAAA,CAAAJ,GAAA;IACb;MACFN,GAAA,CAAAC,GAAA,IAAAjB,KAAA;IAEA;EAEA;EACF,IAAAQ,mBAAA,CAAAmB,SAAA,EAAAX,GAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","normalizeStyle_exports","__export","normalizeStyle","module","exports","import_expandStyle","require","import_expandStyles","import_isObj","import_normalizeValueWithProperty","import_pseudoDescriptors","import_styleOriginalValues","style","disableNormalize","arguments","length","res","originalValues","styleOriginalValues","get","nextOriginalValues","key","prop","originalValue","pseudoDescriptors","isObj","normalizeValueWithProperty","out","expandStyle","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","nextKey","nextValue","err","return"],"sources":["../../../src/helpers/normalizeStyle.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA4B,CAAAK,sBAAA;AAC5B,IAAAK,kBAAA,GAAAC,OAA0B;AAC1B,IAAAC,mBAAsB,GAAAD,OAAA;AACtB,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,iCAAkC,GAAAH,OAAA;AAClC,IAAAI,wBAAA,GAAAJ,OAAoC;AAU7B,IAAAK,0BAAwB,GAA4BL,OAAA,kCAA0B;AACnF,SAAMJ,cAA4BA,CAAAU,KAAA;EAClC,IAAAC,gBAAM,GAAiBC,SAAA,CAAAC,MAAA,QAAAD,SAAA,cAAoB,GAAAA,SAAS;EACpD,IAAIE,GAAA;EAEJ,IAAAC,cAAgB,GAAAN,0BAAO,CAAAO,mBAAA,CAAAC,GAAA,CAAAP,KAAA;EACrB,IAAAQ,kBAAmB;EACnB,SAAIC,GAAA,IAAQT,KAAM;IAClB,IAAAU,IAAM,GAAAV,KAAA,CAAAS,GAAA;IACN,IACEC,IAAA,IAAO;IAEN,IAAIC,aAAO,GAAAN,cAAO,SAAM,IAAIA,cAC7B,uBAAAA,cAAA,CAAAI,GAAA;IACA,IAAAA,GAAI,IAAGX,wBAAyB,CAAAc,iBAAgB;IAAA;IAChDH,GAAA,GAAI,gBAAAb,YAA6B,CAAAiB,KAAA,EAAAH,IAAA;MAC/BN,GAAA,CAAAK,GAAA,IAAAnB,cAAuB,CAACoB,IAAA,EAAAT,gBAAA;MACxB,IAAAU,aAAA,KAAmB,KAAG,CAAI;QAC5BH,kBAAA,KAAAA,kBAAA;QACAA,kBAAA,CAAAC,GAAA,IAAAE,aAAA;MACF;MACA;IAEA;IACA,IAAIxB,KAAK,GAAAc,gBAAA,GAAAS,IAAA,OAAAb,iCAAA,CAAAiB,0BAAA,EAAAJ,IAAA,EAAAD,GAAA;IACP,IAAAM,GAAA,OAAYtB,kBAAkB,CAAAuB,WAAU,EAAAP,GAAA,EAAAtB,KAAA;IACtC,IAAA4B,GAAA,EAAI;MACJ,IAAAE,yBAAsB,GAAW;QAAAC,iBAAA;QAAAC,cAAA;MAC/B;QACA,SAAAC,SAAA,GAAmBL,GAAA,CAAAM,MAAO,CAAIC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;UAChC,KAAAS,OAAA,EAAAC,SAAA,IAAAJ,KAAA,CAAApC,KAAA;UACFiB,GAAA,CAAAsB,OAAA,IAAAC,SAAA;UACF,IAAOhB,aAAA;YACDH,kBAAO,KAAAA,kBAAA;YACPA,kBAAkB,CAAAkB,OAAW,IAAAf,aAAA;UAC/B;QACA;MACF,SAAAiB,GAAA;QACFV,iBAAA;QACFC,cAAA,GAAAS,GAAA;MAEA;QAEI;UACF,KAAAX,yBAAA,IAAAG,SAAoB,CAAAS,MAAS;YAC/BT,SAAA,CAAAS,MAAA;UAEO;QACT","ignoreList":[]}

package/dist/cjs/helpers/platformResolveValue.cjs

@@ -26,7 +26,7 @@ __export(platformResolveValue_exports, {
 });
 module.exports = __toCommonJS(platformResolveValue_exports);
 var import_getTokenForKey = require("./getTokenForKey.cjs");
-const tokenPattern = /(\$[\w.-]+)/g;
+const tokenPattern = /(\$[\w.-]+(?:\/[\d.]+)?)/g;
 function platformResolveValue(_key, value, styleProps, styleState) {
   return value.replace(tokenPattern, t => {
     let r = (0, import_getTokenForKey.getTokenForKey)("size", t, styleProps, styleState);

package/dist/cjs/helpers/platformResolveValue.native.js

@@ -29,7 +29,7 @@ __export(platformResolveValue_native_exports, {
 module.exports = __toCommonJS(platformResolveValue_native_exports);
 var import_getTokenForKey = require("./getTokenForKey.native.js");
 var import_parseNativeStyle = require("./parseNativeStyle.native.js");
-var tokenPattern = /(\$[\w.-]+)/g;
+var tokenPattern = /(\$[\w.-]+(?:\/[\d.]+)?)/g;
 var nativeParseKeys = {
   backgroundImage: true,
   boxShadow: true,

package/dist/cjs/helpers/platformResolveValue.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["platformResolveValue_native_exports","__export","platformResolveValue","module","exports","__toCommonJS","import_getTokenForKey","require","import_parseNativeStyle","tokenPattern","nativeParseKeys","backgroundImage","boxShadow","textShadow","replaceTokens","value","styleProps","styleState","replace","t","r","getTokenForKey","String","key","effectiveStyleProps","resolveValues","tokenMap","Map","placeholderIdx","withPlaceholders","placeholder","set","parsed","parseNativeStyle"],"sources":["../../../src/helpers/platformResolveValue.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,mCAAA;AAAAC,QAAA,CAAAD,mCAAA;EAAAE,oBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,mCAAA;AAAA,IAAAM,qBAAA,GAA+BC,OAAA;AAC/B,IAAAC,uBAAA,GAAiCD,OAAA;AACjC,IAAIE,YAAA,GAAe;AAEnB,IAAIC,eAAA,GAAkB;EAClBC,eAAA,EAAiB;EACjBC,SAAA,EAAW;EACXC,UAAA,EAAY;AAChB;AACA,SAASC,cAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAA,EAAY;EAClD,OAAOF,KAAA,CAAMG,OAAA,CAAQT,YAAA,EAAc,UAASU,CAAA,EAAG;IAC3C,IAAIC,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,QAAQF,CAAA,EAAGH,UAAA,EAAYC,UAAU;IACxD,IAAIG,CAAA,IAAK,MAAM;MACXA,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,SAASF,CAAA,EAAGH,UAAA,EAAYC,UAAU;IACzD;IACA,OAAOG,CAAA,IAAK,OAAOE,MAAA,CAAOF,CAAC,IAAID,CAAA;EACnC,CAAC;AACL;AAIW,SAASjB,qBAAqBqB,GAAA,EAAKR,KAAA,EAAOC,UAAA,EAAYC,UAAA,EAAY;EACzE,IAAI,CAACP,eAAA,CAAgBa,GAAG,GAAG;IACvB,OAAOT,aAAA,CAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAU;EACtD;EAIA,IAAIO,mBAAA,GAAsBD,GAAA,KAAQ,oBAAoB;IAClD,GAAGP,UAAA;IACHS,aAAA,EAAe;EACnB,IAAIT,UAAA;EAEJ,IAAIU,QAAA,GAAW,mBAAIC,GAAA,CAAI;EACvB,IAAIC,cAAA,GAAiB;EACrB,IAAIC,gBAAA,GAAmBd,KAAA,CAAMG,OAAA,CAAQT,YAAA,EAAc,UAASU,CAAA,EAAG;IAC3D,IAAIC,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,QAAQF,CAAA,EAAGK,mBAAA,EAAqBP,UAAU;IACjE,IAAIG,CAAA,IAAK,MAAM;MACXA,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,SAASF,CAAA,EAAGK,mBAAA,EAAqBP,UAAU;IAClE;IACA,IAAIG,CAAA,IAAK,MAAM,OAAOD,CAAA;IACtB,IAAI,OAAOC,CAAA,KAAM,YAAY,OAAOA,CAAA,KAAM,UAAU;MAChD,IAAIU,WAAA,GAAc,OAAOF,cAAA,EAAgB;MACzCF,QAAA,CAASK,GAAA,CAAID,WAAA,EAAaV,CAAC;MAC3B,OAAOU,WAAA;IACX;IACA,OAAOR,MAAA,CAAOF,CAAC;EACnB,CAAC;EACD,IAAIY,MAAA,OAASxB,uBAAA,CAAAyB,gBAAA,EAAiBV,GAAA,EAAKM,gBAAA,EAAkBH,QAAQ;EAC7D,IAAIM,MAAA,EAAQ,OAAOA,MAAA;EAEnB,OAAOlB,aAAA,CAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAU;AACtD","ignoreList":[]}
+{"version":3,"names":["platformResolveValue_native_exports","__export","platformResolveValue","module","exports","__toCommonJS","import_getTokenForKey","require","import_parseNativeStyle","tokenPattern","nativeParseKeys","backgroundImage","boxShadow","textShadow","replaceTokens","value","styleProps","styleState","replace","t","r","getTokenForKey","String","key","effectiveStyleProps","resolveValues","tokenMap","Map","placeholderIdx","withPlaceholders","placeholder","set","parsed","parseNativeStyle"],"sources":["../../../src/helpers/platformResolveValue.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,mCAAA;AAAAC,QAAA,CAAAD,mCAAA;EAAAE,oBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,mCAAA;AAAA,IAAAM,qBAAA,GAA+BC,OAAA;AAC/B,IAAAC,uBAAA,GAAiCD,OAAA;AAIjC,IAAIE,YAAA,GAAe;AAEnB,IAAIC,eAAA,GAAkB;EAClBC,eAAA,EAAiB;EACjBC,SAAA,EAAW;EACXC,UAAA,EAAY;AAChB;AACA,SAASC,cAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAA,EAAY;EAClD,OAAOF,KAAA,CAAMG,OAAA,CAAQT,YAAA,EAAc,UAASU,CAAA,EAAG;IAC3C,IAAIC,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,QAAQF,CAAA,EAAGH,UAAA,EAAYC,UAAU;IACxD,IAAIG,CAAA,IAAK,MAAM;MACXA,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,SAASF,CAAA,EAAGH,UAAA,EAAYC,UAAU;IACzD;IACA,OAAOG,CAAA,IAAK,OAAOE,MAAA,CAAOF,CAAC,IAAID,CAAA;EACnC,CAAC;AACL;AAIW,SAASjB,qBAAqBqB,GAAA,EAAKR,KAAA,EAAOC,UAAA,EAAYC,UAAA,EAAY;EACzE,IAAI,CAACP,eAAA,CAAgBa,GAAG,GAAG;IACvB,OAAOT,aAAA,CAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAU;EACtD;EAIA,IAAIO,mBAAA,GAAsBD,GAAA,KAAQ,oBAAoB;IAClD,GAAGP,UAAA;IACHS,aAAA,EAAe;EACnB,IAAIT,UAAA;EAEJ,IAAIU,QAAA,GAAW,mBAAIC,GAAA,CAAI;EACvB,IAAIC,cAAA,GAAiB;EACrB,IAAIC,gBAAA,GAAmBd,KAAA,CAAMG,OAAA,CAAQT,YAAA,EAAc,UAASU,CAAA,EAAG;IAC3D,IAAIC,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,QAAQF,CAAA,EAAGK,mBAAA,EAAqBP,UAAU;IACjE,IAAIG,CAAA,IAAK,MAAM;MACXA,CAAA,OAAId,qBAAA,CAAAe,cAAA,EAAe,SAASF,CAAA,EAAGK,mBAAA,EAAqBP,UAAU;IAClE;IACA,IAAIG,CAAA,IAAK,MAAM,OAAOD,CAAA;IACtB,IAAI,OAAOC,CAAA,KAAM,YAAY,OAAOA,CAAA,KAAM,UAAU;MAChD,IAAIU,WAAA,GAAc,OAAOF,cAAA,EAAgB;MACzCF,QAAA,CAASK,GAAA,CAAID,WAAA,EAAaV,CAAC;MAC3B,OAAOU,WAAA;IACX;IACA,OAAOR,MAAA,CAAOF,CAAC;EACnB,CAAC;EACD,IAAIY,MAAA,OAASxB,uBAAA,CAAAyB,gBAAA,EAAiBV,GAAA,EAAKM,gBAAA,EAAkBH,QAAQ;EAC7D,IAAIM,MAAA,EAAQ,OAAOA,MAAA;EAEnB,OAAOlB,aAAA,CAAcC,KAAA,EAAOC,UAAA,EAAYC,UAAU;AACtD","ignoreList":[]}

package/dist/cjs/helpers/pointerEvents.native.js

@@ -39,13 +39,19 @@ function usePointerEvents(props, viewProps) {
     onPointerLeave
   } = props;
   var hasPointerEvents = onPointerDown || onPointerUp || onPointerMove || onPointerCancel || onPointerEnter || onPointerLeave;
-  var isInsideRef = (0, import_react.useRef)(false);
-  var layoutRef = (0, import_react.useRef)({
-    width: 0,
-    height: 0
-  });
-  var isCapturedRef = (0, import_react.useRef)(false);
+  var ref = (0, import_react.useRef)(null);
+  if (!ref.current) {
+    ref.current = {
+      isInside: false,
+      layout: {
+        width: 0,
+        height: 0
+      },
+      isCaptured: false
+    };
+  }
   if (!hasPointerEvents) return;
+  var bag = ref.current;
   var createNormalizedEvent = function (e) {
     var touch = e.nativeEvent;
     var _touch_identifier;
@@ -62,10 +68,10 @@ function usePointerEvents(props, viewProps) {
       nativeEvent: touch,
       target: {
         setPointerCapture: function (_pointerId) {
-          isCapturedRef.current = true;
+          bag.isCaptured = true;
         },
         releasePointerCapture: function (_pointerId) {
-          isCapturedRef.current = false;
+          bag.isCaptured = false;
         }
       }
     };
@@ -78,7 +84,7 @@ function usePointerEvents(props, viewProps) {
   }
   if (onPointerUp) {
     viewProps.onTouchEnd = (0, import_helpers.composeEventHandlers)(viewProps.onTouchEnd, function (e) {
-      isCapturedRef.current = false;
+      bag.isCaptured = false;
       onPointerUp(createNormalizedEvent(e));
     });
   }
@@ -91,22 +97,22 @@ function usePointerEvents(props, viewProps) {
       var {
         width,
         height
-      } = layoutRef.current;
+      } = bag.layout;
       var isInBounds = locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height;
-      if (isCapturedRef.current || isInBounds) {
+      if (bag.isCaptured || isInBounds) {
         onPointerMove(createNormalizedEvent(e));
       }
     });
   }
   if (onPointerCancel) {
     viewProps.onTouchCancel = (0, import_helpers.composeEventHandlers)(viewProps.onTouchCancel, function (e) {
-      isCapturedRef.current = false;
+      bag.isCaptured = false;
       onPointerCancel(createNormalizedEvent(e));
     });
   }
   if (onPointerEnter || onPointerLeave || onPointerMove) {
     viewProps.onLayout = (0, import_helpers.composeEventHandlers)(viewProps.onLayout, function (e) {
-      layoutRef.current = {
+      bag.layout = {
         width: e.nativeEvent.layout.width,
         height: e.nativeEvent.layout.height
       };
@@ -121,9 +127,9 @@ function usePointerEvents(props, viewProps) {
       var {
         width,
         height
-      } = layoutRef.current;
+      } = bag.layout;
       if (locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height) {
-        isInsideRef.current = true;
+        bag.isInside = true;
         onPointerEnter(createNormalizedEvent(e));
       }
     });
@@ -137,16 +143,16 @@ function usePointerEvents(props, viewProps) {
       var {
         width,
         height
-      } = layoutRef.current;
+      } = bag.layout;
       var isInside = locationX >= 0 && locationX <= width && locationY >= 0 && locationY <= height;
-      if (isInsideRef.current && !isInside) {
-        isInsideRef.current = false;
+      if (bag.isInside && !isInside) {
+        bag.isInside = false;
         onPointerLeave(createNormalizedEvent(e));
       }
     });
     viewProps.onTouchEnd = (0, import_helpers.composeEventHandlers)(viewProps.onTouchEnd, function (e) {
-      if (isInsideRef.current) {
-        isInsideRef.current = false;
+      if (bag.isInside) {
+        bag.isInside = false;
         onPointerLeave(createNormalizedEvent(e));
       }
     });

package/dist/cjs/helpers/pointerEvents.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["pointerEvents_native_exports","__export","usePointerEvents","module","exports","__toCommonJS","import_react","require","import_helpers","props","viewProps","onPointerDown","onPointerUp","onPointerMove","onPointerCancel","onPointerEnter","onPointerLeave","hasPointerEvents","isInsideRef","useRef","layoutRef","width","height","isCapturedRef","createNormalizedEvent","e","touch","nativeEvent","_touch_identifier","normalized","clientX","pageX","clientY","pageY","offsetX","locationX","offsetY","locationY","pointerType","pointerId","identifier","target","setPointerCapture","_pointerId","current","releasePointerCapture","onTouchStart","composeEventHandlers","onTouchEnd","onTouchMove","isInBounds","onTouchCancel","onLayout","layout","isInside"],"sources":["../../../src/helpers/pointerEvents.native.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["pointerEvents_native_exports","__export","usePointerEvents","module","exports","__toCommonJS","import_react","require","import_helpers","props","viewProps","onPointerDown","onPointerUp","onPointerMove","onPointerCancel","onPointerEnter","onPointerLeave","hasPointerEvents","ref","useRef","current","isInside","layout","width","height","isCaptured","bag","createNormalizedEvent","e","touch","nativeEvent","_touch_identifier","normalized","clientX","pageX","clientY","pageY","offsetX","locationX","offsetY","locationY","pointerType","pointerId","identifier","target","setPointerCapture","_pointerId","releasePointerCapture","onTouchStart","composeEventHandlers","onTouchEnd","onTouchMove","isInBounds","onTouchCancel","onLayout"],"sources":["../../../src/helpers/pointerEvents.native.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/helpers/propMapper.cjs

@@ -39,6 +39,7 @@ var import_pseudoDescriptors = require("./pseudoDescriptors.cjs");
 var import_resolveCompoundTokens = require("./resolveCompoundTokens.cjs");
 var import_resolveRem = require("./resolveRem.cjs");
 var import_skipProps = require("./skipProps.cjs");
+var import_styleOriginalValues = require("./styleOriginalValues.cjs");
 var import_getTokenForKey2 = require("./getTokenForKey.cjs");
 const propMapper = (key, value, styleState, disabled, map) => {
   if (disabled) return map(key, value);
@@ -56,7 +57,9 @@ const propMapper = (key, value, styleState, disabled, map) => {
     if (variants && key in variants) {
       const variantValue = resolveVariants(key, value, styleProps, styleState, "");
       if (variantValue) {
-        variantValue.forEach(([key2, value2]) => map(key2, value2));
+        variantValue.forEach(([key2, value2, originalValue2]) => {
+          map(key2, value2, originalValue2);
+        });
         return;
       }
     }
@@ -76,12 +79,12 @@ const propMapper = (key, value, styleState, disabled, map) => {
   if (value != null) {
     const fontToken = (0, import_getTokenForKey.getLastFontFamilyToken)();
     if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
-    const expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
+    const expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value, conf.settings.styleCompat || "web");
     if (expanded) {
       const max = expanded.length;
       for (let i = 0; i < max; i++) {
-        const [nkey, nvalue] = expanded[i];
-        map(nkey, nvalue, originalValue);
+        const [nkey, nvalue, noriginalValue] = expanded[i];
+        map(nkey, nvalue, noriginalValue ?? originalValue);
       }
     } else map(key, value, originalValue);
   }
@@ -144,8 +147,9 @@ const resolveVariants = (key, value, styleProps, styleState, parentVariantKey) =
     const expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize);
     if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue, `to`, expanded);
     const next = Object.entries(expanded);
+    const originalValues = import_styleOriginalValues.styleOriginalValues.get(expanded);
     if (fontFamilyResult && fontFamilyResult[0] === "$") (0, import_getTokenForKey.setLastFontFamilyToken)((0, import_createVariable.getVariableValue)(fontFamilyResult));
-    return next;
+    return next.map(([key2, value2]) => [key2, value2, originalValues?.[key2]]);
   }
 };
 function getFontFamilyFromNameOrVariable(input, conf) {
@@ -175,11 +179,14 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
     variants
   } = staticConfig;
   const res = {};
+  let originalValues;
   if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   - resolveTokensAndVariants`, key, value);
   for (const _key in value) {
     const subKey = conf.shorthands[_key] || _key;
     const val = value[_key];
     if (!styleProps.noSkip && subKey in import_skipProps.skipProps) continue;
+    originalValues ||= {};
+    originalValues[subKey] = val;
     if (staticConfig) {
       const contextProps = staticConfig.context?.props || staticConfig.parentStaticConfig?.context?.props;
       if (contextProps && subKey in contextProps) {
@@ -192,12 +199,23 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
     if (styleProps.noExpand) res[subKey] = val;else if (variants && subKey in variants) {
       if (parentVariantKey && parentVariantKey === key) res[subKey] = val[0] === "$" ? (0, import_getTokenForKey.getTokenForKey)(subKey, val, styleProps, styleState) : val;else {
         const variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
-        if (variantOut) for (const [key2, val2] of variantOut) {
+        if (variantOut) for (const [key2, val2, originalVal] of variantOut) {
           if (val2 == null) continue;
           if (key2 in import_pseudoDescriptors.pseudoDescriptors) {
             res[key2] ??= {};
             Object.assign(res[key2], val2);
-          } else res[key2] = val2;
+            const subOriginalValues = import_styleOriginalValues.styleOriginalValues.get(val2);
+            if (subOriginalValues) import_styleOriginalValues.styleOriginalValues.set(res[key2], {
+              ...import_styleOriginalValues.styleOriginalValues.get(res[key2]),
+              ...subOriginalValues
+            });
+          } else {
+            res[key2] = val2;
+            if (originalVal !== void 0) {
+              originalValues ||= {};
+              originalValues[key2] = originalVal;
+            }
+          }
         }
       }
       continue;
@@ -217,6 +235,11 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
       if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`object`, subKey, subObject);
       res[subKey] ??= {};
       Object.assign(res[subKey], subObject);
+      const subOriginalValues = import_styleOriginalValues.styleOriginalValues.get(subObject);
+      if (subOriginalValues) import_styleOriginalValues.styleOriginalValues.set(res[subKey], {
+        ...import_styleOriginalValues.styleOriginalValues.get(res[subKey]),
+        ...subOriginalValues
+      });
     } else res[subKey] = val;
     if (process.env.NODE_ENV === "development") {
       if (debug) {
@@ -224,6 +247,7 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
       }
     }
   }
+  if (originalValues) import_styleOriginalValues.styleOriginalValues.set(res, originalValues);
   return res;
 };
 const tokenCats = ["size", "color", "radius", "space", "zIndex"].map(name => ({

package/dist/cjs/helpers/propMapper.native.js

@@ -41,6 +41,7 @@ var import_pseudoDescriptors = require("./pseudoDescriptors.native.js");
 var import_resolveCompoundTokens = require("./resolveCompoundTokens.native.js");
 var import_resolveRem = require("./resolveRem.native.js");
 var import_skipProps = require("./skipProps.native.js");
+var import_styleOriginalValues = require("./styleOriginalValues.native.js");
 var import_getTokenForKey2 = require("./getTokenForKey.native.js");
 function _type_of(obj) {
   "@swc/helpers - typeof";
@@ -61,13 +62,38 @@ var propMapper = function (key, value, styleState, disabled, map) {
   var {
     variants
   } = staticConfig;
+  if (value === "unset") {
+    var expandedKey = !styleProps.disableExpandShorthands && conf.shorthands[key] || key;
+    var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(expandedKey, value, conf.settings.styleCompat || "web");
+    if (styleState.style) if (expanded) {
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var [nkey] = _step.value;
+          delete styleState.style[nkey];
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    } else delete styleState.style[expandedKey];
+    return;
+  }
   if (!styleProps.noExpand) {
     if (variants && key in variants) {
       var variantValue = resolveVariants(key, value, styleProps, styleState, "");
       if (variantValue) {
         variantValue.forEach(function (param) {
-          var [_$key, _$value] = param;
-          return map(_$key, _$value);
+          var [_$key, _$value, originalValue2] = param;
+          map(_$key, _$value, originalValue2);
         });
         return;
       }
@@ -89,22 +115,22 @@ var propMapper = function (key, value, styleState, disabled, map) {
     var parsed = (0, import_parseNativeStyle.parseNativeStyle)(key, value);
     if (parsed) {
       if (key === "textShadow" && Array.isArray(parsed) && Array.isArray(parsed[0])) {
-        var _iteratorNormalCompletion = true,
-          _didIteratorError = false,
-          _iteratorError = void 0;
+        var _iteratorNormalCompletion1 = true,
+          _didIteratorError1 = false,
+          _iteratorError1 = void 0;
         try {
-          for (var _iterator = parsed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-            var [nkey, nvalue] = _step.value;
-            map(nkey, nvalue, originalValue);
+          for (var _iterator1 = parsed[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+            var [nkey1, nvalue] = _step1.value;
+            map(nkey1, nvalue, originalValue);
           }
         } catch (err) {
-          _didIteratorError = true;
-          _iteratorError = err;
+          _didIteratorError1 = true;
+          _iteratorError1 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
           } finally {
-            if (_didIteratorError) throw _iteratorError;
+            if (_didIteratorError1) throw _iteratorError1;
           }
         }
         return;
@@ -115,12 +141,12 @@ var propMapper = function (key, value, styleState, disabled, map) {
   if (value != null) {
     var fontToken = (0, import_getTokenForKey.getLastFontFamilyToken)();
     if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
-    var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
-    if (expanded) {
-      var max = expanded.length;
+    var expanded1 = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value, conf.settings.styleCompat || "web");
+    if (expanded1) {
+      var max = expanded1.length;
       for (var i = 0; i < max; i++) {
-        var [nkey1, nvalue1] = expanded[i];
-        map(nkey1, nvalue1, originalValue);
+        var [nkey2, nvalue1, noriginalValue] = expanded1[i];
+        map(nkey2, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
       }
     } else map(key, value, originalValue);
   }
@@ -173,8 +199,12 @@ var resolveVariants = function (key, value, styleProps, styleState, parentVarian
     var expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize);
     if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue, `to`, expanded);
     var next = Object.entries(expanded);
+    var originalValues = import_styleOriginalValues.styleOriginalValues.get(expanded);
     if (fontFamilyResult && fontFamilyResult[0] === "$") (0, import_getTokenForKey.setLastFontFamilyToken)((0, import_createVariable.getVariableValue)(fontFamilyResult));
-    return next;
+    return next.map(function (param) {
+      var [_$key, _$value] = param;
+      return [_$key, _$value, originalValues === null || originalValues === void 0 ? void 0 : originalValues[_$key]];
+    });
   }
 };
 function getFontFamilyFromNameOrVariable(input, conf) {
@@ -204,11 +234,14 @@ var resolveTokensAndVariants = function (key, value, styleProps, styleState, par
     variants
   } = staticConfig;
   var res = {};
+  var originalValues;
   if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   - resolveTokensAndVariants`, key, value);
   for (var _key in value) {
     var subKey = conf.shorthands[_key] || _key;
     var val = value[_key];
     if (!styleProps.noSkip && subKey in import_skipProps.skipProps) continue;
+    originalValues || (originalValues = {});
+    originalValues[subKey] = val;
     if (staticConfig) {
       var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig;
       var contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
@@ -229,14 +262,25 @@ var resolveTokensAndVariants = function (key, value, styleProps, styleState, par
             _iteratorError = void 0;
           try {
             for (var _iterator = variantOut[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var [_$key, val1] = _step.value;
+              var [_$key, val1, originalVal] = _step.value;
               if (val1 == null) continue;
               if (_$key in import_pseudoDescriptors.pseudoDescriptors) {
                 var _res, _key1;
                 var _;
                 (_ = (_res = res)[_key1 = _$key]) !== null && _ !== void 0 || (_res[_key1] = {});
                 Object.assign(res[_$key], val1);
-              } else res[_$key] = val1;
+                var subOriginalValues = import_styleOriginalValues.styleOriginalValues.get(val1);
+                if (subOriginalValues) import_styleOriginalValues.styleOriginalValues.set(res[_$key], {
+                  ...import_styleOriginalValues.styleOriginalValues.get(res[_$key]),
+                  ...subOriginalValues
+                });
+              } else {
+                res[_$key] = val1;
+                if (originalVal !== void 0) {
+                  originalValues || (originalValues = {});
+                  originalValues[_$key] = originalVal;
+                }
+              }
             }
           } catch (err) {
             _didIteratorError = true;
@@ -269,6 +313,11 @@ var resolveTokensAndVariants = function (key, value, styleProps, styleState, par
       var _1;
       (_1 = (_res1 = res)[_subKey = subKey]) !== null && _1 !== void 0 || (_res1[_subKey] = {});
       Object.assign(res[subKey], subObject);
+      var subOriginalValues1 = import_styleOriginalValues.styleOriginalValues.get(subObject);
+      if (subOriginalValues1) import_styleOriginalValues.styleOriginalValues.set(res[subKey], {
+        ...import_styleOriginalValues.styleOriginalValues.get(res[subKey]),
+        ...subOriginalValues1
+      });
     } else res[subKey] = val;
     if (process.env.NODE_ENV === "development") {
       if (debug) {
@@ -277,6 +326,7 @@ var resolveTokensAndVariants = function (key, value, styleProps, styleState, par
       }
     }
   }
+  if (originalValues) import_styleOriginalValues.styleOriginalValues.set(res, originalValues);
   return res;
 };
 var tokenCats = ["size", "color", "radius", "space", "zIndex"].map(function (name) {