@multiplatform.one/table 7.23.1 → 7.23.2

package/src/components/DataTable/DataTableMobileCards.stories.tsx

@@ -12,6 +12,7 @@
 
 import type { Meta } from "@storybook/react-native-web-vite";
 import { useState } from "react";
+import { fn } from "storybook/test";
 import { YStack } from "tamagui";
 import type { DataTableColumn } from "../../types";
 import { DataTable } from "./index";
@@ -79,6 +80,17 @@ export const Selection = {
   render: () => <CardTable enableRowSelection />,
 };
 
+/**
+ * `onRowPress` makes each card one pressable unit. A pressed card paints one
+ * ramp step above the fill it rests on, never below `$color4`, so the press
+ * shows at every elevation and on a zebra stripe.
+ */
+export const Pressable = {
+  render: () => (
+    <CardTable onRowPress={fn()} rowLabel={(row: Person) => `${row.firstName} ${row.lastName}`} />
+  ),
+};
+
 function DeletableCards() {
   const [rows, setRows] = useState(people);
   return (

package/src/components/DataTable/DataTableMobileCards.tsx

@@ -27,7 +27,11 @@ import type React from "react";
 import { useCallback } from "react";
 import { Text, View, VisuallyHidden, XStack } from "tamagui";
 import { useTranslation } from "react-i18next";
-import { TableCellContext, tableZebraFill } from "@multiplatform.one/table-primitives";
+import {
+  TableCellContext,
+  tablePressFill,
+  tableZebraFill,
+} from "@multiplatform.one/table-primitives";
 import type { DataTableColumn, DataTableField } from "../../types";
 import { withInterp } from "../../utils/withInterp";
 import { rowIntentProps } from "./dataTableChrome";
@@ -132,7 +136,8 @@ export interface DataTableMobileCardsProps<TData> {
    * onRowPress support: press/keyboard/AT props for one pressable row
    * (built by DataTableRoot). Cards live outside the table tree, so they
    * take the `card` variant (role="button") with the same activation,
-   * roving focus, and inner-control isolation as grid rows.
+   * roving focus, and inner-control isolation as grid rows. The card paints
+   * its own press fill, off the fill it rests on (MPO-404).
    */
   getRowPressProps?: (row: any, rowIndex: number, variant?: "row" | "card") => Record<string, any>;
   /** In-flight refetch: do not paint empty-state over a blank body. */
@@ -189,19 +194,23 @@ export function DataTableMobileCards<TData extends Record<string, any>>({
         else if (kind === "control") controls.push(cell);
       }
       const hasBody = bare.length > 0 || figures.length > 0 || controls.length > 0;
+      const cardFill = knobProps.cardSurface.backgroundColor;
+      const restFill = tableZebraOn && index % 2 === 1 ? tableZebraFill(cardFill) : cardFill;
+      const pressProps = getRowPressProps?.(row, index, "card") ?? {};
 
       return (
         <View
           key={`${row.id}-${index}`}
           testID="data-table-card"
           {...knobProps.cardSurface}
-          {...(tableZebraOn && index % 2 === 1
-            ? { backgroundColor: tableZebraFill(knobProps.cardSurface.backgroundColor) }
-            : {})}
+          backgroundColor={restFill}
           {...({
             "data-table-zebra": tableZebraOn ? (index % 2 === 0 ? "even" : "odd") : "off",
           } as any)}
-          {...(getRowPressProps ? (getRowPressProps(row, index, "card") as any) : {})}
+          {...(pressProps as any)}
+          {...(pressProps.onPress
+            ? { pressStyle: { backgroundColor: tablePressFill(restFill) } }
+            : {})}
           {...(rowIntentProps(rowData) as any)}
         >
           {/* Card header: selection + primary-column title + row number + delete */}

package/src/components/DataTable/DataTableRoot.tsx

@@ -609,8 +609,9 @@ export function DataTableRoot<TData extends Record<string, any> = Record<string,
         "aria-label": deriveRowLabel(row, rowIndex),
         onPress: handlePress,
         cursor: "pointer" as const,
-        pressStyle: { backgroundColor: "$color4" },
-        ...(variant === "card" ? { role: "button" as const } : {}),
+        ...(variant === "card"
+          ? { role: "button" as const }
+          : { pressStyle: { backgroundColor: "$color4" } }),
         ...(isWeb && !isSSR
           ? {
               tabIndex: rowIndex === effectiveRowPressAnchor ? 0 : -1,

package/src/components/DataTable/dataTableMobileCards.spec.tsx

@@ -19,7 +19,9 @@ import { Preset } from "@multiplatform.one/theme";
 import { fireEvent, screen, waitFor, within } from "@testing-library/react";
 import { Theme } from "tamagui";
 import { describe, expect, it, vi } from "vitest";
+import type React from "react";
 import type { DataTableColumn, TableFilter } from "../../types";
+import { DataTableMobileCards } from "./DataTableMobileCards";
 import { DataTable } from "./index";
 
 type Person = {
@@ -221,4 +223,129 @@ describe("DataTableMobileCards", () => {
       expect(cardFills("light").slice(0, 2)).toEqual([["_bg-background"], ["_bg-color2"]]);
     });
   });
+
+  describe("a pressed card steps off the fill it rests on (MPO-404)", () => {
+    type Scheme = "light" | "dark";
+    type Elevation = "none" | "small" | "medium" | "large";
+    const schemes: Scheme[] = ["light", "dark"];
+    const elevations: Elevation[] = ["none", "small", "medium", "large"];
+    const zebras = ["off", "on"] as const;
+
+    /** `rest>press` for one card, read off its atomic classes. */
+    function paint(card: Element): string {
+      const classes = Array.from(card.classList);
+      const rest = classes.find((name) => /^_bg-(?!0)/.test(name))?.slice("_bg-".length);
+      const press = classes
+        .find((name) => name.startsWith("_bg-0active-"))
+        ?.slice("_bg-0active-".length);
+      return `${rest}>${press}`;
+    }
+
+    function wrap(scheme: Scheme, ui: React.ReactElement) {
+      return renderWithProviders(scheme === "dark" ? <Theme name="dark">{ui}</Theme> : ui);
+    }
+
+    function pressedCards(scheme: Scheme, elevation: Elevation, zebra: "on" | "off") {
+      const { container, unmount } = wrap(
+        scheme,
+        <Preset overrides={{ tableZebra: zebra, elevation }}>
+          <DataTable
+            data={people}
+            columns={columns}
+            layout="cards"
+            onRowPress={vi.fn()}
+            onStateChange={vi.fn()}
+          />
+        </Preset>,
+      );
+      const painted = cards(container).slice(0, 2).map(paint);
+      unmount();
+      return painted;
+    }
+
+    let rendered: Record<string, string[]> | undefined;
+    const matrix = () =>
+      (rendered ??= Object.fromEntries(
+        schemes.flatMap((scheme) =>
+          elevations.flatMap((elevation) =>
+            zebras.map((zebra) => [
+              `${scheme} ${elevation} zebra-${zebra}`,
+              pressedCards(scheme, elevation, zebra),
+            ]),
+          ),
+        ),
+      ));
+
+    it("an even and an odd card change fill on press at every elevation, zebra on and off, both schemes", () => {
+      const unchanged = Object.entries(matrix()).flatMap(([cell, pair]) =>
+        pair
+          .filter((rp) => {
+            const [rest, press] = rp.split(">");
+            return !press || press === "undefined" || press === rest;
+          })
+          .map((rp) => `${cell}: ${rp}`),
+      );
+      expect(unchanged).toEqual([]);
+    });
+
+    it("presses one ramp step above the rest fill, floored at $color4", () => {
+      expect(matrix()).toEqual({
+        "light none zebra-off": ["background>color4", "background>color4"],
+        "light none zebra-on": ["background>color4", "color2>color4"],
+        "light small zebra-off": ["background>color4", "background>color4"],
+        "light small zebra-on": ["background>color4", "color2>color4"],
+        "light medium zebra-off": ["background>color4", "background>color4"],
+        "light medium zebra-on": ["background>color4", "color2>color4"],
+        "light large zebra-off": ["background>color4", "background>color4"],
+        "light large zebra-on": ["background>color4", "color2>color4"],
+        "dark none zebra-off": ["background>color4", "background>color4"],
+        "dark none zebra-on": ["background>color4", "color2>color4"],
+        "dark small zebra-off": ["color2>color4", "color2>color4"],
+        "dark small zebra-on": ["color2>color4", "color3>color4"],
+        "dark medium zebra-off": ["color3>color4", "color3>color4"],
+        "dark medium zebra-on": ["color3>color4", "color4>color5"],
+        "dark large zebra-off": ["color4>color5", "color4>color5"],
+        "dark large zebra-on": ["color4>color5", "color5>color6"],
+      });
+    });
+
+    it("owns its press fill whatever press props a root hands it (the native root's shape)", () => {
+      const nativeRootPressProps = () => ({
+        onPress: vi.fn(),
+        role: "button",
+        "aria-label": "Row",
+        pressStyle: { backgroundColor: "$color4" },
+      });
+      const rows = people.map((person, index) => ({
+        id: String(index),
+        original: person,
+        getIsSelected: () => false,
+        getVisibleCells: () => [
+          {
+            id: `${index}_firstName`,
+            column: { id: "firstName", columnDef: { header: "First Name" } },
+            getValue: () => person.firstName,
+          },
+        ],
+      }));
+      const { container } = wrap(
+        "dark",
+        <Preset overrides={{ tableZebra: "on", elevation: "large" }}>
+          <DataTableMobileCards
+            tableRows={rows}
+            showRowNumbers={false}
+            showDeleteRow={false}
+            readOnly
+            dataLength={rows.length}
+            minRows={0}
+            hasActiveFilters={false}
+            renderCellContent={(cell) => cell.getValue()}
+            onDeleteRow={vi.fn()}
+            getRowPressProps={nativeRootPressProps}
+          />
+        </Preset>,
+      );
+      expect(cards(container).slice(0, 2).map(paint)).toEqual(["color4>color5", "color5>color6"]);
+    });
+  });
 });

package/src/components/DataTable/index.native.tsx

@@ -561,13 +561,13 @@ function DataTableRoot<TData extends Record<string, any> = Record<string, any>>(
   const getRowPressProps = useCallback(
     // The card list asks for the "card" variant. Native carries no DOM row
     // role for it to override, so both variants land on role="button".
-    (row: (typeof tableRows)[0], index: number, _variant: "row" | "card" = "row") => {
+    (row: (typeof tableRows)[0], index: number, variant: "row" | "card" = "row") => {
       if (!rowPressActive) return {};
       return {
         onPress: () => onRowPress?.(row.original as TData, index),
         role: "button" as const,
         "aria-label": deriveRowLabel(row, index),
-        pressStyle: { backgroundColor: "$color4" },
+        ...(variant === "row" ? { pressStyle: { backgroundColor: "$color4" } } : {}),
       };
     },
     [rowPressActive, onRowPress, deriveRowLabel],

package/types/components/DataTable/DataTableMobileCards.d.ts

@@ -75,7 +75,8 @@ export interface DataTableMobileCardsProps<TData> {
      * onRowPress support: press/keyboard/AT props for one pressable row
      * (built by DataTableRoot). Cards live outside the table tree, so they
      * take the `card` variant (role="button") with the same activation,
-     * roving focus, and inner-control isolation as grid rows.
+     * roving focus, and inner-control isolation as grid rows. The card paints
+     * its own press fill, off the fill it rests on (MPO-404).
      */
     getRowPressProps?: (row: any, rowIndex: number, variant?: "row" | "card") => Record<string, any>;
     /** In-flight refetch: do not paint empty-state over a blank body. */

package/types/components/DataTable/DataTableMobileCards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTableMobileCards.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/DataTableMobileCards.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAKhD;AAsBD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,aAAa,CAgB1D;AAED,MAAM,WAAW,yBAAyB,CAAC,KAAK;IAC9C,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,KAAK,KAAK,CAAC,SAAS,CAAC;IACpF,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjG,qEAAqE;IACrE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACtE,SAAS,EACT,kBAA0B,EAC1B,cAAc,EACd,aAAa,EACb,QAAQ,EACR,QAAgB,EAChB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,gBAAwB,EACxB,sBAA8B,EAC9B,iBAAiB,EACjB,OAAe,EACf,cAAc,EACd,gBAAgB,EAChB,aAAqB,GACtB,EAAE,yBAAyB,CAAC,KAAK,CAAC,2CAiPlC"}
+{"version":3,"file":"DataTableMobileCards.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/DataTableMobileCards.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAKhD;AAsBD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,aAAa,CAgB1D;AAED,MAAM,WAAW,yBAAyB,CAAC,KAAK;IAC9C,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,KAAK,KAAK,CAAC,SAAS,CAAC;IACpF,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,GAAG,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjG,qEAAqE;IACrE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACtE,SAAS,EACT,kBAA0B,EAC1B,cAAc,EACd,aAAa,EACb,QAAQ,EACR,QAAgB,EAChB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,gBAAwB,EACxB,sBAA8B,EAC9B,iBAAiB,EACjB,OAAe,EACf,cAAc,EACd,gBAAgB,EAChB,aAAqB,GACtB,EAAE,yBAAyB,CAAC,KAAK,CAAC,2CAqPlC"}

package/types/components/DataTable/DataTableRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTableRoot.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/DataTableRoot.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAcH,OAAO,KAA4D,MAAM,OAAO,CAAC;AAajF,OAAO,KAAK,EAIV,cAAc,EAEf,MAAM,aAAa,CAAC;AAgDrB,MAAM,WAAW,kBAAkB,CACjC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CACvD,SAAQ,cAAc,CAAC,KAAK,CAAC;IAC7B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACrF,IAAI,EACJ,OAAO,EACP,YAAY,EACZ,eAAe,EACf,aAAa,EACb,OAAO,EACP,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,cAAc,EAC1B,WAAmB,EACnB,aAAmB,EACnB,WAAW,EACX,eAAuB,EACvB,gBAAwB,EACxB,aAAqB,EACrB,eAAsB,EACtB,gBAAgB,EAChB,aAAoB,EACpB,gBAAuB,EACvB,eAAe,EACf,cAAwB,EACxB,QAAQ,EACR,cAAc,EACd,sBAA6B,EAC7B,oBAA4B,EAC5B,oBAA4B,EAC5B,kBAAyB,EACzB,WAAmB,EACnB,YAAsB,EACtB,MAAe,EACf,oBAA4B,EAC5B,oBAAoB,EACpB,sBAA0B,EAC1B,kBAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,mBAA2B,EAC3B,gBAAoB,EACpB,cAAsB,EACtB,wBAAgC,EAChC,UAAU,EACV,QAAQ,EACR,kBAA0B,EAC1B,cAAc,EAAE,kBAAkB,EAClC,WAAW,EACX,QAAgB,EAChB,YAAY,EACZ,IAAI,EACJ,IAAI,EAAE,QAAQ,EACd,cAAsB,EACtB,UAAkB,EAClB,aAAqB,EACrB,OAAW,EACX,OAAO,EACP,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,aAAa,EAAE,cAAc,EAC7B,SAAS,EACT,IAAI,EACJ,OAAe,EACf,QAAgB,EAChB,MAAM,EACN,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,EACR,YAAY,EAAE,SAAS,EACvB,kBAAkB,EAAE,eAAe,EACnC,GAAG,KAAK,EACT,EAAE,kBAAkB,CAAC,KAAK,CAAC,2CA0qE3B"}
+{"version":3,"file":"DataTableRoot.d.ts","sourceRoot":"","sources":["../../../src/components/DataTable/DataTableRoot.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAcH,OAAO,KAA4D,MAAM,OAAO,CAAC;AAajF,OAAO,KAAK,EAIV,cAAc,EAEf,MAAM,aAAa,CAAC;AAgDrB,MAAM,WAAW,kBAAkB,CACjC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CACvD,SAAQ,cAAc,CAAC,KAAK,CAAC;IAC7B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACrF,IAAI,EACJ,OAAO,EACP,YAAY,EACZ,eAAe,EACf,aAAa,EACb,OAAO,EACP,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,cAAc,EAC1B,WAAmB,EACnB,aAAmB,EACnB,WAAW,EACX,eAAuB,EACvB,gBAAwB,EACxB,aAAqB,EACrB,eAAsB,EACtB,gBAAgB,EAChB,aAAoB,EACpB,gBAAuB,EACvB,eAAe,EACf,cAAwB,EACxB,QAAQ,EACR,cAAc,EACd,sBAA6B,EAC7B,oBAA4B,EAC5B,oBAA4B,EAC5B,kBAAyB,EACzB,WAAmB,EACnB,YAAsB,EACtB,MAAe,EACf,oBAA4B,EAC5B,oBAAoB,EACpB,sBAA0B,EAC1B,kBAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,mBAA2B,EAC3B,gBAAoB,EACpB,cAAsB,EACtB,wBAAgC,EAChC,UAAU,EACV,QAAQ,EACR,kBAA0B,EAC1B,cAAc,EAAE,kBAAkB,EAClC,WAAW,EACX,QAAgB,EAChB,YAAY,EACZ,IAAI,EACJ,IAAI,EAAE,QAAQ,EACd,cAAsB,EACtB,UAAkB,EAClB,aAAqB,EACrB,OAAW,EACX,OAAO,EACP,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,aAAa,EAAE,cAAc,EAC7B,SAAS,EACT,IAAI,EACJ,OAAe,EACf,QAAgB,EAChB,MAAM,EACN,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,EACR,YAAY,EAAE,SAAS,EACvB,kBAAkB,EAAE,eAAe,EACnC,GAAG,KAAK,EACT,EAAE,kBAAkB,CAAC,KAAK,CAAC,2CA2qE3B"}