@tamagui/web 1.101.0 → 1.101.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (143) hide show
  1. package/dist/cjs/createComponent.js +23 -15
  2. package/dist/cjs/createComponent.js.map +1 -1
  3. package/dist/cjs/createComponent.native.js +13 -10
  4. package/dist/cjs/createComponent.native.js.map +2 -2
  5. package/dist/cjs/createTokens.js.map +1 -1
  6. package/dist/cjs/createTokens.native.js.map +1 -1
  7. package/dist/cjs/helpers/createMediaStyle.js +2 -6
  8. package/dist/cjs/helpers/createMediaStyle.js.map +1 -1
  9. package/dist/cjs/helpers/createMediaStyle.native.js +51 -7
  10. package/dist/cjs/helpers/createMediaStyle.native.js.map +2 -2
  11. package/dist/cjs/helpers/expandStyles.js.map +1 -1
  12. package/dist/cjs/helpers/expandStyles.native.js.map +1 -1
  13. package/dist/cjs/helpers/getSplitStyles.js +77 -60
  14. package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
  15. package/dist/cjs/helpers/getSplitStyles.native.js +55 -42
  16. package/dist/cjs/helpers/getSplitStyles.native.js.map +2 -2
  17. package/dist/cjs/helpers/getStylesAtomic.js +7 -6
  18. package/dist/cjs/helpers/getStylesAtomic.js.map +1 -1
  19. package/dist/cjs/helpers/insertStyleRule.js +17 -14
  20. package/dist/cjs/helpers/insertStyleRule.js.map +1 -1
  21. package/dist/cjs/helpers/insertStyleRule.native.js +4 -3
  22. package/dist/cjs/helpers/insertStyleRule.native.js.map +2 -2
  23. package/dist/cjs/helpers/propMapper.js +1 -1
  24. package/dist/cjs/helpers/propMapper.js.map +1 -1
  25. package/dist/cjs/helpers/propMapper.native.js +1 -1
  26. package/dist/cjs/helpers/propMapper.native.js.map +2 -2
  27. package/dist/cjs/hooks/useDidHydrateOnce.js +4 -10
  28. package/dist/cjs/hooks/useDidHydrateOnce.js.map +1 -1
  29. package/dist/cjs/hooks/useDidHydrateOnce.native.js +11 -1
  30. package/dist/cjs/hooks/useDidHydrateOnce.native.js.map +2 -2
  31. package/dist/cjs/hooks/useMedia.js +39 -27
  32. package/dist/cjs/hooks/useMedia.js.map +2 -2
  33. package/dist/cjs/hooks/useMedia.native.js +38 -44
  34. package/dist/cjs/hooks/useMedia.native.js.map +2 -2
  35. package/dist/cjs/views/TamaguiProvider.js.map +1 -1
  36. package/dist/cjs/views/TamaguiProvider.native.js.map +1 -1
  37. package/dist/esm/createComponent.js +29 -16
  38. package/dist/esm/createComponent.js.map +1 -1
  39. package/dist/esm/createComponent.mjs +18 -16
  40. package/dist/esm/createComponent.native.js +14 -11
  41. package/dist/esm/createComponent.native.js.map +2 -2
  42. package/dist/esm/createTokens.js.map +1 -1
  43. package/dist/esm/createTokens.native.js.map +1 -1
  44. package/dist/esm/helpers/createMediaStyle.js +2 -6
  45. package/dist/esm/helpers/createMediaStyle.js.map +1 -1
  46. package/dist/esm/helpers/createMediaStyle.mjs +2 -10
  47. package/dist/esm/helpers/createMediaStyle.native.js +49 -6
  48. package/dist/esm/helpers/createMediaStyle.native.js.map +2 -2
  49. package/dist/esm/helpers/expandStyles.js.map +1 -1
  50. package/dist/esm/helpers/expandStyles.native.js.map +1 -1
  51. package/dist/esm/helpers/getSplitStyles.js +81 -60
  52. package/dist/esm/helpers/getSplitStyles.js.map +1 -1
  53. package/dist/esm/helpers/getSplitStyles.mjs +83 -64
  54. package/dist/esm/helpers/getSplitStyles.native.js +56 -43
  55. package/dist/esm/helpers/getSplitStyles.native.js.map +2 -2
  56. package/dist/esm/helpers/getStylesAtomic.js +7 -6
  57. package/dist/esm/helpers/getStylesAtomic.js.map +1 -1
  58. package/dist/esm/helpers/getStylesAtomic.mjs +3 -7
  59. package/dist/esm/helpers/insertStyleRule.js +17 -13
  60. package/dist/esm/helpers/insertStyleRule.js.map +1 -1
  61. package/dist/esm/helpers/insertStyleRule.mjs +6 -5
  62. package/dist/esm/helpers/insertStyleRule.native.js +4 -2
  63. package/dist/esm/helpers/insertStyleRule.native.js.map +2 -2
  64. package/dist/esm/helpers/propMapper.js +1 -1
  65. package/dist/esm/helpers/propMapper.js.map +1 -1
  66. package/dist/esm/helpers/propMapper.mjs +1 -2
  67. package/dist/esm/helpers/propMapper.native.js +1 -1
  68. package/dist/esm/helpers/propMapper.native.js.map +2 -2
  69. package/dist/esm/hooks/useDidHydrateOnce.js +5 -11
  70. package/dist/esm/hooks/useDidHydrateOnce.js.map +1 -1
  71. package/dist/esm/hooks/useDidHydrateOnce.mjs +7 -11
  72. package/dist/esm/hooks/useDidHydrateOnce.native.js +11 -2
  73. package/dist/esm/hooks/useDidHydrateOnce.native.js.map +2 -2
  74. package/dist/esm/hooks/useMedia.js +39 -28
  75. package/dist/esm/hooks/useMedia.js.map +2 -2
  76. package/dist/esm/hooks/useMedia.mjs +34 -33
  77. package/dist/esm/hooks/useMedia.native.js +38 -45
  78. package/dist/esm/hooks/useMedia.native.js.map +2 -2
  79. package/dist/esm/views/TamaguiProvider.js.map +1 -1
  80. package/dist/esm/views/TamaguiProvider.native.js.map +1 -1
  81. package/package.json +12 -12
  82. package/src/createComponent.tsx +38 -21
  83. package/src/createTokens.ts +1 -21
  84. package/src/helpers/createMediaStyle.ts +2 -6
  85. package/src/helpers/expandStyles.ts +2 -1
  86. package/src/helpers/getSplitStyles.tsx +116 -88
  87. package/src/helpers/getStylesAtomic.ts +7 -5
  88. package/src/helpers/insertStyleRule.tsx +6 -3
  89. package/src/helpers/propMapper.ts +1 -2
  90. package/src/hooks/useDidHydrateOnce.tsx +30 -25
  91. package/src/hooks/useMedia.tsx +74 -54
  92. package/src/types.tsx +12 -2
  93. package/src/views/TamaguiProvider.tsx +0 -1
  94. package/types/_withStableStyle.d.ts +0 -1
  95. package/types/_withStableStyle.d.ts.map +1 -1
  96. package/types/config.d.ts +1 -1
  97. package/types/constants/accessibilityDirectMap.d.ts.map +1 -1
  98. package/types/constants/webToNativeProps.native.d.ts.map +1 -1
  99. package/types/createComponent.d.ts.map +1 -1
  100. package/types/createFont.d.ts.map +1 -1
  101. package/types/createTheme.d.ts.map +1 -1
  102. package/types/createTokens.d.ts +1 -1
  103. package/types/createTokens.d.ts.map +1 -1
  104. package/types/createVariable.d.ts +1 -1
  105. package/types/createVariable.d.ts.map +1 -1
  106. package/types/createVariables.d.ts +1 -1
  107. package/types/createVariables.d.ts.map +1 -1
  108. package/types/helpers/ThemeManagerContext.d.ts +0 -1
  109. package/types/helpers/ThemeManagerContext.d.ts.map +1 -1
  110. package/types/helpers/createMediaStyle.d.ts.map +1 -1
  111. package/types/helpers/createShallowSetState.d.ts.map +1 -1
  112. package/types/helpers/expandStyles.d.ts.map +1 -1
  113. package/types/helpers/getSplitStyles.d.ts.map +1 -1
  114. package/types/helpers/getStylesAtomic.d.ts.map +1 -1
  115. package/types/helpers/insertStyleRule.d.ts.map +1 -1
  116. package/types/helpers/isTamaguiElement.d.ts +1 -2
  117. package/types/helpers/isTamaguiElement.d.ts.map +1 -1
  118. package/types/helpers/propMapper.d.ts.map +1 -1
  119. package/types/helpers/setElementProps.d.ts.map +1 -1
  120. package/types/helpers/themeable.d.ts.map +1 -1
  121. package/types/hooks/useConfiguration.d.ts +50 -52
  122. package/types/hooks/useConfiguration.d.ts.map +1 -1
  123. package/types/hooks/useDidHydrateOnce.d.ts +1 -1
  124. package/types/hooks/useDidHydrateOnce.d.ts.map +1 -1
  125. package/types/hooks/useMedia.d.ts +6 -7
  126. package/types/hooks/useMedia.d.ts.map +1 -1
  127. package/types/hooks/useTheme.d.ts.map +1 -1
  128. package/types/styled.d.ts.map +1 -1
  129. package/types/types.d.ts +3 -2
  130. package/types/types.d.ts.map +1 -1
  131. package/types/views/Configuration.d.ts +0 -1
  132. package/types/views/Configuration.d.ts.map +1 -1
  133. package/types/views/TamaguiProvider.d.ts.map +1 -1
  134. package/dist/esm/constants/accessibilityDirectMap.native.mjs +0 -6
  135. package/dist/esm/constants/webToNativeProps.native.mjs +0 -77
  136. package/dist/esm/helpers/getStylesAtomic.native.mjs +0 -7
  137. package/dist/esm/helpers/getThemeCSSRules.native.mjs +0 -4
  138. package/dist/esm/helpers/matchMedia.native.mjs +0 -14
  139. package/dist/esm/helpers/normalizeStylePropKeys.native.mjs +0 -13
  140. package/dist/esm/helpers/setElementProps.native.mjs +0 -6
  141. package/dist/esm/helpers/webPropsToSkip.native.mjs +0 -55
  142. package/dist/esm/views/FontLanguage.native.mjs +0 -15
  143. package/dist/esm/views/ThemeDebug.native.mjs +0 -9
