@genome-spy/core 0.67.0 → 0.69.0

package/dist/src/view/gridView/gridChild.js

@@ -14,6 +14,7 @@ import Point from "../layout/point.js";
 import Rectangle from "../layout/rectangle.js";
 import createTitle from "../title.js";
 import UnitView from "../unitView.js";
+import { markViewAsNonAddressable } from "../viewSelectors.js";
 import Scrollbar from "./scrollbar.js";
 import SelectionRect from "./selectionRect.js";
 
@@ -76,6 +77,9 @@ export default class GridChild {
                         blockEncodingInheritance: true,
                     }
                 );
+                markViewAsNonAddressable(this.background, {
+                    skipSubtree: true,
+                });
             }
 
             const backgroundStrokeSpec = createBackgroundStroke(viewBackground);
@@ -90,6 +94,9 @@ export default class GridChild {
                         blockEncodingInheritance: true,
                     }
                 );
+                markViewAsNonAddressable(this.backgroundStroke, {
+                    skipSubtree: true,
+                });
             }
 
             const title = createTitle(view.spec.title);
@@ -105,6 +112,7 @@ export default class GridChild {
                     }
                 );
                 this.title = unitView;
+                markViewAsNonAddressable(this.title, { skipSubtree: true });
             }
         }
 
@@ -129,7 +137,7 @@ export default class GridChild {
         };
 
         // TODO: If the child is a LayerView, selection params should be pulled from its children as well
-        for (const [name, param] of view.paramMediator.paramConfigs) {
+        for (const [name, param] of view.paramRuntime.paramConfigs) {
             if (!("select" in param)) {
                 continue;
             }
@@ -191,8 +199,13 @@ export default class GridChild {
                     ])
                 );
 
