@tamagui/web 1.41.0 → 1.42.0

package/dist/esm/hooks/useMedia.js

@@ -3,6 +3,7 @@ import { useMemo, useSyncExternalStore } from "react";
 import { getConfig } from "../config";
 import { createProxy } from "../helpers/createProxy";
 import { matchMedia } from "../helpers/matchMedia";
+import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
 import { useSafeRef } from "./useSafeRef";
 let mediaState = (
   // development only safeguard
@@ -22,16 +23,21 @@ let mediaState = (
 const mediaQueryConfig = {};
 const getMedia = () => mediaState;
 const mediaKeys = /* @__PURE__ */ new Set();
-const isMediaKey = (key) => mediaKeys.has(key);
+const isMediaKey = (key) => mediaKeys.has(key) || key.startsWith("$platform-") || key.startsWith("$theme-");
 let initState;
 const getInitialMediaState = () => {
   return (getConfig().disableSSR ? mediaState : initState) || {};
 };
+const defaultMediaImportance = Object.keys(pseudoDescriptors).length;
 let mediaKeysOrdered;
 const getMediaKeyImportance = (key) => {
   if (process.env.NODE_ENV === "development" && key[0] === "$") {
     throw new Error("use short key");
   }
+  const conf = getConfig();
+  if (conf.settings.mediaPropOrder) {
+    return defaultMediaImportance;
+  }
   return mediaKeysOrdered.indexOf(key) + 100;
 };
 const dispose = /* @__PURE__ */ new Set();
@@ -171,25 +177,31 @@ function useMediaPropsActive(props, opts) {
             if (shouldExpandShorthands) {
               subKey = config.shorthands[subKey] || subKey;
             }
-            mergeMediaByImportance(next, mediaKey, subKey, value, importancesUsed);
+            mergeMediaByImportance(next, mediaKey, subKey, value, importancesUsed, true);
           }
         }
       } else {
         if (shouldExpandShorthands) {
           key = config.shorthands[key] || key;
         }
-        mergeMediaByImportance(next, "", key, val, importancesUsed);
+        mergeMediaByImportance(next, "", key, val, importancesUsed, true);
       }
     }
     return next;
   }, [media, props]);
 }
