tamagui 1.137.2 → 1.137.3

package/dist/native.cjs

@@ -1827,23 +1827,73 @@ function getNewThemeName() {
   }
   var parentParts = parentName.split("_"), lastName = parentParts[parentParts.length - 1];
   lastName && lastName[0].toLowerCase() !== lastName[0] && parentParts.pop();
-  for (var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean), found = null, max2 = parentParts.length, i = 0; i <= max2; i++) {
-    var base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join("_"), _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean), found = null;
+  if (name) {
+    var nameHasScheme = getScheme(name);
+    if (nameHasScheme) {
+      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+      try {
+        for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var subName = _step.value;
+          if (subName in themes2) {
+            found = subName;
+            break;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    }
+    if (!found && !nameHasScheme) {
+      var parentScheme = getScheme(parentName);
+      if (parentScheme) {
+        var parentBase = parentParts.join("_"), withScheme = [componentName ? `${parentBase}_${name}_${componentName}` : void 0, `${parentBase}_${name}`, componentName ? `${parentScheme}_${name}_${componentName}` : void 0, `${parentScheme}_${name}`].filter(Boolean), _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+        try {
+          for (var _iterator1 = withScheme[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+            var potential = _step1.value;
+            if (potential in themes2) {
+              found = potential;
+              break;
+            }
+          }
+        } catch (err) {
+          _didIteratorError1 = true, _iteratorError1 = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
+          } finally {
+            if (_didIteratorError1) throw _iteratorError1;
+          }
+        }
+      }
+    }
+  }
+  if (!found) if (!name && componentName) {
+    var potential1 = `${parentParts.join("_")}_${componentName}`;
+    potential1 in themes2 && (found = potential1);
+  } else for (var max2 = parentParts.length, i = 0; i <= max2; i++) {
+    var base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join("_"), _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
     try {
-      for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var subName = _step.value, potential = base ? `${base}_${subName}` : subName;
-        if (potential in themes2) {
-          found = potential;
+      for (var _iterator2 = subNames[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        var subName1 = _step2.value, potential2 = base ? `${base}_${subName1}` : subName1;
+        if (potential2 in themes2) {
+          found = potential2;
           break;
         }
       }
     } catch (err) {
-      _didIteratorError = true, _iteratorError = err;
+      _didIteratorError2 = true, _iteratorError2 = err;
     } finally {
       try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
       } finally {
-        if (_didIteratorError) throw _iteratorError;
+        if (_didIteratorError2) throw _iteratorError2;
       }
     }
     if (found) break;
@@ -4761,7 +4811,45 @@ function createTamagui$2(configIn) {
         return themeRuleSets;
       }
     };
-  })(), shorthands = configIn.shorthands || {}, getCSS = function() {
+  })(), builtinShorthands = {
+    fd: "flexDirection",
+    fb: "flexBasis",
+    bblr: "borderBottomLeftRadius",
+    bbrr: "borderBottomRightRadius",
+    fwr: "flexWrap",
+    col: "color",
+    ff: "fontFamily",
+    fst: "fontStyle",
+    tr: "transform",
+    tt: "textTransform",
+    td: "textDecorationLine",
+    va: "verticalAlign",
+    ws: "whiteSpace",
+    wb: "wordBreak",
+    ww: "wordWrap",
+    brc: "borderRightColor",
+    brw: "borderRightWidth",
+    bs: "borderStyle",
+    btc: "borderTopColor",
+    btlr: "borderTopLeftRadius",
+    btrr: "borderTopRightRadius",
+    btw: "borderTopWidth",
+    bw: "borderWidth",
+    o: "opacity",
+    cur: "cursor",
+    pe: "pointerEvents",
+    ov: "overflow",
+    pos: "position",
+    dsp: "display",
+    fw: "fontWeight",
+    fs: "fontSize",
+    ls: "letterSpacing",
+    lh: "lineHeight",
+    bxs: "boxSizing",
+    bxsh: "boxShadow",
+    ox: "overflowX",
+    oy: "overflowY"
+  }, userShorthands = configIn.shorthands || {}, shorthands = __spreadValues(__spreadValues({}, builtinShorthands), userShorthands), getCSS = function() {
     return "";
   }, getNewCSS = function(opts) {
     return getCSS(__spreadValues({}, opts));
@@ -4793,6 +4881,7 @@ function createTamagui$2(configIn) {
     tokens,
     // vite made this into a function if it wasn't set
     shorthands,
+    userShorthands,
     inverseShorthands: shorthands ? Object.fromEntries(Object.entries(shorthands).map(function(param) {
       var [k, v] = param;
       return [v, k];

package/dist/test.cjs

@@ -2067,23 +2067,73 @@ function getNewThemeName() {
   }
   var parentParts = parentName.split("_"), lastName = parentParts[parentParts.length - 1];
   lastName && lastName[0].toLowerCase() !== lastName[0] && parentParts.pop();
-  for (var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean), found = null, max2 = parentParts.length, i = 0; i <= max2; i++) {
-    var base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join("_"), _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean), found = null;
+  if (name) {
+    var nameHasScheme = getScheme(name);
+    if (nameHasScheme) {
+      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+      try {
+        for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var subName = _step.value;
+          if (subName in themes2) {
+            found = subName;
+            break;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    }
+    if (!found && !nameHasScheme) {
+      var parentScheme = getScheme(parentName);
+      if (parentScheme) {
+        var parentBase = parentParts.join("_"), withScheme = [componentName ? `${parentBase}_${name}_${componentName}` : void 0, `${parentBase}_${name}`, componentName ? `${parentScheme}_${name}_${componentName}` : void 0, `${parentScheme}_${name}`].filter(Boolean), _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+        try {
+          for (var _iterator1 = withScheme[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+            var potential = _step1.value;
+            if (potential in themes2) {
+              found = potential;
+              break;
+            }
+          }
+        } catch (err) {
+          _didIteratorError1 = true, _iteratorError1 = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
+          } finally {
+            if (_didIteratorError1) throw _iteratorError1;
+          }
+        }
+      }
+    }
+  }
+  if (!found) if (!name && componentName) {
+    var potential1 = `${parentParts.join("_")}_${componentName}`;
+    potential1 in themes2 && (found = potential1);
+  } else for (var max2 = parentParts.length, i = 0; i <= max2; i++) {
+    var base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join("_"), _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
     try {
-      for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var subName = _step.value, potential = base ? `${base}_${subName}` : subName;
-        if (potential in themes2) {
-          found = potential;
+      for (var _iterator2 = subNames[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+        var subName1 = _step2.value, potential2 = base ? `${base}_${subName1}` : subName1;
+        if (potential2 in themes2) {
+          found = potential2;
           break;
         }
       }
     } catch (err) {
-      _didIteratorError = true, _iteratorError = err;
+      _didIteratorError2 = true, _iteratorError2 = err;
     } finally {
       try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
       } finally {
-        if (_didIteratorError) throw _iteratorError;
+        if (_didIteratorError2) throw _iteratorError2;
       }
     }
     if (found) break;
@@ -5008,7 +5058,45 @@ function createTamagui$2(configIn) {
         return themeRuleSets;
       }
     };
-  })(), shorthands = configIn.shorthands || {}, getCSS = function() {
+  })(), builtinShorthands = {
+    fd: "flexDirection",
+    fb: "flexBasis",
+    bblr: "borderBottomLeftRadius",
+    bbrr: "borderBottomRightRadius",
+    fwr: "flexWrap",
+    col: "color",
+    ff: "fontFamily",
+    fst: "fontStyle",
+    tr: "transform",
+    tt: "textTransform",
+    td: "textDecorationLine",
+    va: "verticalAlign",
+    ws: "whiteSpace",
+    wb: "wordBreak",
+    ww: "wordWrap",
+    brc: "borderRightColor",
+    brw: "borderRightWidth",
+    bs: "borderStyle",
+    btc: "borderTopColor",
+    btlr: "borderTopLeftRadius",
+    btrr: "borderTopRightRadius",
+    btw: "borderTopWidth",
+    bw: "borderWidth",
+    o: "opacity",
+    cur: "cursor",
+    pe: "pointerEvents",
+    ov: "overflow",
+    pos: "position",
+    dsp: "display",
+    fw: "fontWeight",
+    fs: "fontSize",
+    ls: "letterSpacing",
+    lh: "lineHeight",
+    bxs: "boxSizing",
+    bxsh: "boxShadow",
+    ox: "overflowX",
+    oy: "overflowY"
+  }, userShorthands = configIn.shorthands || {}, shorthands = __spreadValues(__spreadValues({}, builtinShorthands), userShorthands), getCSS = function() {
     return "";
   }, getNewCSS = function(opts) {
     return getCSS(__spreadValues({}, opts));
@@ -5040,6 +5128,7 @@ function createTamagui$2(configIn) {
     tokens,
     // vite made this into a function if it wasn't set
     shorthands,
+    userShorthands,
     inverseShorthands: shorthands ? Object.fromEntries(Object.entries(shorthands).map(function(param) {
       var [k, v] = param;
       return [v, k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "1.137.2",
+  "version": "1.137.3",
   "type": "module",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "removeSideEffects": true,
@@ -81,62 +81,62 @@
     }
   },
   "dependencies": {
-    "@tamagui/accordion": "1.137.2",
-    "@tamagui/adapt": "1.137.2",
-    "@tamagui/alert-dialog": "1.137.2",
-    "@tamagui/animate-presence": "1.137.2",
-    "@tamagui/avatar": "1.137.2",
-    "@tamagui/button": "1.137.2",
-    "@tamagui/card": "1.137.2",
-    "@tamagui/checkbox": "1.137.2",
-    "@tamagui/compose-refs": "1.137.2",
-    "@tamagui/constants": "1.137.2",
-    "@tamagui/core": "1.137.2",
-    "@tamagui/create-context": "1.137.2",
-    "@tamagui/dialog": "1.137.2",
-    "@tamagui/elements": "1.137.2",
-    "@tamagui/fake-react-native": "1.137.2",
-    "@tamagui/focusable": "1.137.2",
-    "@tamagui/font-size": "1.137.2",
-    "@tamagui/form": "1.137.2",
-    "@tamagui/get-button-sized": "1.137.2",
-    "@tamagui/get-font-sized": "1.137.2",
-    "@tamagui/get-token": "1.137.2",
-    "@tamagui/group": "1.137.2",
-    "@tamagui/helpers-tamagui": "1.137.2",
-    "@tamagui/image": "1.137.2",
-    "@tamagui/label": "1.137.2",
-    "@tamagui/linear-gradient": "1.137.2",
-    "@tamagui/list-item": "1.137.2",
-    "@tamagui/polyfill-dev": "1.137.2",
-    "@tamagui/popover": "1.137.2",
-    "@tamagui/popper": "1.137.2",
-    "@tamagui/portal": "1.137.2",
-    "@tamagui/progress": "1.137.2",
-    "@tamagui/radio-group": "1.137.2",
-    "@tamagui/react-native-media-driver": "1.137.2",
-    "@tamagui/scroll-view": "1.137.2",
-    "@tamagui/select": "1.137.2",
-    "@tamagui/separator": "1.137.2",
-    "@tamagui/shapes": "1.137.2",
-    "@tamagui/sheet": "1.137.2",
-    "@tamagui/slider": "1.137.2",
-    "@tamagui/stacks": "1.137.2",
-    "@tamagui/switch": "1.137.2",
-    "@tamagui/tabs": "1.137.2",
-    "@tamagui/text": "1.137.2",
-    "@tamagui/theme": "1.137.2",
-    "@tamagui/toggle-group": "1.137.2",
-    "@tamagui/tooltip": "1.137.2",
-    "@tamagui/use-controllable-state": "1.137.2",
-    "@tamagui/use-debounce": "1.137.2",
-    "@tamagui/use-force-update": "1.137.2",
-    "@tamagui/use-window-dimensions": "1.137.2",
-    "@tamagui/visually-hidden": "1.137.2",
-    "@tamagui/z-index-stack": "1.137.2"
+    "@tamagui/accordion": "1.137.3",
+    "@tamagui/adapt": "1.137.3",
+    "@tamagui/alert-dialog": "1.137.3",
+    "@tamagui/animate-presence": "1.137.3",
+    "@tamagui/avatar": "1.137.3",
+    "@tamagui/button": "1.137.3",
+    "@tamagui/card": "1.137.3",
+    "@tamagui/checkbox": "1.137.3",
+    "@tamagui/compose-refs": "1.137.3",
+    "@tamagui/constants": "1.137.3",
+    "@tamagui/core": "1.137.3",
+    "@tamagui/create-context": "1.137.3",
+    "@tamagui/dialog": "1.137.3",
+    "@tamagui/elements": "1.137.3",
+    "@tamagui/fake-react-native": "1.137.3",
+    "@tamagui/focusable": "1.137.3",
+    "@tamagui/font-size": "1.137.3",
+    "@tamagui/form": "1.137.3",
+    "@tamagui/get-button-sized": "1.137.3",
+    "@tamagui/get-font-sized": "1.137.3",
+    "@tamagui/get-token": "1.137.3",
+    "@tamagui/group": "1.137.3",
+    "@tamagui/helpers-tamagui": "1.137.3",
+    "@tamagui/image": "1.137.3",
+    "@tamagui/label": "1.137.3",
+    "@tamagui/linear-gradient": "1.137.3",
+    "@tamagui/list-item": "1.137.3",
+    "@tamagui/polyfill-dev": "1.137.3",
+    "@tamagui/popover": "1.137.3",
+    "@tamagui/popper": "1.137.3",
+    "@tamagui/portal": "1.137.3",
+    "@tamagui/progress": "1.137.3",
+    "@tamagui/radio-group": "1.137.3",
+    "@tamagui/react-native-media-driver": "1.137.3",
+    "@tamagui/scroll-view": "1.137.3",
+    "@tamagui/select": "1.137.3",
+    "@tamagui/separator": "1.137.3",
+    "@tamagui/shapes": "1.137.3",
+    "@tamagui/sheet": "1.137.3",
+    "@tamagui/slider": "1.137.3",
+    "@tamagui/stacks": "1.137.3",
+    "@tamagui/switch": "1.137.3",
+    "@tamagui/tabs": "1.137.3",
+    "@tamagui/text": "1.137.3",
+    "@tamagui/theme": "1.137.3",
+    "@tamagui/toggle-group": "1.137.3",
+    "@tamagui/tooltip": "1.137.3",
+    "@tamagui/use-controllable-state": "1.137.3",
+    "@tamagui/use-debounce": "1.137.3",
+    "@tamagui/use-force-update": "1.137.3",
+    "@tamagui/use-window-dimensions": "1.137.3",
+    "@tamagui/visually-hidden": "1.137.3",
+    "@tamagui/z-index-stack": "1.137.3"
   },
   "devDependencies": {
-    "@tamagui/build": "1.137.2",
+    "@tamagui/build": "1.137.3",
     "react": "*",
     "react-native": "^0.79.2",
     "react-native-web": "^0.20.0"