@@ -1,17 +1,13 @@
1
- import { useEffect } from "react";
2
- let didHydrateOnce = !1;
1
+ import { useSyncExternalStore } from "react";
3
2
  function useDidHydrateOnceRoot() {
4
- process.env.TAMAGUI_DISABLE_HYDRATION_OPTIMIZATION || useEffect(() => {
5
- const tm = setInterval(() => {
6
- Date.now() - last > 150 && (didHydrateOnce = !0, clearInterval(tm));
7
- }, 16);
8
- return () => {
9
- clearInterval(tm);
10
- };
11
- }, []);
3
+ return !0;
12
4
  }
13
5
  let last = Date.now();
14
6
  function useDidHydrateOnce() {
15
- return process.env.TAMAGUI_DISABLE_HYDRATION_OPTIMIZATION ? !1 : (didHydrateOnce || (last = Date.now()), didHydrateOnce);
7
+ return useDidHydrateSync();
16
8
  }
9
+ const emptySubscribe = () => () => {},
10
+ getClientSnapshot = () => !0,
11
+ getServerSnapshot = () => !1,
12
+ useDidHydrateSync = () => useSyncExternalStore(emptySubscribe, getClientSnapshot, getServerSnapshot);
17
13
  export { useDidHydrateOnce, useDidHydrateOnceRoot };
@@ -1,5 +1,4 @@
1
- import { useEffect } from "react";
2
- var didHydrateOnce = !1;
1
+ import { useSyncExternalStore } from "react";
3
2
  function useDidHydrateOnceRoot() {
4
3
  return !0;
5
4
  }
@@ -7,6 +6,16 @@ var last = Date.now();
7
6
  function useDidHydrateOnce() {
8
7
  return !0;
9
8
  }
9
+ var emptySubscribe = function() {
10
+ return function() {
11
+ };
12
+ }, getClientSnapshot = function() {
13
+ return !0;
14
+ }, getServerSnapshot = function() {
15
+ return !1;
16
+ }, useDidHydrateSync = function() {
17
+ return useSyncExternalStore(emptySubscribe, getClientSnapshot, getServerSnapshot);
18
+ };
10
19
  export {
11
20
  useDidHydrateOnce,
12
21
  useDidHydrateOnceRoot
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useDidHydrateOnce.tsx"],
4
- "mappings": "AAAA,SAASA,iBAAiB;AAE1B,IAAIC,iBAAiB;AAEd,SAASC,wBAAAA;AAEZ,SAAO;AAgBX;AAEA,IAAIC,OAAOC,KAAKC,IAAG;AAEZ,SAASC,oBAAAA;AAEZ,SAAO;AASX;",
5
- "names": ["useEffect", "didHydrateOnce", "useDidHydrateOnceRoot", "last", "Date", "now", "useDidHydrateOnce"]
4
+ "mappings": "AAAA,SAAoBA,4BAA4B;AAIzC,SAASC,wBAAAA;AAgBd,SAAO;AACT;AAEA,IAAIC,OAAOC,KAAKC,IAAG;AAEZ,SAASC,oBAAAA;AAEZ,SAAO;AASX;AAEA,IAAMC,iBAAiB,WAAA;SAAM,WAAA;EAAO;GAC9BC,oBAAoB,WAAA;SAAM;GAC1BC,oBAAoB,WAAA;SAAM;GAC1BC,oBAAoB,WAAA;SACxBC,qBAAqBJ,gBAAgBC,mBAAmBC,iBAAAA;;",
5
+ "names": ["useSyncExternalStore", "useDidHydrateOnceRoot", "last", "Date", "now", "useDidHydrateOnce", "emptySubscribe", "getClientSnapshot", "getServerSnapshot", "useDidHydrateSync", "useSyncExternalStore"]
6
6
  }