-const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed) => {
-  const importance = getMediaKeyImportance(mediaKey);
+const getMediaImportanceIfMoreImportant = (mediaKey, key, importancesUsed, isSizeMedia) => {
+  const conf = getConfig();
+  const importance = isSizeMedia && !conf.settings.mediaPropOrder ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
   return !importancesUsed[key] || importance > importancesUsed[key] ? importance : null;
 };
-function mergeMediaByImportance(onto, mediaKey, key, value, importancesUsed) {
-  const importance = getMediaImportanceIfMoreImportant(mediaKey, key, importancesUsed);
+function mergeMediaByImportance(onto, mediaKey, key, value, importancesUsed, isSizeMedia) {
+  const importance = getMediaImportanceIfMoreImportant(
+    mediaKey,
+    key,
+    importancesUsed,
+    isSizeMedia
+  );
   if (importance === null) {
     return false;
   }

package/dist/esm/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": ["update"]
 }

package/dist/esm/hooks/useStyle.js

@@ -4,17 +4,17 @@ import { FontLanguageContext } from "../contexts/FontLanguageContext";
 import { TextAncestorContext } from "../contexts/TextAncestorContext";
 import { useSplitStyles } from "../helpers/getSplitStyles";
 import { useMedia } from "./useMedia";
-import { useTheme } from "./useTheme";
+import { useThemeWithState } from "./useTheme";
 function useStyle(base, style, options) {
   const isText = base.staticConfig.isText;
   const hasTextAncestor = !!(isWeb && isText ? useContext(TextAncestorContext) : false);
   const languageContext = isRSC ? null : useContext(FontLanguageContext);
-  const theme = useTheme();
+  const themeState = useThemeWithState({});
   const media = useMedia();
   const out = useSplitStyles(
     style,
     base.staticConfig,
-    theme,
+    themeState,
     {
       ...options,
       mediaState: media,

package/dist/esm/hooks/useStyle.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useStyle.tsx"],
-  "mappings": "AAAA,SAAS,OAAO,aAAa;AAC7B,SAAS,kBAAkB;AAE3B,SAAS,2BAA2B;AACpC,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAQ/B,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAElB,SAAS,SAId,MACA,OACA,SACA;AACA,QAAM,SAAS,KAAK,aAAa;AACjC,QAAM,kBAAkB,CAAC,EAAE,SAAS,SAAS,WAAW,mBAAmB,IAAI;AAC/E,QAAM,kBAAkB,QAAQ,OAAO,WAAW,mBAAmB;AACrE,QAAM,QAAQ,SAAS;AACvB,QAAM,QAAQ,SAAS;AACvB,QAAM,MAAM;AAAA,IACV;AAAA,IACA,KAAK;AAAA,IACL;AAAA,IACA;AAAA,MACE,GAAI;AAAA,MACJ,YAAY;AAAA,MACZ;AAAA,MACA,oBAAoB;AAAA,IACtB;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,IACnB,SAAS,SAAS;AAAA,IAClB,mCAAS;AAAA,EACX;AACA,SAAO;AAAA,IACL,OAAO,OAAO,KAAK,IAAI,KAAK,EAAE,SAAS,IAAI,QAAQ;AAAA,IACnD,YAAY,IAAI;AAAA,EAClB;AACF;",
+  "mappings": "AAAA,SAAS,OAAO,aAAa;AAC7B,SAAS,kBAAkB;AAE3B,SAAS,2BAA2B;AACpC,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAQ/B,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAE3B,SAAS,SAId,MACA,OACA,SACA;AACA,QAAM,SAAS,KAAK,aAAa;AACjC,QAAM,kBAAkB,CAAC,EAAE,SAAS,SAAS,WAAW,mBAAmB,IAAI;AAC/E,QAAM,kBAAkB,QAAQ,OAAO,WAAW,mBAAmB;AACrE,QAAM,aAAa,kBAAkB,CAAC,CAAC;AACvC,QAAM,QAAQ,SAAS;AACvB,QAAM,MAAM;AAAA,IACV;AAAA,IACA,KAAK;AAAA,IACL;AAAA,IACA;AAAA,MACE,GAAI;AAAA,MACJ,YAAY;AAAA,MACZ;AAAA,MACA,oBAAoB;AAAA,IACtB;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,IACnB,SAAS,SAAS;AAAA,IAClB,mCAAS;AAAA,EACX;AACA,SAAO;AAAA,IACL,OAAO,OAAO,KAAK,IAAI,KAAK,EAAE,SAAS,IAAI,QAAQ;AAAA,IACnD,YAAY,IAAI;AAAA,EAClB;AACF;",
   "names": []
 }

package/dist/esm/hooks/useTheme.js

@@ -32,7 +32,7 @@ const useThemeWithState = (props) => {
     keys.current,
     isClient ? () => {
       var _a;
-      return ((_a = props.shouldUpdate) == null ? void 0 : _a.call(props)) ?? keys.current.length === 0;
+      return ((_a = props.shouldUpdate) == null ? void 0 : _a.call(props)) ?? (keys.current.length > 0 ? true : void 0);
     } : void 0
   );
   const { themeManager, theme, name, className } = changedTheme;
@@ -77,32 +77,31 @@ function getThemeProxied({
       if (key === GetThemeUnwrapped) {
         return theme;
       }
-      if (key === "__proto__" || key === "$typeof" || typeof key !== "string" || !themeManager) {
-        return Reflect.get(_, key);
-      }
-      const keyString = key[0] === "$" ? key.slice(1) : key;
-      const val = themeManager.getValue(keyString);
-      if (val && keys) {
-        return new Proxy(val, {
-          // when they touch the actual value we only track it
-          // if its a variable (web), its ignored!
-          get(_2, subkey) {
-            if ((subkey === "val" || subkey === "get" && !isWeb) && !keys.includes(keyString)) {
-              keys.push(keyString);
-            }
-            if (subkey === "get") {
-              return () => getVariable(val);
+      if (typeof key === "string" && keys) {
+        const keyString = key[0] === "$" ? key.slice(1) : key;
+        const val = themeManager.getValue(keyString);
+        if (val && typeof val === "object") {
+          return new Proxy(val, {
+            // when they touch the actual value we only track it
+            // if its a variable (web), its ignored!
+            get(_2, subkey) {
+              if ((subkey === "val" || subkey === "get" && !isWeb) && !keys.includes(keyString)) {
+                keys.push(keyString);
+              }
+              if (subkey === "get") {
+                return () => getVariable(val);
+              }
+              return Reflect.get(val, subkey);
             }
-            return Reflect.get(val, subkey);
-          }
-        });
+          });
+        }
       }
-      return val;
+      return Reflect.get(_, key);
     }
   });
 }
 const activeThemeManagers = /* @__PURE__ */ new Set();
-const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
+const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
   if (isRSC) {
     return {
       isNewTheme: false,
@@ -129,13 +128,18 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
   const { state, mounted, isNewTheme, themeManager } = themeState;
   const isInversingOnMount = Boolean(!themeState.mounted && props.inverse);
   function getShouldUpdateTheme(manager = themeManager, nextState, prevState = state, forceShouldChange = false) {
-    const next = nextState || manager.getState(props, parentManager);
-    if (!next)
+    if (forceShouldChange)
       return;
-    if ((disableUpdate == null ? void 0 : disableUpdate()) === true)
+    const forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
+    if (forceUpdate === false)
       return;
-    if (!forceShouldChange && !manager.getStateShouldChange(next, prevState))
+    const next = nextState || manager.getState(props, parentManager);
+    if (!next)
       return;
+    if (forceUpdate !== true) {
+      if (!manager.getStateShouldChange(next, prevState))
+        return;
+    }
     return next;
   }
   if (!isServer) {
@@ -164,12 +168,13 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
         }
       });
       const disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme((name, manager) => {
-        const shouldUpdate = Boolean((keys == null ? void 0 : keys.length) || isNewTheme);
+        const force = shouldUpdate == null ? void 0 : shouldUpdate();
+        const doUpdate = force ?? Boolean((keys == null ? void 0 : keys.length) || isNewTheme);
         if (process.env.NODE_ENV === "development" && props.debug) {
-          const logs = { shouldUpdate, props, name, manager, keys };
+          const logs = { force, doUpdate, props, name, manager, keys };
           console.log(` \u{1F538} onChange`, themeManager.id, logs);
         }
-        if (shouldUpdate) {
+        if (doUpdate) {
           setThemeState(createState);
         }
       }, themeManager.id);
@@ -213,7 +218,7 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
     themeManager
   };
   function createState(prev, force = false) {
-    if (prev && (disableUpdate == null ? void 0 : disableUpdate())) {
+    if (prev && (shouldUpdate == null ? void 0 : shouldUpdate()) === false) {
       return prev;
     }
     let themeManager2 = parentManager;

package/dist/esm/hooks/useTheme.js.map

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

package/dist/esm/styled.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/styled.tsx"],
-  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAEhC,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,MAAI,YAAiB,yBACjB,eACA,yDAAoB,cAAa;AAErC,QAAM,oBAAoB,qBAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,kBACpB,qBAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AA7FnC;AA8FI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,qBAAW,cAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,MAChD;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,CAAC;AAyCzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,uBAAuB;AAEhC,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AAuC9B,SAAS,OAId,aAEA,SAOA,yBACA;AAEA,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,QAAI,CAAC,aAAa;AAChB,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,mCAAS,UAAU;AACrB,iBAAW,OAAO,QAAQ,UAAU;AAClC,YAAI,OAAO,eAAe;AACxB,kBAAQ;AAAA,YACN,gDAAgD;AAAA,UAClD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,qBAAqB,YAAY,cAAc;AAErD,QAAM,yBACJ,CAAC,CAAC,sBACF,EAAE,mBAAmB,iBAAiB,mBAAmB;AAE3D,MAAI,YAAiB,yBACjB,eACA,yDAAoB,cAAa;AAErC,QAAM,oBAAoB,qBAAqB,SAAS;AACxD,QAAM,gBAAgB;AAAA,IACpB,sBACE,mEAAyB,mBACzB,yDAAoB,kBACpB,qBAAqB,yDAAoB,SAAS;AAAA,EACtD;AAEA,QAAM,qBAAqB,MAAM;AA7FnC;AA8FI,QAAI,SAAS;AACX,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA,kBAAkB;AAAA,QAClB;AAAA,QACA,GAAG;AAAA,MACL,IAAI;AAEJ,UAAI,oBAAoB;AACtB,cAAM,QAAQ,mBAAmB,SAAS,CAAC,mBAAmB;AAC9D,YAAI,CAAC,OAAO;AACV,yBAAe;AAAA,YACb,GAAG,mBAAmB;AAAA,YACtB,GAAG;AAAA,UACL;AAAA,QACF;AAEA,YAAI,mBAAmB,UAAU;AAC/B,qBAAW,cAAc,mBAAmB,UAAU,QAAQ;AAAA,QAChE;AAAA,MACF;AAEA,UAAI,iBAAiB;AACnB,uBAAe;AAAA,UACb,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAEA,UAAI,yDAAoB,OAAO;AAE7B,YAAI,MAAM;AAER,uBAAa,gBAAgB;AAAA,QAC/B;AAAA,MACF;AAEA,YAAM,SAAS;AAAA,SACb,mEAAyB,YAAU,yDAAoB;AAAA,MACzD;AAEA,YAAM,mBACJ,yBACC,0BACC,kBACC,yDAAoB,WAAS,yDAAoB;AAEtD,UAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAI,8DAAoB,iBAApB,mBAAkC,UAAS,CAAC,QAAQ,OAAO;AAC7D,iBAAO,aAAa;AAAA,QACtB;AAAA,MACF;AAEA,YAAM,OAA8B;AAAA,QAClC,GAAG;AAAA,QACH,GAAG;AAAA,QACH,GAAI,CAAC,0BAA0B;AAAA,UAC7B;AAAA,QACF;AAAA;AAAA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,eAAe,SAAQ,yDAAoB;AAAA,QAC3C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAG;AAAA,QACH,aAAa,QAAQ,yDAAoB,KAAK;AAAA,MAChD;AAGA,UAAI,aAAa,YAAY,CAAC,oBAAoB,SAAS;AACzD,aAAK,eAAe;AAAA,MACtB;AAEA,aAAO;AAAA,IACT;AAAA,EACF,GAAG;AAEH,QAAM,YAAY,gBAAgB,qBAAqB,CAAC,CAAC;AAwCzD,aAAW,OAAO,aAAa;AAC7B,QAAI,OAAO;AAAW;AAEtB,cAAU,GAAG,IAAI,YAAY,GAAG;AAAA,EAClC;AAEA,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.41.0",
-    "@tamagui/constants": "1.41.0",
-    "@tamagui/helpers": "1.41.0",
-    "@tamagui/normalize-css-color": "1.41.0",
-    "@tamagui/use-did-finish-ssr": "1.41.0",
-    "@tamagui/use-event": "1.41.0",
-    "@tamagui/use-force-update": "1.41.0"
+    "@tamagui/compose-refs": "1.42.0",
+    "@tamagui/constants": "1.42.0",
+    "@tamagui/helpers": "1.42.0",
+    "@tamagui/normalize-css-color": "1.42.0",
+    "@tamagui/use-did-finish-ssr": "1.42.0",
+    "@tamagui/use-event": "1.42.0",
+    "@tamagui/use-force-update": "1.42.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.41.0",
+    "@tamagui/build": "1.42.0",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/createComponent.tsx

@@ -243,7 +243,7 @@ export function createComponent<
       undefined as any as {
         hasAnimated?: boolean
         themeShallow?: boolean
-        didAccessThemeVariableValue?: boolean
+        isListeningToTheme?: boolean
       }
     )
     stateRef.current ||= {}
@@ -366,7 +366,10 @@ export function createComponent<
       inverse: props.themeInverse,
       // @ts-ignore this is internal use only
       disable: disableTheme,
-      shouldUpdate: () => !!stateRef.current.didAccessThemeVariableValue,
+      shouldUpdate: () => {
+        // only forces when defined
+        return stateRef.current.isListeningToTheme
+      },
       debug: debugProp,
     }
 
@@ -424,7 +427,7 @@ export function createComponent<
     const splitStyles = useSplitStyles(
       props,
       staticConfig,
-      themeState.theme,
+      themeState,
       {
         ...state,
         mediaState,
@@ -440,6 +443,8 @@ export function createComponent<
       debugProp
     )
 
+    stateRef.current.isListeningToTheme = splitStyles.dynamicThemeAccess
+
     // only listen for changes if we are using raw theme values or media space, or dynamic media (native)
     // array = space media breakpoints
     const isMediaArray = Array.isArray(splitStyles.hasMedia)

package/src/helpers/createMediaStyle.ts

@@ -1,3 +1,4 @@
+import { getConfig } from '../config'
 import { mediaObjectToString } from '../hooks/useMedia'
 import type { MediaQueries, MediaStyleObject, StyleObject } from '../types'
 
@@ -12,38 +13,85 @@ export const createMediaStyle = (
   { property, identifier, rules }: StyleObject,
   mediaKey: string,
   mediaQueries: MediaQueries,
-  negate?: boolean
+  negate?: boolean,
+  priority?: number
 ): MediaStyleObject => {
-  if (!(prefixes && selectors)) {
-    // TODO move this into useMedia calc once there and unify w getMediaImportance
-    const mediaKeys = Object.keys(mediaQueries)
-    prefixes = Object.fromEntries(
-      mediaKeys.map((key, index) => [key, new Array(index + 1).fill(':root').join('')])
-    )
-    selectors = Object.fromEntries(
-      mediaKeys.map((key) => [key, mediaObjectToString(mediaQueries[key])])
-    )
-  }
-  const precendencePrefix = prefixes[mediaKey]
-  const mediaSelector = selectors[mediaKey]
+  const conf = getConfig()
+  const enableMediaPropOrder = conf.settings.mediaPropOrder
+  const isThemeMedia = mediaKey.startsWith('theme-')
+  const isPlatformMedia = !isThemeMedia && mediaKey.startsWith('platform-')
+  const isThemeOrPlatform = isThemeMedia || isPlatformMedia
   const negKey = negate ? '0' : ''
   const ogPrefix = identifier.slice(0, identifier.indexOf('-') + 1)
-  const nextIdentifier = `${identifier.replace(
-    ogPrefix,
-    `${ogPrefix}${MEDIA_SEP}${mediaKey}${negKey}${MEDIA_SEP}`
-  )}`
-  const screenStr = negate ? 'not all and' : ''
-  const mediaQuery = `${screenStr} ${mediaSelector}`
-  const styleInner = rules
-    .map((rule) => rule.replace(identifier, nextIdentifier))
-    .join(';')
-  // combines media queries if they already exist
-  let styleRule = ''
-  if (styleInner.includes('@media')) {
-    // combine
-    styleRule = styleInner.replace('{', ` and ${mediaQuery} {`)
+
+  let styleRule: string
+
+  const id = `${ogPrefix}${MEDIA_SEP}${mediaKey.replace('-', '')}${negKey}${MEDIA_SEP}`
+  const nextIdentifier = identifier.replace(ogPrefix, id)
+
+  if (isThemeOrPlatform) {
+    const precedencePrefix = new Array(priority).fill(':root').join('')
+    const styleInner = rules
+      .map((rule) => rule.replace(identifier, nextIdentifier))
+      .join(';')
+
+    if (isThemeMedia) {
+      const key = mediaKey.split('-')[1]
+      const selectorStart = styleInner.indexOf(':root')
+      const selectorEnd = styleInner.lastIndexOf('{')
+      const selector = styleInner.slice(selectorStart, selectorEnd)
+      const precedenceSpace = conf.themeClassNameOnRoot ? '' : ' '
+      const nextSelector = `:root${precedencePrefix}${precedenceSpace}.t_${key} ${selector.replace(
+        ':root',
+        ''
+      )}`
+      const selectors = `${nextSelector}, :root${nextSelector}`
+      // add back in the { we used to split
+      styleRule = styleInner.replace(selector, nextSelector)
+    } else {
+      styleRule = `${precedencePrefix}${styleInner}`
+    }
   } else {
-    styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner.trim()} }`
+    if (!selectors) {
+      if (enableMediaPropOrder) {
+        const mediaKeys = Object.keys(mediaQueries)
+        selectors = Object.fromEntries(
+          mediaKeys.map((key) => [key, mediaObjectToString(mediaQueries[key])])
+        )
+      } else {
+        const mediaKeys = Object.keys(mediaQueries)
+        prefixes = Object.fromEntries(
+          mediaKeys.map((key, index) => [
+            key,
+            new Array(index + 1).fill(':root').join(''),
+          ])
+        )
+        selectors = Object.fromEntries(
+          mediaKeys.map((key) => [key, mediaObjectToString(mediaQueries[key])])
+        )
+      }
+    }
+
+    const precedencePrefix = enableMediaPropOrder
+      ? // this new array should be cached
+        new Array(priority).fill(':root').join('')
+      : // @ts-ignore
+        prefixes[mediaKey]
+
+    const mediaSelector = selectors[mediaKey]
+    const screenStr = negate ? 'not all and' : ''
+    const mediaQuery = `${screenStr} ${mediaSelector}`
+    const styleInner = rules
+      .map((rule) => rule.replace(identifier, nextIdentifier))
+      .join(';')
+
+    // combines media queries if they already exist
+    if (styleInner.includes('@media')) {
+      // combine
+      styleRule = styleInner.replace('{', ` and ${mediaQuery} {`)
+    } else {
+      styleRule = `@media ${mediaQuery}{${precedencePrefix}${styleInner}}`
+    }
   }
 
   return {

package/src/helpers/getSplitStyles.tsx

@@ -1,4 +1,5 @@
 import {
+  currentPlatform,
   isAndroid,
   isClient,
   isRSC,
@@ -92,7 +93,10 @@ let conf: TamaguiInternalConfig
 type StyleSplitter = (
   props: { [key: string]: any },
   staticConfig: StaticConfigParsed,
-  theme: ThemeParsed,
+  themeState: {
+    theme: ThemeParsed
+    name: string
+  },
   state: SplitStyleState,
   parentSplitStyles?: GetStyleResult | null,
   languageContext?: LanguageContextType,
@@ -114,7 +118,7 @@ let defaultFontVariable = ''
 export const getSplitStyles: StyleSplitter = (
   props,
   staticConfig,
-  theme,
+  themeState,
   state,
   parentSplitStyles,
   languageContext,
@@ -123,6 +127,7 @@ export const getSplitStyles: StyleSplitter = (
 ) => {
   conf = conf || getConfig()
   const { shorthands } = conf
+  const { theme, name: themeName } = themeState
   const { variants, propMapper, isReactNative, inlineProps, inlineWhenUnflattened } =
     staticConfig
   const validStyleProps = staticConfig.isText ? stylePropsText : validStyles
@@ -134,6 +139,7 @@ export const getSplitStyles: StyleSplitter = (
   const numProps = propKeys.length
   let space: SpaceTokens | null = props.space
   let hasMedia: boolean | string[] = false
+  let dynamicThemeAccess: boolean | undefined
 
   const shouldDoClasses =
     staticConfig.acceptsClassName && (isWeb || IS_STATIC) && !state.noClassNames
@@ -149,6 +155,7 @@ export const getSplitStyles: StyleSplitter = (
 
   // fontFamily is our special baby, ensure we grab the latest set one always
   let fontFamily: string | undefined
+  let mediaStylesSeen = 0
 
   /**
    * Not the biggest fan of creating this object but it is a nice API
@@ -754,6 +761,14 @@ export const getSplitStyles: StyleSplitter = (
       if (isMedia) {
         if (!val) continue
 
+        const isPlatformMedia = key.startsWith('$platform-')
+        if (isPlatformMedia) {
+          const platform = key.slice(10)
+          if (platform !== currentPlatform) {
+            continue
+          }
+        }
+
         hasMedia ||= true
 
         // THIS USED TO PROXY BACK TO REGULAR PROPS BUT THAT IS THE WRONG BEHAVIOR
@@ -791,7 +806,8 @@ export const getSplitStyles: StyleSplitter = (
               const importance = getMediaImportanceIfMoreImportant(
                 mediaKeyShort,
                 'space',
-                usedKeys
+                usedKeys,
+                true
               )
               if (importance) {
                 space = val['space']
@@ -807,19 +823,48 @@ export const getSplitStyles: StyleSplitter = (
           }
 
           const mediaStyles = getStylesAtomic(mediaStyle)
+          const priority = mediaStylesSeen
+          mediaStylesSeen += 1
+
           for (const style of mediaStyles) {
-            const out = createMediaStyle(style, mediaKeyShort, mediaQueryConfig)
+            const out = createMediaStyle(
+              style,
+              mediaKeyShort,
+              mediaQueryConfig,
+              false,
+              priority
+            )
             const fullKey = `${style.property}${PROP_SPLIT}${mediaKeyShort}`
             if (fullKey in usedKeys) continue
             addStyleToInsertRules(rulesToInsert, out as any)
             mergeClassName(transforms, classNames, fullKey, out.identifier, true)
           }
-        } else if (mediaState[mediaKeyShort]) {
+        } else {
+          const isThemeMedia = mediaKeyShort.startsWith('theme-')
+          const isPlatformMedia = mediaKeyShort.startsWith('platform-')
+
+          if (!isThemeMedia && !isPlatformMedia) {
+            if (!mediaState[mediaKeyShort]) {
+              continue
+            }
+          }
+
+          if (isThemeMedia) {
+            // needed to get updates when theme changes
+            dynamicThemeAccess = true
+
+            const mediaThemeName = mediaKeyShort.slice(6)
+            if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName))) {
+              continue
+            }
+          }
+
           for (const subKey in mediaStyle) {
             const importance = getMediaImportanceIfMoreImportant(
               mediaKeyShort,
               subKey,
-              usedKeys
+              usedKeys,
+              mediaState[mediaKeyShort]
             )
             if (importance === null) continue
             if (subKey === 'space') {
@@ -831,7 +876,8 @@ export const getSplitStyles: StyleSplitter = (
               mediaKeyShort,
               subKey,
               mediaStyle[subKey],
-              usedKeys
+              usedKeys,
+              mediaState[mediaKeyShort]
             )
             if (key === 'fontFamily') {
               fontFamily = mediaStyle.fontFamily as string
@@ -1040,6 +1086,7 @@ export const getSplitStyles: StyleSplitter = (
     pseudos,
     classNames,
     rulesToInsert,
+    dynamicThemeAccess,
   }
 
   if (className) {