@tamagui/web 1.116.4 → 1.116.6
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.
- package/dist/cjs/hooks/useMedia.cjs +18 -17
- package/dist/cjs/hooks/useMedia.js +18 -22
- package/dist/cjs/hooks/useMedia.js.map +2 -2
- package/dist/cjs/hooks/useMedia.native.js +23 -22
- package/dist/cjs/hooks/useMedia.native.js.map +2 -2
- package/dist/esm/hooks/useMedia.js +18 -22
- package/dist/esm/hooks/useMedia.js.map +2 -2
- package/dist/esm/hooks/useMedia.mjs +18 -17
- package/dist/esm/hooks/useMedia.mjs.map +1 -1
- package/dist/esm/hooks/useMedia.native.js +23 -22
- package/dist/esm/hooks/useMedia.native.js.map +2 -2
- package/package.json +11 -11
- package/src/hooks/useMedia.tsx +38 -34
- package/types/hooks/useMedia.d.ts.map +1 -1
|
@@ -146,17 +146,15 @@ function subscribe(subscriber) {
|
|
|
146
146
|
listeners.delete(subscriber);
|
|
147
147
|
};
|
|
148
148
|
}
|
|
149
|
+
const CurrentKeysMap = /* @__PURE__ */new WeakMap();
|
|
149
150
|
function useMedia(cc, debug) {
|
|
150
151
|
const initialState = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc) || !import_constants.isWeb ? mediaState : initState,
|
|
151
152
|
[state, setState] = import_react.default.useState(initialState);
|
|
152
|
-
|
|
153
|
-
const
|
|
154
|
-
function getSnapshot(cur
|
|
155
|
-
if (!
|
|
156
|
-
for (const key of
|
|
157
|
-
...mediaState,
|
|
158
|
-
lastKeys: new Set(keys)
|
|
159
|
-
};
|
|
153
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */new Set());
|
|
154
|
+
const currentKeys = CurrentKeysMap.get(setState);
|
|
155
|
+
function getSnapshot(cur) {
|
|
156
|
+
if (!currentKeys) return cur;
|
|
157
|
+
for (const key of currentKeys) if (mediaState[key] !== cur[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
160
158
|
return cur;
|
|
161
159
|
}
|
|
162
160
|
let isRendering = !0;
|
|
@@ -164,16 +162,19 @@ function useMedia(cc, debug) {
|
|
|
164
162
|
return (0, import_constants.useIsomorphicLayoutEffect)(() => {
|
|
165
163
|
isRendering = !1;
|
|
166
164
|
}), (0, import_constants.useIsomorphicLayoutEffect)(() => {
|
|
167
|
-
const update = () => setState(prev => getSnapshot(prev
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
165
|
+
const update = () => setState(prev => getSnapshot(prev));
|
|
166
|
+
update();
|
|
167
|
+
const tm = setTimeout(() => {
|
|
168
|
+
currentKeys.size && update();
|
|
169
|
+
}),
|
|
170
|
+
dispose2 = subscribe(update);
|
|
171
|
+
return () => {
|
|
172
|
+
dispose2(), clearTimeout(tm);
|
|
173
|
+
};
|
|
174
|
+
}, [setState]), new Proxy(state, {
|
|
174
175
|
get(_, key) {
|
|
175
|
-
if (isRendering && !disableMediaTouch && typeof key == "string" && (
|
|
176
|
-
const next = getSnapshot(state
|
|
176
|
+
if (isRendering && !disableMediaTouch && typeof key == "string" && (currentKeys.add(key), state[key] !== mediaState[key] && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState))) {
|
|
177
|
+
const next = getSnapshot(state);
|
|
177
178
|
next !== state && setState(next);
|
|
178
179
|
}
|
|
179
180
|
return Reflect.get(state, key);
|
|
@@ -123,18 +123,16 @@ function subscribe(subscriber) {
|
|
|
123
123
|
listeners.delete(subscriber);
|
|
124
124
|
};
|
|
125
125
|
}
|
|
126
|
+
const CurrentKeysMap = /* @__PURE__ */ new WeakMap();
|
|
126
127
|
function useMedia(cc, debug) {
|
|
127
128
|
const initialState = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc) || !import_constants.isWeb ? mediaState : initState, [state, setState] = import_react.default.useState(initialState);
|
|
128
|
-
|
|
129
|
-
const
|
|
130
|
-
function getSnapshot(cur
|
|
131
|
-
if (!
|
|
132
|
-
for (const key of
|
|
129
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */ new Set());
|
|
130
|
+
const currentKeys = CurrentKeysMap.get(setState);
|
|
131
|
+
function getSnapshot(cur) {
|
|
132
|
+
if (!currentKeys) return cur;
|
|
133
|
+
for (const key of currentKeys)
|
|
133
134
|
if (mediaState[key] !== cur[key])
|
|
134
|
-
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]),
|
|
135
|
-
...mediaState,
|
|
136
|
-
lastKeys: new Set(keys)
|
|
137
|
-
};
|
|
135
|
+
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
138
136
|
return cur;
|
|
139
137
|
}
|
|
140
138
|
let isRendering = !0;
|
|
@@ -142,20 +140,18 @@ function useMedia(cc, debug) {
|
|
|
142
140
|
return (0, import_constants.useIsomorphicLayoutEffect)(() => {
|
|
143
141
|
isRendering = !1;
|
|
144
142
|
}), (0, import_constants.useIsomorphicLayoutEffect)(() => {
|
|
145
|
-
const update = () => setState(
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
return update(), subscribe(update);
|
|
155
|
-
}, []), new Proxy(state, {
|
|
143
|
+
const update = () => setState((prev) => getSnapshot(prev));
|
|
144
|
+
update();
|
|
145
|
+
const tm = setTimeout(() => {
|
|
146
|
+
currentKeys.size && update();
|
|
147
|
+
}), dispose2 = subscribe(update);
|
|
148
|
+
return () => {
|
|
149
|
+
dispose2(), clearTimeout(tm);
|
|
150
|
+
};
|
|
151
|
+
}, [setState]), new Proxy(state, {
|
|
156
152
|
get(_, key) {
|
|
157
|
-
if (isRendering && !disableMediaTouch && typeof key == "string" && (
|
|
158
|
-
const next = getSnapshot(state
|
|
153
|
+
if (isRendering && !disableMediaTouch && typeof key == "string" && (currentKeys.add(key), state[key] !== mediaState[key] && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState))) {
|
|
154
|
+
const next = getSnapshot(state);
|
|
159
155
|
next !== state && setState(next);
|
|
160
156
|
}
|
|
161
157
|
return Reflect.get(state, key);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2D,+BAC3D,
|
|
5
|
-
"names": ["React"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["React", "dispose"]
|
|
6
6
|
}
|
|
@@ -127,22 +127,19 @@ function subscribe(subscriber) {
|
|
|
127
127
|
listeners.delete(subscriber);
|
|
128
128
|
};
|
|
129
129
|
}
|
|
130
|
+
var CurrentKeysMap = /* @__PURE__ */ new WeakMap();
|
|
130
131
|
function useMedia(cc, debug) {
|
|
131
|
-
var disableSSR = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc), initialState = disableSSR || !import_constants.isWeb ? mediaState : initState, [state, setState] = import_react.default.useState(initialState)
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
var disableSSR = (0, import_config.getSetting)("disableSSR") || (0, import_useDisableSSR.getDisableSSR)(cc), initialState = disableSSR || !import_constants.isWeb ? mediaState : initState, [state, setState] = import_react.default.useState(initialState);
|
|
133
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */ new Set());
|
|
134
|
+
var currentKeys = CurrentKeysMap.get(setState);
|
|
134
135
|
function getSnapshot(cur) {
|
|
135
|
-
|
|
136
|
-
if (!keys) return cur;
|
|
136
|
+
if (!currentKeys) return cur;
|
|
137
137
|
var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
|
138
138
|
try {
|
|
139
|
-
for (var _iterator =
|
|
139
|
+
for (var _iterator = currentKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
140
140
|
var key = _step.value;
|
|
141
141
|
if (mediaState[key] !== cur[key])
|
|
142
|
-
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]),
|
|
143
|
-
...mediaState,
|
|
144
|
-
lastKeys: new Set(keys)
|
|
145
|
-
};
|
|
142
|
+
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
146
143
|
}
|
|
147
144
|
} catch (err) {
|
|
148
145
|
_didIteratorError = !0, _iteratorError = err;
|
|
@@ -162,22 +159,26 @@ function useMedia(cc, debug) {
|
|
|
162
159
|
}), (0, import_constants.useIsomorphicLayoutEffect)(function() {
|
|
163
160
|
var update = function() {
|
|
164
161
|
return setState(function(prev) {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
// because the !didHydrateOnce logic we can't update as we render
|
|
168
|
-
// we need to get the current keys in case we added
|
|
169
|
-
// these only ever add keys so likely ok?
|
|
170
|
-
getCurrentKeys()
|
|
171
|
-
);
|
|
162
|
+
var next = getSnapshot(prev);
|
|
163
|
+
return next;
|
|
172
164
|
});
|
|
173
165
|
};
|
|
174
|
-
|
|
175
|
-
|
|
166
|
+
update();
|
|
167
|
+
var tm = setTimeout(function() {
|
|
168
|
+
currentKeys.size && update();
|
|
169
|
+
}), dispose2 = subscribe(update);
|
|
170
|
+
return function() {
|
|
171
|
+
dispose2(), clearTimeout(tm);
|
|
172
|
+
};
|
|
173
|
+
}, [
|
|
174
|
+
setState
|
|
175
|
+
]), new Proxy(state, {
|
|
176
176
|
get(_, key) {
|
|
177
177
|
if (isRendering && !disableMediaTouch && typeof key == "string") {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
178
|
+
currentKeys.add(key);
|
|
179
|
+
var shouldUpdate = state[key] !== mediaState[key];
|
|
180
|
+
if (shouldUpdate && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState)) {
|
|
181
|
+
var next = getSnapshot(state);
|
|
181
182
|
next !== state && setState(next);
|
|
182
183
|
}
|
|
183
184
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;uBAA2D,+BAC3D,
|
|
5
|
-
"names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "mediaKeyRegex", "isMediaKey", "has", "match", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "getSetting", "add", "assign", "setupMediaListeners", "unlisten", "forEach", "cb", "clear", "setupVersion", "str", "mediaObjectToString", "getMatch", "matchMedia", "addListener", "update", "removeListener", "next", "matches", "updateCurrentState", "isWeb", "isServer", "IS_STATIC", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "enabled", "cur", "set", "subscribe", "subscriber", "delete", "useMedia", "cc", "debug", "disableSSR", "getDisableSSR", "initialState", "state", "setState", "React", "useState", "currentKeys", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "mediaKeyRegex", "isMediaKey", "has", "match", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "settings", "mediaPropOrder", "indexOf", "dispose", "mediaVersion", "configureMedia", "config", "media", "mediaQueryDefaultActive", "getSetting", "add", "assign", "setupMediaListeners", "unlisten", "forEach", "cb", "clear", "setupVersion", "str", "mediaObjectToString", "getMatch", "matchMedia", "addListener", "update", "removeListener", "next", "matches", "updateCurrentState", "isWeb", "isServer", "IS_STATIC", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "enabled", "cur", "set", "subscribe", "subscriber", "delete", "CurrentKeysMap", "useMedia", "cc", "debug", "disableSSR", "getDisableSSR", "initialState", "state", "setState", "React", "useState", "currentKeys", "getSnapshot", "console", "warn", "isRendering", "isInitialState", "useIsomorphicLayoutEffect", "prev", "tm", "setTimeout", "size", "clearTimeout", "_", "disableMediaTouch", "shouldUpdate", "info", "_disableMediaTouch", "val", "getMediaState", "mediaGroups", "layout", "res", "fromEntries", "map", "mediaKey", "mediaKeyMatch", "getMediaImportanceIfMoreImportant", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "entries", "feature", "value", "test", "join", "mediaKeyToQuery", "dimensions", "mediaQueries", "result", "every", "expectedVal", "isMax", "startsWith", "isWidth", "endsWith", "givenVal"]
|
|
6
6
|
}
|
|
@@ -86,18 +86,16 @@ function subscribe(subscriber) {
|
|
|
86
86
|
listeners.delete(subscriber);
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
|
+
const CurrentKeysMap = /* @__PURE__ */ new WeakMap();
|
|
89
90
|
function useMedia(cc, debug) {
|
|
90
91
|
const initialState = getSetting("disableSSR") || getDisableSSR(cc) || !isWeb ? mediaState : initState, [state, setState] = React.useState(initialState);
|
|
91
|
-
|
|
92
|
-
const
|
|
93
|
-
function getSnapshot(cur
|
|
94
|
-
if (!
|
|
95
|
-
for (const key of
|
|
92
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */ new Set());
|
|
93
|
+
const currentKeys = CurrentKeysMap.get(setState);
|
|
94
|
+
function getSnapshot(cur) {
|
|
95
|
+
if (!currentKeys) return cur;
|
|
96
|
+
for (const key of currentKeys)
|
|
96
97
|
if (mediaState[key] !== cur[key])
|
|
97
|
-
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]),
|
|
98
|
-
...mediaState,
|
|
99
|
-
lastKeys: new Set(keys)
|
|
100
|
-
};
|
|
98
|
+
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
101
99
|
return cur;
|
|
102
100
|
}
|
|
103
101
|
let isRendering = !0;
|
|
@@ -105,20 +103,18 @@ function useMedia(cc, debug) {
|
|
|
105
103
|
return useIsomorphicLayoutEffect(() => {
|
|
106
104
|
isRendering = !1;
|
|
107
105
|
}), useIsomorphicLayoutEffect(() => {
|
|
108
|
-
const update = () => setState(
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
return update(), subscribe(update);
|
|
118
|
-
}, []), new Proxy(state, {
|
|
106
|
+
const update = () => setState((prev) => getSnapshot(prev));
|
|
107
|
+
update();
|
|
108
|
+
const tm = setTimeout(() => {
|
|
109
|
+
currentKeys.size && update();
|
|
110
|
+
}), dispose2 = subscribe(update);
|
|
111
|
+
return () => {
|
|
112
|
+
dispose2(), clearTimeout(tm);
|
|
113
|
+
};
|
|
114
|
+
}, [setState]), new Proxy(state, {
|
|
119
115
|
get(_, key) {
|
|
120
|
-
if (isRendering && !disableMediaTouch && typeof key == "string" && (
|
|
121
|
-
const next = getSnapshot(state
|
|
116
|
+
if (isRendering && !disableMediaTouch && typeof key == "string" && (currentKeys.add(key), state[key] !== mediaState[key] && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState))) {
|
|
117
|
+
const next = getSnapshot(state);
|
|
122
118
|
next !== state && setState(next);
|
|
123
119
|
}
|
|
124
120
|
return Reflect.get(state, key);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,OAAO,iCAAiC;AAC3D,OAAO,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["dispose"]
|
|
6
6
|
}
|
|
@@ -95,17 +95,15 @@ function subscribe(subscriber) {
|
|
|
95
95
|
listeners.delete(subscriber);
|
|
96
96
|
};
|
|
97
97
|
}
|
|
98
|
+
const CurrentKeysMap = /* @__PURE__ */new WeakMap();
|
|
98
99
|
function useMedia(cc, debug) {
|
|
99
100
|
const initialState = getSetting("disableSSR") || getDisableSSR(cc) || !isWeb ? mediaState : initState,
|
|
100
101
|
[state, setState] = React.useState(initialState);
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
function getSnapshot(cur
|
|
104
|
-
if (!
|
|
105
|
-
for (const key of
|
|
106
|
-
...mediaState,
|
|
107
|
-
lastKeys: new Set(keys)
|
|
108
|
-
};
|
|
102
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */new Set());
|
|
103
|
+
const currentKeys = CurrentKeysMap.get(setState);
|
|
104
|
+
function getSnapshot(cur) {
|
|
105
|
+
if (!currentKeys) return cur;
|
|
106
|
+
for (const key of currentKeys) if (mediaState[key] !== cur[key]) return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
109
107
|
return cur;
|
|
110
108
|
}
|
|
111
109
|
let isRendering = !0;
|
|
@@ -113,16 +111,19 @@ function useMedia(cc, debug) {
|
|
|
113
111
|
return useIsomorphicLayoutEffect(() => {
|
|
114
112
|
isRendering = !1;
|
|
115
113
|
}), useIsomorphicLayoutEffect(() => {
|
|
116
|
-
const update = () => setState(prev => getSnapshot(prev
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
114
|
+
const update = () => setState(prev => getSnapshot(prev));
|
|
115
|
+
update();
|
|
116
|
+
const tm = setTimeout(() => {
|
|
117
|
+
currentKeys.size && update();
|
|
118
|
+
}),
|
|
119
|
+
dispose2 = subscribe(update);
|
|
120
|
+
return () => {
|
|
121
|
+
dispose2(), clearTimeout(tm);
|
|
122
|
+
};
|
|
123
|
+
}, [setState]), new Proxy(state, {
|
|
123
124
|
get(_, key) {
|
|
124
|
-
if (isRendering && !disableMediaTouch && typeof key == "string" && (
|
|
125
|
-
const next = getSnapshot(state
|
|
125
|
+
if (isRendering && !disableMediaTouch && typeof key == "string" && (currentKeys.add(key), state[key] !== mediaState[key] && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState))) {
|
|
126
|
+
const next = getSnapshot(state);
|
|
126
127
|
next !== state && setState(next);
|
|
127
128
|
}
|
|
128
129
|
return Reflect.get(state, key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isServer","isWeb","useIsomorphicLayoutEffect","React","getConfig","getSetting","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","settings","mediaPropOrder","indexOf","dispose","mediaVersion","configureMedia","config","media","mediaQueryDefaultActive","add","assign","setupMediaListeners","unlisten","forEach","cb","clear","setupVersion","IS_STATIC","update","next","getMatch","matches","updateCurrentState","str","mediaObjectToString","addListener","removeListener","listeners","flushing","flushVersion","Promise","resolve","then","States","WeakMap","setMediaShouldUpdate","ref","enabled","cur","set","subscribe","subscriber","delete","useMedia","cc","debug","initialState","state","setState","useState","currentKeys","
|
|
1
|
+
{"version":3,"names":["isServer","isWeb","useIsomorphicLayoutEffect","React","getConfig","getSetting","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","settings","mediaPropOrder","indexOf","dispose","mediaVersion","configureMedia","config","media","mediaQueryDefaultActive","add","assign","setupMediaListeners","unlisten","forEach","cb","clear","setupVersion","IS_STATIC","update","next","getMatch","matches","updateCurrentState","str","mediaObjectToString","addListener","removeListener","listeners","flushing","flushVersion","Promise","resolve","then","States","WeakMap","setMediaShouldUpdate","ref","enabled","cur","set","subscribe","subscriber","delete","CurrentKeysMap","useMedia","cc","debug","initialState","state","setState","useState","currentKeys","getSnapshot","console","warn","isRendering","isInitialState","prev","tm","setTimeout","size","dispose2","clearTimeout","_","disableMediaTouch","info","_disableMediaTouch","val","getMediaState","mediaGroups","layout","res","fromEntries","map","mediaKey","mediaKeyMatch","getMediaImportanceIfMoreImportant","importancesUsed","isSizeMedia","importance","camelToHyphen","replace","m","toLowerCase","cache","cachedMediaKeyToQuery","query","entries","feature","value","test","join","mediaKeyToQuery","dimensions","mediaQueries","every","expectedVal","isMax","startsWith","isWidth","endsWith","givenVal"],"sources":["../../../src/hooks/useMedia.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -90,22 +90,19 @@ function subscribe(subscriber) {
|
|
|
90
90
|
listeners.delete(subscriber);
|
|
91
91
|
};
|
|
92
92
|
}
|
|
93
|
+
var CurrentKeysMap = /* @__PURE__ */ new WeakMap();
|
|
93
94
|
function useMedia(cc, debug) {
|
|
94
|
-
var disableSSR = getSetting("disableSSR") || getDisableSSR(cc), initialState = disableSSR || !isWeb ? mediaState : initState, [state, setState] = React.useState(initialState)
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
var disableSSR = getSetting("disableSSR") || getDisableSSR(cc), initialState = disableSSR || !isWeb ? mediaState : initState, [state, setState] = React.useState(initialState);
|
|
96
|
+
CurrentKeysMap.get(setState) || CurrentKeysMap.set(setState, /* @__PURE__ */ new Set());
|
|
97
|
+
var currentKeys = CurrentKeysMap.get(setState);
|
|
97
98
|
function getSnapshot(cur) {
|
|
98
|
-
|
|
99
|
-
if (!keys) return cur;
|
|
99
|
+
if (!currentKeys) return cur;
|
|
100
100
|
var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
|
101
101
|
try {
|
|
102
|
-
for (var _iterator =
|
|
102
|
+
for (var _iterator = currentKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
103
103
|
var key = _step.value;
|
|
104
104
|
if (mediaState[key] !== cur[key])
|
|
105
|
-
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]),
|
|
106
|
-
...mediaState,
|
|
107
|
-
lastKeys: new Set(keys)
|
|
108
|
-
};
|
|
105
|
+
return process.env.NODE_ENV === "development" && debug && console.warn("useMedia()\u270D\uFE0F", key, cur[key], ">", mediaState[key]), mediaState;
|
|
109
106
|
}
|
|
110
107
|
} catch (err) {
|
|
111
108
|
_didIteratorError = !0, _iteratorError = err;
|
|
@@ -125,22 +122,26 @@ function useMedia(cc, debug) {
|
|
|
125
122
|
}), useIsomorphicLayoutEffect(function() {
|
|
126
123
|
var update = function() {
|
|
127
124
|
return setState(function(prev) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
// because the !didHydrateOnce logic we can't update as we render
|
|
131
|
-
// we need to get the current keys in case we added
|
|
132
|
-
// these only ever add keys so likely ok?
|
|
133
|
-
getCurrentKeys()
|
|
134
|
-
);
|
|
125
|
+
var next = getSnapshot(prev);
|
|
126
|
+
return next;
|
|
135
127
|
});
|
|
136
128
|
};
|
|
137
|
-
|
|
138
|
-
|
|
129
|
+
update();
|
|
130
|
+
var tm = setTimeout(function() {
|
|
131
|
+
currentKeys.size && update();
|
|
132
|
+
}), dispose2 = subscribe(update);
|
|
133
|
+
return function() {
|
|
134
|
+
dispose2(), clearTimeout(tm);
|
|
135
|
+
};
|
|
136
|
+
}, [
|
|
137
|
+
setState
|
|
138
|
+
]), new Proxy(state, {
|
|
139
139
|
get(_, key) {
|
|
140
140
|
if (isRendering && !disableMediaTouch && typeof key == "string") {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
141
|
+
currentKeys.add(key);
|
|
142
|
+
var shouldUpdate = state[key] !== mediaState[key];
|
|
143
|
+
if (shouldUpdate && (process.env.NODE_ENV === "development" && debug && console.info("useMedia() TOUCH", key), !isInitialState)) {
|
|
144
|
+
var next = getSnapshot(state);
|
|
144
145
|
next !== state && setState(next);
|
|
145
146
|
}
|
|
146
147
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAASA,UAAUC,OAAOC,iCAAiC;AAC3D,OAAOC,
|
|
5
|
-
"names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "React", "getConfig", "getSetting", "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", "setupMediaListeners", "unlisten", "forEach", "cb", "clear", "setupVersion", "str", "mediaObjectToString", "getMatch", "addListener", "update", "removeListener", "next", "matches", "updateCurrentState", "IS_STATIC", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "enabled", "cur", "set", "subscribe", "subscriber", "delete", "useMedia", "cc", "debug", "disableSSR", "initialState", "state", "setState", "useState", "currentKeys", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "React", "getConfig", "getSetting", "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", "setupMediaListeners", "unlisten", "forEach", "cb", "clear", "setupVersion", "str", "mediaObjectToString", "getMatch", "addListener", "update", "removeListener", "next", "matches", "updateCurrentState", "IS_STATIC", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "States", "WeakMap", "setMediaShouldUpdate", "ref", "enabled", "cur", "set", "subscribe", "subscriber", "delete", "CurrentKeysMap", "useMedia", "cc", "debug", "disableSSR", "initialState", "state", "setState", "useState", "currentKeys", "getSnapshot", "console", "warn", "isRendering", "isInitialState", "prev", "tm", "setTimeout", "size", "clearTimeout", "_", "disableMediaTouch", "shouldUpdate", "info", "_disableMediaTouch", "val", "getMediaState", "mediaGroups", "layout", "res", "fromEntries", "map", "mediaKey", "mediaKeyMatch", "getMediaImportanceIfMoreImportant", "importancesUsed", "isSizeMedia", "importance", "camelToHyphen", "replace", "m", "toLowerCase", "cache", "cachedMediaKeyToQuery", "query", "entries", "feature", "value", "test", "join", "mediaKeyToQuery", "dimensions", "mediaQueries", "result", "every", "expectedVal", "isMax", "startsWith", "isWidth", "endsWith", "givenVal"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.116.
|
|
3
|
+
"version": "1.116.6",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,20 +27,20 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.116.
|
|
31
|
-
"@tamagui/constants": "1.116.
|
|
32
|
-
"@tamagui/helpers": "1.116.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.116.
|
|
34
|
-
"@tamagui/timer": "1.116.
|
|
35
|
-
"@tamagui/types": "1.116.
|
|
36
|
-
"@tamagui/use-did-finish-ssr": "1.116.
|
|
37
|
-
"@tamagui/use-event": "1.116.
|
|
38
|
-
"@tamagui/use-force-update": "1.116.
|
|
30
|
+
"@tamagui/compose-refs": "1.116.6",
|
|
31
|
+
"@tamagui/constants": "1.116.6",
|
|
32
|
+
"@tamagui/helpers": "1.116.6",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.116.6",
|
|
34
|
+
"@tamagui/timer": "1.116.6",
|
|
35
|
+
"@tamagui/types": "1.116.6",
|
|
36
|
+
"@tamagui/use-did-finish-ssr": "1.116.6",
|
|
37
|
+
"@tamagui/use-event": "1.116.6",
|
|
38
|
+
"@tamagui/use-force-update": "1.116.6",
|
|
39
39
|
"react": "^18.2.0 || ^19.0.0",
|
|
40
40
|
"react-dom": "^18.2.0 || ^19.0.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.116.
|
|
43
|
+
"@tamagui/build": "1.116.6",
|
|
44
44
|
"@testing-library/react": "^16.0.1",
|
|
45
45
|
"csstype": "^3.0.10",
|
|
46
46
|
"typescript": "^5.5.2",
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isServer, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
|
|
2
|
-
import React
|
|
2
|
+
import React from 'react'
|
|
3
3
|
import { getConfig, getSetting } from '../config'
|
|
4
4
|
import { matchMedia } from '../helpers/matchMedia'
|
|
5
5
|
import { pseudoDescriptors } from '../helpers/pseudoDescriptors'
|
|
@@ -197,9 +197,9 @@ function subscribe(subscriber: any) {
|
|
|
197
197
|
|
|
198
198
|
type ComponentMediaKeys = Set<string>
|
|
199
199
|
|
|
200
|
-
type ComponentMediaQueryState = MediaKeysState
|
|
201
|
-
|
|
202
|
-
|
|
200
|
+
type ComponentMediaQueryState = MediaKeysState
|
|
201
|
+
|
|
202
|
+
const CurrentKeysMap = new WeakMap<any, ComponentMediaKeys>()
|
|
203
203
|
|
|
204
204
|
export function useMedia(cc?: ComponentContextI, debug?: DebugProp): UseMediaState {
|
|
205
205
|
// performance boost to avoid using context twice
|
|
@@ -207,25 +207,24 @@ export function useMedia(cc?: ComponentContextI, debug?: DebugProp): UseMediaSta
|
|
|
207
207
|
const initialState = disableSSR || !isWeb ? mediaState : initState
|
|
208
208
|
const [state, setState] = React.useState<ComponentMediaQueryState>(initialState)
|
|
209
209
|
|
|
210
|
-
|
|
211
|
-
|
|
210
|
+
if (!CurrentKeysMap.get(setState)) {
|
|
211
|
+
CurrentKeysMap.set(setState, new Set())
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
const currentKeys = CurrentKeysMap.get(setState)!
|
|
212
215
|
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
keys: ComponentMediaKeys | undefined = cur.lastKeys
|
|
216
|
-
) {
|
|
217
|
-
if (!keys) return cur
|
|
216
|
+
// clear each render to track only rendered touched keys
|
|
217
|
+
// if (currentKeys.size) currentKeys.clear()
|
|
218
218
|
|
|
219
|
-
|
|
219
|
+
function getSnapshot(cur: ComponentMediaQueryState) {
|
|
220
|
+
if (!currentKeys) return cur
|
|
221
|
+
|
|
222
|
+
for (const key of currentKeys) {
|
|
220
223
|
if (mediaState[key] !== cur[key]) {
|
|
221
224
|
if (process.env.NODE_ENV === 'development' && debug) {
|
|
222
225
|
console.warn(`useMedia()✍️`, key, cur[key], '>', mediaState[key])
|
|
223
226
|
}
|
|
224
|
-
|
|
225
|
-
return {
|
|
226
|
-
...mediaState,
|
|
227
|
-
lastKeys: new Set(keys),
|
|
228
|
-
}
|
|
227
|
+
return mediaState
|
|
229
228
|
}
|
|
230
229
|
}
|
|
231
230
|
|
|
@@ -241,37 +240,42 @@ export function useMedia(cc?: ComponentContextI, debug?: DebugProp): UseMediaSta
|
|
|
241
240
|
|
|
242
241
|
useIsomorphicLayoutEffect(() => {
|
|
243
242
|
const update = () =>
|
|
244
|
-
setState((prev) =>
|
|
245
|
-
getSnapshot(
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
// we need to get the current keys in case we added
|
|
249
|
-
// these only ever add keys so likely ok?
|
|
250
|
-
getCurrentKeys()
|
|
251
|
-
)
|
|
252
|
-
)
|
|
243
|
+
setState((prev) => {
|
|
244
|
+
const next = getSnapshot(prev)
|
|
245
|
+
return next
|
|
246
|
+
})
|
|
253
247
|
|
|
254
248
|
update()
|
|
255
249
|
|
|
256
|
-
|
|
257
|
-
|
|
250
|
+
const tm = setTimeout(() => {
|
|
251
|
+
if (currentKeys.size) {
|
|
252
|
+
update()
|
|
253
|
+
}
|
|
254
|
+
})
|
|
255
|
+
|
|
256
|
+
const dispose = subscribe(update)
|
|
257
|
+
|
|
258
|
+
return () => {
|
|
259
|
+
dispose()
|
|
260
|
+
clearTimeout(tm)
|
|
261
|
+
}
|
|
262
|
+
}, [setState])
|
|
258
263
|
|
|
259
264
|
return new Proxy(state, {
|
|
260
265
|
get(_, key) {
|
|
261
266
|
if (isRendering && !disableMediaTouch && typeof key === 'string') {
|
|
262
|
-
|
|
267
|
+
currentKeys.add(key)
|
|
263
268
|
|
|
264
|
-
|
|
269
|
+
const shouldUpdate = state[key] !== mediaState[key]
|
|
270
|
+
|
|
271
|
+
if (shouldUpdate) {
|
|
265
272
|
if (process.env.NODE_ENV === 'development' && debug) {
|
|
266
273
|
console.info(`useMedia() TOUCH`, key)
|
|
267
274
|
}
|
|
268
275
|
|
|
269
|
-
currentKeys ||= new Set<string>()
|
|
270
|
-
currentKeys.add(key)
|
|
271
|
-
|
|
272
276
|
// the first update() will get this in an ssr safe way in the useLayoutEffect
|
|
273
277
|
if (!isInitialState) {
|
|
274
|
-
const next = getSnapshot(state
|
|
278
|
+
const next = getSnapshot(state)
|
|
275
279
|
if (next !== state) {
|
|
276
280
|
setState(next)
|
|
277
281
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EACT,WAAW,EACX,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,aAAa,EACd,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAI1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAOxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAa3D,CAAA;AAaD,wBAAgB,mBAAmB,SAkClC;AAkBD,KAAK,cAAc,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CACtC,CAAA;AAID,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,OAAO,EACjB,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,QAW1B;AAeD,wBAAgB,QAAQ,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EACT,WAAW,EACX,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,aAAa,EACd,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAEhD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AAExC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAI1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAOxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAa3D,CAAA;AAaD,wBAAgB,mBAAmB,SAkClC;AAkBD,KAAK,cAAc,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CACtC,CAAA;AAID,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,OAAO,EACjB,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,QAW1B;AAeD,wBAAgB,QAAQ,CAAC,EAAE,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,aAAa,CAoFjF;AAGD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,QAE9C;AAED,wBAAgB,aAAa,CAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,2BAc7C;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAOrB,CAAA;AASD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,GAAG,CAAC,EAAE,MAAM,UAwBjF;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,UAE1C;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,WAY9C"}
|