@@ -1,10 +1,9 @@
1
1
  import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
2
- import { useRef, useState } from "react";
2
+ import { useRef, useState, useSyncExternalStore } from "react";
3
3
  import { getConfig } from "../config";
4
4
  import { matchMedia } from "../helpers/matchMedia";
5
5
  import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
6
6
  import { getDisableSSR } from "./useDisableSSR";
7
- import { useDidHydrateOnce } from "./useDidHydrateOnce";
8
7
  let mediaState = (
9
8
  // development only safeguard
10
9
  process.env.NODE_ENV === "development" ? new Proxy(
@@ -19,12 +18,11 @@ let mediaState = (
19
18
  }
20
19
  ) : {}
21
20
  );
22
- const mediaQueryConfig = {}, getMedia = () => mediaState, mediaKeys = /* @__PURE__ */ new Set(), isMediaKey = (key) => {
21
+ const mediaQueryConfig = {}, getMedia = () => mediaState, mediaKeys = /* @__PURE__ */ new Set(), mediaKeyRegex = /\$(platform|theme|group)-/, isMediaKey = (key) => {
23
22
  if (mediaKeys.has(key)) return !0;
24
23
  if (key[0] === "$") {
25
- if (key.startsWith("$platform-")) return "platform";
26
- if (key.startsWith("$theme-")) return "theme";
27
- if (key.startsWith("$group-")) return "group";
24
+ const match = key.match(mediaKeyRegex);
25
+ if (match) return match[1];
28
26
  }
29
27
  return !1;
30
28
  };
@@ -52,7 +50,7 @@ function unlisten() {
52
50
  let setupVersion = -1;
53
51
  function setupMediaListeners() {
54
52
  if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
55
- setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
53
+ setupVersion = mediaVersion, unlisten();
56
54
  for (const key in mediaQueryConfig) {
57
55
  let update = function() {
58
56
  const next = !!getMatch().matches;
@@ -81,30 +79,43 @@ function setMediaShouldUpdate(ref, props) {
81
79
  ...props
82
80
  });
83
81
  }
84
- function getSnapshot({ touched, prev, enabled, keys }) {
85
- if (enabled === !1)
86
- return prev;
87
- const testKeys = keys || touched ? [...keys || [], ...touched || []] : null;
88
- return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : mediaState;
82
+ function subscribe(subscriber) {
83
+ return listeners.add(subscriber), () => {
84
+ listeners.delete(subscriber);
85
+ };
89
86
  }
90
- function useMedia(uidIn, componentContext) {
91
- const uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
87
+ function useMedia(uidIn, componentContext, debug) {
88
+ const uid = uidIn ?? useRef(), initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {};
92
89
  let componentState = States.get(uid);
93
- componentState || (componentState = { prev: initialState }, States.set(uid, componentState)), componentState.touched = void 0;
94
- const [state, setState] = useState(initialState);
95
- return useIsomorphicLayoutEffect(() => {
96
- function update() {
97
- setState((prev) => {
98
- const componentState2 = States.get(uid), next = getSnapshot(componentState2);
99
- return next !== prev ? (componentState2.prev = next, next) : prev;
100
- });
101
- }
102
- return update(), listeners.add(update), () => {
103
- listeners.delete(update);
104
- };
105
- }, [uid]), new Proxy(state, {
90
+ componentState || (componentState = { prev: initialState }, States.set(uid, componentState));
91
+ const getSnapshot = () => {
92
+ if (!componentState)
93
+ return initialState;
94
+ const { keys, prev = initialState } = componentState;
95
+ if (componentState && componentState.enabled === !1)
96
+ return prev;
97
+ const testKeys = componentState?.keys ?? ((!componentState || componentState.enabled) && keys) ?? null;
98
+ return !testKeys || testKeys?.every((key) => mediaState[key] === prev[key]) ? prev : (componentState.prev = mediaState, mediaState);
99
+ };
100
+ let state;
101
+ if (process.env.TAMAGUI_SYNC_MEDIA_QUERY)
102
+ state = useSyncExternalStore(
103
+ subscribe,
104
+ getSnapshot,
105
+ () => initialState
106
+ );
107
+ else {
108
+ const [internalState, setState] = useState(initialState);
109
+ state = internalState, useIsomorphicLayoutEffect(() => {
110
+ function update() {
111
+ setState(getSnapshot);
112
+ }
113
+ return update(), subscribe(update);
114
+ }, []);
115
+ }
116
+ return new Proxy(state, {
106
117
  get(_, key) {
107
- return typeof key == "string" && (componentState.touched ||= /* @__PURE__ */ new Set(), componentState.touched.add(key)), Reflect.get(state, key);
118
+ return typeof key == "string" && (componentState.keys ||= [], componentState.keys.includes(key) || componentState.keys.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key)), Reflect.get(state, key);
108
119
  }
109
120
  });
110
121
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/hooks/useMedia.tsx"],
4
- "mappings": "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",
5
- "names": ["componentState"]
4
+ "mappings": "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",
5
+ "names": []
6
6
  }
@@ -1,10 +1,9 @@
1
1
  import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
2
- import { useRef, useState } from "react";
2
+ import { useRef, useState, useSyncExternalStore } from "react";
3
3
  import { getConfig } from "../config.mjs";
4
4
  import { matchMedia } from "../helpers/matchMedia.mjs";
5
5
  import { pseudoDescriptors } from "../helpers/pseudoDescriptors.mjs";
6
6
  import { getDisableSSR } from "./useDisableSSR.mjs";
7
- import { useDidHydrateOnce } from "./useDidHydrateOnce.mjs";
8
7
  let mediaState =
9
8
  // development only safeguard
10
9
  process.env.NODE_ENV === "development" ? new Proxy({}, {
@@ -18,12 +17,12 @@ process.env.NODE_ENV === "development" ? new Proxy({}, {
18
17
  const mediaQueryConfig = {},
19
18
  getMedia = () => mediaState,
20
19
  mediaKeys = /* @__PURE__ */new Set(),
20
+ mediaKeyRegex = /\$(platform|theme|group)-/,
21
21
  isMediaKey = key => {
22
22
  if (mediaKeys.has(key)) return !0;
23
23
  if (key[0] === "$") {
24
- if (key.startsWith("$platform-")) return "platform";
25
- if (key.startsWith("$theme-")) return "theme";
26
- if (key.startsWith("$group-")) return "group";
24
+ const match = key.match(mediaKeyRegex);
25
+ if (match) return match[1];
27
26
  }
28
27
  return !1;
29
28
  };
@@ -55,7 +54,7 @@ function unlisten() {
55
54
  let setupVersion = -1;
56
55
  function setupMediaListeners() {
57
56
  if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
58
- setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
57
+ setupVersion = mediaVersion, unlisten();
59
58
  for (const key in mediaQueryConfig) {
60
59
  let update = function () {
61
60
  const next = !!getMatch().matches;
@@ -89,39 +88,41 @@ function setMediaShouldUpdate(ref, props) {
89
88
  ...props
90
89
  });
91
90
  }
92
- function getSnapshot({
93
- touched,
94
- prev,
95
- enabled,
96
- keys
97
- }) {
98
- if (enabled === !1) return prev;
99
- const testKeys = keys || touched ? [...(keys || []), ...(touched || [])] : null;
100
- return !testKeys || testKeys?.every(key => mediaState[key] === prev[key]) ? prev : mediaState;
91
+ function subscribe(subscriber) {
92
+ return listeners.add(subscriber), () => {
93
+ listeners.delete(subscriber);
94
+ };
101
95
  }
102
- function useMedia(uidIn, componentContext) {
96
+ function useMedia(uidIn, componentContext, debug) {
103
97
  const uid = uidIn ?? useRef(),
104
- hasHydrated = useDidHydrateOnce(),
105
- initialState = !isWeb || getDisableSSR(componentContext) || hasHydrated ? mediaState : initState;
98
+ initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {};
106
99
  let componentState = States.get(uid);
107
100
  componentState || (componentState = {
108
101
  prev: initialState
109
- }, States.set(uid, componentState)), componentState.touched = void 0;
110
- const [state, setState] = useState(initialState);
111
- return useIsomorphicLayoutEffect(() => {
112
- function update() {
113
- setState(prev => {
114
- const componentState2 = States.get(uid),
115
- next = getSnapshot(componentState2);
116
- return next !== prev ? (componentState2.prev = next, next) : prev;
117
- });
118
- }
119
- return update(), listeners.add(update), () => {
120
- listeners.delete(update);
121
- };
122
- }, [uid]), new Proxy(state, {
102
+ }, States.set(uid, componentState));
103
+ const getSnapshot = () => {
104
+ if (!componentState) return initialState;
105
+ const {
106
+ keys,
107
+ prev = initialState
108
+ } = componentState;
109
+ if (componentState && componentState.enabled === !1) return prev;
110
+ const testKeys = componentState?.keys ?? ((!componentState || componentState.enabled) && keys) ?? null;
111
+ return !testKeys || testKeys?.every(key => mediaState[key] === prev[key]) ? prev : (componentState.prev = mediaState, mediaState);
112
+ };
113
+ let state;
114
+ if (process.env.TAMAGUI_SYNC_MEDIA_QUERY) state = useSyncExternalStore(subscribe, getSnapshot, () => initialState);else {
115
+ const [internalState, setState] = useState(initialState);
116
+ state = internalState, useIsomorphicLayoutEffect(() => {
117
+ function update() {
118
+ setState(getSnapshot);
119
+ }
120
+ return update(), subscribe(update);
121
+ }, []);
122
+ }
123
+ return new Proxy(state, {
123
124
  get(_, key) {
124
- return typeof key == "string" && (componentState.touched ||= /* @__PURE__ */new Set(), componentState.touched.add(key)), Reflect.get(state, key);
125
+ return typeof key == "string" && (componentState.keys ||= [], componentState.keys.includes(key) || componentState.keys.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key)), Reflect.get(state, key);
125
126
  }
126
127
  });
127
128
  }
@@ -1,10 +1,9 @@
1
1
  import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
2
- import { useRef, useState } from "react";
2
+ import { useRef, useState, useSyncExternalStore } from "react";
3
3
  import { getConfig } from "../config";
4
4
  import { matchMedia } from "../helpers/matchMedia";
5
5
  import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
6
6
  import { getDisableSSR } from "./useDisableSSR";
7
- import { useDidHydrateOnce } from "./useDidHydrateOnce";
8
7
  function _array_like_to_array(arr, len) {
9
8
  (len == null || len > arr.length) && (len = arr.length);
10
9
  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -13,9 +12,6 @@ function _array_like_to_array(arr, len) {
13
12
  function _array_with_holes(arr) {
14
13
  if (Array.isArray(arr)) return arr;
15
14
  }
16
- function _array_without_holes(arr) {
17
- if (Array.isArray(arr)) return _array_like_to_array(arr);
18
- }
19
15
  function _define_property(obj, key, value) {
20
16
  return key in obj ? Object.defineProperty(obj, key, {
21
17
  value,
@@ -24,9 +20,6 @@ function _define_property(obj, key, value) {
24
20
  writable: !0
25
21
  }) : obj[key] = value, obj;
26
22
  }
27
- function _iterable_to_array(iter) {
28
- if (typeof Symbol < "u" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
29
- }
30
23
  function _iterable_to_array_limit(arr, i) {
31
24
  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
32
25
  if (_i != null) {
@@ -49,9 +42,6 @@ function _iterable_to_array_limit(arr, i) {
49
42
  function _non_iterable_rest() {
50
43
  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
51
44
  }
52
- function _non_iterable_spread() {
53
- throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
54
- }
55
45
  function _object_spread(target) {
56
46
  for (var i = 1; i < arguments.length; i++) {
57
47
  var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
@@ -81,9 +71,6 @@ function _object_spread_props(target, source) {
81
71
  function _sliced_to_array(arr, i) {
82
72
  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
83
73
  }
84
- function _to_consumable_array(arr) {
85
- return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
86
- }
87
74
  function _unsupported_iterable_to_array(o, minLen) {
88
75
  if (o) {
89
76
  if (typeof o == "string") return _array_like_to_array(o, minLen);
@@ -104,12 +91,11 @@ var mediaState = (
104
91
  }) : {}
105
92
  ), mediaQueryConfig = {}, getMedia = function() {
106
93
  return mediaState;
107
- }, mediaKeys = /* @__PURE__ */ new Set(), isMediaKey = function(key) {
94
+ }, mediaKeys = /* @__PURE__ */ new Set(), mediaKeyRegex = /\$(platform|theme|group)-/, isMediaKey = function(key) {
108
95
  if (mediaKeys.has(key)) return !0;
109
96
  if (key[0] === "$") {
110
- if (key.startsWith("$platform-")) return "platform";
111
- if (key.startsWith("$theme-")) return "theme";
112
- if (key.startsWith("$group-")) return "group";
97
+ var match = key.match(mediaKeyRegex);
98
+ if (match) return match[1];
113
99
  }
114
100
  return !1;
115
101
  }, initState, defaultMediaImportance = Object.keys(pseudoDescriptors).length, mediaKeysOrdered, getMediaKeyImportance = function(key) {
@@ -147,7 +133,7 @@ function setupMediaListeners() {
147
133
  }), update();
148
134
  };
149
135
  if (!(isWeb && isServer) && setupVersion !== mediaVersion) {
150
- setupVersion = mediaVersion, process.env.NODE_ENV === "development" && unlisten();
136
+ setupVersion = mediaVersion, unlisten();
151
137
  for (var key in mediaQueryConfig) _loop(key);
152
138
  }
153
139
  }
@@ -163,38 +149,45 @@ var States = /* @__PURE__ */ new WeakMap();
163
149
  function setMediaShouldUpdate(ref, props) {
164
150
  return States.set(ref, _object_spread({}, States.get(ref), props));
165
151
  }
166
- function getSnapshot(param) {
167
- var touched = param.touched, prev = param.prev, enabled = param.enabled, keys = param.keys, isDisabled = enabled === !1;
168
- if (isDisabled)
169
- return prev;
170
- var testKeys = keys || touched ? _to_consumable_array(keys || []).concat(_to_consumable_array(touched || [])) : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
171
- return mediaState[key] === prev[key];
172
- }));
173
- return hasntUpdated ? prev : mediaState;
152
+ function subscribe(subscriber) {
153
+ return listeners.add(subscriber), function() {
154
+ listeners.delete(subscriber);
155
+ };
174
156
  }
175
- function useMedia(uidIn, componentContext) {
176
- var uid = uidIn ?? useRef(), hasHydrated = useDidHydrateOnce(), isHydrated = !isWeb || getDisableSSR(componentContext) || hasHydrated, initialState = isHydrated ? mediaState : initState, componentState = States.get(uid);
157
+ function useMedia(uidIn, componentContext, debug) {
158
+ var uid = uidIn ?? useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {}, componentState = States.get(uid);
177
159
  componentState || (componentState = {
178
160
  prev: initialState
179
- }, States.set(uid, componentState)), componentState.touched = void 0;
180
- var _useState = _sliced_to_array(useState(initialState), 2), state = _useState[0], setState = _useState[1];
181
- return useIsomorphicLayoutEffect(function() {
182
- var update = function() {
183
- setState(function(prev) {
184
- var componentState2 = States.get(uid), next = getSnapshot(componentState2);
185
- return next !== prev ? (componentState2.prev = next, next) : prev;
186
- });
187
- };
188
- return update(), listeners.add(update), function() {
189
- listeners.delete(update);
190
- };
191
- }, [
192
- uid
193
- ]), new Proxy(state, {
161
+ }, States.set(uid, componentState));
162
+ var getSnapshot = function() {
163
+ if (!componentState)
164
+ return initialState;
165
+ var keys = componentState.keys, _componentState_prev = componentState.prev, prev = _componentState_prev === void 0 ? initialState : _componentState_prev;
166
+ if (componentState && componentState.enabled === !1)
167
+ return prev;
168
+ var _componentState_keys, _ref, testKeys = (_ref = (_componentState_keys = componentState == null ? void 0 : componentState.keys) !== null && _componentState_keys !== void 0 ? _componentState_keys : (!componentState || componentState.enabled) && keys) !== null && _ref !== void 0 ? _ref : null, hasntUpdated = !testKeys || (testKeys == null ? void 0 : testKeys.every(function(key) {
169
+ return mediaState[key] === prev[key];
170
+ }));
171
+ return hasntUpdated ? prev : (componentState.prev = mediaState, mediaState);
172
+ }, state;
173
+ if (process.env.TAMAGUI_SYNC_MEDIA_QUERY)
174
+ state = useSyncExternalStore(subscribe, getSnapshot, function() {
175
+ return initialState;
176
+ });
177
+ else {
178
+ var _useState = _sliced_to_array(useState(initialState), 2), internalState = _useState[0], setState = _useState[1];
179
+ state = internalState, useIsomorphicLayoutEffect(function() {
180
+ var update = function() {
181
+ setState(getSnapshot);
182
+ };
183
+ return update(), subscribe(update);
184
+ }, []);
185
+ }
186
+ return new Proxy(state, {
194
187
  get: function(_, key) {
195
188
  if (typeof key == "string") {
196
189
  var _componentState;
197
- (_componentState = componentState).touched || (_componentState.touched = /* @__PURE__ */ new Set()), componentState.touched.add(key);
190
+ (_componentState = componentState).keys || (_componentState.keys = []), componentState.keys.includes(key) || componentState.keys.push(key), process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key);
198
191
  }
199
192
  return Reflect.get(state, key);
200
193
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/hooks/Users/n8/tamagui/packages/web/src/hooks/useMedia.tsx"],
4
- "mappings": "AAAA,SAASA,UAAUC,OAAOC,iCAAiC;AAC3D,SAAgBC,QAAQC,gBAAsC;AAE9D,SAASC,iBAAiB;AAC1B,SAASC,kBAAkB;AAC3B,SAASC,yBAAyB;AAWlC,SAASC,qBAAqB;AAC9B,SAASC,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE3B,IAAIC;;EAETC,QAAQC,IAAIC,aAAa,gBACrB,IAAIC,MACF,CAAC,GACD;IACEC,KAAAA,SAAIC,QAAQC,KAAG;AACb,UACE,OAAOA,OAAQ,YACfA,IAAI,CAAA,MAAO;MAEXA,IAAI,CAAA,MAAO;AAEX,cAAM,IAAIC,MAAO,yCAA4C,OAAJD,GAAAA,CAAAA;AAE3D,aAAOE,QAAQJ,IAAIC,QAAQC,GAAAA;IAC7B;EACF,CAAA,IAED,CAAC;GAEKG,mBAAiC,CAAC,GAElCC,WAAW,WAAA;SAAMX;GAEjBY,YAAY,oBAAIC,IAAAA,GAEhBC,aAAa,SAACP,KAAAA;AACzB,MAAIK,UAAUG,IAAIR,GAAAA,EAAM,QAAO;AAC/B,MAAIA,IAAI,CAAA,MAAO,KAAK;AAClB,QAAIA,IAAIS,WAAW,YAAA,EAAe,QAAO;AACzC,QAAIT,IAAIS,WAAW,SAAA,EAAY,QAAO;AACtC,QAAIT,IAAIS,WAAW,SAAA,EAAY,QAAO;EACxC;AACA,SAAO;AACT,GAGIC,WAGEC,yBAAyBC,OAAOC,KAAKvB,iBAAAA,EAAmBwB,QAE1DC,kBAESC,wBAAwB,SAAChB,KAAAA;AACpC,MAAIN,QAAQC,IAAIC,aAAa,iBAAiBI,IAAI,CAAA,MAAO;AACvD,UAAM,IAAIC,MAAM,eAAA;AAGlB,MAAMgB,OAAO7B,UAAAA;AACb,SAAI6B,KAAKC,SAASC,iBACTR,yBAMFI,iBAAiBK,QAAQpB,GAAAA,IAAO;AACzC,GAEMqB,UAAU,oBAAIf,IAAAA,GAEhBgB,eAAe,GAENC,iBAAiB,SAACC,QAAAA;AAC7B,MAAQC,QAAmCD,OAAnCC,OAAOC,0BAA4BF,OAA5BE;AACf,MAAKD,OACLH;;AACA,aAAWtB,OAAOyB;AAChBhC,iBAAWO,GAAAA,KAAO0B,2BAAAA,OAAAA,SAAAA,wBAA0B1B,GAAAA,MAAQ,IACpDK,UAAUsB,IAAK,IAAO,OAAJ3B,GAAAA,CAAAA;AAEpBY,WAAOgB,OAAOzB,kBAAkBsB,KAAAA,GAChCf,YAAY,eAAA,CAAA,GAAKjB,UAAAA,GACjBsB,mBAAmBH,OAAOC,KAAKY,KAAAA,GAE3BD,OAAOK,aACTC,oBAAAA,IAEAC,mBAAAA;;AAEJ;AAEA,SAASC,WAAAA;AACPX,UAAQY,QAAQ,SAACC,IAAAA;WAAOA,GAAAA;MACxBb,QAAQc,MAAK;AACf;AAOA,IAAIC,eAAe;AACZ,SAASN,sBAAAA;;QA4BHO,SAAT,WAASA;AACP,UAAMC,OAAO,CAAC,CAACC,SAAAA,EAAWC;AAC1B,MAAIF,SAAS7C,WAAWO,IAAAA,MACxBP,aAAa,qBAAA,eAAA,CAAA,GAAKA,UAAAA,GAAY,iBAAA,CAAA,GAACO,MAAMsC,IAAAA,CAAAA,GACrCP,mBAAAA;IACF,GApBMU,MAAMC,oBAAoBvC,iBAAiBH,IAAAA,GAAMA,IAAAA,GACjDuC,WAAW,WAAA;aAAMlD,WAAWoD,GAAAA;OAC5BE,QAAQJ,SAAAA;AACd,QAAI,CAACI;AACH,YAAM,IAAI1C,MAAM,uBAAA;AAIlB0C,UAAMC,YAAYP,MAAAA,GAClBhB,QAAQM,IAAI,WAAA;AACVgB,YAAME,eAAeR,MAAAA;IACvB,CAAA,GAEAA,OAAAA;EAQF;AAjCA,MAAIrD,WAASD,aAGTqD,iBAAiBd,cACrBc;mBAAed,cAGX5B,QAAQC,IAAIC,aAAa,iBAC3BoC,SAAAA;AAGF,aAAWhC,OAAOG,iBAAAA,OAAAA,GAAAA;;AAuBpB;AAEA,IAAM2C,YAAY,oBAAIxC,IAAAA,GAClByC,WAAW,IACXC,eAAe;AACnB,SAASjB,qBAAAA;AAEP,EAAIgB,YAAYC,iBAAiB1B,iBAGjC0B,eAAe1B,cACfyB,WAAW,IACXE,QAAQC,QAAO,EAAGC,KAAK,WAAA;AACrBJ,eAAW,IACXD,UAAUb,QAAQ,SAACC,IAAAA;aAAOA,GAAGzC,UAAAA;;EAC/B,CAAA;AACF;AAaA,IAAM2D,SAAS,oBAAIC,QAAAA;AAEZ,SAASC,qBAAqBC,KAAUC,OAA2B;AACxE,SAAOJ,OAAOK,IAAIF,KAAK,eAAA,CAAA,GACjBH,OAAOtD,IAAIyD,GAAAA,GACZC,KAAAA,CAAAA;AAEP;AAEA,SAASE,YAAY,OAA6C;MAA3CC,UAAF,MAAEA,SAASC,OAAX,MAAWA,MAAMC,UAAjB,MAAiBA,SAAShD,OAA1B,MAA0BA,MACvCiD,aAAaD,YAAY;AAC/B,MAAIC;AACF,WAAOF;AAGT,MAAMG,WAAWlD,QAAQ8C,UAAW,qBAAI9C,QAAQ,CAAA,CAAE,EAAA,OAAG,qBAAI8C,WAAW,CAAA,CAAE,CAAA,IAAK,MACrEK,eACJ,CAACD,aAAYA,YAAAA,OAAAA,SAAAA,SAAUE,MAAM,SAACjE,KAAAA;WAAQP,WAAWO,GAAAA,MAAS4D,KAAK5D,GAAAA;;AACjE,SAAIgE,eACKJ,OAGFnE;AACT;AAEO,SAASyE,SACdC,OACAC,kBAAoC;AAEpC,MAAMC,MAAMF,SAASjF,OAAAA,GAEfoF,cAAc9E,kBAAAA,GACd+E,aAAa,CAACvF,SAASO,cAAc6E,gBAAAA,KAAqBE,aAC1DE,eAAeD,aAAa9E,aAAaiB,WAE3C+D,iBAAiBrB,OAAOtD,IAAIuE,GAAAA;AAChC,EAAKI,mBACHA,iBAAiB;IAAEb,MAAMY;EAAa,GACtCpB,OAAOK,IAAIY,KAAKI,cAAAA,IAIlBA,eAAed,UAAUe;AAEzB,MAA0BvF,YAAAA,iBAAAA,SAASqF,YAAAA,GAAAA,CAAAA,GAA5BG,QAAmBxF,UAAAA,CAAAA,GAAZyF,WAAYzF,UAAAA,CAAAA;AAE1BF,mCAA0B,WAAA;QACfoD,SAAT,WAASA;AACPuC,eAAS,SAAChB,MAAAA;AACR,YAAMa,kBAAiBrB,OAAOtD,IAAIuE,GAAAA,GAC5B/B,OAAOoB,YAAYe,eAAAA;AACzB,eAAInC,SAASsB,QACXa,gBAAeb,OAAOtB,MACfA,QAEFsB;MACT,CAAA;IACF;AAGAvB,kBAAAA,GAEAS,UAAUnB,IAAIU,MAAAA,GACP,WAAA;AACLS,gBAAU+B,OAAOxC,MAAAA;IACnB;EACF,GAAG;IAACgC;GAAI,GAED,IAAIxE,MAAM8E,OAAO;IACtB7E,KAAAA,SAAIgF,GAAG9E,KAAG;AACR,UAAI,OAAOA,OAAQ,UAAU;YAC3ByE;AAAAA,SAAAA,kBAAAA,gBAAed,YAAfc,gBAAed,UAAY,oBAAIrD,IAAAA,IAC/BmE,eAAed,QAAQhC,IAAI3B,GAAAA;MAC7B;AACA,aAAOE,QAAQJ,IAAI6E,OAAO3E,GAAAA;IAC5B;EACF,CAAA;AACF;AAEO,IAAM+E,oCAAoC,SAC/CC,UACAhF,KACAiF,iBACAC,aAAAA;AAEA,MAAMjE,OAAO7B,UAAAA,GACP+F,aACJD,eAAe,CAACjE,KAAKC,SAASC,iBAC1BH,sBAAsBgE,QAAAA,IACtBrE;AACN,SAAO,CAACsE,gBAAgBjF,GAAAA,KAAQmF,aAAaF,gBAAgBjF,GAAAA,IAAOmF,aAAa;AACnF;AAEA,SAASC,cAAc3C,KAAW;AAChC,SAAOA,IAAI4C,QAAQ,UAAU,SAACC,GAAAA;WAAO,IAAmB,OAAhBA,EAAEC,YAAW,CAAA;KAAMA,YAAW;AACxE;AAEA,IAAMC,QAAQ,oBAAInC,QAAAA,GACZoC,wBAAgD,CAAC;AAEhD,SAAS/C,oBAAoBgD,OAAkC1F,KAAY;AAChF,MAAI,OAAO0F,SAAU;AACnB,WAAOA;AAET,MAAIF,MAAMhF,IAAIkF,KAAAA;AACZ,WAAOF,MAAM1F,IAAI4F,KAAAA;AAEnB,MAAMC,MAAM/E,OAAOgF,QAAQF,KAAAA,EACxBG,IAAI,SAAA,OAAA;6CAAEC,UAAAA,OAAAA,CAAAA,GAASC,QAAAA,OAAAA,CAAAA;AAEd,WADAD,UAAUV,cAAcU,OAAAA,GACpB,OAAOC,SAAU,YAGjB,OAAOA,SAAU,YAAY,kBAAkBC,KAAKF,OAAAA,MACtDC,QAAS,GAAQ,OAANA,OAAM,IAAA,IAEX,IAAeA,OAAZD,SAAQ,IAAA,EAAU,OAANC,OAAM,GAAA;EAC/B,CAAA,EACCE,KAAK,OAAA;AACR,SAAIjG,QACFyF,sBAAsBzF,GAAAA,IAAO2F,MAE/BH,MAAM/B,IAAIiC,OAAOC,GAAAA,GACVA;AACT;AAEO,SAASO,gBAAgBlG,KAAW;AACzC,SAAOyF,sBAAsBzF,GAAAA,KAAQ0C,oBAAoBvC,iBAAiBH,GAAAA,GAAMA,GAAAA;AAClF;AAEO,SAASmG,cACdnG,KACAoG,YAA6C;AAE7C,MAAMC,eAAelG,iBAAiBH,GAAAA,GAChCsG,SAAS1F,OAAOC,KAAKwF,YAAAA,EAAcpC,MAAM,SAACyB,OAAAA;AAC9C,QAAMa,cAAc,CAACF,aAAaX,KAAAA,GAC5Bc,QAAQd,MAAMjF,WAAW,KAAA,GACzBgG,UAAUf,MAAMgB,SAAS,OAAA,GACzBC,WAAWP,WAAWK,UAAU,UAAU,QAAA;AAEhD,WAAOD,QAAQG,WAAWJ,cAAcI,WAAWJ;EACrD,CAAA;AACA,SAAOD;AACT;",
5
- "names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "useDidHydrateOnce", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "match", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "getSnapshot", "touched", "prev", "enabled", "isDisabled", "testKeys", "hasntUpdated", "every", "useMedia", "uidIn", "componentContext", "uid", "hasHydrated", "isHydrated", "initialState", "componentState", "undefined", "state", "setState", "delete", "_", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "isWidth", "endsWith", "givenVal"]
4
+ "mappings": "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",
5
+ "names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "useSyncExternalStore", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "mediaKeyRegex", "isMediaKey", "has", "match", "initState", "defaultMediaImportance", "Object", "keys", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "add", "assign", "disableSSR", "setupMediaListeners", "updateCurrentState", "unlisten", "forEach", "cb", "clear", "setupVersion", "update", "next", "getMatch", "matches", "str", "mediaObjectToString", "addListener", "removeListener", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useMedia", "uidIn", "componentContext", "debug", "uid", "initialState", "componentState", "prev", "getSnapshot", "enabled", "testKeys", "hasntUpdated", "every", "state", "TAMAGUI_SYNC_MEDIA_QUERY", "internalState", "setState", "_", "includes", "push", "console", "info", "getMediaImportanceIfMoreImportant", "mediaKey", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "res", "entries", "map", "feature", "value", "test", "join", "mediaKeyToQuery", "mediaKeyMatch", "dimensions", "mediaQueries", "result", "expectedVal", "isMax", "startsWith", "isWidth", "endsWith", "givenVal"]
6
6
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/views/TamaguiProvider.tsx"],
4
- "mappings": "AAAA,SAAS,gBAAgB;AACzB,YAAY,WAAW;AAEvB,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AAEpC,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AAsChC;AApCC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAyB;AACvB,6BAAoB,GAEhB,aAGF,sBAAsB,GAEtB,MAAM,mBAAmB,MAAM;AAC7B,QAAK,WACA,OAAO,cAGN,SAAS,gBAAgB,UAAU,SAAS,aAAa,KAC3D,SAAS,gBAAgB,UAAU,OAAO,aAAa,GAIvD,CAAC,mBAAkB;AACrB,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,mBAAM,YAAY,SAAS,eAAe,OAAO,OAAO,CAAC,CAAC,GAC1D,SAAS,KAAK,YAAY,KAAK,GACxB,MAAM;AACX,iBAAS,KAAK,YAAY,KAAK;AAAA,MACjC;AAAA,IACF;AAAA,EACF,GAAG,CAAC,QAAQ,gBAAgB,CAAC,IAI7B,oBAAC,iBAAiB,UAAjB,EAA0B,iBAAiB,QAAQ,YAClD;AAAA,IAAC;AAAA;AAAA,MACC,sBAAsB,QAAQ;AAAA,MAC9B,uBAAuB,QAAQ;AAAA,MAC9B,GAAG;AAAA,MACJ,cACE,mBAAmB,iBAAiB,SAAS,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,IAAI;AAAA,MAG9E;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,gBAAgB,cAAiB;",
4
+ "mappings": "AAAA,SAAS,gBAAgB;AACzB,YAAY,WAAW;AAEvB,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AAEpC,SAAS,qBAAqB;AAC9B,SAAS,6BAA6B;AAqChC;AAnCC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAAyB;AACvB,6BAAoB,GAEhB,aAEF,sBAAsB,GAEtB,MAAM,mBAAmB,MAAM;AAC7B,QAAK,WACA,OAAO,cAGN,SAAS,gBAAgB,UAAU,SAAS,aAAa,KAC3D,SAAS,gBAAgB,UAAU,OAAO,aAAa,GAIvD,CAAC,mBAAkB;AACrB,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,mBAAM,YAAY,SAAS,eAAe,OAAO,OAAO,CAAC,CAAC,GAC1D,SAAS,KAAK,YAAY,KAAK,GACxB,MAAM;AACX,iBAAS,KAAK,YAAY,KAAK;AAAA,MACjC;AAAA,IACF;AAAA,EACF,GAAG,CAAC,QAAQ,gBAAgB,CAAC,IAI7B,oBAAC,iBAAiB,UAAjB,EAA0B,iBAAiB,QAAQ,YAClD;AAAA,IAAC;AAAA;AAAA,MACC,sBAAsB,QAAQ;AAAA,MAC9B,uBAAuB,QAAQ;AAAA,MAC9B,GAAG;AAAA,MACJ,cACE,mBAAmB,iBAAiB,SAAS,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,IAAI;AAAA,MAG9E;AAAA;AAAA,EACH,GACF;AAEJ;AAEA,gBAAgB,cAAiB;",
5
5
  "names": []
6
6
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/views/Users/n8/tamagui/packages/web/src/views/TamaguiProvider.tsx"],
4
- "mappings": ";AAAA,SAASA,gBAAgB;AACzB,YAAYC,WAAW;AAEvB,SAASC,wBAAwB;AACjC,SAASC,2BAA2B;AAEpC,SAASC,qBAAqB;AAC9B,SAASC,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/B,SAASC,gBAAgB,QAAA;MAC9BC,WAD8B,OAC9BA,UACAC,mBAF8B,OAE9BA,kBACAC,SAH8B,OAG9BA,QACGC,qBAAAA,2BAJ2B,QAAA;IAC9BH;IACAC;IACAC;;AAGAN,sBAAAA,GAEIH,aAGFK,sBAAAA,GAEAJ,MAAMU,mBAAmB,WAAA;AACvB,QAAKF,WACAA,OAAOG,cAGNC,SAASC,gBAAgBC,UAAUC,SAAS,aAAA,KAC9CH,SAASC,gBAAgBC,UAAUE,OAAO,aAAA,GAI1C,CAACT,mBAAkB;AACrB,UAAMU,QAAQL,SAASM,cAAc,OAAA;AACrCD,mBAAME,YAAYP,SAASQ,eAAeZ,OAAOa,OAAM,CAAA,CAAA,GACvDT,SAASU,KAAKH,YAAYF,KAAAA,GACnB,WAAA;AACLL,iBAASU,KAAKC,YAAYN,KAAAA;MAC5B;IACF;EACF,GAAG;IAACT;IAAQD;GAAiB;MAUvBE;AAPR,SACE,qBAACR,iBAAiBuB,UAAQ;IAACC,iBAAiBjB,UAAAA,OAAAA,SAAAA,OAAQkB;cAClD,qBAACvB,eAAAA,qBAAAA,eAAAA;MACCwB,sBAAsBnB,UAAAA,OAAAA,SAAAA,OAAQmB;MAC9BC,uBAAuBpB,UAAAA,OAAAA,SAAAA,OAAQoB;OAC3BnB,kBAAAA,GAAAA;MACJoB,eACEpB,mCAAAA,mBAAmBoB,kBAAY,QAA/BpB,qCAAAA,SAAAA,mCAAoCD,SAASsB,OAAOC,KAAKvB,OAAOwB,MAAM,EAAE,CAAA,IAAK;;;;AAOvF;AAEA3B,gBAAgB,cAAiB;",
4
+ "mappings": ";AAAA,SAASA,gBAAgB;AACzB,YAAYC,WAAW;AAEvB,SAASC,wBAAwB;AACjC,SAASC,2BAA2B;AAEpC,SAASC,qBAAqB;AAC9B,SAASC,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/B,SAASC,gBAAgB,QAAA;MAC9BC,WAD8B,OAC9BA,UACAC,mBAF8B,OAE9BA,kBACAC,SAH8B,OAG9BA,QACGC,qBAAAA,2BAJ2B,QAAA;IAC9BH;IACAC;IACAC;;AAGAN,sBAAAA,GAEIH,aAEFK,sBAAAA,GAEAJ,MAAMU,mBAAmB,WAAA;AACvB,QAAKF,WACAA,OAAOG,cAGNC,SAASC,gBAAgBC,UAAUC,SAAS,aAAA,KAC9CH,SAASC,gBAAgBC,UAAUE,OAAO,aAAA,GAI1C,CAACT,mBAAkB;AACrB,UAAMU,QAAQL,SAASM,cAAc,OAAA;AACrCD,mBAAME,YAAYP,SAASQ,eAAeZ,OAAOa,OAAM,CAAA,CAAA,GACvDT,SAASU,KAAKH,YAAYF,KAAAA,GACnB,WAAA;AACLL,iBAASU,KAAKC,YAAYN,KAAAA;MAC5B;IACF;EACF,GAAG;IAACT;IAAQD;GAAiB;MAUvBE;AAPR,SACE,qBAACR,iBAAiBuB,UAAQ;IAACC,iBAAiBjB,UAAAA,OAAAA,SAAAA,OAAQkB;cAClD,qBAACvB,eAAAA,qBAAAA,eAAAA;MACCwB,sBAAsBnB,UAAAA,OAAAA,SAAAA,OAAQmB;MAC9BC,uBAAuBpB,UAAAA,OAAAA,SAAAA,OAAQoB;OAC3BnB,kBAAAA,GAAAA;MACJoB,eACEpB,mCAAAA,mBAAmBoB,kBAAY,QAA/BpB,qCAAAA,SAAAA,mCAAoCD,SAASsB,OAAOC,KAAKvB,OAAOwB,MAAM,EAAE,CAAA,IAAK;;;;AAOvF;AAEA3B,gBAAgB,cAAiB;",
5
5
  "names": ["isClient", "React", "ComponentContext", "setupMediaListeners", "ThemeProvider", "useDidHydrateOnceRoot", "TamaguiProvider", "children", "disableInjectCSS", "config", "themePropsProvider", "useInsertionEffect", "disableSSR", "document", "documentElement", "classList", "contains", "remove", "style", "createElement", "appendChild", "createTextNode", "getCSS", "head", "removeChild", "Provider", "animationDriver", "animations", "themeClassNameOnRoot", "disableRootThemeClass", "defaultTheme", "Object", "keys", "themes"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "1.101.0",
3
+ "version": "1.101.2",
4
4
  "source": "src/index.ts",
5
5
  "main": "dist/cjs",
6
6
  "module": "dist/esm",
@@ -27,23 +27,23 @@
27
27
  "reset.css"
28
28
  ],
29
29
  "dependencies": {
30
- "@tamagui/compose-refs": "1.101.0",
31
- "@tamagui/constants": "1.101.0",
32
- "@tamagui/helpers": "1.101.0",
33
- "@tamagui/normalize-css-color": "1.101.0",
34
- "@tamagui/timer": "1.101.0",
35
- "@tamagui/types": "1.101.0",
36
- "@tamagui/use-did-finish-ssr": "1.101.0",
37
- "@tamagui/use-event": "1.101.0",
38
- "@tamagui/use-force-update": "1.101.0"
30
+ "@tamagui/compose-refs": "1.101.2",
31
+ "@tamagui/constants": "1.101.2",
32
+ "@tamagui/helpers": "1.101.2",
33
+ "@tamagui/normalize-css-color": "1.101.2",
34
+ "@tamagui/timer": "1.101.2",
35
+ "@tamagui/types": "1.101.2",
36
+ "@tamagui/use-did-finish-ssr": "1.101.2",
37
+ "@tamagui/use-event": "1.101.2",
38
+ "@tamagui/use-force-update": "1.101.2"
39
39
  },
40
40
  "devDependencies": {
41
- "@tamagui/build": "1.101.0",
41
+ "@tamagui/build": "1.101.2",
42
42
  "@testing-library/react": "^14.0.0",
43
43
  "csstype": "^3.0.10",
44
44
  "react": "^18.2.0",
45
45
  "react-dom": "^18.2.0",
46
- "typescript": "^5.4.5",
46
+ "typescript": "^5.5.2",
47
47
  "vitest": "^0.34.3"
48
48
  },
49
49
  "exports": {