-            const selectionExpr = view.paramMediator.createExpression(name);
-            const setter = view.paramMediator.getSetter(name);
+            const selectionExpr = view.paramRuntime.createExpression(name);
+            const setter = (
+                /** @type {import("../../types/selectionTypes.js").IntervalSelection} */
+                selection
+            ) => {
+                view.paramRuntime.setValue(name, selection);
+            };
 
             if (param.value) {
                 setter({ type: "interval", intervals: param.value });

package/dist/src/view/gridView/gridView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/gridView.js"],"names":[],"mappings":"AA42BA;;GAEG;AACH,+EAUC;AAED;;;;;GAKG;AACH,4CAJW,OAAO,wBAAwB,EAAE,OAAO,UACxC,OAAO,oBAAoB,EAAE,UAAU,YACvC,QAAQ,aAmBlB;AA/3BD;;;;;;;;;;;;;;;GAeG;AACH;IAoCI;;;;;;;;;OASG;IACH,kBARW,OAAO,oBAAoB,EAAE,aAAa,WAC1C,OAAO,4BAA4B,EAAE,OAAO,gBAC5C,aAAa,kDAEb,MAAM,WACN,MAAM,YACN,OAAO,YAAY,EAAE,WAAW,EAoB1C;IARG,iDAAgB;IAOhB,uBAA0B;IAG9B;;OAEG;IACH,sDAEC;IAED;;;;;;OAMG;IACH,qDAFa,SAAS,CAIrB;IAED;;;;;;;OAOG;IACH,6DAHW,MAAM,GACJ,SAAS,CAQrB;IAED;;;;;OAKG;IACH,0DAQC;IAED;;;;;OAKG;IACH,qBAFW,MAAM,QAShB;IAeD;;OAEG;IACH,mBAFW,8BAAM,QAUhB;IAYD;;OAEG;IACH,+CAEC;IAED,yBAEC;IAED;;OAEG;IACH,sCAKC;IAED;;;;OAIG;IACH,gCAqCC;;CAwkBJ;qBAr0B0D,gBAAgB;sBADrD,wBAAwB;0BAEpB,qBAAqB;sBAIzB,gBAAgB"}
+{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/gridView.js"],"names":[],"mappings":"AAg9BA;;GAEG;AACH,+EAUC;AAmBD;;;;;GAKG;AACH,4CAJW,OAAO,wBAAwB,EAAE,OAAO,UACxC,OAAO,oBAAoB,EAAE,UAAU,YACvC,QAAQ,aAmBlB;AAn/BD;;;;;;;;;;;;;;;GAeG;AACH;IAuCI;;;;;;;;;OASG;IACH,kBARW,OAAO,oBAAoB,EAAE,aAAa,WAC1C,OAAO,4BAA4B,EAAE,OAAO,gBAC5C,aAAa,kDAEb,MAAM,WACN,MAAM,YACN,OAAO,YAAY,EAAE,WAAW,EAkC1C;IAtBG,iDAAgB;IAOhB,uBAA0B;IAiB9B;;OAEG;IACH,sDAEC;IAED;;;;;;OAMG;IACH,qDAFa,SAAS,CAIrB;IAED;;;;;;;OAOG;IACH,6DAHW,MAAM,GACJ,SAAS,CASrB;IAED;;;;;OAKG;IACH,0DAQC;IAED;;;;;OAKG;IACH,qBAFW,MAAM,QAUhB;IAeD;;OAEG;IACH,mBAFW,8BAAM,QAWhB;IAYD;;OAEG;IACH,+CAEC;IAED,yBAEC;IAED;;OAEG;IACH,sCAKC;IAED;;;;OAIG;IACH,gCAqCC;;CAupBJ;qBAz6B0D,gBAAgB;sBADrD,wBAAwB;0BAEpB,qBAAqB;sBAIzB,gBAAgB"}

package/dist/src/view/gridView/gridView.js

@@ -16,6 +16,7 @@ import LayerView from "../layerView.js";
 import UnitView from "../unitView.js";
 import { interactionToZoom } from "../zoom.js";
 import GridChild from "./gridChild.js";
+import SeparatorView, { resolveSeparatorProps } from "./separatorView.js";
 
 /**
  * Modeled after: https://vega.github.io/vega/docs/layout/
@@ -69,6 +70,9 @@ export default class GridView extends ContainerView {
 
     #childSerial = 0;
 
+    /** @type {Partial<Record<"horizontal" | "vertical", SeparatorView>>} */
+    #separatorViews = {};
+
     /**
      *
      * @param {import("../../spec/view.js").AnyConcatSpec} spec
@@ -97,6 +101,20 @@ export default class GridView extends ContainerView {
         this.#children = [];
 
         this.wrappingFacet = false;
+
+        const separatorProps = resolveSeparatorProps(spec.separator);
+        if (separatorProps) {
+            for (const direction of getSeparatorDirections(spec)) {
+                this.#separatorViews[direction] = new SeparatorView({
+                    direction,
+                    props: separatorProps,
+                    context: this.context,
+                    layoutParent: this,
+                    dataParent: this,
+                    getName: (prefix) => this.getNextAutoName(prefix),
+                });
+            }
+        }
     }
 
     /**
@@ -130,6 +148,7 @@ export default class GridView extends ContainerView {
         const gridChild = new GridChild(view, this, this.#childSerial);
         this.#childSerial++;
         this.#children.splice(index, 0, gridChild);
+        this.invalidateSizeCache();
         return gridChild;
     }
 
@@ -162,6 +181,7 @@ export default class GridView extends ContainerView {
         }
         this.#disposeGridChild(gridChild);
         this.#children.splice(index, 1);
+        this.invalidateSizeCache();
     }
 
     get #visibleChildren() {
@@ -188,6 +208,7 @@ export default class GridView extends ContainerView {
         for (const view of views) {
             this.appendChild(view);
         }
+        this.invalidateSizeCache();
     }
 
     /**
@@ -273,6 +294,10 @@ export default class GridView extends ContainerView {
             yield* gridChild.getChildren();
         }
 
+        for (const separatorView of Object.values(this.#separatorViews)) {
+            yield separatorView.view;
+        }
+
         for (const axisView of Object.values(this.#sharedAxes)) {
             yield axisView;
         }
@@ -519,8 +544,10 @@ export default class GridView extends ContainerView {
 
         context.pushView(this, coords);
 
+        const devicePixelRatio = context.getDevicePixelRatio();
+
         const flexOpts = {
-            devicePixelRatio: context.getDevicePixelRatio(),
+            devicePixelRatio,
         };
         const columnFlexCoords = mapToPixelCoords(
             this.#makeFlexItems("column"),
@@ -543,6 +570,10 @@ export default class GridView extends ContainerView {
         const round = (x) =>
             Math.round(x * devicePixelRatio) / devicePixelRatio;
 
+        // Two-phase render: compute layout once, then render backgrounds/separators
+        // before gridlines/axes/marks without recomputing per-child coords.
+        const renderItems = [];
+
         for (const [i, gridChild] of this.#visibleChildren.entries()) {
             const {
                 view,
@@ -619,10 +650,79 @@ export default class GridView extends ContainerView {
                 ? viewportCoords.intersect(options.clipRect)
                 : viewportCoords;
 
-            background?.render(context, clippedChildCoords, {
+            renderItems.push({
+                col,
+                row,
+                view,
+                axes,
+                gridLines,
+                background,
+                backgroundStroke,
+                title,
+                selectionRect,
+                viewportCoords,
+                viewCoords,
+                clippedChildCoords,
+                viewWidth,
+                viewHeight,
+                scrollable,
+                gridChild,
+            });
+        }
+
+        for (const item of renderItems) {
+            item.background?.render(context, item.clippedChildCoords, {
                 ...options,
                 clipRect: undefined,
             });
+        }
+
+        const gridOverhang = this.#getGridOverhang();
+
+        const verticalSeparator = this.#separatorViews.vertical;
+        if (verticalSeparator) {
+            verticalSeparator.update(
+                columnFlexCoords,
+                grid.nCols,
+                coords,
+                (direction, index) => this.#getViewSlot(direction, index),
+                this.wrappingFacet,
+                gridOverhang
+            );
+            verticalSeparator.render(context, coords, options);
+        }
+
+        const horizontalSeparator = this.#separatorViews.horizontal;
+        if (horizontalSeparator) {
+            horizontalSeparator.update(
+                rowFlexCoords,
+                grid.nRows,
+                coords,
+                (direction, index) => this.#getViewSlot(direction, index),
+                this.wrappingFacet,
+                gridOverhang
+            );
+            horizontalSeparator.render(context, coords, options);
+        }
+
+        for (const item of renderItems) {
+            const {
+                view,
+                axes,
+                gridLines,
+                backgroundStroke,
+                title,
+                selectionRect,
+                viewportCoords,
+                viewCoords,
+                clippedChildCoords,
+                viewWidth,
+                viewHeight,
+                scrollable,
+                gridChild,
+                col,
+                row,
+            } = item;
 
             for (const gridLineView of Object.values(gridLines)) {
                 gridLineView.render(context, viewportCoords, options);
@@ -889,6 +989,23 @@ export function isClippedChildren(view) {
     return clipped;
 }
 
+/**
+ * @param {import("../../spec/view.js").AnyConcatSpec} spec
+ * @returns {("horizontal" | "vertical")[]}
+ */
+function getSeparatorDirections(spec) {
+    // vconcat = horizontal separators, hconcat = vertical separators, concat = both
+    if ("vconcat" in spec) {
+        return ["horizontal"];
+    }
+
+    if ("hconcat" in spec) {
+        return ["vertical"];
+    }
+
+    return ["horizontal", "vertical"];
+}
+
 /**
  *
  * @param {import("../layout/rectangle.js").default} coords

package/dist/src/view/gridView/scrollbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrollbar.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/scrollbar.js"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH;IAwBI;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,mBAChC,eAAe,YACf;QAAE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,EAwH/D;IAvID;;;;;;OAMG;IACH,uBAAmB;IAiDf;;;;MAAoB;IAiFxB,2BAEC;IAED;;;OAGG;IACH,yBAHW,MAAM,6BACN;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,QAYtD;IAqFD;;;;;;;;;OASG;IACH,gCAHW,SAAS,iBACT,SAAS,QASnB;IAMG;;;;MAWC;;CAER;;;;;8BAlSY,YAAY,GAAG,UAAU;qBANjB,gBAAgB;sBADf,wBAAwB"}
+{"version":3,"file":"scrollbar.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/scrollbar.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH;IAwBI;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,mBAChC,eAAe,YACf;QAAE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,EA0H/D;IAzID;;;;;;OAMG;IACH,uBAAmB;IAmDf;;;;MAAoB;IAiFxB,2BAEC;IAED;;;OAGG;IACH,yBAHW,MAAM,6BACN;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,QAYtD;IAqFD;;;;;;;;;OASG;IACH,gCAHW,SAAS,iBACT,SAAS,QASnB;IAMG;;;;MAWC;;CAER;;;;;8BApSY,YAAY,GAAG,UAAU;qBAPjB,gBAAgB;sBADf,wBAAwB"}

package/dist/src/view/gridView/scrollbar.js

@@ -2,6 +2,7 @@ import clamp from "../../utils/clamp.js";
 import { makeLerpSmoother } from "../../utils/animator.js";
 import Rectangle from "../layout/rectangle.js";
 import UnitView from "../unitView.js";
+import { markViewAsNonAddressable } from "../viewSelectors.js";
 
 /**
  * This class represents a scrollbar thumb that can be used within a grid view
@@ -77,6 +78,8 @@ export default class Scrollbar extends UnitView {
             }
         );
 
+        markViewAsNonAddressable(this, { skipSubtree: true });
+
         this.config = config;
         this.#scrollDirection = scrollDirection;
         this.#onViewportOffsetChange = options.onViewportOffsetChange;

package/dist/src/view/gridView/selectionRect.d.ts

@@ -1,18 +1,14 @@
 export default class SelectionRect extends LayerView {
-    /**
-     * @param {import("./gridChild.js").default} gridChild
-     * @param {import("../paramMediator.js").ExprRefFunction} selectionExpr
-     * @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
-     */
-    constructor(gridChild: import("./gridChild.js").default, selectionExpr: import("../paramMediator.js").ExprRefFunction, brushConfig?: import("../../spec/parameter.js").BrushConfig);
     /**
      * @typedef {import("../../spec/channel.js").PrimaryPositionalChannel} PrimaryPositionalChannel
      * @typedef {import("../../types/selectionTypes.js").IntervalSelection} IntervalSelection
      */
-    /** @type {import("../paramMediator.js").ExprRefFunction} */
-    _selectionExpr: import("../paramMediator.js").ExprRefFunction;
-    /** @type {() => void} */
-    _selectionListener: () => void;
+    /**
+     * @param {import("./gridChild.js").default} gridChild
+     * @param {import("../../paramRuntime/types.js").ExprRefFunction} selectionExpr
+     * @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
+     */
+    constructor(gridChild: import("./gridChild.js").default, selectionExpr: import("../../paramRuntime/types.js").ExprRefFunction, brushConfig?: import("../../spec/parameter.js").BrushConfig);
 }
 import LayerView from "../layerView.js";
 //# sourceMappingURL=selectionRect.d.ts.map

package/dist/src/view/gridView/selectionRect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectionRect.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/selectionRect.js"],"names":[],"mappings":"AAGA;IAYI;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,iBAChC,OAAO,qBAAqB,EAAE,eAAe,gBAC7C,OAAO,yBAAyB,EAAE,WAAW,EAqJvD;IAnKD;;;OAGG;IAEH,4DAA4D;IAC5D,gBADW,OAAO,qBAAqB,EAAE,eAAe,CACzC;IAEf,yBAAyB;IACzB,oBADW,MAAM,IAAI,CACF;CAmKtB;sBA/KqB,iBAAiB"}
+{"version":3,"file":"selectionRect.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/selectionRect.js"],"names":[],"mappings":"AAIA;IACI;;;OAGG;IAEH;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,iBAChC,OAAO,6BAA6B,EAAE,eAAe,gBACrD,OAAO,yBAAyB,EAAE,WAAW,EAgKvD;CACJ;sBA7KqB,iBAAiB"}

