@tamagui/web 1.68.6 → 1.69.0

package/dist/cjs/hooks/useMedia.js

@@ -30,11 +30,10 @@ __export(useMedia_exports, {
   setMediaShouldUpdate: () => setMediaShouldUpdate,
   setupMediaListeners: () => setupMediaListeners,
   useMedia: () => useMedia,
-  useMediaListeners: () => useMediaListeners,
-  useMediaPropsActive: () => useMediaPropsActive
+  useMediaListeners: () => useMediaListeners
 });
 module.exports = __toCommonJS(useMedia_exports);
-var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createProxy = require("../helpers/createProxy"), import_matchMedia = require("../helpers/matchMedia"), import_propMapper = require("../helpers/propMapper"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useTheme = require("./useTheme");
+var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createProxy = require("../helpers/createProxy"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors");
 let mediaState = (
   // development only safeguard
   process.env.NODE_ENV === "development" ? (0, import_createProxy.createProxy)(
@@ -128,38 +127,6 @@ function useMedia(uid) {
     }
   });
 }
-function useMediaPropsActive(props, opts) {
-  const media = useMedia(), resolveAs = (opts == null ? void 0 : opts.resolveValues) || "none", theme = resolveAs ? (0, import_useTheme.useTheme)() : null, styleState = { theme }, shouldExpandShorthands = opts == null ? void 0 : opts.expandShorthands;
-  return (0, import_react.useMemo)(() => {
-    const config = (0, import_config.getConfig)(), next = {}, importancesUsed = {}, propNames = Object.keys(props), len = propNames.length;
-    for (let i = 0; i < len; i++) {
-      let key = propNames[i];
-      const val = props[key];
-      if (key[0] === "$") {
-        const mediaKey = key.slice(1);
-        if (!media[mediaKey])
-          continue;
-        if (val && typeof val == "object") {
-          const subKeys = Object.keys(val);
-          for (let j = subKeys.length; j--; j >= 0) {
-            let subKey = subKeys[j];
-            const value = (0, import_propMapper.getTokenForKey)(subKey, val[subKey], resolveAs, styleState);
-            shouldExpandShorthands && (subKey = config.shorthands[subKey] || subKey), mergeMediaByImportance(next, mediaKey, subKey, value, importancesUsed, !0);
-          }
-        }
-      } else
-        shouldExpandShorthands && (key = config.shorthands[key] || key), mergeMediaByImportance(
-          next,
-          "",
-          key,
-          (0, import_propMapper.getTokenForKey)(key, val, resolveAs, styleState),
-          importancesUsed,
-          !0
-        );
-    }
-    return next;
-  }, [media, props, theme, resolveAs]);
-}
 const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed, isSizeMedia) => {
   const conf = (0, import_config.getConfig)(), importance = isSizeMedia && !conf.settings.mediaPropOrder ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
   return !importancesUsed[key] || importance > importancesUsed[key] ? importance : null;
@@ -213,7 +180,6 @@ function mediaKeyMatch(key, dimensions) {
   setMediaShouldUpdate,
   setupMediaListeners,
   useMedia,
-  useMediaListeners,
-  useMediaPropsActive
+  useMediaListeners
 });
 //# sourceMappingURL=useMedia.js.map

package/dist/cjs/hooks/useMedia.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useMedia.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/hooks/useMedia.native.js

@@ -31,11 +31,10 @@ __export(useMedia_exports, {
   setMediaShouldUpdate: () => setMediaShouldUpdate,
   setupMediaListeners: () => setupMediaListeners,
   useMedia: () => useMedia,
-  useMediaListeners: () => useMediaListeners,
-  useMediaPropsActive: () => useMediaPropsActive
+  useMediaListeners: () => useMediaListeners
 });
 module.exports = __toCommonJS(useMedia_exports);
