cx 26.7.0 → 26.7.2

package/build/ui/Cx.d.ts

@@ -43,6 +43,7 @@ export declare class Cx extends VDOM.Component<CxProps, CxState> {
     deferCounter: number;
     pendingUpdateTimer?: NodeJS.Timeout;
     unsubscribeIdleRequest?: () => void;
+    stateUpdateDepth: number;
     constructor(props: CxProps);
     UNSAFE_componentWillReceiveProps(props: CxProps): void;
     getInstance(): Instance;
@@ -50,6 +51,7 @@ export declare class Cx extends VDOM.Component<CxProps, CxState> {
     componentDidMount(): void;
     componentDidUpdate(): void;
     update(): void;
+    onStateUpdateCompleted(): void;
     waitForIdle(): void;
     componentWillUnmount(): void;
     shouldComponentUpdate(props: CxProps, state: CxState): boolean;

package/build/ui/Cx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cx.d.ts","sourceRoot":"","sources":["../../src/ui/Cx.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAc,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,OAAO,EAA2D,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACzG,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,OAAO;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAChE,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,GAAG,CAAA;KAAE,KAAK,GAAG,CAAC;IACnD,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,OAAO;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACb;AAED,qBAAa,EAAG,SAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC;IACZ,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACpC,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;gBAExB,KAAK,EAAE,OAAO;IAwC1B,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAsBtD,WAAW,IAAI,QAAQ;IAcvB,MAAM;IAkBN,iBAAiB,IAAI,IAAI;IAOzB,kBAAkB,IAAI,IAAI;IAM1B,MAAM,IAAI,IAAI;IAmBd,WAAW,IAAI,IAAI;IAgBnB,oBAAoB,IAAI,IAAI;IAO5B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAe9D,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;CAIzD"}
+{"version":3,"file":"Cx.d.ts","sourceRoot":"","sources":["../../src/ui/Cx.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAc,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,OAAO,EAA2D,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACzG,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,OAAO;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAChE,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,GAAG,CAAA;KAAE,KAAK,GAAG,CAAC;IACnD,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,OAAO;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACb;AAED,qBAAa,EAAG,SAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC;IACZ,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACpC,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpC,gBAAgB,EAAE,MAAM,CAAK;gBAEjB,KAAK,EAAE,OAAO;IA0C1B,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAsBtD,WAAW,IAAI,QAAQ;IAcvB,MAAM;IAkBN,iBAAiB,IAAI,IAAI;IAOzB,kBAAkB,IAAI,IAAI;IAM1B,MAAM,IAAI,IAAI;IAkCd,sBAAsB;IAWtB,WAAW,IAAI,IAAI;IAgBnB,oBAAoB,IAAI,IAAI;IAO5B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAe9D,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;CAIzD"}

package/build/ui/Cx.js

@@ -23,6 +23,8 @@ export class Cx extends VDOM.Component {
     deferCounter;
     pendingUpdateTimer;
     unsubscribeIdleRequest;
+    // 0 when no synchronous setState is in flight; >0 while one is pending (re-entrancy guard for update())
+    stateUpdateDepth = 0;
     constructor(props) {
         super(props);
         if (props.instance) {
@@ -49,6 +51,7 @@ export class Cx extends VDOM.Component {
             this.unsubscribe = this.store.subscribe(this.update.bind(this));
             this.state.data = this.store.getData();
         }
+        this.onStateUpdateCompleted = this.onStateUpdateCompleted.bind(this);
         this.flags = {};
         this.renderCount = 0;
         if (props.onError)
@@ -87,7 +90,7 @@ export class Cx extends VDOM.Component {
             return this.instance;
         }
         if (this.widget && this.parentInstance)
-            return (this.instance = this.parentInstance.getDetachedChild(this.widget, 0, this.store));
+            return (this.instance = this.parentInstance.getDetachedChild(this.widget, "0", this.store));
         throw new Error("Could not resolve a widget instance in the Cx component.");
     }
     render() {
@@ -111,21 +114,47 @@ export class Cx extends VDOM.Component {
         debug(appDataFlag, data);
         if (this.flags.preparing)
             this.flags.dirty = true;
-        else if (isBatchingUpdates() || this.props.immediate) {
-            notifyBatchedUpdateStarting();
-            this.setState({ data: data }, notifyBatchedUpdateCompleted);
+        // Synchronous path (while batching, or for `immediate` instances). At most one setState may be in flight
+        // per Cx: if one is already pending (stateUpdateDepth != 0) skip issuing another. Re-entrant setStates
+        // nested deep -- e.g. a large initial render that writes to the store while it renders -- are what trip
+        // React's "Maximum update depth exceeded"; coalescing them into a single in-flight update avoids that.
+        // The pending update's completion callback re-reads the store and renders again if it changed
+        // (see onStateUpdateCompleted), so no change is dropped.
+        else if (this.props.immediate || isBatchingUpdates()) {
+            if (this.stateUpdateDepth == 0) {
+                this.stateUpdateDepth = 1;
+                notifyBatchedUpdateStarting();
+                this.setState({ data: data }, this.onStateUpdateCompleted);
+            }
         }
         else {
-            //in standard mode sequential store commands are batched
+            // standard mode: coalesce sequential store commands into a single deferred update
             if (!this.pendingUpdateTimer) {
                 notifyBatchedUpdateStarting();
                 this.pendingUpdateTimer = setTimeout(() => {
                     delete this.pendingUpdateTimer;
-                    this.setState({ data: data }, notifyBatchedUpdateCompleted);
+                    // read fresh data at fire time so the coalesced update renders the latest store state
+                    this.setState({ data: this.store.getData() }, notifyBatchedUpdateCompleted);
                 }, 0);
             }
         }
     }
+    // Completion callback for the synchronous setState above. If the store changed while that update was
+    // rendering -- i.e. the render itself wrote to the store, as happens throughout a large initial render --
+    // render once more with the latest data, keeping this callback armed; otherwise the burst has settled, so
+    // clear the in-flight flag and report completion. Re-arming coalesces until the store reaches a fixpoint;
+    // a genuinely non-converging update loop is still caught by React's own max-update-depth guard.
+    onStateUpdateCompleted() {
+        let latestData = this.store.getData();
+        if (this.state.data === latestData) {
+            this.stateUpdateDepth = 0;
+            notifyBatchedUpdateCompleted();
+        }
+        else {
+            this.stateUpdateDepth++;
+            this.setState({ data: latestData }, this.onStateUpdateCompleted);
+        }
+    }
     waitForIdle() {
         if (!this.props.deferredUntilIdle)
             return;
@@ -133,7 +162,7 @@ export class Cx extends VDOM.Component {
             this.unsubscribeIdleRequest();
         let token = ++this.deferCounter;
         this.unsubscribeIdleRequest = onIdleCallback(() => {
-            this.setState({ deferToken: token });
+            this.setState({ deferToken: token }, this.onStateUpdateCompleted);
         }, {
             timeout: this.props.idleTimeout || 30000,
         });

package/build/widgets/DocumentTitle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocumentTitle.d.ts","sourceRoot":"","sources":["../../src/widgets/DocumentTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACtD,oDAAoD;IACpD,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB,oDAAoD;IACpD,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,kFAAkF;IAClF,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAE1C,yFAAyF;IACzF,SAAS,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IACnD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,SAAS,CAAC,EAAE,UAAU,CAAC;gBAEnB,MAAM,CAAC,EAAE,mBAAmB;IAIxC,IAAI,IAAI,IAAI;IAQZ,WAAW,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI;IASrD,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA+B5D,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAK5D,MAAM,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"DocumentTitle.d.ts","sourceRoot":"","sources":["../../src/widgets/DocumentTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACtD,oDAAoD;IACpD,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB,oDAAoD;IACpD,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,kFAAkF;IAClF,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAE1C,yFAAyF;IACzF,SAAS,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,qBAAa,aAAc,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IACnD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,SAAS,CAAC,EAAE,UAAU,CAAC;gBAEnB,MAAM,CAAC,EAAE,mBAAmB;IAIxC,IAAI,IAAI,IAAI;IAQZ,WAAW,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI;IASrD,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA+B5D,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAO5D,MAAM,IAAI,IAAI;CAGhB"}

package/build/widgets/DocumentTitle.js

@@ -45,6 +45,8 @@ export class DocumentTitle extends Widget {
         super.explore(context, instance);
     }
     prepare(context, instance) {
+        if (typeof document == "undefined")
+            return;
         if (context.documentTitle.activeInstance == instance)
             document.title = context.documentTitle.title;
     }

package/build/widgets/grid/TreeNode.d.ts

@@ -25,6 +25,8 @@ export interface TreeNodeConfig extends StyledContainerConfig {
     openFolderIcon?: StringProp;
     /** Icon for folder. */
     folderIcon?: StringProp;
+    /** Icon used for the expand/collapse arrow. Defaults to `drop-down`. */
+    arrowIcon?: StringProp;
     /** Set to `true` to hide the icon. */
     hideIcon?: boolean;
     /** Set to `true` to hide the arrow. */

package/build/widgets/grid/TreeNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeNode.d.ts","sourceRoot":"","sources":["../../../src/widgets/grid/TreeNode.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,cAAe,SAAQ,qBAAqB;IAC3D,qCAAqC;IACrC,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB,6DAA6D;IAC7D,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,4BAA4B;IAC5B,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B,uBAAuB;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,uCAAuC;IACvC,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB;AAED,qBAAa,QAAS,SAAQ,aAAa,CAAC,cAAc,CAAC;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;gBAEd,MAAM,CAAC,EAAE,cAAc;IAInC,IAAI;IAKJ,WAAW;IAkBX,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ;IAazD,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM;IA+CjE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ;CAM/C"}
+{"version":3,"file":"TreeNode.d.ts","sourceRoot":"","sources":["../../../src/widgets/grid/TreeNode.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,cAAe,SAAQ,qBAAqB;IAC3D,qCAAqC;IACrC,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB,6DAA6D;IAC7D,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEtB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,4BAA4B;IAC5B,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B,uBAAuB;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,wEAAwE;IACxE,SAAS,CAAC,EAAE,UAAU,CAAC;IAEvB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,uCAAuC;IACvC,SAAS,CAAC,EAAE,WAAW,CAAC;CACzB;AAED,qBAAa,QAAS,SAAQ,aAAa,CAAC,cAAc,CAAC;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;gBAEd,MAAM,CAAC,EAAE,cAAc;IAInC,IAAI;IAKJ,WAAW;IAkBX,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ;IAazD,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM;IA+CjE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ;CAM/C"}