@multiplatform.one/theme 7.56.0 → 7.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/theme",
-  "version": "7.56.0",
+  "version": "7.58.0",
   "description": "Tamagui theme system for multiplatform.one",
   "keywords": [
     "multiplatform",
@@ -72,8 +72,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@multiplatform.one/platform": "^7.56.0",
-    "@multiplatform.one/store": "^7.56.0",
+    "@multiplatform.one/platform": "^7.58.0",
+    "@multiplatform.one/store": "^7.58.0",
     "@tamagui/animations-react-native": "2.7.6",
     "@tamagui/colors": "2.7.6",
     "@tamagui/config": "2.7.6",
@@ -89,8 +89,8 @@
   },
   "devDependencies": {
     "@expo/prebuild-config": "55.0.18",
-    "@multiplatform.one/config": "7.56.0",
-    "@multiplatform.one/test-utils": "7.56.0",
+    "@multiplatform.one/config": "7.58.0",
+    "@multiplatform.one/test-utils": "7.58.0",
     "@tamagui/animations-css": "2.7.6",
     "@tamagui/animations-reanimated": "2.7.6",
     "@tamagui/font-inter": "2.7.6",

package/src/theme/Surface.tsx

@@ -13,13 +13,23 @@ export type SurfaceSize = SizeTokens | "unset";
  * `bar`: the subtree is a bar (nav bar, page-head actions, toolbar), so its
  * neutral buttons take the plain tier (LC-153). Any explicit `painted` (a
  * card or an overlay) resets it: content inside them is content again.
+ *
+ * `elevated`: the subtree sits on the elevated ground (`elevatedSurface`
+ * unpainted), which in dark is the control wash's own step, so controls on it
+ * step their fill one up (LC-153, FZ-7944). Any explicit `painted` resets it.
  */
-export type SurfaceIntent = { size: SurfaceSize; painted: boolean; bar: boolean };
+export type SurfaceIntent = {
+  size: SurfaceSize;
+  painted: boolean;
+  bar: boolean;
+  elevated: boolean;
+};
 
 export const SurfaceContext = createStyledContext<SurfaceIntent>({
   size: "unset",
   painted: false,
   bar: false,
+  elevated: false,
 });
 
 /** True inside a bar (LC-153): neutral buttons there are plain, not tinted. */
@@ -27,6 +37,11 @@ export function useBarSurface(): boolean {
   return SurfaceContext.useStyledContext().bar ?? false;
 }
 
+/** True on an elevated ground (an overlay frame, an unnested Panel): controls step their wash up in dark. */
+export function useElevatedSurface(): boolean {
+  return SurfaceContext.useStyledContext().elevated ?? false;
+}
+
 const sizeKeyRank = new Map<string, number>(SIZE_KEYS.map((key, index) => [key, index]));
 sizeKeyRank.set("$true", sizeKeyRank.get("$4") ?? 0);
 
@@ -104,9 +119,10 @@ export function clampSurfaceSize(requested: SurfaceSize, parent: SurfaceSize): S
  * controls at `size` unless it asks for a smaller one (LC-78 ceiling).
  * `painted` marks (true) or resets (false) the painted-ancestor flag; omitted
  * inherits it. `bar` marks a bar subtree (LC-153); omitted, it inherits unless
- * `painted` is given, which resets it. Either way a painted value opens a new
- * surface with its own inset, so the page gutter does not reach inside it
- * (LC-146).
+ * `painted` is given, which resets it. `elevated` marks a frame that paints
+ * the elevated ground; omitted it inherits unless `painted` is given, which
+ * resets it. Either way a painted value opens a new surface with its own
+ * inset, so the page gutter does not reach inside it (LC-146).
  *
  * @example A table cell's editors at the row's control height
  * <Surface size="$3">{cell}</Surface>
@@ -115,19 +131,27 @@ export function Surface({
   size,
   painted,
   bar,
+  elevated,
   children,
 }: {
   size?: SizeTokens;
   painted?: boolean;
   bar?: boolean;
+  elevated?: boolean;
   children?: ReactNode;
 }) {
   const parent = SurfaceContext.useStyledContext();
   const nextSize = clampSurfaceSize(size ?? "unset", parent.size);
   const nextPainted = painted ?? parent.painted ?? false;
   const nextBar = bar ?? (painted === undefined ? (parent.bar ?? false) : false);
+  const nextElevated = elevated ?? (painted === undefined ? (parent.elevated ?? false) : false);
   return (
-    <SurfaceContext.Provider size={nextSize} painted={nextPainted} bar={nextBar}>
+    <SurfaceContext.Provider
+      size={nextSize}
+      painted={nextPainted}
+      bar={nextBar}
+      elevated={nextElevated}
+    >
       {painted === undefined ? children : <PageGutter inset={null}>{children}</PageGutter>}
     </SurfaceContext.Provider>
   );

package/src/theme/controlTiers.ts

@@ -5,7 +5,12 @@
  * - `tinted`, in content: a filled wash with no edge, the preset's radius and
  *   the size token's height. Light washes at `$color3` (#ededed on the stock
  *   ramp), dark one step further up at `$color4`, because dark `$color3` sits
- *   a single lightness point off the page and the button would vanish.
+ *   a single lightness point off the page and the button would vanish. On an
+ *   elevated ground (`useElevatedSurface()`: an overlay frame or an unnested
+ *   Panel) dark climbs one more step to `$color5`, because the dark elevated
+ *   tint is `$color4` itself (HIG: a control's fill sits above the elevated
+ *   background it is on). Light's elevated ground is the page step, so its
+ *   wash stays put.
  * - `plain`, inside a bar (`useBarSurface()`): ink only at rest, the tinted
  *   wash on hover and press. The bar's position carries the affordance.
  *
@@ -24,15 +29,25 @@ export interface ControlTierPaint {
 
 const lightWash: ControlTierPaint = { rest: "$color3", hover: "$color4", press: "$color5" };
 const darkWash: ControlTierPaint = { rest: "$color4", hover: "$color5", press: "$color6" };
+const darkElevatedWash: ControlTierPaint = {
+  rest: "$color5",
+  hover: "$color6",
+  press: "$color7",
+};
 
-/** The tinted wash for a scheme: rest, hover and press fills. */
-export function controlTierWash(dark: boolean): ControlTierPaint {
-  return dark ? darkWash : lightWash;
+/** The tinted wash for a scheme and ground: rest, hover and press fills. */
+export function controlTierWash(dark: boolean, elevated = false): ControlTierPaint {
+  if (!dark) return lightWash;
+  return elevated ? darkElevatedWash : darkWash;
 }
 
-/** Rest, hover and press fills for a tier in a scheme. */
-export function controlTierPaint(tier: ControlTier, dark: boolean): ControlTierPaint {
-  const wash = controlTierWash(dark);
+/** Rest, hover and press fills for a tier in a scheme, on the page or an elevated ground. */
+export function controlTierPaint(
+  tier: ControlTier,
+  dark: boolean,
+  elevated = false,
+): ControlTierPaint {
+  const wash = controlTierWash(dark, elevated);
   return tier === "plain" ? { rest: "transparent", hover: wash.rest, press: wash.hover } : wash;
 }
 

package/src/theme/overlaySurfaces.tsx

@@ -157,7 +157,7 @@ export const DialogContent = forwardRef<TamaguiElement, DialogContentProps>(func
   ref,
 ) {
   return (
-    <Surface size={size} painted={false}>
+    <Surface size={size} painted={false} elevated>
       <DialogContentInner ref={ref} {...props}>
         {children}
       </DialogContentInner>
@@ -239,7 +239,7 @@ export const DialogOverlay = forwardRef<
 export const AlertDialogContent = forwardRef<TamaguiElement, DialogContentProps>(
   function AlertDialogContent({ children, size = "$true", ...props }, ref) {
     return (
-      <Surface size={size} painted={false}>
+      <Surface size={size} painted={false} elevated>
         <AlertDialogContentInner ref={ref} {...props}>
           {children}
         </AlertDialogContentInner>
@@ -329,7 +329,9 @@ export const PopoverContent = forwardRef<TamaguiElement, PopoverContentProps>(
         onOpenAutoFocus={withHouseOpenFocus(onOpenAutoFocus)}
         {...props}
       >
-        <Surface painted={false}>{children}</Surface>
+        <Surface painted={false} elevated>
+          {children}
+        </Surface>
       </Popover.Content>
     );
   },

package/types/theme/Surface.d.ts

@@ -10,15 +10,22 @@ export type SurfaceSize = SizeTokens | "unset";
  * `bar`: the subtree is a bar (nav bar, page-head actions, toolbar), so its
  * neutral buttons take the plain tier (LC-153). Any explicit `painted` (a
  * card or an overlay) resets it: content inside them is content again.
+ *
+ * `elevated`: the subtree sits on the elevated ground (`elevatedSurface`
+ * unpainted), which in dark is the control wash's own step, so controls on it
+ * step their fill one up (LC-153, FZ-7944). Any explicit `painted` resets it.
  */
 export type SurfaceIntent = {
     size: SurfaceSize;
     painted: boolean;
     bar: boolean;
+    elevated: boolean;
 };
 export declare const SurfaceContext: import("@tamagui/web").StyledContext<SurfaceIntent>;
 /** True inside a bar (LC-153): neutral buttons there are plain, not tinted. */
 export declare function useBarSurface(): boolean;
+/** True on an elevated ground (an overlay frame, an unnested Panel): controls step their wash up in dark. */
+export declare function useElevatedSurface(): boolean;
 /**
  * Rank of a size key on the scale's sorted `$size` ladder (`$true` ranks
  * with `$4`). Undefined for anything that is not a size key.
@@ -63,17 +70,19 @@ export declare function clampSurfaceSize(requested: SurfaceSize, parent: Surface
  * controls at `size` unless it asks for a smaller one (LC-78 ceiling).
  * `painted` marks (true) or resets (false) the painted-ancestor flag; omitted
  * inherits it. `bar` marks a bar subtree (LC-153); omitted, it inherits unless
- * `painted` is given, which resets it. Either way a painted value opens a new
- * surface with its own inset, so the page gutter does not reach inside it
- * (LC-146).
+ * `painted` is given, which resets it. `elevated` marks a frame that paints
+ * the elevated ground; omitted it inherits unless `painted` is given, which
+ * resets it. Either way a painted value opens a new surface with its own
+ * inset, so the page gutter does not reach inside it (LC-146).
  *
  * @example A table cell's editors at the row's control height
  * <Surface size="$3">{cell}</Surface>
  */
-export declare function Surface({ size, painted, bar, children, }: {
+export declare function Surface({ size, painted, bar, elevated, children, }: {
     size?: SizeTokens;
     painted?: boolean;
     bar?: boolean;
+    elevated?: boolean;
     children?: ReactNode;
 }): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=Surface.d.ts.map

package/types/theme/Surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Surface.d.ts","sourceRoot":"","sources":["../../src/theme/Surface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAI/D,oEAAoE;AACpE,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,CAAC;AAC/C;;;;;;;;GAQG;AACH,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC;AAElF,eAAO,MAAM,cAAc,qDAIzB,CAAC;AAEH,+EAA+E;AAC/E,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAKD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAErE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,CAI1F;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAG3F;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,CAKpE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CAQzF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,OAAO,CAAC,EACtB,IAAI,EACJ,OAAO,EACP,GAAG,EACH,QAAQ,GACT,EAAE;IACD,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,2CAUA"}
+{"version":3,"file":"Surface.d.ts","sourceRoot":"","sources":["../../src/theme/Surface.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAI/D,oEAAoE;AACpE,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,CAAC;AAC/C;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,cAAc,qDAKzB,CAAC;AAEH,+EAA+E;AAC/E,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,6GAA6G;AAC7G,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAKD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAErE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,CAI1F;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAG3F;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,CAKpE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CAQzF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,OAAO,CAAC,EACtB,IAAI,EACJ,OAAO,EACP,GAAG,EACH,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,2CAgBA"}

package/types/theme/controlTiers.d.ts

@@ -5,7 +5,12 @@
  * - `tinted`, in content: a filled wash with no edge, the preset's radius and
  *   the size token's height. Light washes at `$color3` (#ededed on the stock
  *   ramp), dark one step further up at `$color4`, because dark `$color3` sits
- *   a single lightness point off the page and the button would vanish.
+ *   a single lightness point off the page and the button would vanish. On an
+ *   elevated ground (`useElevatedSurface()`: an overlay frame or an unnested
+ *   Panel) dark climbs one more step to `$color5`, because the dark elevated
+ *   tint is `$color4` itself (HIG: a control's fill sits above the elevated
+ *   background it is on). Light's elevated ground is the page step, so its
+ *   wash stays put.
  * - `plain`, inside a bar (`useBarSurface()`): ink only at rest, the tinted
  *   wash on hover and press. The bar's position carries the affordance.
  *
@@ -20,10 +25,10 @@ export interface ControlTierPaint {
     hover: string;
     press: string;
 }
-/** The tinted wash for a scheme: rest, hover and press fills. */
-export declare function controlTierWash(dark: boolean): ControlTierPaint;
-/** Rest, hover and press fills for a tier in a scheme. */
-export declare function controlTierPaint(tier: ControlTier, dark: boolean): ControlTierPaint;
+/** The tinted wash for a scheme and ground: rest, hover and press fills. */
+export declare function controlTierWash(dark: boolean, elevated?: boolean): ControlTierPaint;
+/** Rest, hover and press fills for a tier in a scheme, on the page or an elevated ground. */
+export declare function controlTierPaint(tier: ControlTier, dark: boolean, elevated?: boolean): ControlTierPaint;
 /** LC-153 disabled look for either tier (fill drained, AA ink). */
 export declare function controlTierDisabled(tier: ControlTier): {
     backgroundColor: string;

package/types/theme/controlTiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controlTiers.d.ts","sourceRoot":"","sources":["../../src/theme/controlTiers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAKD,iEAAiE;AACjE,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,gBAAgB,CAE/D;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,gBAAgB,CAGnF;AAED,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAMA;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAExE"}
+{"version":3,"file":"controlTiers.d.ts","sourceRoot":"","sources":["../../src/theme/controlTiers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAUD,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,UAAQ,GAAG,gBAAgB,CAGjF;AAED,6FAA6F;AAC7F,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,OAAO,EACb,QAAQ,UAAQ,GACf,gBAAgB,CAGlB;AAED,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAMA;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAExE"}

package/types/theme/overlaySurfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlaySurfaces.d.ts","sourceRoot":"","sources":["../../src/theme/overlaySurfaces.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAML,KAAK,kBAAkB,IAAI,yBAAyB,EAEpD,KAAK,UAAU,EACf,KAAK,cAAc,EAEpB,MAAM,SAAS,CAAC;AAyDjB,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAmC5C;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,EAAE,eAAe,EAAE,EAAE;IAAE,eAAe,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAG9F;AAID,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,mDAE9B,CAAC;AAEH,wBAAgB,sBAAsB,IAAI,wBAAwB,CAEjE;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAQD,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,GAAG;IACzE,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,aAAa;eAJb,SAAS;WACb,UAAU;kDAcjB,CAAC;AA0CH;;;;;;GAMG;AACH,eAAO,MAAM,aAAa;;;;;;;;eAEiB,SAAS;kDAelD,CAAC;AAOH,eAAO,MAAM,kBAAkB;eAxFlB,SAAS;WACb,UAAU;kDAiGlB,CAAC;AAgCF,eAAO,MAAM,kBAAkB;;;;;;;;eAEY,SAAS;kDAelD,CAAC;AAiBH,eAAO,MAAM,cAAc;eALd,SAAS;IACpB,iEAAiE;sBAC/C,aAAa;kDAwBhC,CAAC"}
+{"version":3,"file":"overlaySurfaces.d.ts","sourceRoot":"","sources":["../../src/theme/overlaySurfaces.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAML,KAAK,kBAAkB,IAAI,yBAAyB,EAEpD,KAAK,UAAU,EACf,KAAK,cAAc,EAEpB,MAAM,SAAS,CAAC;AAyDjB,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAmC5C;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,EAAE,eAAe,EAAE,EAAE;IAAE,eAAe,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAG9F;AAID,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,mDAE9B,CAAC;AAEH,wBAAgB,sBAAsB,IAAI,wBAAwB,CAEjE;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAQD,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,GAAG;IACzE,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,aAAa;eAJb,SAAS;WACb,UAAU;kDAcjB,CAAC;AA0CH;;;;;;GAMG;AACH,eAAO,MAAM,aAAa;;;;;;;;eAEiB,SAAS;kDAelD,CAAC;AAOH,eAAO,MAAM,kBAAkB;eAxFlB,SAAS;WACb,UAAU;kDAiGlB,CAAC;AAgCF,eAAO,MAAM,kBAAkB;;;;;;;;eAEY,SAAS;kDAelD,CAAC;AAiBH,eAAO,MAAM,cAAc;eALd,SAAS;IACpB,iEAAiE;sBAC/C,aAAa;kDA0BhC,CAAC"}