-var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createProxy = require("../helpers/createProxy"), import_matchMedia = require("../helpers/matchMedia"), import_propMapper = require("../helpers/propMapper"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useTheme = require("./useTheme");
+var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createProxy = require("../helpers/createProxy"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors");
 let mediaState = (
   // development only safeguard
   process.env.NODE_ENV === "development" ? (0, import_createProxy.createProxy)(
@@ -130,38 +129,6 @@ function useMedia(uid) {
     }
   });
 }
-function useMediaPropsActive(props, opts) {
-  const media = useMedia(), resolveAs = (opts == null ? void 0 : opts.resolveValues) || "none", theme = resolveAs ? (0, import_useTheme.useTheme)() : null, styleState = { theme }, shouldExpandShorthands = opts == null ? void 0 : opts.expandShorthands;
-  return (0, import_react.useMemo)(() => {
-    const config = (0, import_config.getConfig)(), next = {}, importancesUsed = {}, propNames = Object.keys(props), len = propNames.length;
-    for (let i = 0; i < len; i++) {
-      let key = propNames[i];
-      const val = props[key];
-      if (key[0] === "$") {
-        const mediaKey = key.slice(1);
-        if (!media[mediaKey])
-          continue;
-        if (val && typeof val == "object") {
-          const subKeys = Object.keys(val);
-          for (let j = subKeys.length; j--; j >= 0) {
-            let subKey = subKeys[j];
-            const value = (0, import_propMapper.getTokenForKey)(subKey, val[subKey], resolveAs, styleState);
-            shouldExpandShorthands && (subKey = config.shorthands[subKey] || subKey), mergeMediaByImportance(next, mediaKey, subKey, value, importancesUsed, !0);
-          }
-        }
-      } else
-        shouldExpandShorthands && (key = config.shorthands[key] || key), mergeMediaByImportance(
-          next,
-          "",
-          key,
-          (0, import_propMapper.getTokenForKey)(key, val, resolveAs, styleState),
-          importancesUsed,
-          !0
-        );
-    }
-    return next;
-  }, [media, props, theme, resolveAs]);
-}
 const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed, isSizeMedia) => {
   const conf = (0, import_config.getConfig)(), importance = isSizeMedia && !conf.settings.mediaPropOrder ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
   return !importancesUsed[key] || importance > importancesUsed[key] ? importance : null;
@@ -215,7 +182,6 @@ function mediaKeyMatch(key, dimensions) {
   setMediaShouldUpdate,
   setupMediaListeners,
   useMedia,
-  useMediaListeners,
-  useMediaPropsActive
+  useMediaListeners
 });
 //# sourceMappingURL=useMedia.js.map

package/dist/cjs/hooks/useMedia.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useMedia.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["update"]
 }

package/dist/cjs/hooks/useProps.js

@@ -14,18 +14,52 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useProps_exports = {};
 __export(useProps_exports, {
-  useProps: () => useProps
+  useProps: () => useProps,
+  usePropsAndStyle: () => usePropsAndStyle,
+  useStyle: () => useStyle
 });
 module.exports = __toCommonJS(useProps_exports);
