@tamagui/web 1.100.0 → 1.100.1
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.js +10 -1
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useMedia.native.js +12 -1
- package/dist/cjs/hooks/useMedia.native.js.map +2 -2
- package/dist/esm/hooks/useMedia.js +12 -3
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useMedia.mjs +12 -3
- package/dist/esm/hooks/useMedia.native.js +14 -3
- package/dist/esm/hooks/useMedia.native.js.map +2 -2
- package/package.json +11 -11
- package/src/hooks/useMedia.tsx +25 -3
- package/types/hooks/useMedia.d.ts.map +1 -1
|
@@ -107,8 +107,17 @@ function setMediaShouldUpdate(ref, props) {
|
|
|
107
107
|
function subscribe(subscriber) {
|
|
108
108
|
return listeners.add(subscriber), () => listeners.delete(subscriber);
|
|
109
109
|
}
|
|
110
|
+
function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
|
|
111
|
+
const [state, setState] = (0, import_react.useState)(getServerSnapshot);
|
|
112
|
+
return (0, import_constants.useIsomorphicLayoutEffect)(() => subscriber(() => {
|
|
113
|
+
setState((prev) => {
|
|
114
|
+
const next = getSnapshot();
|
|
115
|
+
return next !== prev ? next : prev;
|
|
116
|
+
});
|
|
117
|
+
}), []), state;
|
|
118
|
+
}
|
|
110
119
|
function useMedia(uid, componentContext) {
|
|
111
|
-
const internal = (0, import_react.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants.isWeb ? mediaState : initState) || {}, state = (
|
|
120
|
+
const internal = (0, import_react.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants.isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(
|
|
112
121
|
subscribe,
|
|
113
122
|
() => {
|
|
114
123
|
if (!internal.current)
|
|
@@ -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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -195,8 +195,19 @@ function subscribe(subscriber) {
|
|
|
195
195
|
return listeners.delete(subscriber);
|
|
196
196
|
};
|
|
197
197
|
}
|
|
198
|
+
function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
|
|
199
|
+
var _useState = _sliced_to_array((0, import_react.useState)(getServerSnapshot), 2), state = _useState[0], setState = _useState[1];
|
|
200
|
+
return (0, import_constants.useIsomorphicLayoutEffect)(function() {
|
|
201
|
+
return subscriber(function() {
|
|
202
|
+
setState(function(prev) {
|
|
203
|
+
var next = getSnapshot();
|
|
204
|
+
return next !== prev ? next : prev;
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
}, []), state;
|
|
208
|
+
}
|
|
198
209
|
function useMedia(uid, componentContext) {
|
|
199
|
-
var internal = (0, import_react.useRef)(), disableSSR = (0, import_useDisableSSR.getDisableSSR)(componentContext), initialState = (disableSSR || !import_constants.isWeb ? mediaState : initState) || {}, state = (
|
|
210
|
+
var internal = (0, import_react.useRef)(), disableSSR = (0, import_useDisableSSR.getDisableSSR)(componentContext), initialState = (disableSSR || !import_constants.isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(subscribe, function() {
|
|
200
211
|
if (!internal.current)
|
|
201
212
|
return initialState;
|
|
202
213
|
var _internal_current = internal.current, touched = _internal_current.touched, prev = _internal_current.prev, componentState = uid ? shouldUpdate.get(uid) : void 0;
|
|
@@ -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,
|
|
5
|
-
"names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "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", "matchMedia", "match", "addListener", "removeListener", "isWeb", "isServer", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "shouldUpdate", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["mediaState", "process", "env", "NODE_ENV", "Proxy", "get", "target", "key", "Error", "Reflect", "mediaQueryConfig", "getMedia", "mediaKeys", "Set", "isMediaKey", "has", "startsWith", "initState", "defaultMediaImportance", "Object", "keys", "pseudoDescriptors", "length", "mediaKeysOrdered", "getMediaKeyImportance", "conf", "getConfig", "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", "matchMedia", "match", "addListener", "removeListener", "isWeb", "isServer", "listeners", "flushing", "flushVersion", "Promise", "resolve", "then", "shouldUpdate", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useLayoutExternalStore", "getSnapshot", "getServerSnapshot", "useState", "state", "setState", "useIsomorphicLayoutEffect", "prev", "useMedia", "uid", "componentContext", "internal", "useRef", "getDisableSSR", "initialState", "current", "touched", "componentState", "undefined", "enabled", "testKeys", "hasntUpdated", "every", "_", "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"]
|
|
6
6
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isServer, isWeb } from "@tamagui/constants";
|
|
2
|
-
import { useRef,
|
|
1
|
+
import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
|
|
2
|
+
import { useRef, useState } from "react";
|
|
3
3
|
import { getConfig } from "../config";
|
|
4
4
|
import { matchMedia } from "../helpers/matchMedia";
|
|
5
5
|
import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
|
|
@@ -80,8 +80,17 @@ function setMediaShouldUpdate(ref, props) {
|
|
|
80
80
|
function subscribe(subscriber) {
|
|
81
81
|
return listeners.add(subscriber), () => listeners.delete(subscriber);
|
|
82
82
|
}
|
|
83
|
+
function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
|
|
84
|
+
const [state, setState] = useState(getServerSnapshot);
|
|
85
|
+
return useIsomorphicLayoutEffect(() => subscriber(() => {
|
|
86
|
+
setState((prev) => {
|
|
87
|
+
const next = getSnapshot();
|
|
88
|
+
return next !== prev ? next : prev;
|
|
89
|
+
});
|
|
90
|
+
}), []), state;
|
|
91
|
+
}
|
|
83
92
|
function useMedia(uid, componentContext) {
|
|
84
|
-
const internal = useRef(), initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {}, state =
|
|
93
|
+
const internal = useRef(), initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(
|
|
85
94
|
subscribe,
|
|
86
95
|
() => {
|
|
87
96
|
if (!internal.current)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isServer, isWeb } from "@tamagui/constants";
|
|
2
|
-
import { useRef,
|
|
1
|
+
import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
|
|
2
|
+
import { useRef, useState } 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";
|
|
@@ -88,10 +88,19 @@ function setMediaShouldUpdate(ref, props) {
|
|
|
88
88
|
function subscribe(subscriber) {
|
|
89
89
|
return listeners.add(subscriber), () => listeners.delete(subscriber);
|
|
90
90
|
}
|
|
91
|
+
function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
|
|
92
|
+
const [state, setState] = useState(getServerSnapshot);
|
|
93
|
+
return useIsomorphicLayoutEffect(() => subscriber(() => {
|
|
94
|
+
setState(prev => {
|
|
95
|
+
const next = getSnapshot();
|
|
96
|
+
return next !== prev ? next : prev;
|
|
97
|
+
});
|
|
98
|
+
}), []), state;
|
|
99
|
+
}
|
|
91
100
|
function useMedia(uid, componentContext) {
|
|
92
101
|
const internal = useRef(),
|
|
93
102
|
initialState = (getDisableSSR(componentContext) || !isWeb ? mediaState : initState) || {},
|
|
94
|
-
state =
|
|
103
|
+
state = useLayoutExternalStore(subscribe, () => {
|
|
95
104
|
if (!internal.current) return initialState;
|
|
96
105
|
const {
|
|
97
106
|
touched,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isServer, isWeb } from "@tamagui/constants";
|
|
2
|
-
import { useRef,
|
|
1
|
+
import { isServer, isWeb, useIsomorphicLayoutEffect } from "@tamagui/constants";
|
|
2
|
+
import { useRef, useState } from "react";
|
|
3
3
|
import { getConfig } from "../config";
|
|
4
4
|
import { matchMedia } from "../helpers/matchMedia";
|
|
5
5
|
import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
|
|
@@ -167,8 +167,19 @@ function subscribe(subscriber) {
|
|
|
167
167
|
return listeners.delete(subscriber);
|
|
168
168
|
};
|
|
169
169
|
}
|
|
170
|
+
function useLayoutExternalStore(subscriber, getSnapshot, getServerSnapshot) {
|
|
171
|
+
var _useState = _sliced_to_array(useState(getServerSnapshot), 2), state = _useState[0], setState = _useState[1];
|
|
172
|
+
return useIsomorphicLayoutEffect(function() {
|
|
173
|
+
return subscriber(function() {
|
|
174
|
+
setState(function(prev) {
|
|
175
|
+
var next = getSnapshot();
|
|
176
|
+
return next !== prev ? next : prev;
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
}, []), state;
|
|
180
|
+
}
|
|
170
181
|
function useMedia(uid, componentContext) {
|
|
171
|
-
var internal = useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {}, state =
|
|
182
|
+
var internal = useRef(), disableSSR = getDisableSSR(componentContext), initialState = (disableSSR || !isWeb ? mediaState : initState) || {}, state = useLayoutExternalStore(subscribe, function() {
|
|
172
183
|
if (!internal.current)
|
|
173
184
|
return initialState;
|
|
174
185
|
var _internal_current = internal.current, touched = _internal_current.touched, prev = _internal_current.prev, componentState = uid ? shouldUpdate.get(uid) : void 0;
|
|
@@ -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,
|
|
5
|
-
"names": ["isServer", "isWeb", "useRef", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["isServer", "isWeb", "useIsomorphicLayoutEffect", "useRef", "useState", "getConfig", "matchMedia", "pseudoDescriptors", "getDisableSSR", "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", "shouldUpdate", "WeakMap", "setMediaShouldUpdate", "ref", "props", "set", "subscribe", "subscriber", "delete", "useLayoutExternalStore", "getSnapshot", "getServerSnapshot", "state", "setState", "prev", "useMedia", "uid", "componentContext", "internal", "initialState", "current", "touched", "componentState", "undefined", "enabled", "testKeys", "hasntUpdated", "every", "_", "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"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.100.
|
|
3
|
+
"version": "1.100.1",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,18 +27,18 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.100.
|
|
31
|
-
"@tamagui/constants": "1.100.
|
|
32
|
-
"@tamagui/helpers": "1.100.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.100.
|
|
34
|
-
"@tamagui/timer": "1.100.
|
|
35
|
-
"@tamagui/types": "1.100.
|
|
36
|
-
"@tamagui/use-did-finish-ssr": "1.100.
|
|
37
|
-
"@tamagui/use-event": "1.100.
|
|
38
|
-
"@tamagui/use-force-update": "1.100.
|
|
30
|
+
"@tamagui/compose-refs": "1.100.1",
|
|
31
|
+
"@tamagui/constants": "1.100.1",
|
|
32
|
+
"@tamagui/helpers": "1.100.1",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.100.1",
|
|
34
|
+
"@tamagui/timer": "1.100.1",
|
|
35
|
+
"@tamagui/types": "1.100.1",
|
|
36
|
+
"@tamagui/use-did-finish-ssr": "1.100.1",
|
|
37
|
+
"@tamagui/use-event": "1.100.1",
|
|
38
|
+
"@tamagui/use-force-update": "1.100.1"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@tamagui/build": "1.100.
|
|
41
|
+
"@tamagui/build": "1.100.1",
|
|
42
42
|
"@testing-library/react": "^14.0.0",
|
|
43
43
|
"csstype": "^3.0.10",
|
|
44
44
|
"react": "^18.2.0",
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isServer, isWeb } from '@tamagui/constants'
|
|
2
|
-
import { useRef, useSyncExternalStore } from 'react'
|
|
1
|
+
import { isServer, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
|
|
2
|
+
import { useRef, useState, useSyncExternalStore } from 'react'
|
|
3
3
|
|
|
4
4
|
import { getConfig } from '../config'
|
|
5
5
|
import { matchMedia } from '../helpers/matchMedia'
|
|
@@ -187,13 +187,35 @@ function subscribe(subscriber: any) {
|
|
|
187
187
|
return () => listeners.delete(subscriber)
|
|
188
188
|
}
|
|
189
189
|
|
|
190
|
+
function useLayoutExternalStore<State>(
|
|
191
|
+
subscriber,
|
|
192
|
+
getSnapshot,
|
|
193
|
+
getServerSnapshot
|
|
194
|
+
): State {
|
|
195
|
+
const [state, setState] = useState(getServerSnapshot)
|
|
196
|
+
|
|
197
|
+
useIsomorphicLayoutEffect(() => {
|
|
198
|
+
return subscriber(() => {
|
|
199
|
+
setState((prev) => {
|
|
200
|
+
const next = getSnapshot()
|
|
201
|
+
if (next !== prev) {
|
|
202
|
+
return next
|
|
203
|
+
}
|
|
204
|
+
return prev
|
|
205
|
+
})
|
|
206
|
+
})
|
|
207
|
+
}, [])
|
|
208
|
+
|
|
209
|
+
return state
|
|
210
|
+
}
|
|
211
|
+
|
|
190
212
|
export function useMedia(uid?: any, componentContext?: ComponentContextI): UseMediaState {
|
|
191
213
|
const internal = useRef<UseMediaInternalState | undefined>()
|
|
192
214
|
// performance boost to avoid using context twice
|
|
193
215
|
const disableSSR = getDisableSSR(componentContext)
|
|
194
216
|
const initialState = (disableSSR || !isWeb ? mediaState : initState) || {}
|
|
195
217
|
|
|
196
|
-
const state =
|
|
218
|
+
const state = useLayoutExternalStore<MediaQueryState>(
|
|
197
219
|
subscribe,
|
|
198
220
|
() => {
|
|
199
221
|
if (!internal.current) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,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;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAQxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SAiClC;AAsBD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;
|
|
1
|
+
{"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,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;AAE1C,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,WAQxC,CAAA;AAUD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAchD,CAAA;AAMD,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAiB3D,CAAA;AAaD,wBAAgB,mBAAmB,SAiClC;AAsBD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAkCD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAgDvF;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,eAC1B,OAAO,kBAQrB,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"}
|