package/dist/src/view/gridView/selectionRect.js

@@ -1,5 +1,6 @@
 import { primaryPositionalChannels } from "../../encoder/encoder.js";
 import LayerView from "../layerView.js";
+import { markViewAsNonAddressable } from "../viewSelectors.js";
 
 export default class SelectionRect extends LayerView {
     /**
@@ -7,15 +8,9 @@ export default class SelectionRect extends LayerView {
      * @typedef {import("../../types/selectionTypes.js").IntervalSelection} IntervalSelection
      */
 
-    /** @type {import("../paramMediator.js").ExprRefFunction} */
-    _selectionExpr;
-
-    /** @type {() => void} */
-    _selectionListener;
-
     /**
      * @param {import("./gridChild.js").default} gridChild
-     * @param {import("../paramMediator.js").ExprRefFunction} selectionExpr
+     * @param {import("../../paramRuntime/types.js").ExprRefFunction} selectionExpr
      * @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
      */
     constructor(gridChild, selectionExpr, brushConfig = {}) {
@@ -34,6 +29,7 @@ export default class SelectionRect extends LayerView {
         const layerSpec = {
             name: "selectionRect",
             configurableVisibility: false,
+            domainInert: true,
             resolve: {
                 scale: {
                     x: "forced",
@@ -46,12 +42,24 @@ export default class SelectionRect extends LayerView {
         };
 
         if (channels.includes("x")) {
-            layerSpec.encoding.x = { field: "_x", type: null, title: null };
-            layerSpec.encoding.x2 = { field: "_x2" };
+            layerSpec.encoding.x = {
+                field: "_x",
+                type: null,
+                title: null,
+            };
+            layerSpec.encoding.x2 = {
+                field: "_x2",
+            };
         }
         if (channels.includes("y")) {
-            layerSpec.encoding.y = { field: "_y", type: null, title: null };
-            layerSpec.encoding.y2 = { field: "_y2" };
+            layerSpec.encoding.y = {
+                field: "_y",
+                type: null,
+                title: null,
+            };
+            layerSpec.encoding.y2 = {
+                field: "_y2",
+            };
         }
 
         layerSpec.layer.push({
@@ -137,14 +145,12 @@ export default class SelectionRect extends LayerView {
             "selectionRect", // TODO: Serial
             {
                 blockEncodingInheritance: true,
-                contributesToScaleDomain: false,
             }
         );
 
-        /** @type {import("../paramMediator.js").ExprRefFunction} */
-        this._selectionExpr = selectionExpr;
+        markViewAsNonAddressable(this, { skipSubtree: true });
 
-        this._selectionListener = () => {
+        const selectionListener = () => {
             const selection =
                 /** @type {import("../../types/selectionTypes.js").IntervalSelection} */ (
                     selectionExpr()
@@ -164,15 +170,7 @@ export default class SelectionRect extends LayerView {
             datasource.updateDynamicData(selectionToData(selection));
         };
 
-        selectionExpr.addListener(this._selectionListener);
-    }
-
-    /**
-     * @override
-     */
-    dispose() {
-        this._selectionExpr.removeListener(this._selectionListener);
-        super.dispose();
+        this.registerDisposer(selectionExpr.subscribe(selectionListener));
     }
 }
 

package/dist/src/view/gridView/separatorView.d.ts

@@ -0,0 +1,51 @@
+/**
+ * @param {import("../../spec/view.js").SeparatorProps | boolean | undefined} separator
+ * @returns {import("../../spec/view.js").SeparatorProps | null}
+ */
+export function resolveSeparatorProps(separator: import("../../spec/view.js").SeparatorProps | boolean | undefined): import("../../spec/view.js").SeparatorProps | null;
+/**
+ * Draws separator rules for a single direction in a grid layout.
+ */
+export default class SeparatorView {
+    /**
+     * @param {{
+     *   direction: SeparatorDirection,
+     *   props: import("../../spec/view.js").SeparatorProps,
+     *   context: import("../../types/viewContext.js").default,
+     *   layoutParent: import("../containerView.js").default,
+     *   dataParent: import("../view.js").default,
+     *   getName: (prefix: string) => string
+     * }} options
+     */
+    constructor({ direction, props, context, layoutParent, dataParent, getName, }: {
+        direction: SeparatorDirection;
+        props: import("../../spec/view.js").SeparatorProps;
+        context: import("../../types/viewContext.js").default;
+        layoutParent: import("../containerView.js").default;
+        dataParent: import("../view.js").default;
+        getName: (prefix: string) => string;
+    });
+    /**
+     * @returns {UnitView}
+     */
+    get view(): UnitView;
+    /**
+     * @param {import("../layout/flexLayout.js").LocSize[]} flexCoords
+     * @param {number} count
+     * @param {import("../layout/rectangle.js").default} coords
+     * @param {(direction: "row" | "column", index: number) => number} getViewSlot
+     * @param {boolean} wrappingFacet
+     * @param {import("../layout/padding.js").default} overhang
+     */
+    update(flexCoords: import("../layout/flexLayout.js").LocSize[], count: number, coords: import("../layout/rectangle.js").default, getViewSlot: (direction: "row" | "column", index: number) => number, wrappingFacet: boolean, overhang: import("../layout/padding.js").default): void;
+    /**
+     * @param {import("../renderingContext/viewRenderingContext.js").default} context
+     * @param {import("../layout/rectangle.js").default} coords
+     * @param {import("../../types/rendering.js").RenderingOptions} options
+     */
+    render(context: import("../renderingContext/viewRenderingContext.js").default, coords: import("../layout/rectangle.js").default, options: import("../../types/rendering.js").RenderingOptions): void;
+    #private;
+}
+export type SeparatorDirection = "horizontal" | "vertical";
+import UnitView from "../unitView.js";
+//# sourceMappingURL=separatorView.d.ts.map

package/dist/src/view/gridView/separatorView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"separatorView.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/separatorView.js"],"names":[],"mappings":"AA2NA;;;GAGG;AACH,iDAHW,OAAO,oBAAoB,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS,GAC/D,OAAO,oBAAoB,EAAE,cAAc,GAAG,IAAI,CAiB9D;AA/ND;;GAEG;AACH;IAsBI;;;;;;;;;OASG;IACH,+EATW;QACN,SAAS,EAAE,kBAAkB,CAAC;QAC9B,KAAK,EAAE,OAAO,oBAAoB,EAAE,cAAc,CAAC;QACnD,OAAO,EAAE,OAAO,4BAA4B,EAAE,OAAO,CAAC;QACtD,YAAY,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC;QACpD,UAAU,EAAE,OAAO,YAAY,EAAE,OAAO,CAAC;QACzC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAA;KACpC,EAqBH;IAED;;OAEG;IACH,YAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,mBAPW,OAAO,yBAAyB,EAAE,OAAO,EAAE,SAC3C,MAAM,UACN,OAAO,wBAAwB,EAAE,OAAO,eACxC,CAAC,SAAS,EAAE,KAAK,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,iBACtD,OAAO,YACP,OAAO,sBAAsB,EAAE,OAAO,QAKhD;IAED;;;;OAIG;IACH,gBAJW,OAAO,6CAA6C,EAAE,OAAO,UAC7D,OAAO,wBAAwB,EAAE,OAAO,WACxC,OAAO,0BAA0B,EAAE,gBAAgB,QAI7D;;CAuHJ;iCArNY,YAAY,GAAG,UAAU;qBAJjB,gBAAgB"}