-var import_useMedia = require("./useMedia");
+var import_react = require("react"), import_ComponentContext = require("../contexts/ComponentContext"), import_defaultComponentState = require("../defaultComponentState"), import_getSplitStyles = require("../helpers/getSplitStyles"), import_Stack = require("../views/Stack"), import_useMedia = require("./useMedia"), import_useTheme = require("./useTheme");
 function useProps(props, opts) {
-  return (0, import_useMedia.useMediaPropsActive)(props, {
-    expandShorthands: !(opts != null && opts.disableExpandShorthands),
-    resolveValues: opts == null ? void 0 : opts.resolveValues
+  const [propsOut, styleOut] = usePropsAndStyle(props, {
+    ...opts,
+    noExpand: !0,
+    noNormalize: !0,
+    resolveValues: "none"
   });
+  return {
+    ...propsOut,
+    ...styleOut
+  };
+}
+function useStyle(props, opts) {
+  return usePropsAndStyle(props, opts)[1];
+}
+function usePropsAndStyle(props, opts) {
+  var _a;
+  const staticConfig = ((_a = opts == null ? void 0 : opts.forComponent) == null ? void 0 : _a.staticConfig) ?? import_Stack.Stack.staticConfig, [themeState, theme] = (0, import_useTheme.useThemeWithState)({
+    componentName: staticConfig.componentName
+  }), componentContext = (0, import_react.useContext)(import_ComponentContext.ComponentContext), media = (0, import_useMedia.useMedia)(), splitStyles = (0, import_getSplitStyles.useSplitStyles)(
+    props,
+    staticConfig,
+    theme,
+    themeState.state.name,
+    import_defaultComponentState.defaultComponentStateMounted,
+    {
+      isAnimated: !1,
+      mediaState: media,
+      noClassNames: !0,
+      ...opts
+    },
+    null,
+    componentContext
+  );
+  return [splitStyles.viewProps, splitStyles.style];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useProps
+  useProps,
+  usePropsAndStyle,
+  useStyle
 });
 //# sourceMappingURL=useProps.js.map

package/dist/cjs/hooks/useProps.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useProps.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,sBAAoC;AAQ7B,SAAS,SACd,OACA,MAOA;AACA,aAAO,qCAAoB,OAAO;AAAA,IAChC,kBAAkB,EAAC,qBAAM;AAAA,IACzB,eAAe,6BAAM;AAAA,EACvB,CAAC;AACH;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B,kBAE3B,0BAAiC,yCACjC,+BAA6C,qCAC7C,wBAA+B,sCAE/B,eAAsB,2BACtB,kBAAyB,uBACzB,kBAAkC;AAqB3B,SAAS,SACd,OACA,MACmB;AACnB,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MACmB;AACnB,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACwC;AAnE1C;AAoEE,QAAM,iBAAe,kCAAM,iBAAN,mBAAoB,iBAAgB,mBAAM,cACzD,CAAC,YAAY,KAAK,QAAI,mCAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,uBAAmB,yBAAW,wCAAgB,GAC9C,YAAQ,0BAAS,GACjB,kBAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,MAAM;AAAA,IACjB;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,KAAK;AAClD;",
   "names": []
 }

package/dist/cjs/hooks/useProps.native.js

@@ -15,18 +15,52 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useProps_exports = {};
 __export(useProps_exports, {
-  useProps: () => useProps
+  useProps: () => useProps,
+  usePropsAndStyle: () => usePropsAndStyle,
+  useStyle: () => useStyle
 });
 module.exports = __toCommonJS(useProps_exports);
-var import_useMedia = require("./useMedia");
+var import_react = require("react"), import_ComponentContext = require("../contexts/ComponentContext"), import_defaultComponentState = require("../defaultComponentState"), import_getSplitStyles = require("../helpers/getSplitStyles"), import_Stack = require("../views/Stack"), import_useMedia = require("./useMedia"), import_useTheme = require("./useTheme");
 function useProps(props, opts) {
-  return (0, import_useMedia.useMediaPropsActive)(props, {
-    expandShorthands: !(opts != null && opts.disableExpandShorthands),
-    resolveValues: opts == null ? void 0 : opts.resolveValues
+  const [propsOut, styleOut] = usePropsAndStyle(props, {
+    ...opts,
+    noExpand: !0,
+    noNormalize: !0,
+    resolveValues: "none"
   });
+  return {
+    ...propsOut,
+    ...styleOut
+  };
+}
+function useStyle(props, opts) {
+  return usePropsAndStyle(props, opts)[1];
+}
+function usePropsAndStyle(props, opts) {
+  var _a;
+  const staticConfig = ((_a = opts == null ? void 0 : opts.forComponent) == null ? void 0 : _a.staticConfig) ?? import_Stack.Stack.staticConfig, [themeState, theme] = (0, import_useTheme.useThemeWithState)({
+    componentName: staticConfig.componentName
+  }), componentContext = (0, import_react.useContext)(import_ComponentContext.ComponentContext), media = (0, import_useMedia.useMedia)(), splitStyles = (0, import_getSplitStyles.useSplitStyles)(
+    props,
+    staticConfig,
+    theme,
+    themeState.state.name,
+    import_defaultComponentState.defaultComponentStateMounted,
+    {
+      isAnimated: !1,
+      mediaState: media,
+      noClassNames: !0,
+      ...opts
+    },
+    null,
+    componentContext
+  );
+  return [splitStyles.viewProps, splitStyles.style];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useProps
+  useProps,
+  usePropsAndStyle,
+  useStyle
 });
 //# sourceMappingURL=useProps.js.map

package/dist/cjs/hooks/useProps.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useProps.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,sBAAoC;AAQ7B,SAAS,SACd,OACA,MAOA;AACA,aAAO,qCAAoB,OAAO;AAAA,IAChC,kBAAkB,EAAC,qBAAM;AAAA,IACzB,eAAe,6BAAM;AAAA,EACvB,CAAC;AACH;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B,kBAE3B,0BAAiC,yCACjC,+BAA6C,qCAC7C,wBAA+B,sCAE/B,eAAsB,2BACtB,kBAAyB,uBACzB,kBAAkC;AAqB3B,SAAS,SACd,OACA,MACmB;AACnB,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MACmB;AACnB,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACwC;AAnE1C;AAoEE,QAAM,iBAAe,kCAAM,iBAAN,mBAAoB,iBAAgB,mBAAM,cACzD,CAAC,YAAY,KAAK,QAAI,mCAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,uBAAmB,yBAAW,wCAAgB,GAC9C,YAAQ,0BAAS,GACjB,kBAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,MAAM;AAAA,IACjB;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,KAAK;AAClD;",
   "names": []
 }

package/dist/cjs/index.js

@@ -26,8 +26,7 @@ __export(src_exports, {
   mediaState: () => import_useMedia.mediaState,
   setupDev: () => import_config.setupDev,
   updateConfig: () => import_config.updateConfig,
-  useMedia: () => import_useMedia.useMedia,
-  useMediaPropsActive: () => import_useMedia.useMediaPropsActive
+  useMedia: () => import_useMedia.useMedia
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./Tamagui"), module.exports);
@@ -71,7 +70,6 @@ __reExport(src_exports, require("./helpers/withStaticProperties"), module.export
 var import_useMedia = require("./hooks/useMedia");
 __reExport(src_exports, require("./hooks/useTheme"), module.exports);
 __reExport(src_exports, require("./hooks/useThemeName"), module.exports);
-__reExport(src_exports, require("./hooks/useStyle"), module.exports);
 __reExport(src_exports, require("./hooks/useAnimationDriver"), module.exports);
 __reExport(src_exports, require("./hooks/useIsTouchDevice"), module.exports);
 __reExport(src_exports, require("./hooks/useProps"), module.exports);
@@ -105,7 +103,6 @@ __reExport(src_exports, require("./setupHooks"), module.exports);
   setupDev,
   updateConfig,
   useMedia,
-  useMediaPropsActive,
   ...require("./Tamagui"),
   ...require("./createComponent"),
   ...require("./createShorthands"),
@@ -145,7 +142,6 @@ __reExport(src_exports, require("./setupHooks"), module.exports);
   ...require("./helpers/withStaticProperties"),
   ...require("./hooks/useTheme"),
   ...require("./hooks/useThemeName"),
-  ...require("./hooks/useStyle"),
   ...require("./hooks/useAnimationDriver"),
   ...require("./hooks/useIsTouchDevice"),
   ...require("./hooks/useProps"),

package/dist/cjs/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAaA,wBAAc,oBAbd;AAcA,wBAAc,gCAdd;AAgBA,oBAQO;AAEP,wBAAc,kCA1Bd;AA4BA,wBAAc,wCA5Bd;AA8BA,wBAAc,0CA9Bd;AA+BA,wBAAc,mCA/Bd;AAgCA,wBAAc,iCAhCd;AAiCA,wBAAc,yCAjCd;AAkCA,wBAAc,4CAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,sCApCd;AAqCA,wBAAc,uCArCd;AAsCA,wBAAc,uCAtCd;AAuCA,wBAAc,yCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,iCAzCd;AA0CA,wBAAc,iCA1Cd;AA2CA,wBAAc,qCA3Cd;AA4CA,wBAAc,0CA5Cd;AA6CA,wBAAc,0CA7Cd;AA8CA,wBAAc,wCA9Cd;AA+CA,wBAAc,gCA/Cd;AAgDA,wBAAc,6BAhDd;AAiDA,wBAAc,4CAjDd;AAkDA,wBAAc,2CAlDd;AAoDA,sBAQO;AACP,wBAAc,6BA7Dd;AA8DA,wBAAc,iCA9Dd;AA+DA,wBAAc,6BA/Dd;AAgEA,wBAAc,uCAhEd;AAiEA,wBAAc,qCAjEd;AAkEA,wBAAc,6BAlEd;AAoEA,wBAAc,yBApEd;AAqEA,wBAAc,0BArEd;AAsEA,wBAAc,yBAtEd;AAuEA,wBAAc,yBAvEd;AAwEA,wBAAc,0BAxEd;AAyEA,wBAAc,kCAzEd;AA0EA,wBAAc,iCA1Ed;AA2EA,wBAAc,oCA3Ed;AA4EA,wBAAc,4CA5Ed;AA8EA,wBAAc,wCA9Ed;AA+EA,wBAAc,+BA/Ed;AAgFA,wBAAc,kCAhFd;AAiFA,wBAAc,6BAjFd;AAkFA,wBAAc,+BAlFd;AAoFA,wBAAc,yBApFd;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAaA,wBAAc,oBAbd;AAcA,wBAAc,gCAdd;AAgBA,oBAQO;AAEP,wBAAc,kCA1Bd;AA4BA,wBAAc,wCA5Bd;AA8BA,wBAAc,0CA9Bd;AA+BA,wBAAc,mCA/Bd;AAgCA,wBAAc,iCAhCd;AAiCA,wBAAc,yCAjCd;AAkCA,wBAAc,4CAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,sCApCd;AAqCA,wBAAc,uCArCd;AAsCA,wBAAc,uCAtCd;AAuCA,wBAAc,yCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,iCAzCd;AA0CA,wBAAc,iCA1Cd;AA2CA,wBAAc,qCA3Cd;AA4CA,wBAAc,0CA5Cd;AA6CA,wBAAc,0CA7Cd;AA8CA,wBAAc,wCA9Cd;AA+CA,wBAAc,gCA/Cd;AAgDA,wBAAc,6BAhDd;AAiDA,wBAAc,4CAjDd;AAkDA,wBAAc,2CAlDd;AAoDA,sBAOO;AACP,wBAAc,6BA5Dd;AA6DA,wBAAc,iCA7Dd;AA8DA,wBAAc,uCA9Dd;AA+DA,wBAAc,qCA/Dd;AAgEA,wBAAc,6BAhEd;AAkEA,wBAAc,yBAlEd;AAmEA,wBAAc,0BAnEd;AAoEA,wBAAc,yBApEd;AAqEA,wBAAc,yBArEd;AAsEA,wBAAc,0BAtEd;AAuEA,wBAAc,kCAvEd;AAwEA,wBAAc,iCAxEd;AAyEA,wBAAc,oCAzEd;AA0EA,wBAAc,4CA1Ed;AA4EA,wBAAc,wCA5Ed;AA6EA,wBAAc,+BA7Ed;AA8EA,wBAAc,kCA9Ed;AA+EA,wBAAc,6BA/Ed;AAgFA,wBAAc,+BAhFd;AAkFA,wBAAc,yBAlFd;",
   "names": []
 }

package/dist/cjs/index.native.js

@@ -27,8 +27,7 @@ __export(src_exports, {
   mediaState: () => import_useMedia.mediaState,
   setupDev: () => import_config.setupDev,
   updateConfig: () => import_config.updateConfig,
-  useMedia: () => import_useMedia.useMedia,
-  useMediaPropsActive: () => import_useMedia.useMediaPropsActive
+  useMedia: () => import_useMedia.useMedia
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./Tamagui"), module.exports);
@@ -72,7 +71,6 @@ __reExport(src_exports, require("./helpers/withStaticProperties"), module.export
 var import_useMedia = require("./hooks/useMedia");
 __reExport(src_exports, require("./hooks/useTheme"), module.exports);
 __reExport(src_exports, require("./hooks/useThemeName"), module.exports);
-__reExport(src_exports, require("./hooks/useStyle"), module.exports);
 __reExport(src_exports, require("./hooks/useAnimationDriver"), module.exports);
 __reExport(src_exports, require("./hooks/useIsTouchDevice"), module.exports);
 __reExport(src_exports, require("./hooks/useProps"), module.exports);
@@ -106,7 +104,6 @@ __reExport(src_exports, require("./setupHooks"), module.exports);
   setupDev,
   updateConfig,
   useMedia,
-  useMediaPropsActive,
   ...require("./Tamagui"),
   ...require("./createComponent"),
   ...require("./createShorthands"),
@@ -146,7 +143,6 @@ __reExport(src_exports, require("./setupHooks"), module.exports);
   ...require("./helpers/withStaticProperties"),
   ...require("./hooks/useTheme"),
   ...require("./hooks/useThemeName"),
-  ...require("./hooks/useStyle"),
   ...require("./hooks/useAnimationDriver"),
   ...require("./hooks/useIsTouchDevice"),
   ...require("./hooks/useProps"),

package/dist/cjs/index.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAaA,wBAAc,oBAbd;AAcA,wBAAc,gCAdd;AAgBA,oBAQO;AAEP,wBAAc,kCA1Bd;AA4BA,wBAAc,wCA5Bd;AA8BA,wBAAc,0CA9Bd;AA+BA,wBAAc,mCA/Bd;AAgCA,wBAAc,iCAhCd;AAiCA,wBAAc,yCAjCd;AAkCA,wBAAc,4CAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,sCApCd;AAqCA,wBAAc,uCArCd;AAsCA,wBAAc,uCAtCd;AAuCA,wBAAc,yCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,iCAzCd;AA0CA,wBAAc,iCA1Cd;AA2CA,wBAAc,qCA3Cd;AA4CA,wBAAc,0CA5Cd;AA6CA,wBAAc,0CA7Cd;AA8CA,wBAAc,wCA9Cd;AA+CA,wBAAc,gCA/Cd;AAgDA,wBAAc,6BAhDd;AAiDA,wBAAc,4CAjDd;AAkDA,wBAAc,2CAlDd;AAoDA,sBAQO;AACP,wBAAc,6BA7Dd;AA8DA,wBAAc,iCA9Dd;AA+DA,wBAAc,6BA/Dd;AAgEA,wBAAc,uCAhEd;AAiEA,wBAAc,qCAjEd;AAkEA,wBAAc,6BAlEd;AAoEA,wBAAc,yBApEd;AAqEA,wBAAc,0BArEd;AAsEA,wBAAc,yBAtEd;AAuEA,wBAAc,yBAvEd;AAwEA,wBAAc,0BAxEd;AAyEA,wBAAc,kCAzEd;AA0EA,wBAAc,iCA1Ed;AA2EA,wBAAc,oCA3Ed;AA4EA,wBAAc,4CA5Ed;AA8EA,wBAAc,wCA9Ed;AA+EA,wBAAc,+BA/Ed;AAgFA,wBAAc,kCAhFd;AAiFA,wBAAc,6BAjFd;AAkFA,wBAAc,+BAlFd;AAoFA,wBAAc,yBApFd;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAaA,wBAAc,oBAbd;AAcA,wBAAc,gCAdd;AAgBA,oBAQO;AAEP,wBAAc,kCA1Bd;AA4BA,wBAAc,wCA5Bd;AA8BA,wBAAc,0CA9Bd;AA+BA,wBAAc,mCA/Bd;AAgCA,wBAAc,iCAhCd;AAiCA,wBAAc,yCAjCd;AAkCA,wBAAc,4CAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,sCApCd;AAqCA,wBAAc,uCArCd;AAsCA,wBAAc,uCAtCd;AAuCA,wBAAc,yCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,iCAzCd;AA0CA,wBAAc,iCA1Cd;AA2CA,wBAAc,qCA3Cd;AA4CA,wBAAc,0CA5Cd;AA6CA,wBAAc,0CA7Cd;AA8CA,wBAAc,wCA9Cd;AA+CA,wBAAc,gCA/Cd;AAgDA,wBAAc,6BAhDd;AAiDA,wBAAc,4CAjDd;AAkDA,wBAAc,2CAlDd;AAoDA,sBAOO;AACP,wBAAc,6BA5Dd;AA6DA,wBAAc,iCA7Dd;AA8DA,wBAAc,uCA9Dd;AA+DA,wBAAc,qCA/Dd;AAgEA,wBAAc,6BAhEd;AAkEA,wBAAc,yBAlEd;AAmEA,wBAAc,0BAnEd;AAoEA,wBAAc,yBApEd;AAqEA,wBAAc,yBArEd;AAsEA,wBAAc,0BAtEd;AAuEA,wBAAc,kCAvEd;AAwEA,wBAAc,iCAxEd;AAyEA,wBAAc,oCAzEd;AA0EA,wBAAc,4CA1Ed;AA4EA,wBAAc,wCA5Ed;AA6EA,wBAAc,+BA7Ed;AA8EA,wBAAc,kCA9Ed;AA+EA,wBAAc,6BA/Ed;AAgFA,wBAAc,+BAhFd;AAkFA,wBAAc,yBAlFd;",
   "names": []
 }

package/dist/esm/createComponent.js

@@ -219,13 +219,13 @@ function createComponent(staticConfig) {
       stateRef
     );
     process.env.NODE_ENV === "development" && time && time`media`, setDidGetVariableValue(!1);
-    const resolveVariablesAs = (
+    const resolveValues = (
       // if HOC + mounted + has animation prop, resolve as value so it passes non-variable to child
       isAnimated && !supportsCSSVars || isHOC && state.unmounted == !1 && hasAnimationProp ? "value" : "auto"
     ), keepStyleSSR = willBeAnimated && animationsConfig?.keepStyleSSR, styleProps = {
       mediaState,
       noClassNames,
-      resolveVariablesAs,
+      resolveValues,
       isExiting,
       isAnimated,
       keepStyleSSR
@@ -284,15 +284,15 @@ function createComponent(staticConfig) {
     const {
       asChild,
       children,
+      themeShallow,
+      spaceDirection: _spaceDirection,
+      disabled: disabledProp,
       onPress,
       onLongPress,
       onPressIn,
       onPressOut,
       onHoverIn,
       onHoverOut,
-      themeShallow,
-      spaceDirection: _spaceDirection,
-      disabled: disabledProp,
       onMouseUp,
       onMouseDown,
       onMouseEnter,
@@ -401,24 +401,24 @@ If you meant to do this, you can disable this warning - either change untilMeasu
     isReactNative && process.env.NODE_ENV === "development" && Object.keys(viewProps).forEach((key) => {
       key.startsWith("data-") && (viewProps.dataSet ??= {}, viewProps.dataSet[key.replace("data-", "")] = viewProps[key], delete viewProps[key]);
     });
-    const runtimePressStyle = !disabled && noClassNames && pseudos?.pressStyle, attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && pseudos?.hoverStyle, isHoverable = isWeb && !!(groupName || runtimeHoverStyle || onHoverIn || onHoverOut || onMouseEnter || onMouseLeave), handlesPressEvents = !(isWeb || asChild), shouldAttach = !!(attachPress || isHoverable || noClassNames && "pressStyle" in props || isWeb && noClassNames && "hoverStyle" in props);
+    const runtimePressStyle = !disabled && noClassNames && pseudos?.pressStyle, attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), needsHoverState = !disabled && noClassNames && pseudos?.hoverStyle || onHoverIn || onHoverOut, isHoverable = isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), handlesPressEvents = !(isWeb || asChild), shouldAttach = !!(attachPress || isHoverable || noClassNames && "pressStyle" in props || isWeb && noClassNames && "hoverStyle" in props);
     process.env.NODE_ENV === "development" && time && time`events-setup`;
-    const events = shouldAttach && !isDisabled && !asChild ? {
+    const events = shouldAttach && !isDisabled && !props.asChild ? {
       onPressOut: attachPress ? (e) => {
         unPress(), onPressOut?.(e), onMouseUp?.(e);
       } : void 0,
       ...(isHoverable || attachPress) && {
         onMouseEnter: (e) => {
           const next = {};
-          next.hover = !0, state.pressIn && (next.press = !0), setStateShallow(next), onHoverIn?.(e), onMouseEnter?.(e);
+          needsHoverState && (next.hover = !0), runtimePressStyle && state.pressIn && (next.press = !0), setStateShallow(next), onHoverIn?.(e), onMouseEnter?.(e);
         },
         onMouseLeave: (e) => {
           const next = {};
-          mouseUps.add(unPress), next.hover = !1, state.pressIn && (next.press = !1, next.pressIn = !1), setStateShallow(next), onHoverOut?.(e), onMouseLeave?.(e);
+          mouseUps.add(unPress), needsHoverState && (next.hover = !1), runtimePressStyle && state.pressIn && (next.press = !1, next.pressIn = !1), setStateShallow(next), onHoverOut?.(e), onMouseLeave?.(e);
         }
       },
       onPressIn: attachPress ? (e) => {
-        setStateShallow({
+        runtimePressStyle && setStateShallow({
           press: !0,
           pressIn: !0
         }), onPressIn?.(e), onMouseDown?.(e), isWeb && mouseUps.add(unPress);
@@ -438,12 +438,28 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       isZStack,
       debug: debugProp
     });
-    asChild && (elementType = Slot, Object.assign(viewProps, {
-      onPress,
-      onLongPress,
-      onPressIn,
-      onPressOut
-    })), process.env.NODE_ENV === "development" && time && time`spaced-as-child`, // in test mode disable perf unwrapping so react-testing-library finds Text properly
+    if (asChild) {
+      elementType = Slot;
+      {
+        const passEvents = {
+          onPress,
+          onLongPress,
+          onPressIn,
+          onPressOut,
+          onHoverIn,
+          onHoverOut,
+          onMouseUp,
+          onMouseDown,
+          onMouseEnter,
+          onMouseLeave
+        };
+        Object.assign(
+          viewProps,
+          asChild === "web" || asChild === "except-style-web" ? getWebEvents(passEvents) : passEvents
+        );
+      }
+    }
+    process.env.NODE_ENV === "development" && time && time`spaced-as-child`, // in test mode disable perf unwrapping so react-testing-library finds Text properly
     process.env.NODE_ENV, content = createElement(elementType, viewProps, content), process.env.NODE_ENV === "development" && time && time`create-element`;
     const subGroupContext = useMemo(() => {
       if (groupName)
@@ -468,15 +484,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       "span",
       {
         className: `${isAnimatedReactNativeWeb ? className : ""} _dsp_contents`,
-        ...events && {
-          onMouseEnter: events.onMouseEnter,
-          onMouseLeave: events.onMouseLeave,
-          onClick: events.onPress,
-          onMouseDown: events.onPressIn,
-          onMouseUp: events.onPressOut,
-          onTouchStart: events.onPressIn,
-          onTouchEnd: events.onPressOut
-        },
+        ...events && getWebEvents(events),
         children: content
       }
     )), overriddenContextProps) {
@@ -550,6 +558,17 @@ If you meant to do this, you can disable this warning - either change untilMeasu
   }
   return res.extractable = extractable, res.styleable = styleable, res;
 }
+function getWebEvents(events) {
+  return {
+    onMouseEnter: events.onMouseEnter,
+    onMouseLeave: events.onMouseLeave,
+    onClick: events.onPress,
+    onMouseDown: events.onPressIn,
+    onMouseUp: events.onPressOut,
+    onTouchStart: events.onPressIn,
+    onTouchEnd: events.onPressOut
+  };
+}
 function Unspaced(props) {
   return props.children;
 }