igniteui-webcomponents-data-grids 7.1.0 → 7.1.1-beta.0

package/esm2015/lib/ColumnFilterCondition_combined.js

@@ -5828,7 +5828,7 @@ let Pager = /*@__PURE__*/ (() => {
                 if (this.b.isVirtual) {
                     this.b.firstVisibleIndexRequested = a;
                     this.b.lastVisibleIndexRequested = a + this.ah;
-                    this.d.ef = false;
+                    this.d.ei = false;
                 }
                 this.b4();
                 this.ac.clear();
@@ -5839,7 +5839,7 @@ let Pager = /*@__PURE__*/ (() => {
                     let c = this.b.getItemAtIndex(b);
                     this.ac.add1(c);
                     if (c != null) {
-                        this.d.ef = true;
+                        this.d.ei = true;
                     }
                 }
                 let d = new Array(this.ac.count);
@@ -5850,7 +5850,7 @@ let Pager = /*@__PURE__*/ (() => {
                 if (this.targetGrid != null) {
                     this.targetGrid.actualDataSource.queueAutoRefresh();
                     this.targetGrid.actualDataSource.flushAutoRefresh();
-                    if (this.b.isVirtual && this.d.ef) {
+                    if (this.b.isVirtual && this.d.ei) {
                         this.targetGrid.xz(0, this.ao - 1);
                     }
                     else {
@@ -5881,7 +5881,7 @@ let Pager = /*@__PURE__*/ (() => {
                 this.b.summaryScope = this.p;
                 let b = this.b;
                 b.schemaChanged = delegateCombine(b.schemaChanged, runOn(this, this.bl));
-                this.d.ee = this.b;
+                this.d.eh = this.b;
                 switch (this.l) {
                     case 1:
                     case 0:
@@ -6589,7 +6589,7 @@ let EditingManager = /*@__PURE__*/ (() => {
             }
             this.a = a;
             this.d = this.g.actualColumns._inner[a.l.a6];
-            this.c = this.g.model.b9._inner[a.l.a6];
+            this.c = this.g.model.ca._inner[a.l.a6];
             this.r = a.l.x;
             this.q = a.l.a6;
             this.u = a.il;
@@ -6984,7 +6984,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 this.iv = false;
                 if (this.selectionMode == 5) {
                     if (a.l.aj && !a.l.a1) {
-                        let g = this.model.b9._inner[a.l.a6].n;
+                        let g = this.model.ca._inner[a.l.a6].n;
                         if (this.selectionBehavior == 1) {
                             if (b) {
                                 this.y7(a.l.x, g);
@@ -7117,10 +7117,10 @@ let DataGrid = /*@__PURE__*/ (() => {
             if (this.dragger != null && this.columnResizingMode != 2 && this.ap.h) {
                 let d = this.az.j._inner[a.l.a6];
                 if (d.kd) {
-                    let e = this.model.b9._inner[this.ap.a6];
+                    let e = this.model.ca._inner[this.ap.a6];
                     this.mq = e.k;
-                    this.mn = this.model.cz;
-                    this.mo = this.model.c0;
+                    this.mn = this.model.c0;
+                    this.mo = this.model.c1;
                     this.mr = this.model.actualVisibleRegion.left;
                     this.ms = this.model.actualVisibleRegion.top;
                     let f = this.dragger.view.transformPoint(b, c);
@@ -7139,8 +7139,8 @@ let DataGrid = /*@__PURE__*/ (() => {
         }
         xa(a, b, c) {
             let d = 0;
-            for (let e = 0; e < this.model.b9.count; e++) {
-                let f = this.model.b9._inner[e];
+            for (let e = 0; e < this.model.ca.count; e++) {
+                let f = this.model.ca._inner[e];
                 d += f.k;
             }
             let g = this.dragger.view.transformPoint(b, c);
@@ -7226,7 +7226,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                     this.zj();
                 }
                 this.n0 = a.x;
-                this.nz = this.model.b9._inner[a.a6].n;
+                this.nz = this.model.ca._inner[a.a6].n;
                 this.i1 = this.h4;
                 if (this.activationMode == 1) {
                     this.ae.z(a);
@@ -7272,7 +7272,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 this.externalGrid.setDefaultCursor();
                 if (this.columnResizingMode == 0) {
                     if (this.md != -1) {
-                        let c = this.model.b9._inner[this.dragger.cellPath.a6];
+                        let c = this.model.ca._inner[this.dragger.cellPath.a6];
                         this.c8.ah(this, this.columnAnimationSettings, c, this.md);
                         this.columns._inner[this.dragger.cellPath.a6].po("Resized");
                     }
@@ -7358,8 +7358,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 let c = this.dragger.cellPath.a6;
                 let d = this.oz;
                 this.fq = 0;
-                for (let e = 0; e < this.model.b9.count; e++) {
-                    let f = this.model.b9._inner[e];
+                for (let e = 0; e < this.model.ca.count; e++) {
+                    let f = this.model.ca._inner[e];
                     if (f.a == 3) {
                         continue;
                     }
@@ -7374,13 +7374,13 @@ let DataGrid = /*@__PURE__*/ (() => {
                         if (e != c) {
                             c = e < this.dragger.cellPath.a6 ? e : e - 1;
                         }
-                        if (f.d != 1 && d < this.model.actualVisibleRegion.x + this.model.cz) {
-                            d = this.model.actualVisibleRegion.x + this.model.cz;
+                        if (f.d != 1 && d < this.model.actualVisibleRegion.x + this.model.c0) {
+                            d = this.model.actualVisibleRegion.x + this.model.c0;
                         }
                         this.fq = f.d;
                         break;
                     }
-                    else if ((b > i && b < h) || (e == this.model.b9.count - 1 && b > h)) {
+                    else if ((b > i && b < h) || (e == this.model.ca.count - 1 && b > h)) {
                         d = h - this.columnMovingSeparatorWidth;
                         if (e != c) {
                             c = e < this.dragger.cellPath.a6 ? e + 1 : e;
@@ -7419,16 +7419,16 @@ let DataGrid = /*@__PURE__*/ (() => {
             this.md = Math.max(this.mq + b, Math.max(c, 10));
             let d = 20;
             if (a.iu == 1) {
-                d = Math.min(20, this.actualVisibleRegion.width - this.model.cz);
-                let e = this.actualVisibleRegion.width - d - this.model.c0;
+                d = Math.min(20, this.actualVisibleRegion.width - this.model.c0);
+                let e = this.actualVisibleRegion.width - d - this.model.c1;
                 let f = this.mn + (this.md - this.mq);
                 if (f > e) {
                     this.md = this.md - (f - e);
                 }
             }
             else if (a.iu == 2) {
-                d = Math.min(20, this.actualVisibleRegion.width - this.model.c0);
-                let g = this.actualVisibleRegion.width - d - this.model.cz;
+                d = Math.min(20, this.actualVisibleRegion.width - this.model.c1);
+                let g = this.actualVisibleRegion.width - d - this.model.c0;
                 let h = this.mo + (this.md - this.mq);
                 if (h > g) {
                     this.md = this.md - (h - g);
@@ -7544,10 +7544,10 @@ let DataGrid = /*@__PURE__*/ (() => {
                 if (!n.l.aj || n.l.a1 || n.l.ak || n.l.al) {
                     continue;
                 }
-                if (l < this.model.actualVisibleRegion.x + this.model.cz && n.l.d != 1) {
+                if (l < this.model.actualVisibleRegion.x + this.model.c0 && n.l.d != 1) {
                     continue;
                 }
-                if (l > this.model.actualVisibleRegion.right - this.model.c0 && n.l.d != 2) {
+                if (l > this.model.actualVisibleRegion.right - this.model.c1 && n.l.d != 2) {
                     continue;
                 }
                 if (d) {
@@ -7562,7 +7562,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 }
                 let o = new Rect(0, n.db, n.dc, n.ib, n.gd);
                 if (a.intersectsWith(o)) {
-                    let p = this.model.b9._inner[n.l.a6].n;
+                    let p = this.model.ca._inner[n.l.a6].n;
                     let q = Math.abs(n.l.x - b);
                     let r = Math.abs(Math.max(0, p) - c);
                     let s = Math.abs(j - b);
@@ -10024,7 +10024,7 @@ let DataGrid = /*@__PURE__*/ (() => {
             this.gn = a;
         }
         get actualVisibleRegion() {
-            return new Rect(0, this.gn.cm, this.gn.cr, this.gn.cs, this.gn.ch);
+            return new Rect(0, this.gn.cn, this.gn.cs, this.gn.ct, this.gn.ci);
         }
         get initialSortDescriptions() {
             return this.b2;
@@ -10569,6 +10569,10 @@ let DataGrid = /*@__PURE__*/ (() => {
                     if (!p.gf.equals(q.gf)) {
                         this.c8.s(this, null, "PinnedRowBackground", 2, p.gf, q.gf, false, true, false, false);
                     }
+                    if (this.summaryDescriptions.j.count > 0 && (this.summaryScope == 1 || this.summaryScope == 0)) {
+                        this.model.b6 = true;
+                        this.za();
+                    }
                 }
             }
             if (a == "HeaderRowSeparator") {
@@ -10633,7 +10637,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 }
             }
             if (a == "DefaultColumnWidth" || a == "DefaultColumnMinWidth" || a == "Inset" || a == "HeaderSeparatorWidth") {
-                if (this.model != null && this.model.b9 != null && this.model.b9.count > 0) {
+                if (this.model != null && this.model.ca != null && this.model.ca.count > 0) {
                     this.za();
                 }
             }
@@ -10661,6 +10665,17 @@ let DataGrid = /*@__PURE__*/ (() => {
                 }
                 this.za();
             }
+            if (a == "SummaryRowRoot") {
+                if (b != null) {
+                    let ac = typeCast(SummaryRowRoot.$, b);
+                    ac.grid = null;
+                }
+                if (this.summaryRowRoot != null) {
+                    this.summaryRowRoot.grid = this;
+                }
+                this.model.b6 = true;
+                this.za();
+            }
             if (a == "ActiveCell") {
                 this.dj = typeCast(GridCellPosition.$, b);
                 this.i6 = true;
@@ -10673,8 +10688,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 this.i6 = false;
             }
             if (a == "ReactsToSortChanges") {
-                let ac = c;
-                if (!ac) {
+                let ad = c;
+                if (!ad) {
                     this.sortDescriptions.b = null;
                 }
                 else {
@@ -10684,8 +10699,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 }
             }
             if (a == "ReactsToGroupChanges") {
-                let ad = c;
-                if (!ad) {
+                let ae = c;
+                if (!ae) {
                     this.groupDescriptions.b = null;
                 }
                 else {
@@ -10695,8 +10710,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 }
             }
             if (a == "ReactsToFilterChanges") {
-                let ae = c;
-                if (!ae) {
+                let af = c;
+                if (!af) {
                     this.filterExpressions.syncTarget = null;
                 }
                 else {
@@ -10752,8 +10767,8 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             if (a == "HeaderHeight") {
                 this.x1();
-                let af = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
-                this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + af);
+                let ag = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
+                this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + ag);
             }
             if (a == "DefaultBorderWidth" || a == "BorderWidth") {
                 this.actualBorderWidth = this.ad9(this.borderWidth, this.aea);
@@ -10775,8 +10790,8 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             if (a == "FilterUIType") {
                 this.za();
-                let ag = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
-                this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + ag);
+                let ah = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
+                this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + ah);
             }
             if (a == "ScrollbarStyle") {
                 this.externalGrid.setScrollbarStyle(this.scrollbarStyle);
@@ -10912,8 +10927,8 @@ let DataGrid = /*@__PURE__*/ (() => {
             if (a != null && stringStartsWith(a, "Actual")) {
                 a = a.substr(6);
             }
-            for (let e = 0; e < this.model.b9.count; e++) {
-                let f = this.model.b9._inner[e];
+            for (let e = 0; e < this.model.ca.count; e++) {
+                let f = this.model.ca._inner[e];
                 this.c8.s(this, f, a, b, c, d, true, false, false, true);
             }
         }
@@ -11341,7 +11356,7 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             this.jm(false);
             a.lk = this.ge.k(e, this, this.model);
-            a.ll = this.model.b9._inner[e].n;
+            a.ll = this.model.ca._inner[e].n;
             a.it = a.iu;
             a.iu = b;
             this.ge.s(this.model);
@@ -11469,7 +11484,7 @@ let DataGrid = /*@__PURE__*/ (() => {
         cg(a) {
             let b = a ? 1 : 2;
             let c = this.actualColumns;
-            let d = this.model.cg;
+            let d = this.model.ch;
             let e = d.count - 1;
             let f = a ? 0 : e;
             let g = d._inner[f];
@@ -11488,7 +11503,7 @@ let DataGrid = /*@__PURE__*/ (() => {
         }
         cf(a) {
             let b = this.actualColumns;
-            let c = this.model.cg;
+            let c = this.model.ch;
             let d = c.count - 1;
             let e = a ? 0 : d;
             let f = c._inner[e];
@@ -11511,7 +11526,7 @@ let DataGrid = /*@__PURE__*/ (() => {
         xp(a, b, c) {
             c.lk = this.ge.k(a, this, this.model);
             c.lj = a;
-            c.ll = this.model.b9._inner[a].n;
+            c.ll = this.model.ca._inner[a].n;
             let d = c.hy;
             this.ge.u(this.d4, this.model, a, b, c.lr);
             if (!this.j0(c) && d != 3) {
@@ -11717,7 +11732,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 a = this.fa.getRowCount() - 1;
             }
             let e = 0;
-            for (let f of fromEnum(this.model.ce)) {
+            for (let f of fromEnum(this.model.cf)) {
                 if (d + f.m > a) {
                     e = truncate(Math.floor(a - d));
                     let g = f.e(e);
@@ -11729,7 +11744,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                     continue;
                 }
             }
-            let h = this.gm.n(this, this.model, new Rect(0, b, c, this.model.cs, this.model.ch));
+            let h = this.gm.n(this, this.model, new Rect(0, b, c, this.model.ct, this.model.ci));
             let i = -1;
             let j = -1;
             let k = false;
@@ -11802,7 +11817,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 a = this.fa.getRowCount() - 1;
             }
             let e = 0;
-            for (let f of fromEnum(this.model.ce)) {
+            for (let f of fromEnum(this.model.cf)) {
                 if (d + f.m > a) {
                     let g = truncate(Math.floor(a - d));
                     let h = f.e(g);
@@ -11815,10 +11830,10 @@ let DataGrid = /*@__PURE__*/ (() => {
                     continue;
                 }
             }
-            c -= this.model.c3;
+            c -= this.model.c4;
             c = Math.max(c, 0);
             if (this.model.absoluteHeight > 0 && this.model.actualVisibleRegion.height > 0) {
-                c -= truncate(Math.round(this.model.actualVisibleRegion.height - this.model.df - (e + this.model.c3)));
+                c -= truncate(Math.round(this.model.actualVisibleRegion.height - this.model.dg - (e + this.model.c4)));
             }
             if (this.model.absoluteHeight > 0 && this.model.actualVisibleRegion.height > 0 && c + this.model.actualVisibleRegion.height > this.model.absoluteHeight) {
                 c = truncate(Math.round(this.model.absoluteHeight - this.model.actualVisibleRegion.height));
@@ -11852,9 +11867,9 @@ let DataGrid = /*@__PURE__*/ (() => {
                 b = 0;
                 a = 0;
             }
-            if (a > this.model.b9.count) {
-                b = this.model.b9.count - 1;
-                a = this.model.b9.count - 1;
+            if (a > this.model.ca.count) {
+                b = this.model.ca.count - 1;
+                a = this.model.ca.count - 1;
             }
             let c = this.columns._inner[b];
             if (c.iu != 0) {
@@ -11865,8 +11880,8 @@ let DataGrid = /*@__PURE__*/ (() => {
             if (this.no != -1) {
                 e = this.no;
             }
-            let f = d + truncate((this.model.b9._inner[b].k * (a - b)));
-            f -= this.model.cz;
+            let f = d + truncate((this.model.ca._inner[b].k * (a - b)));
+            f -= this.model.c0;
             if (this.model.absoluteWidth > 0 && this.model.actualVisibleRegion.width > 0 && f + this.model.actualVisibleRegion.width > this.model.absoluteWidth) {
                 f = truncate(Math.round(this.model.absoluteWidth - this.model.actualVisibleRegion.width));
             }
@@ -11883,9 +11898,9 @@ let DataGrid = /*@__PURE__*/ (() => {
                 b = 0;
                 a = 0;
             }
-            if (a > this.model.b9.count) {
-                b = this.model.b9.count - 1;
-                a = this.model.b9.count - 1;
+            if (a > this.model.ca.count) {
+                b = this.model.ca.count - 1;
+                a = this.model.ca.count - 1;
             }
             let c = this.columns._inner[b];
             let d = this.ge.k(b, this, this.model);
@@ -11893,10 +11908,10 @@ let DataGrid = /*@__PURE__*/ (() => {
             if (this.no != -1) {
                 e = this.no;
             }
-            let f = d + truncate((this.model.b9._inner[b].k * (a - b)));
-            let g = this.model.actualVisibleRegion.width - this.model.c0;
+            let f = d + truncate((this.model.ca._inner[b].k * (a - b)));
+            let g = this.model.actualVisibleRegion.width - this.model.c1;
             if (this.model.absoluteWidth > 0 && g > 0) {
-                f -= truncate(Math.round(g - this.model.b9._inner[b].k));
+                f -= truncate(Math.round(g - this.model.ca._inner[b].k));
             }
             if (this.model.absoluteWidth > 0 && this.model.actualVisibleRegion.width > 0 && f + this.model.actualVisibleRegion.width > this.model.absoluteWidth) {
                 f = truncate(Math.round(this.model.absoluteWidth - this.model.actualVisibleRegion.width));
@@ -11937,7 +11952,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 return;
             }
             this.c8.z(this, a, b, false);
-            if (this.fa.getRowCount() != this.model.c5()) {
+            if (this.fa.getRowCount() != this.model.c6()) {
                 this.za();
             }
             else {
@@ -11977,11 +11992,11 @@ let DataGrid = /*@__PURE__*/ (() => {
             return this.ge.i(this.model, this.model.bx);
         }
         of() {
-            let a = this.ge.b(this.model.actualVisibleRegion.top + this.model.c6 + this.model.c7 + this.model.dg, this.model);
+            let a = this.ge.b(this.model.actualVisibleRegion.top + this.model.c7 + this.model.c8 + this.model.dh, this.model);
             return this.ge.i(this.model, a);
         }
         ok() {
-            let a = this.ge.b(this.model.actualVisibleRegion.bottom - this.model.df, this.model);
+            let a = this.ge.b(this.model.actualVisibleRegion.bottom - this.model.dg, this.model);
             return this.ge.i(this.model, a);
         }
         y0() {
@@ -12178,8 +12193,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = d;
                 return $ret;
             })());
-            if (this.model.b9.count > 0) {
-                this.vo(e, this.model.b9._inner[f].n, false);
+            if (this.model.ca.count > 0) {
+                this.vo(e, this.model.ca._inner[f].n, false);
             }
             this.iv = false;
             if (this.selectionMode == 2 && a) {
@@ -12195,13 +12210,13 @@ let DataGrid = /*@__PURE__*/ (() => {
                     this.ny = c;
                 }
                 if (this.nx == -1) {
-                    this.nx = this.model.b9._inner[f].n;
+                    this.nx = this.model.ca._inner[f].n;
                 }
                 let k = new CellRange();
                 k.l = Math.min(this.ny, e);
-                k.k = Math.min(this.nx, this.model.b9._inner[f].n);
+                k.k = Math.min(this.nx, this.model.ca._inner[f].n);
                 k.j = Math.max(this.ny, e);
-                k.i = Math.max(this.nx, this.model.b9._inner[f].n);
+                k.i = Math.max(this.nx, this.model.ca._inner[f].n);
                 this.z1(k);
             }
             else {
@@ -12247,7 +12262,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = h;
                 return $ret;
             })());
-            this.vo(g, this.model.b9._inner[e].n, false);
+            this.vo(g, this.model.ca._inner[e].n, false);
             return true;
         }
         oj(a = false) {
@@ -12291,14 +12306,14 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             if (this.actualColumns._inner[c].kc) {
                 let d = c;
-                let e = this.model.b9._inner[c].n;
+                let e = this.model.ca._inner[c].n;
                 while (e > 0 && this.actualColumns._inner[d].kc) {
                     e--;
                     d = this.ge.j(e, this.model);
                 }
                 if (this.actualColumns._inner[d].kc) {
                     d = c;
-                    e = this.model.b9._inner[c].n;
+                    e = this.model.ca._inner[c].n;
                     while (e < this.actualColumns.count - 1 && this.actualColumns._inner[d].kc) {
                         e++;
                         d = this.ge.j(e, this.model);
@@ -12324,14 +12339,14 @@ let DataGrid = /*@__PURE__*/ (() => {
             a = Math.min(a, this.actualColumns.count - 1);
             if (this.actualColumns._inner[a].kc) {
                 let b = a;
-                let c = this.model.b9._inner[b].n;
+                let c = this.model.ca._inner[b].n;
                 while (c < this.actualColumns.count - 1 && this.actualColumns._inner[b].kc) {
                     c++;
                     b = this.ge.j(c, this.model);
                 }
                 if (this.actualColumns._inner[b].kc) {
                     b = a;
-                    c = this.model.b9._inner[b].n;
+                    c = this.model.ca._inner[b].n;
                     while (c > 0 && this.actualColumns._inner[b].kc) {
                         c--;
                         b = this.ge.j(c, this.model);
@@ -12347,16 +12362,16 @@ let DataGrid = /*@__PURE__*/ (() => {
             return a;
         }
         vo(a, b, c, d = false) {
-            b = Math.max(0, Math.min(b, this.model.b9.count - 1));
+            b = Math.max(0, Math.min(b, this.model.ca.count - 1));
             if (b <= this.og()) {
                 b = this.ge.j(b, this.model);
-                if (this.model.b9._inner[b].d == 0) {
+                if (this.model.ca._inner[b].d == 0) {
                     this.scrollToColumnByIndex(b);
                 }
             }
             else if (b >= this.ol()) {
                 b = this.ge.j(b, this.model);
-                if (this.model.b9._inner[b].d == 0) {
+                if (this.model.ca._inner[b].d == 0) {
                     this.zx(b);
                 }
             }
@@ -12409,7 +12424,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = h;
                 return $ret;
             })());
-            this.vo(g, this.model.b9._inner[e].n, false);
+            this.vo(g, this.model.ca._inner[e].n, false);
             return true;
         }
         k4(a, b) {
@@ -12423,14 +12438,14 @@ let DataGrid = /*@__PURE__*/ (() => {
                 return this.k2(false, false);
             }
             let c = this.ae.s();
-            let d = this.model.b9._inner[c].n;
+            let d = this.model.ca._inner[c].n;
             let e = this.di.b;
             let f = this.di.d;
             if (f == null) {
                 return false;
             }
             let g = this.oo(d, false);
-            let h = this.model.b9._inner[g].n;
+            let h = this.model.ca._inner[g].n;
             let i = this.actualColumns._inner[g];
             if (f == i.nx()) {
                 return false;
@@ -12442,9 +12457,9 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = f;
                 return $ret;
             })());
-            if (this.model.b9.count > 0) {
+            if (this.model.ca.count > 0) {
                 if (i.iu == 0) {
-                    this.vo(e, this.model.b9._inner[g].n, false);
+                    this.vo(e, this.model.ca._inner[g].n, false);
                 }
             }
             if (this.selectionMode == 5 && a) {
@@ -12494,7 +12509,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                     return $ret;
                 })());
             }
-            this.vo(h, this.model.b9._inner[d].n, true);
+            this.vo(h, this.model.ca._inner[d].n, true);
             return true;
         }
         k6(a, b) {
@@ -12522,7 +12537,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                     return $ret;
                 })());
             }
-            this.vo(h, this.model.b9._inner[d].n, false);
+            this.vo(h, this.model.ca._inner[d].n, false);
             return true;
         }
         k7(a, b) {
@@ -12536,14 +12551,14 @@ let DataGrid = /*@__PURE__*/ (() => {
                 return this.ky(false, false);
             }
             let c = this.ae.s();
-            let d = this.model.b9._inner[c].n;
+            let d = this.model.ca._inner[c].n;
             let e = this.di.b;
             let f = this.di.d;
             if (f == null) {
                 return false;
             }
             let g = this.on(d, false);
-            let h = this.model.b9._inner[g].n;
+            let h = this.model.ca._inner[g].n;
             let i = this.actualColumns._inner[g];
             if (f == i.nx()) {
                 return false;
@@ -12555,9 +12570,9 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = f;
                 return $ret;
             })());
-            if (this.model.b9.count > 0) {
+            if (this.model.ca.count > 0) {
                 if (i.iu == 0) {
-                    this.vo(e, this.model.b9._inner[g].n, false);
+                    this.vo(e, this.model.ca._inner[g].n, false);
                 }
             }
             if (this.selectionMode == 5 && a) {
@@ -12612,7 +12627,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = e.nx();
                 return $ret;
             })());
-            this.vo(c, this.model.b9._inner[d].n, false);
+            this.vo(c, this.model.ca._inner[d].n, false);
         }
         k9(a, b) {
             if (this.activationMode == 0 || this.activeCell == null) {
@@ -12625,7 +12640,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                 return true;
             }
             let c = this.ae.s();
-            let d = this.model.b9._inner[c].n;
+            let d = this.model.ca._inner[c].n;
             let e = this.di.b;
             let f = this.di.d;
             let g = e;
@@ -12665,7 +12680,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                             return true;
                         }
                     }
-                    d = this.model.b9._inner[o].n;
+                    d = this.model.ca._inner[o].n;
                     h = p.nx();
                 } while (this.cm.j && g >= 0 && (!l || !p.j9));
                 if (this.groupSummaryDisplayMode != 1) {
@@ -12700,7 +12715,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                             return true;
                         }
                     }
-                    d = this.model.b9._inner[s].n;
+                    d = this.model.ca._inner[s].n;
                     h = t.nx();
                 } while (this.cm.j && g < this.fa.getRowCount() && (!l || !t.j9));
                 if (this.groupSummaryDisplayMode != 1) {
@@ -12723,7 +12738,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                         $ret.d = h;
                         return $ret;
                     })());
-                    this.vo(g, this.model.b9._inner[i].n, false);
+                    this.vo(g, this.model.ca._inner[i].n, false);
                     this.lu();
                 }
             }
@@ -12734,7 +12749,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                     $ret.d = h;
                     return $ret;
                 })());
-                this.vo(g, this.model.b9._inner[i].n, false);
+                this.vo(g, this.model.ca._inner[i].n, false);
             }
             return true;
         }
@@ -12780,8 +12795,8 @@ let DataGrid = /*@__PURE__*/ (() => {
                 $ret.d = d;
                 return $ret;
             })());
-            if (this.model.b9.count > 0) {
-                this.vo(e, this.model.b9._inner[f].n, false);
+            if (this.model.ca.count > 0) {
+                this.vo(e, this.model.ca._inner[f].n, false);
             }
             this.iv = false;
             if (this.selectionMode == 2 && a) {
@@ -12797,13 +12812,13 @@ let DataGrid = /*@__PURE__*/ (() => {
                     this.ny = c;
                 }
                 if (this.nx == -1) {
-                    this.nx = this.model.b9._inner[f].n;
+                    this.nx = this.model.ca._inner[f].n;
                 }
                 let k = new CellRange();
                 k.l = Math.min(this.ny, e);
-                k.k = Math.min(this.nx, this.model.b9._inner[f].n);
+                k.k = Math.min(this.nx, this.model.ca._inner[f].n);
                 k.j = Math.max(this.ny, e);
-                k.i = Math.max(this.nx, this.model.b9._inner[f].n);
+                k.i = Math.max(this.nx, this.model.ca._inner[f].n);
                 this.z1(k);
             }
             else {
@@ -12985,7 +13000,7 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             this.cm.ad(a);
             if (a.y == 0) {
-                let d = this.model.b9._inner[a.l.a6].n;
+                let d = this.model.ca._inner[a.l.a6].n;
                 this.vo(a.l.x, d, false, a.bq);
             }
             this.nh = a.l.x;
@@ -13468,13 +13483,14 @@ let DataGrid = /*@__PURE__*/ (() => {
             }
             this.c8.z(this, a, b, true);
             this.model.b5 = true;
+            this.model.b6 = true;
             this.zb();
         }
         og() {
-            return this.ge.o(this.model.actualVisibleRegion.left + this.model.cz, this, this.model);
+            return this.ge.o(this.model.actualVisibleRegion.left + this.model.c0, this, this.model);
         }
         ol() {
-            return this.ge.o(this.model.actualVisibleRegion.right - this.model.c0, this, this.model);
+            return this.ge.o(this.model.actualVisibleRegion.right - this.model.c1, this, this.model);
         }
         wl(a, b) {
             let c = this.ge.i(this.model, a);
@@ -14112,11 +14128,11 @@ let DataGrid = /*@__PURE__*/ (() => {
                                 for (let o = 0; o < m.count; o++) {
                                     let p = m._inner[o];
                                     let q = this.ge.j(p, this.model);
-                                    if (q < 0 || this.model.b9 == null || q >= this.model.b9.count) {
+                                    if (q < 0 || this.model.ca == null || q >= this.model.ca.count) {
                                         n.add(new Tuple$2(DataGridColumn.$, Number_$type, null, -1));
                                         continue;
                                     }
-                                    let r = this.model.b9._inner[q];
+                                    let r = this.model.ca._inner[q];
                                     let s = this.az.f(r.o);
                                     let t = s != null ? this.actualColumns.indexOf(s) : -1;
                                     n.add(new Tuple$2(DataGridColumn.$, Number_$type, s, t));
@@ -14193,7 +14209,7 @@ let DataGrid = /*@__PURE__*/ (() => {
                                 }
                                 ak.aa((an, ao) => Base.compareSimple(an.c, ao.c));
                                 let an = new StringBuilder(0);
-                                let ao = this.model.cg;
+                                let ao = this.model.ch;
                                 for (let ap = 0; ap < ak.count; ap++) {
                                     if (ap > 0) {
                                         an.t();
@@ -14739,7 +14755,7 @@ let DataGrid = /*@__PURE__*/ (() => {
         }
         oi(a) {
             let b = a.a6;
-            if ((b >= 0 && this.model.b9._inner[b].n == 0) || a.a1) {
+            if ((b >= 0 && this.model.ca._inner[b].n == 0) || a.a1) {
                 return this.fa.getRowIndent(a.x);
             }
             return 0;
@@ -15634,7 +15650,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                             break;
                         case 4:
                         case 9:
-                            q = (a.mu + a.model.c3) * -1;
+                            q = (a.mu + a.model.c4) * -1;
                             p.c8 = q;
                             p.cy = 0;
                             p.cz = 0;
@@ -15642,7 +15658,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                             break;
                         case 5:
                         case 10:
-                            q = (a.mu + a.model.c3) * 1;
+                            q = (a.mu + a.model.c4) * 1;
                             p.c8 = q;
                             p.cy = 0;
                             p.cz = 0;
@@ -15848,12 +15864,12 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             switch (h) {
                 case 4:
                 case 9:
-                    l.bq = (a.mu + a.model.c3) * -1;
+                    l.bq = (a.mu + a.model.c4) * -1;
                     m = true;
                     break;
                 case 5:
                 case 10:
-                    l.bq = (a.mu + a.model.c3) * 1;
+                    l.bq = (a.mu + a.model.c4) * 1;
                     m = true;
                     break;
             }
@@ -16009,7 +16025,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                         break;
                     case 4:
                     case 9:
-                        r = (a.mu + a.model.c3) * 1;
+                        r = (a.mu + a.model.c4) * 1;
                         q.c8 = r;
                         q.cy = 0;
                         q.cz = 1;
@@ -16017,7 +16033,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                         break;
                     case 5:
                     case 10:
-                        r = (a.mu + a.model.c3) * -1;
+                        r = (a.mu + a.model.c4) * -1;
                         q.c8 = r;
                         q.cy = 0;
                         q.cz = 1;
@@ -16273,9 +16289,9 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             let j = new GridEffectGroup(1);
             j.effectsFinished = delegateCombine(j.effectsFinished, (k, l) => {
                 let m = a.model.h(c.o);
-                let n = a.model.cb(m);
+                let n = a.model.cc(m);
                 for (let o = 0; o < n.count; o++) {
-                    a.model.dk(n._inner[o]);
+                    a.model.dl(n._inner[o]);
                 }
                 h.hy = 5;
                 a.za();
@@ -16302,15 +16318,15 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             }
             let p = null;
             if (d != 6) {
-                p = a.model.i(n, c, (c.k + a.model.cv) - c.f(a.model), c.b == null || c.b.c, o);
+                p = a.model.i(n, c, (c.k + a.model.cw) - c.f(a.model), c.b == null || c.b.c, o);
             }
-            let q = a.model.cb(c);
+            let q = a.model.cc(c);
             for (let r = 0; r < q.count; r++) {
                 q._inner[r].e = true;
             }
             let s = c.m;
             let t = null;
-            let u = a.model.cf;
+            let u = a.model.cg;
             if (u._inner[s].count > 0) {
                 for (let v = 0; v < u._inner[s].count; v++) {
                     if (u._inner[s]._inner[v].n == c.o) {
@@ -16346,7 +16362,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             let af = c.m;
             let ag = a.ge.k(c.m, a, a.model);
             let ah = this.n(a, c, c.m);
-            ag = this.q(a, c, ag, a.model.cb(c), ah);
+            ag = this.q(a, c, ag, a.model.cc(c), ah);
             j.g(ab);
             ab.x = (ai, aj, ak, al, am) => {
                 let an = ak;
@@ -16371,7 +16387,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                         ap.h = av + (an - av) * ai;
                     }
                     if (!ad) {
-                        let aw = a.model.ca(ap);
+                        let aw = a.model.cb(ap);
                         for (let ax = 0; ax < aw.count; ax++) {
                             let ay = aw._inner[ax];
                             ay.cz += (ae - ap.h);
@@ -16379,7 +16395,7 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                     }
                     ae = ap.h;
                     af = ap.m;
-                    let az = a.model.cb(ap);
+                    let az = a.model.cc(ap);
                     ah = this.n(a, ap, ap.m);
                     ag = this.q(a, ap, ag, az, ah);
                 }
@@ -16418,18 +16434,18 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             a.dz.t(c, ai);
         }
         static at(a, b, c, d, e) {
-            if (a.cm > a.cj) {
+            if (a.cn > a.ck) {
                 if (b.d == 1) {
-                    e += truncate(a.cj);
-                    d += truncate(a.cm);
+                    e += truncate(a.ck);
+                    d += truncate(a.cn);
                 }
                 else if (b.d == 0 && c.it == 1) {
-                    e += truncate(a.cm);
-                    d += truncate(a.cj);
+                    e += truncate(a.cn);
+                    d += truncate(a.ck);
                 }
             }
-            if (a.cp < a.absoluteWidth - a.ck) {
-                let f = a.absoluteWidth - a.ck - a.cp;
+            if (a.cq < a.absoluteWidth - a.cl) {
+                let f = a.absoluteWidth - a.cl - a.cq;
                 if (b.d == 2) {
                     d -= truncate(f);
                 }
@@ -16556,11 +16572,11 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                     break;
                 case 4:
                 case 9:
-                    l = (a.mu + a.model.c3) * -1;
+                    l = (a.mu + a.model.c4) * -1;
                     break;
                 case 5:
                 case 10:
-                    l = (a.mu + a.model.c3) * 1;
+                    l = (a.mu + a.model.c4) * 1;
                     break;
             }
             a.model.b2 = true;
@@ -16688,373 +16704,386 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
         }
         r(a, b, c, d, e, f, g) {
             if (!a.model.b4()) {
-                if (a.filterUIType != 1 && g != 11) {
+                let h = false;
+                if (a.filterUIType == 1 && g == 11) {
+                    h = true;
+                }
+                if (a.az != null && a.actualColumns.count > 0 && (g == 0 || g == 7)) {
+                    h = true;
+                }
+                if (!h) {
                     return;
                 }
             }
-            let h = this.p();
-            this.x(h);
-            let i = this.g.u;
+            let i = this.p();
+            this.x(i);
+            let j = this.g.u;
             if (a.columnAnimationSettings != null && a.columnAnimationSettings.u != null) {
-                i = a.columnAnimationSettings.u;
+                j = a.columnAnimationSettings.u;
             }
-            let j = a.columnPropertyUpdatingAnimationMode;
-            let k = new ColumnCellsEffect();
-            k.bx(i);
-            k.t = 8;
-            k.as = true;
+            let k = a.columnPropertyUpdatingAnimationMode;
+            let l = new ColumnCellsEffect();
+            l.bx(j);
+            l.t = 8;
+            l.as = true;
             if (g == 0) {
-                k.v = 5;
+                l.v = 5;
             }
             if (g == 7) {
-                k.v = 6;
+                l.v = 6;
             }
             if (g == 8) {
-                k.v = 7;
+                l.v = 7;
             }
-            k.bs = c;
-            k.al = true;
-            k.bq = f;
-            k.onFinished = delegateCombine(k.onFinished, (l) => this.w(h));
-            k.onCanceled = delegateCombine(k.onCanceled, (l, m) => this.v(h));
-            if (j == 0) {
-                j = 2;
+            l.bs = c;
+            l.al = true;
+            l.bq = f;
+            l.onFinished = delegateCombine(l.onFinished, (m) => this.w(i));
+            l.onCanceled = delegateCombine(l.onCanceled, (m, n) => this.v(i));
+            if (k == 0) {
+                k = 2;
             }
             if (d == 11) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    q.mw(c, n);
+                    r.mw(c, o);
                 };
             }
-            if (d == 5 || d == 4 || d == 9 || d == 8 || (j != 3 && (d == 7 || d == 1 || d == 3))) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+            if (d == 5 || d == 4 || d == 9 || d == 8 || (k != 3 && (d == 7 || d == 1 || d == 3))) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    if (l > 0.5) {
-                        q.mw(c, n);
+                    if (m > 0.5) {
+                        r.mw(c, o);
                     }
                     else {
-                        q.mw(c, m);
+                        r.mw(c, n);
                     }
                 };
             }
-            if (j == 3 && d == 1) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+            if (k == 3 && d == 1) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    if (m == null) {
-                        m = 0;
+                    if (n == null) {
+                        n = 0;
                     }
-                    let r = m;
                     let s = n;
-                    let t = r + (s - r) * l;
-                    q.mw(c, t);
+                    let t = o;
+                    let u = s + (t - s) * m;
+                    r.mw(c, u);
                 };
             }
             if (d == 0) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    if (m == null) {
-                        m = 0;
+                    if (n == null) {
+                        n = 0;
                     }
-                    let r = m;
                     let s = n;
-                    let t = r + (s - r) * l;
-                    q.mw(c, t);
+                    let t = o;
+                    let u = s + (t - s) * m;
+                    r.mw(c, u);
                 };
             }
             if (d == 2) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    if (m == null) {
-                        m = BrushUtil.l(0, 0, 0, 0);
+                    if (n == null) {
+                        n = BrushUtil.l(0, 0, 0, 0);
                     }
-                    let r = m;
                     let s = n;
-                    let t = BrushUtil.p(r, l, s, 0);
-                    q.mw(c, t);
+                    let t = o;
+                    let u = BrushUtil.p(s, m, t, 0);
+                    r.mw(c, u);
                 };
             }
             if (d == 3) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    let r = m;
                     let s = n;
-                    if (r != null) {
-                        r.w(a.externalGrid.renderer);
-                    }
+                    let t = o;
                     if (s != null) {
                         s.w(a.externalGrid.renderer);
                     }
-                    let t = new FontInfo();
-                    FontUtil.interpolateFont(t, l, r, s);
-                    q.mw(c, t);
+                    if (t != null) {
+                        t.w(a.externalGrid.renderer);
+                    }
+                    let u = new FontInfo();
+                    FontUtil.interpolateFont(u, m, s, t);
+                    r.mw(c, u);
                 };
             }
             if (d == 6) {
-                k.x = (l, m, n, o, p) => {
-                    let q = o;
-                    if (q.w != g) {
+                l.x = (m, n, o, p, q) => {
+                    let r = p;
+                    if (r.w != g) {
                         return;
                     }
-                    if (m == null) {
-                        m = 0;
+                    if (n == null) {
+                        n = 0;
                     }
-                    let r = typeGetValue(m);
                     let s = typeGetValue(n);
-                    let t = truncate((Math.round(r + (s - r) * l)));
-                    q.mw(c, t);
+                    let t = typeGetValue(o);
+                    let u = truncate((Math.round(s + (t - s) * m)));
+                    r.mw(c, u);
                 };
             }
-            k.o = (l, m) => {
-                let n = l;
-                return n.ik(c);
+            l.o = (m, n) => {
+                let o = m;
+                return o.ik(c);
             };
             if (a.model.b4()) {
                 if (g == 4) {
-                    k.g = new CellPath(0, 0, -300, a.model.bx.y, a.model.bx.x);
-                    k.e = new CellPath(0, 0, -300, a.model.bw.y, a.model.bw.x);
+                    l.g = new CellPath(0, 0, -300, a.model.bx.y, a.model.bx.x);
+                    l.e = new CellPath(0, 0, -300, a.model.bw.y, a.model.bw.x);
                 }
                 else if (g == 2 || g == 8 || g == 6) {
-                    k.g = new CellPath(0, 0, -400, a.model.bx.y, a.model.bx.x);
-                    k.e = new CellPath(0, 0, -400, a.model.bw.y, a.model.bw.x);
+                    l.g = new CellPath(0, 0, -400, a.model.bx.y, a.model.bx.x);
+                    l.e = new CellPath(0, 0, -400, a.model.bw.y, a.model.bw.x);
                 }
                 else {
-                    k.g = new CellPath(0, 0, b.m, a.model.bx.y, a.model.bx.x);
-                    k.e = new CellPath(0, 0, b.m, a.model.bw.y, a.model.bw.x);
+                    l.g = new CellPath(0, 0, b.m, a.model.bx.y, a.model.bx.x);
+                    l.e = new CellPath(0, 0, b.m, a.model.bw.y, a.model.bw.x);
                 }
             }
             if (!a.j4 || d == 11) {
-                k.ba = 0;
+                l.ba = 0;
             }
             if (g == 4) {
-                a.dz.x(k);
+                a.dz.x(l);
             }
             else if (g == 2 || g == 8 || g == 6) {
-                a.dz.y(k);
+                a.dz.y(l);
             }
             else {
-                a.dz.t(b, k);
+                a.dz.t(b, l);
             }
         }
         s(a, b, c, d, e, f, g, h, i, j) {
             if (!a.model.b4()) {
-                return;
+                let k = false;
+                if (a.az != null && a.actualColumns.count > 0 && (g || j)) {
+                    k = true;
+                }
+                if (!k) {
+                    return;
+                }
             }
-            let k = this.p();
-            this.x(k);
-            let l = this.g.u;
+            let l = this.p();
+            this.x(l);
+            let m = this.g.u;
             if (a.columnAnimationSettings != null && a.columnAnimationSettings.u != null) {
-                l = a.columnAnimationSettings.u;
+                m = a.columnAnimationSettings.u;
             }
-            let m = a.columnPropertyUpdatingAnimationMode;
-            let n = new ColumnCellsEffect();
-            n.bx(l);
-            n.t = 8;
-            n.as = true;
+            let n = a.columnPropertyUpdatingAnimationMode;
+            let o = new ColumnCellsEffect();
+            o.bx(m);
+            o.t = 8;
+            o.as = true;
             if (g) {
-                n.v = 5;
+                o.v = 5;
             }
             if (j) {
-                n.v = 6;
+                o.v = 6;
             }
-            n.bs = c;
-            n.al = true;
-            n.bq = f;
-            n.onFinished = delegateCombine(n.onFinished, (o) => this.w(k));
-            n.onCanceled = delegateCombine(n.onCanceled, (o, p) => this.v(k));
-            if (m == 0) {
-                m = 2;
+            o.bs = c;
+            o.al = true;
+            o.bq = f;
+            o.onFinished = delegateCombine(o.onFinished, (p) => this.w(l));
+            o.onCanceled = delegateCombine(o.onCanceled, (p, q) => this.v(l));
+            if (n == 0) {
+                n = 2;
             }
             if (d == 11) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    t.mw(c, q);
+                    u.mw(c, r);
                 };
             }
-            if (d == 5 || d == 4 || d == 9 || d == 8 || (m != 3 && (d == 7 || d == 1 || d == 3))) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+            if (d == 5 || d == 4 || d == 9 || d == 8 || (n != 3 && (d == 7 || d == 1 || d == 3))) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    if (o > 0.5) {
-                        t.mw(c, q);
+                    if (p > 0.5) {
+                        u.mw(c, r);
                     }
                     else {
-                        t.mw(c, p);
+                        u.mw(c, q);
                     }
                 };
             }
-            if (m == 3 && d == 1) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+            if (n == 3 && d == 1) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    if (p == null) {
-                        p = 0;
+                    if (q == null) {
+                        q = 0;
                     }
-                    let u = p;
                     let v = q;
-                    let w = u + (v - u) * o;
-                    t.mw(c, w);
+                    let w = r;
+                    let x = v + (w - v) * p;
+                    u.mw(c, x);
                 };
             }
             if (d == 0) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    if (p == null) {
-                        p = 0;
+                    if (q == null) {
+                        q = 0;
                     }
-                    let u = p;
                     let v = q;
-                    let w = u + (v - u) * o;
-                    t.mw(c, w);
+                    let w = r;
+                    let x = v + (w - v) * p;
+                    u.mw(c, x);
                 };
             }
             if (d == 2) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    if (p == null) {
-                        p = BrushUtil.l(0, 0, 0, 0);
+                    if (q == null) {
+                        q = BrushUtil.l(0, 0, 0, 0);
                     }
-                    let u = p;
                     let v = q;
-                    let w = BrushUtil.p(u, o, v, 0);
-                    t.mw(c, w);
+                    let w = r;
+                    let x = BrushUtil.p(v, p, w, 0);
+                    u.mw(c, x);
                 };
             }
             if (d == 3) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    let u = p;
                     let v = q;
-                    if (u != null) {
-                        u.w(a.externalGrid.renderer);
-                    }
+                    let w = r;
                     if (v != null) {
                         v.w(a.externalGrid.renderer);
                     }
-                    let w = new FontInfo();
-                    FontUtil.interpolateFont(w, o, u, v);
-                    t.mw(c, w);
+                    if (w != null) {
+                        w.w(a.externalGrid.renderer);
+                    }
+                    let x = new FontInfo();
+                    FontUtil.interpolateFont(x, p, v, w);
+                    u.mw(c, x);
                 };
             }
             if (d == 6) {
-                n.x = (o, p, q, r, s) => {
-                    let t = r;
-                    if (g != t.l.g) {
+                o.x = (p, q, r, s, t) => {
+                    let u = s;
+                    if (g != u.l.g) {
                         return;
                     }
-                    if ((h && !t.l.az) || (!h && t.l.az)) {
+                    if ((h && !u.l.az) || (!h && u.l.az)) {
                         return;
                     }
-                    if ((j && !t.l.h) || (!j && t.l.h)) {
+                    if ((j && !u.l.h) || (!j && u.l.h)) {
                         return;
                     }
-                    if (p == null) {
-                        p = 0;
+                    if (q == null) {
+                        q = 0;
                     }
-                    let u = typeGetValue(p);
                     let v = typeGetValue(q);
-                    let w = truncate((Math.round(u + (v - u) * o)));
-                    t.mw(c, w);
+                    let w = typeGetValue(r);
+                    let x = truncate((Math.round(v + (w - v) * p)));
+                    u.mw(c, x);
                 };
             }
-            n.o = (o, p) => {
-                let q = o;
-                return q.ik(c);
+            o.o = (p, q) => {
+                let r = p;
+                return r.ik(c);
             };
             if (a.model.b4()) {
                 if (h) {
-                    n.g = new CellPath(0, 0, -300, a.model.bx.y, a.model.bx.x);
-                    n.e = new CellPath(0, 0, -300, a.model.bw.y, a.model.bw.x);
+                    o.g = new CellPath(0, 0, -300, a.model.bx.y, a.model.bx.x);
+                    o.e = new CellPath(0, 0, -300, a.model.bw.y, a.model.bw.x);
                 }
                 else if (i) {
-                    n.g = new CellPath(0, 0, -400, a.model.bx.y, a.model.bx.x);
-                    n.e = new CellPath(0, 0, -400, a.model.bw.y, a.model.bw.x);
+                    o.g = new CellPath(0, 0, -400, a.model.bx.y, a.model.bx.x);
+                    o.e = new CellPath(0, 0, -400, a.model.bw.y, a.model.bw.x);
                 }
                 else {
-                    n.g = new CellPath(0, 0, b.m, a.model.bx.y, a.model.bx.x);
-                    n.e = new CellPath(0, 0, b.m, a.model.bw.y, a.model.bw.x);
+                    o.g = new CellPath(0, 0, b.m, a.model.bx.y, a.model.bx.x);
+                    o.e = new CellPath(0, 0, b.m, a.model.bw.y, a.model.bw.x);
                 }
             }
             if (!a.j4 || d == 11) {
-                n.ba = 0;
+                o.ba = 0;
             }
             if (h) {
-                a.dz.x(n);
+                a.dz.x(o);
             }
             else if (i) {
-                a.dz.y(n);
+                a.dz.y(o);
             }
             else {
-                a.dz.t(b, n);
+                a.dz.t(b, o);
             }
         }
         am(a, b, c) {
@@ -17093,8 +17122,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
                 };
                 let j = a.fx(h);
                 if (a.model.b4()) {
-                    i.g = new CellPath(0, 0, a.model.c8, j.y, j.x);
-                    i.e = new CellPath(0, 0, a.model.db, j.y, j.x);
+                    i.g = new CellPath(0, 0, a.model.c9, j.y, j.x);
+                    i.e = new CellPath(0, 0, a.model.dc, j.y, j.x);
                 }
                 if (!a.kq) {
                     i.ba = 0;
@@ -17164,8 +17193,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             let i = new GridEffectGroup(1);
             i.effectsFinished = delegateCombine(i.effectsFinished, (j, k) => this.w(e));
             i.effectsCanceled = delegateCombine(i.effectsCanceled, (j, k) => this.v(e));
-            for (let j = 0; j < h.b9.count; j++) {
-                let k = h.b9._inner[j];
+            for (let j = 0; j < h.ca.count; j++) {
+                let k = h.ca._inner[j];
                 let l = a.az.f(k.o);
                 if (l == null) {
                     continue;
@@ -17237,10 +17266,10 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             }
             let h = a.cellDataLoadedAnimationMode;
             let i = a.model;
-            if (d < 0 || d >= i.b9.count) {
+            if (d < 0 || d >= i.ca.count) {
                 return;
             }
-            let j = i.b9._inner[d];
+            let j = i.ca._inner[d];
             let k = a.az.f(j.o);
             if (k == null) {
                 return;
@@ -17339,10 +17368,10 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let h = a.fx(b);
             if (a.model.b4()) {
-                g.g = new CellPath(0, 0, a.model.c8, h.y, h.x);
-                g.g.d = a.model.b9._inner[a.model.c8].d;
-                g.e = new CellPath(0, 0, a.model.db, h.y, h.x);
-                g.e.d = a.model.b9._inner[a.model.db].d;
+                g.g = new CellPath(0, 0, a.model.c9, h.y, h.x);
+                g.g.d = a.model.ca._inner[a.model.c9].d;
+                g.e = new CellPath(0, 0, a.model.dc, h.y, h.x);
+                g.e.d = a.model.ca._inner[a.model.dc].d;
             }
             if (!a.kq || a.dragger.isDragActive) {
                 g.ba = 0;
@@ -17385,10 +17414,10 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let h = a.fx(b);
             if (a.model.b4()) {
-                g.g = new CellPath(0, 0, a.model.c8, h.y, h.x);
-                g.g.d = a.model.b9._inner[a.model.c8].d;
-                g.e = new CellPath(0, 0, a.model.db, h.y, h.x);
-                g.e.d = a.model.b9._inner[a.model.db].d;
+                g.g = new CellPath(0, 0, a.model.c9, h.y, h.x);
+                g.g.d = a.model.ca._inner[a.model.c9].d;
+                g.e = new CellPath(0, 0, a.model.dc, h.y, h.x);
+                g.e.d = a.model.ca._inner[a.model.dc].d;
             }
             if (!a.kq || a.dragger.isDragActive) {
                 g.ba = 0;
@@ -17427,8 +17456,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let i = new CellPath(1, c, 0, b);
             if (a.model.b4()) {
-                h.g = new CellPath(0, 0, a.model.c8, i.y, i.x);
-                h.e = new CellPath(0, 0, a.model.db, i.y, i.x);
+                h.g = new CellPath(0, 0, a.model.c9, i.y, i.x);
+                h.e = new CellPath(0, 0, a.model.dc, i.y, i.x);
             }
             if (!a.ju || a.dragger.isDragActive) {
                 h.ba = 0;
@@ -17504,8 +17533,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let i = new CellPath(1, c, 0, b);
             if (a.model.b4()) {
-                h.g = new CellPath(0, 0, a.model.c8, i.y, i.x);
-                h.e = new CellPath(0, 0, a.model.db, i.y, i.x);
+                h.g = new CellPath(0, 0, a.model.c9, i.y, i.x);
+                h.e = new CellPath(0, 0, a.model.dc, i.y, i.x);
             }
             if (!a.ju || a.dragger.isDragActive) {
                 h.ba = 0;
@@ -17581,8 +17610,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let h = new CellPath(1, c, 0, b);
             if (a.model.b4()) {
-                g.g = new CellPath(0, 0, a.model.c8, h.y, h.x);
-                g.e = new CellPath(0, 0, a.model.db, h.y, h.x);
+                g.g = new CellPath(0, 0, a.model.c9, h.y, h.x);
+                g.e = new CellPath(0, 0, a.model.dc, h.y, h.x);
             }
             if (!a.ju || a.dragger.isDragActive) {
                 g.ba = 0;
@@ -17621,8 +17650,8 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let h = new CellPath(1, c, 0, b);
             if (a.model.b4()) {
-                g.g = new CellPath(0, 0, a.model.c8, h.y, h.x);
-                g.e = new CellPath(0, 0, a.model.db, h.y, h.x);
+                g.g = new CellPath(0, 0, a.model.c9, h.y, h.x);
+                g.e = new CellPath(0, 0, a.model.dc, h.y, h.x);
             }
             if (!a.ju || a.dragger.isDragActive) {
                 g.ba = 0;
@@ -17660,10 +17689,10 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let f = a.fx(b);
             if (a.model.b4()) {
-                e.g = new CellPath(0, 0, a.model.c8, f.y, f.x);
-                e.g.d = a.model.b9._inner[a.model.c8].d;
-                e.e = new CellPath(0, 0, a.model.db, f.y, f.x);
-                e.e.d = a.model.b9._inner[a.model.db].d;
+                e.g = new CellPath(0, 0, a.model.c9, f.y, f.x);
+                e.g.d = a.model.ca._inner[a.model.c9].d;
+                e.e = new CellPath(0, 0, a.model.dc, f.y, f.x);
+                e.e.d = a.model.ca._inner[a.model.dc].d;
             }
             if (!a.ko) {
                 e.ba = 0;
@@ -17701,10 +17730,10 @@ let GridAnimationManager = /*@__PURE__*/ (() => {
             };
             let f = a.fx(b);
             if (a.model.b4()) {
-                e.g = new CellPath(0, 0, a.model.c8, f.y, f.x);
-                e.g.d = a.model.b9._inner[a.model.c8].d;
-                e.e = new CellPath(0, 0, a.model.db, f.y, f.x);
-                e.e.d = a.model.b9._inner[a.model.db].d;
+                e.g = new CellPath(0, 0, a.model.c9, f.y, f.x);
+                e.g.d = a.model.ca._inner[a.model.c9].d;
+                e.e = new CellPath(0, 0, a.model.dc, f.y, f.x);
+                e.e.d = a.model.ca._inner[a.model.dc].d;
             }
             if (!a.ko) {
                 e.ba = 0;
@@ -21130,7 +21159,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.i4;
             this.i4 = a;
             if (b != this.i4) {
-                this.ew("ColumnOptionsTextStyle", 10, b, this.i4);
+                this.ew("ActualColumnOptionsTextStyle", 10, b, this.i4);
             }
         }
         get je() {
@@ -21150,7 +21179,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.qt;
             this.qt = a;
             if (b != this.qt) {
-                this.ew("ColumnOptionsHoverBackgroundColor", 2, b, this.qt);
+                this.ew("ActualColumnOptionsHoverBackgroundColor", 2, b, this.qt);
             }
         }
         get sh() {
@@ -21170,7 +21199,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.q0;
             this.q0 = a;
             if (b != this.q0) {
-                this.ew("ColumnOptionsToolTipBackgroundColor", 2, b, this.q0);
+                this.ew(DataGridColumn.ml, 2, b, this.q0);
             }
         }
         get so() {
@@ -21190,7 +21219,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.q1;
             this.q1 = a;
             if (b != this.q1) {
-                this.ew("ColumnOptionsToolTipTextColor", 2, b, this.q1);
+                this.ew("ActualColumnOptionsToolTipTextColor", 2, b, this.q1);
             }
         }
         get sp() {
@@ -21210,7 +21239,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.qs;
             this.qs = a;
             if (b != this.qs) {
-                this.ew("ColumnOptionsHighlightColor", 2, b, this.qs);
+                this.ew("ActualColumnOptionsHighlightColor", 2, b, this.qs);
             }
         }
         get sg() {
@@ -21290,7 +21319,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.i3;
             this.i3 = a;
             if (b != this.i3) {
-                this.ew("ColumnOptionsGroupHeaderTextStyle", 10, b, this.i3);
+                this.ew("ActualColumnOptionsGroupHeaderTextStyle", 10, b, this.i3);
             }
         }
         get jd() {
@@ -21330,7 +21359,7 @@ let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.k0;
             this.k0 = a;
             if (b != this.k0) {
-                this.ew("ColumnOptionsRowHeight", 10, b, this.k0);
+                this.ew("ActualColumnOptionsRowHeight", 10, b, this.k0);
             }
         }
         get le() {
@@ -23413,7 +23442,7 @@ let SelectionManager = /*@__PURE__*/ (() => {
             }
             if (!d) {
                 if (a.l.a6 >= 0) {
-                    let i = this.a.model.b9._inner[a.l.a6];
+                    let i = this.a.model.ca._inner[a.l.a6];
                     for (let j = 0; j < this.s.count; j++) {
                         if (this.s._inner[j].b(a.l.x, i.n)) {
                             d = true;
@@ -23955,9 +23984,9 @@ let SelectionManager = /*@__PURE__*/ (() => {
                 for (let d = 0; d < c.length; d++) {
                     let e = this.a.fa.getRowType(c[d]);
                     if (e == 3) {
-                        for (let f = 0; f < this.a.model.cg.count; f++) {
-                            let g = this.a.model.cg._inner[f];
-                            let h = this.a.model.b9._inner[g].n;
+                        for (let f = 0; f < this.a.model.ch.count; f++) {
+                            let g = this.a.model.ch._inner[f];
+                            let h = this.a.model.ca._inner[g].n;
                             this.x(c[d], h);
                         }
                     }
@@ -23966,9 +23995,9 @@ let SelectionManager = /*@__PURE__*/ (() => {
             let i = this.a.getFirstVisibleIndex();
             let j = this.a.getLastVisibleIndex();
             for (let k = i; k <= j; k++) {
-                for (let l = 0; l < this.a.model.cg.count; l++) {
-                    let m = this.a.model.cg._inner[l];
-                    let n = this.a.model.b9._inner[m].n;
+                for (let l = 0; l < this.a.model.ch.count; l++) {
+                    let m = this.a.model.ch._inner[l];
+                    let n = this.a.model.ca._inner[m].n;
                     this.x(k, n);
                 }
             }
@@ -26362,6 +26391,9 @@ let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                     d = b.actualDataSource;
                     e = b.actualDataSource.clone();
                 }
+                if (e != null) {
+                    e.sourceName = "ColumnOptions";
+                }
             }
             if (null != e) {
                 this.bt(d, e);
@@ -26393,6 +26425,10 @@ let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                 e.isSectionContentVisible = false;
                 e.flushAutoRefresh();
                 this.h.pl((k) => {
+                    let l = k.getContextValue("GridColumnOptionsFilterItemsSource", 7);
+                    if (l != null) {
+                        l.destroy();
+                    }
                     k.setContextValue("GridColumnOptionsFilterItemsSource", 7, e);
                     k.setContextValue("GridColumnOptionsFilterDataMemberPath", 3, c);
                     k.setContextValue("GridColumnOptionsFilterPrimaryKey", 7, [c]);
@@ -26804,6 +26840,12 @@ let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                     b.summaryDescriptions.d(c);
                 }
             }
+            for (let e = b.initialSummaryDescriptions.j.count - 1; e >= 0; e--) {
+                let f = b.initialSummaryDescriptions.j.item(e);
+                if (f.ah == this.h.ns && !a.contains(f.i) && f.t) {
+                    b.initialSummaryDescriptions.d(e);
+                }
+            }
         }
         ba(a, b) {
             let c = new ColumnSummaryDescription(1, this.h.ns);
@@ -29525,14 +29567,16 @@ let SummaryRow = /*@__PURE__*/ (() => {
             if (h != null) {
                 let i = e.getSummaryResults(h.ns);
                 if (i.length > 0 && b.summaryDescriptions.j.count > 0) {
-                    let j = b.summaryDescriptions.j.item(i[0].summaryIndex);
-                    if (j.l != null) {
-                        let k = h.y(j, i[0]);
-                        f = j.ae != null ? j.ae : j.l.displayName;
-                        g = k.d;
-                        let l = h.pe(a, k.b, d);
-                        if (l != null) {
-                            g = l;
+                    if (i[0].summaryIndex != -1) {
+                        let j = b.summaryDescriptions.j.item(i[0].summaryIndex);
+                        if (j.l != null) {
+                            let k = h.y(j, i[0]);
+                            f = j.ae != null ? j.ae : j.l.displayName;
+                            g = k.d;
+                            let l = h.pe(a, k.b, d);
+                            if (l != null) {
+                                g = l;
+                            }
                         }
                     }
                 }
@@ -30671,12 +30715,12 @@ let ColumnCellsEffect = /*@__PURE__*/ (() => {
             return false;
         }
         d(a) {
-            if (a.c3 > 0) {
+            if (a.c4 > 0) {
                 let b = this.g;
                 let c = new CellPath(0, b.b, b.a6, -100, -100);
                 return c;
             }
-            else if (a.c2 > 0) {
+            else if (a.c3 > 0) {
                 let d = this.g;
                 let e = new CellPath(0, d.b, d.a6, -100, -105);
                 return e;
@@ -30699,10 +30743,10 @@ let ColumnCellsEffect = /*@__PURE__*/ (() => {
                 return 0;
             }
             let f = 0;
-            if (a.c3 > 0) {
+            if (a.c4 > 0) {
                 f++;
             }
-            if (a.c2 > 0) {
+            if (a.c3 > 0) {
                 f++;
             }
             if (c == null) {
@@ -30722,23 +30766,23 @@ let ColumnCellsEffect = /*@__PURE__*/ (() => {
             if (e.y > c.y) {
                 while (h <= e.y) {
                     if (h == c.y) {
-                        g += (a.ce._inner[h].m - 1) - c.x;
-                        if (a.ce._inner[h].d > 0) {
+                        g += (a.cf._inner[h].m - 1) - c.x;
+                        if (a.cf._inner[h].d > 0) {
                             g++;
                         }
                     }
                     else if (h == e.y) {
-                        if (a.ce._inner[h].g > 0) {
+                        if (a.cf._inner[h].g > 0) {
                             g++;
                         }
                         g += (e.x + 1);
                     }
                     else {
-                        if (a.ce._inner[h].g > 0) {
+                        if (a.cf._inner[h].g > 0) {
                             g++;
                         }
-                        g += a.ce._inner[h].m;
-                        if (a.ce._inner[h].d > 0) {
+                        g += a.cf._inner[h].m;
+                        if (a.cf._inner[h].d > 0) {
                             g++;
                         }
                     }
@@ -30749,22 +30793,22 @@ let ColumnCellsEffect = /*@__PURE__*/ (() => {
                 while (h >= e.y) {
                     if (h == c.y) {
                         g -= c.x;
-                        if (a.ce._inner[h].d > 0) {
+                        if (a.cf._inner[h].d > 0) {
                             g++;
                         }
                     }
                     else if (h == e.y) {
-                        if (a.ce._inner[h].d > 0) {
+                        if (a.cf._inner[h].d > 0) {
                             g--;
                         }
-                        g -= (a.ce._inner[h].m - e.x);
+                        g -= (a.cf._inner[h].m - e.x);
                     }
                     else {
-                        if (a.ce._inner[h].g > 0) {
+                        if (a.cf._inner[h].g > 0) {
                             g--;
                         }
-                        g -= a.ce._inner[h].m;
-                        if (a.ce._inner[h].d > 0) {
+                        g -= a.cf._inner[h].m;
+                        if (a.cf._inner[h].d > 0) {
                             g--;
                         }
                     }
@@ -30887,16 +30931,16 @@ let RowCellsEffect = /*@__PURE__*/ (() => {
             if (b.az) {
                 return this.be(a, this.e);
             }
-            if (b.a6 > (a.b9.count - 1)) {
+            if (b.a6 > (a.ca.count - 1)) {
                 return 0;
             }
-            let c = a.b9._inner[this.g.a6].n;
-            let d = a.b9._inner[b.a6].n;
+            let c = a.ca._inner[this.g.a6].n;
+            let d = a.ca._inner[b.a6].n;
             if (b.d == 0) {
-                d = a.b9._inner[b.a6].n - a.c9;
+                d = a.ca._inner[b.a6].n - a.da;
             }
             else if (b.d == 2) {
-                d = a.b9._inner[b.a6].n - (a.c9 + a.dc);
+                d = a.ca._inner[b.a6].n - (a.da + a.dd);
             }
             return d - c;
         }
@@ -31178,8 +31222,8 @@ let GridEffectManager = /*@__PURE__*/ (() => {
                     this.ai(this.k._inner[h].b0, false, this.k._inner[h]);
                 }
             }
-            for (let i = 0; i < b.b9.count; i++) {
-                e = b.b9._inner[i];
+            for (let i = 0; i < b.ca.count; i++) {
+                e = b.ca._inner[i];
                 for (let j = 0; j < this.k.count; j++) {
                     f = this.k._inner[j];
                     if (f.ah(e, b)) {
@@ -31200,7 +31244,7 @@ let GridEffectManager = /*@__PURE__*/ (() => {
         }
         h(a, b, c) {
             let d = true;
-            let e = b.cf;
+            let e = b.cg;
             let f = new List$1(GridColumnSpacer.$, 0);
             let g = new List$1(SpacerEffect.$, 0);
             for (let h = 0; h < e.count; h++) {
@@ -31235,7 +31279,7 @@ let GridEffectManager = /*@__PURE__*/ (() => {
                 e.b = f.b0.b;
                 e.x = f.b0.x;
                 e.y = f.b0.y;
-                if (!f.aw(b.ce._inner[e.y], b, c, a)) {
+                if (!f.aw(b.cf._inner[e.y], b, c, a)) {
                     d = false;
                 }
             }
@@ -31269,8 +31313,8 @@ let GridEffectManager = /*@__PURE__*/ (() => {
                 }
                 this.i._inner[h].ap = true;
             }
-            for (let j = 0; j < b.cc.count; j++) {
-                let k = b.cc._inner[j];
+            for (let j = 0; j < b.cd.count; j++) {
+                let k = b.cd._inner[j];
                 for (let l = 0; l < k.o.count; l++) {
                     if (k.p._inner[l]) {
                         continue;
@@ -31355,7 +31399,7 @@ let GridLayerController = /*@__PURE__*/ (() => {
             this.e = new RecyclingManager();
         }
         a(a, b) {
-            let c = b.cc;
+            let c = b.cd;
             let d = c.count;
             for (let e = 0; e < d; e++) {
                 let f = c._inner[e].b(a);
@@ -31411,12 +31455,12 @@ let GridLayerController = /*@__PURE__*/ (() => {
                 let p = false;
                 let q = false;
                 let r = j.l.a6;
-                let s = (r >= 0 && c.b9._inner[r].n == 0) || a.a1;
+                let s = (r >= 0 && c.ca._inner[r].n == 0) || a.a1;
                 if (s) {
                     let t = b.fa.getRowType(j.l.x);
                     if (t == 1 && b.isGroupCollapsable) {
                         if (b.shiftSectionContent) {
-                            if (a.a6 == -401 || (a.a6 == -400 && c.cz == 0)) {
+                            if (a.a6 == -401 || (a.a6 == -400 && c.c0 == 0)) {
                                 p = b.isGroupCollapsable;
                                 q = b.actualDataSource.getIsRowExpandedAtIndex(j.l.x);
                             }
@@ -31454,12 +31498,12 @@ let GridLayerController = /*@__PURE__*/ (() => {
                 let v = false;
                 let w = false;
                 let x = i.l.a6;
-                let y = (x >= 0 && c.b9._inner[x].n == 0) || a.a1;
+                let y = (x >= 0 && c.ca._inner[x].n == 0) || a.a1;
                 if (y) {
                     let z = b.fa.getRowType(i.l.x);
                     if (z == 1 && b.isGroupCollapsable) {
                         if (b.shiftSectionContent) {
-                            if (a.a6 == -401 || (a.a6 == -400 && c.cz == 0)) {
+                            if (a.a6 == -401 || (a.a6 == -400 && c.c0 == 0)) {
                                 v = b.isGroupCollapsable;
                                 w = b.actualDataSource.getIsRowExpandedAtIndex(i.l.x);
                             }
@@ -31477,9 +31521,9 @@ let GridLayerController = /*@__PURE__*/ (() => {
             }
         }
         d(a, b) {
-            for (let c = 0; c < b.cc.count; c++) {
-                if (b.cc._inner[c].d(a)) {
-                    return b.cc._inner[c];
+            for (let c = 0; c < b.cd.count; c++) {
+                if (b.cd._inner[c].d(a)) {
+                    return b.cd._inner[c];
                 }
             }
             return null;
@@ -31536,16 +31580,16 @@ let GridLayerController = /*@__PURE__*/ (() => {
             this.e.c(d);
         }
         c(a, b) {
-            for (let c = 0; c < b.cc.count; c++) {
-                if (b.cc._inner[c].d(a)) {
-                    return b.cc._inner[c].item(a);
+            for (let c = 0; c < b.cd.count; c++) {
+                if (b.cd._inner[c].d(a)) {
+                    return b.cd._inner[c].item(a);
                 }
             }
             return null;
         }
         h(a, b, c, d, e, f) {
             if (a.l.h) {
-                a.db = c + a.cy + (a.cz * b.b9._inner[a.l.a6].k);
+                a.db = c + a.cy + (a.cz * b.ca._inner[a.l.a6].k);
             }
             else {
                 a.db = c + a.cy + (a.cz * a.ib);
@@ -31603,39 +31647,39 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             if (e.width == 0 || e.height == 0) {
                 return;
             }
-            if (b.b9.count == 0) {
+            if (b.ca.count == 0) {
                 return;
             }
             if (a.fa == null) {
                 return;
             }
             let f = this.a(a, b, c, e);
-            for (let g = 0; g < b.cg.count; g++) {
-                let h = b.cg._inner[g];
+            for (let g = 0; g < b.ch.count; g++) {
+                let h = b.ch._inner[g];
                 let i = c.k(h, a, b);
-                b.b9._inner[h].l = i;
+                b.ca._inner[h].l = i;
             }
-            b.da = 0;
-            b.dg = 0;
-            b.cq = 0;
+            b.db = 0;
+            b.dh = 0;
+            b.cr = 0;
             b.bx = f.b;
             b.bw = f.a;
-            b.c8 = f.k;
-            b.db = f.m;
-            b.c9 = f.l;
-            b.dc = f.n;
+            b.c9 = f.k;
+            b.dc = f.m;
+            b.da = f.l;
+            b.dd = f.n;
             a.y0();
             this.d = f.b;
             this.c = f.a;
             let j = a.d4;
             a.le = true;
             this.ag(a, b, f, j);
-            if (b.cg.count == 0) {
+            if (b.ch.count == 0) {
                 return;
             }
             this.x(a, b, f, j);
             this.w(a, b, f);
-            f.j += b.c1;
+            f.j += b.c2;
             if (this.c.x == -1) {
                 return;
             }
@@ -31667,51 +31711,51 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             e.d = Math.max(e.h, a.inset.left);
             e.f = Math.min(e.i, b.absoluteWidth - a.inset.right);
             e.e = e.f - e.d;
-            e.b = c.b(e.j + b.c6 + b.c7 + b.c2, b);
+            e.b = c.b(e.j + b.c7 + b.c8 + b.c3, b);
             e.a = c.b(e.g, b);
             e.k = 0;
             e.m = 0;
-            b.cg.clear();
-            let g = b.cz + truncate(a.inset.left);
+            b.ch.clear();
+            let g = b.c0 + truncate(a.inset.left);
             let h = g;
             let i = 0;
             let j = 0;
-            let k = b.c0;
-            for (let l = 0; l < b.b9.count; l++) {
-                let m = b.b9._inner[l];
-                let n = b.cf._inner[l];
-                let o = b.b9._inner[l].d == 0;
+            let k = b.c1;
+            for (let l = 0; l < b.ca.count; l++) {
+                let m = b.ca._inner[l];
+                let n = b.cg._inner[l];
+                let o = b.ca._inner[l].d == 0;
                 if (o) {
                     g += truncate(Math.round(n.ad(-1)));
                     if (m.a != 6) {
-                        g += (m.k) + a.model.cv - truncate(Math.round(m.f(b)));
+                        g += (m.k) + a.model.cw - truncate(Math.round(m.f(b)));
                     }
                 }
                 if (m.a == 3) {
                     continue;
                 }
-                if (b.b9._inner[l].d == 1) {
-                    b.cg.insert(i, l);
+                if (b.ca._inner[l].d == 1) {
+                    b.ch.insert(i, l);
                     i++;
                 }
-                else if (b.b9._inner[l].d == 2) {
-                    b.cg.insert(b.cg.count, l);
+                else if (b.ca._inner[l].d == 2) {
+                    b.ch.insert(b.ch.count, l);
                     j++;
                     if (m.a == 6) {
                         k -= m.k;
                     }
                 }
                 else {
-                    if (g >= e.d + b.cz && h <= e.f - k) {
-                        b.cg.insert(b.cg.count - j, l);
+                    if (g >= e.d + b.c0 && h <= e.f - k) {
+                        b.ch.insert(b.ch.count - j, l);
                     }
-                    else if (b.b9._inner[l].a == 2 || b.b9._inner[l].a == 1 || b.b9._inner[l].a == 6) {
-                        b.cg.insert(b.cg.count - j, l);
+                    else if (b.ca._inner[l].a == 2 || b.ca._inner[l].a == 1 || b.ca._inner[l].a == 6) {
+                        b.ch.insert(b.ch.count - j, l);
                     }
-                    else if (g < e.d + b.cz) {
+                    else if (g < e.d + b.c0) {
                         e.l++;
                     }
-                    else if (h > e.f - b.c0) {
+                    else if (h > e.f - b.c1) {
                         e.n++;
                     }
                 }
@@ -31720,9 +31764,9 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     g += truncate(Math.round(n.af(-1)));
                 }
             }
-            if (b.cg.count > 0) {
-                e.k = b.cg._inner[0];
-                e.m = b.cg._inner[b.cg.count - 1];
+            if (b.ch.count > 0) {
+                e.k = b.ch._inner[0];
+                e.m = b.ch._inner[b.ch.count - 1];
             }
             return e;
         }
@@ -31753,8 +31797,8 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     u.add_1(v[w]);
                 }
             }
-            for (let x = 0; x < b.cc.count; x++) {
-                let y = b.cc._inner[x];
+            for (let x = 0; x < b.cd.count; x++) {
+                let y = b.cd._inner[x];
                 y.g = true;
                 for (let z = 0; z < y.o.count; z++) {
                     if (y.p._inner[z]) {
@@ -31772,11 +31816,11 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     r = aa.am;
                     n = u != null && u.contains(j);
                     q = aa.d != 0;
-                    if (b.cg.count == 0) {
+                    if (b.ch.count == 0) {
                         l = true;
                     }
                     if (aa.am) {
-                        if (b.c2 == 0 || a.actualDataSource == null || a.actualDataSource.actualSchema == null || a.actualDataSource.actualSchema.propertyNames.length == 0) {
+                        if (b.c3 == 0 || a.actualDataSource == null || a.actualDataSource.actualSchema == null || a.actualDataSource.actualSchema.propertyNames.length == 0) {
                             l = true;
                         }
                         else if (!m) {
@@ -31829,16 +31873,16 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     if (aa.aw && (a.dragger == null || !a.dragger.isDragActive)) {
                         l = true;
                     }
-                    if ((aa.ar || aa.aq) && b.cz == 0) {
+                    if ((aa.ar || aa.aq) && b.c0 == 0) {
                         l = true;
                     }
-                    if ((aa.at || aa.as) && b.c0 == 0) {
+                    if ((aa.at || aa.as) && b.c1 == 0) {
                         l = true;
                     }
-                    if (aa.au && b.cq == 0) {
+                    if (aa.au && b.cr == 0) {
                         l = true;
                     }
-                    if (!m && !b.cg.contains(k)) {
+                    if (!m && !b.ch.contains(k)) {
                         l = true;
                     }
                     else if (!o && !r && (i < e || i > f)) {
@@ -31864,6 +31908,9 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                             if (b.b5 && (ad == 1 || ad == 2)) {
                                 l = true;
                             }
+                            else if (b.b6 && (ad == 4 || ad == 5)) {
+                                l = true;
+                            }
                             else if ((ae && !m) || (m && !ae)) {
                                 l = true;
                             }
@@ -31871,8 +31918,13 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                                 l = true;
                             }
                         }
-                        else if ((ad == 4 && !aa.ay) || (ad != 4 && aa.ay)) {
-                            l = true;
+                        else {
+                            if (b.b6 && (ad == 4 || ad == 5)) {
+                                l = true;
+                            }
+                            else if ((ad == 4 && !aa.ay) || (ad != 4 && aa.ay)) {
+                                l = true;
+                            }
                         }
                     }
                     if (l) {
@@ -31885,15 +31937,16 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 y.g = false;
             }
             b.b5 = false;
+            b.b6 = false;
         }
         af(a, b, c, d) {
             let e = this.d.x;
             let f = this.c.x;
-            let g = b.ce._inner[0];
+            let g = b.cf._inner[0];
             let h = g.k();
             let i = h - g.o;
-            for (let j = 0; j < b.cc.count; j++) {
-                let k = b.cc._inner[j];
+            for (let j = 0; j < b.cd.count; j++) {
+                let k = b.cd._inner[j];
                 if (this.h(k, b)) {
                     k.g = true;
                     for (let l = 0; l < k.o.count; l++) {
@@ -31937,7 +31990,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                                 o = true;
                             }
                             else {
-                                if (!b.cg.contains(m.a6)) {
+                                if (!b.ch.contains(m.a6)) {
                                     o = true;
                                 }
                                 if (!n.bq) {
@@ -31966,7 +32019,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
         ab(a, b, c, d, e) {
             let f = d.b;
             let g = d.a;
-            let h = c.ce;
+            let h = c.cf;
             let i = b.d4;
             let j = g.y;
             let k = d.d;
@@ -32007,7 +32060,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             let h = d.a.y;
             let i = d.b.y;
             let j = new CellPath(1, 0, 0, 0);
-            let k = b.ce._inner[0];
+            let k = b.cf._inner[0];
             let l = a.fa.getStickyRowsInRange(g.x, f.x);
             let m = -1;
             let n = -1;
@@ -32020,9 +32073,9 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             t.clear();
             this.o = 0;
             let u = new List$1(PinnedRowInfo.$, 0);
-            b.df = 0;
+            b.dg = 0;
             if (l != null && ((a.groupDescriptions.j.count > 0 && a.isGroupRowSticky) || a.groupDescriptions.j.count == 0)) {
-                let v = c.top + b.c3 + b.c2;
+                let v = c.top + b.c4 + b.c3;
                 let w = c.bottom;
                 for (let x = 0; x < l.length; x++) {
                     let y = l[x];
@@ -32054,7 +32107,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                             ab.l += (c.bottom - ab.j);
                             ab.h = true;
                             q = true;
-                            b.cq++;
+                            b.cr++;
                         }
                         continue;
                     }
@@ -32113,7 +32166,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     if (z == 4) {
                         ab.l += (c.bottom - ab.j);
                         ab.h = true;
-                        b.cq++;
+                        b.cr++;
                         q = true;
                         this.am(a, x - 1, x, 4, l, t);
                     }
@@ -32175,7 +32228,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                         let bd = t.item(a6).a == 3;
                         if (!e) {
                             j.i = true;
-                            j.o = (b.da - 1) - a4;
+                            j.o = (b.db - 1) - a4;
                             this.aa(a, b, d, j, a.d4, a6, a7, a9, true, bd, bd, bc, ba, bb);
                             j.i = false;
                             j.o = -1;
@@ -32336,7 +32389,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             d.av = m;
             d.ai = n;
             d.an = false;
-            let o = b.b9;
+            let o = b.ca;
             let p = c.d;
             let q = c.f;
             let r = c.e;
@@ -32349,13 +32402,13 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 u = a.fa.isRowSpanning(t) && a.groupSummaryDisplayMode != 1;
             }
             if (u) {
-                let v = a.shiftSectionContent ? b.cz : 0;
-                let w = a.shiftSectionContent ? b.c0 : 0;
+                let v = a.shiftSectionContent ? b.c0 : 0;
+                let w = a.shiftSectionContent ? b.c1 : 0;
                 let x = p;
                 let y = r;
                 if (v > 0) {
                     d.a6 = -401;
-                    y = b.cz;
+                    y = b.c0;
                     this.an(x, y, g, h, d.ab(), b, p, q, a, i, j, k, l, t);
                 }
                 d.a6 = -400;
@@ -32364,14 +32417,14 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 this.an(x, y, g, h, d.ab(), b, p, q, a, i, j, k, l, t);
                 if (w > 0) {
                     d.a6 = -402;
-                    x = q - b.c0;
-                    y = b.c0;
+                    x = q - b.c1;
+                    y = b.c1;
                     this.an(x, y, g, h, d.ab(), b, p, q, a, i, j, k, l, t);
                 }
             }
             else {
-                for (let z = 0; z < b.cg.count; z++) {
-                    let aa = b.cg._inner[z];
+                for (let z = 0; z < b.ch.count; z++) {
+                    let aa = b.ch._inner[z];
                     let ab = o._inner[aa];
                     d.a6 = ab.m;
                     d.bc = ab.n;
@@ -32382,22 +32435,22 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             }
             let ad = t != 4 && t != 2 && (t != 5 || a.groupSummaryDisplayMode != 3);
             if (ad && i) {
-                b.dg = truncate(Math.round((g + h + a.rowSpacingHeight) - c.j));
+                b.dh = truncate(Math.round((g + h + a.rowSpacingHeight) - c.j));
             }
             let ae = t == 4 || (t == 5 && a.groupSummaryDisplayMode == 3);
             if (ae && i && g < c.g) {
-                b.df += truncate(h) + a.rowSpacingHeight;
+                b.dg += truncate(h) + a.rowSpacingHeight;
             }
             let af = t == 4 && (f == 0 || a.fa.getRowType(f - 1) != 4);
             if (s > 0) {
                 if (ad && i) {
-                    b.dg = truncate(Math.round((g + h + a.rowSpacingHeight + s) - c.j));
+                    b.dh = truncate(Math.round((g + h + a.rowSpacingHeight + s) - c.j));
                 }
                 if (ae && i && g < c.g) {
-                    b.df += s;
+                    b.dg += s;
                 }
                 if (af && i && g < c.g) {
-                    b.df += s;
+                    b.dg += s;
                 }
                 d.d = 0;
                 d.a6 = -300;
@@ -32456,20 +32509,20 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             }
         }
         x(a, b, c, d) {
-            let e = b.b9;
+            let e = b.ca;
             let f = a.inset;
             let g = f.top;
             if (a.itemsSource == null) {
                 return;
             }
-            if (b.c3 > 0) {
+            if (b.c4 > 0) {
                 let h = Math.max(c.j, g);
                 b.b1 = this.i;
                 if (this.i) {
                     h = g;
                 }
-                for (let i = 0; i < b.cg.count; i++) {
-                    let j = b.cg._inner[i];
+                for (let i = 0; i < b.ch.count; i++) {
+                    let j = b.ch._inner[i];
                     let k = e._inner[j];
                     let l = new CellPath(1, k.m, -100, -100);
                     l.d = k.d;
@@ -32479,72 +32532,72 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                         m.d = k.d;
                         let n = a.n4(a.headerSeparatorWidth);
                         let o = a.headerSeparatorWidth + n * 2;
-                        let p = c.o.left + b.b9._inner[l.a6].l + b.b9._inner[l.a6].k - a.headerSeparatorWidth - n;
-                        this.aw(m, b, h, p, o, b.c6, c.d, c.f, a);
+                        let p = c.o.left + b.ca._inner[l.a6].l + b.ca._inner[l.a6].k - a.headerSeparatorWidth - n;
+                        this.aw(m, b, h, p, o, b.c7, c.d, c.f, a);
                     }
                 }
-                if (b.c7 > 0) {
+                if (b.c8 > 0) {
                     let q = new CellPath(1, -300, -100, -100);
-                    this.av(c, q, b, c.d, c.e, 0, b.c7, a, false, false, false, false, 0);
+                    this.av(c, q, b, c.d, c.e, 0, b.c8, a, false, false, false, false, 0);
                 }
             }
             if (a.columnResizingMode == 0 && a.dragger != null && a.dragger.isDragActive && a.dragger.dragType == 1) {
                 let r = new CellPath(3, -400, -102, 7);
-                this.aw(r, b, Math.max(c.j, g), a.oz, a.columnResizingSeparatorWidth, b.ch, c.h, c.i, a);
+                this.aw(r, b, Math.max(c.j, g), a.oz, a.columnResizingSeparatorWidth, b.ci, c.h, c.i, a);
             }
             if (a.columnMovingMode != 1 && a.dragger != null && a.dragger.isDragActive && a.dragger.dragType == 2) {
                 let s = new CellPath(3, -400, -102, 6);
-                this.aw(s, b, c.j, a.oz, a.columnMovingSeparatorWidth, b.ch, c.h, c.i, a);
+                this.aw(s, b, c.j, a.oz, a.columnMovingSeparatorWidth, b.ci, c.h, c.i, a);
             }
         }
         z(a, b, c, d) {
-            if (b.cx > -1) {
-                b.cn = c.d + a.ge.k(b.cx, a, b) - a.pinnedAreaSeparatorWidth;
+            if (b.cy > -1) {
+                b.co = c.d + a.ge.k(b.cy, a, b) - a.pinnedAreaSeparatorWidth;
             }
             else {
-                b.cn = b.cz;
+                b.co = b.c0;
             }
-            if (b.cy > -1) {
-                let e = b.b9._inner[b.cy].l - a.pinnedAreaSeparatorWidth;
+            if (b.cz > -1) {
+                let e = b.ca._inner[b.cz].l - a.pinnedAreaSeparatorWidth;
                 if (c.i >= b.absoluteWidth) {
-                    b.co = e + a.inset.left;
+                    b.cp = e + a.inset.left;
                 }
                 else {
-                    b.co = e - (b.absoluteWidth - c.i - a.inset.left - a.inset.right);
+                    b.cp = e - (b.absoluteWidth - c.i - a.inset.left - a.inset.right);
                 }
             }
-            let f = Math.max(c.j - b.c3 - b.c2, a.inset.top);
+            let f = Math.max(c.j - b.c4 - b.c3, a.inset.top);
             let g = c.j;
-            let h = b.c3 + b.c2;
-            let i = b.cq * (a.actualRowHeight + a.rowSeparatorHeight + a.rowSpacingHeight) + (b.cq > 0 ? a.rowSeparatorHeight : 0);
+            let h = b.c4 + b.c3;
+            let i = b.cr * (a.actualRowHeight + a.rowSeparatorHeight + a.rowSpacingHeight) + (b.cr > 0 ? a.rowSeparatorHeight : 0);
             let j = c.g - i;
             let k = Math.min(b.absoluteHeight - i, c.g - i);
             let l = Math.max(0, k - g);
             let m = new CellPath(1, 0, 0, 0);
-            if (b.cz > 0) {
+            if (b.c0 > 0) {
                 m.a6 = -500;
-                if (b.c3 > 0) {
+                if (b.c4 > 0) {
                     m.x = -100;
-                    this.aw(m.ab(), b, f, b.cn, a.pinnedAreaSeparatorWidth, h, c.d, c.i, a);
+                    this.aw(m.ab(), b, f, b.co, a.pinnedAreaSeparatorWidth, h, c.d, c.i, a);
                 }
                 m.x = -103;
-                this.aw(m.ab(), b, g, b.cn, a.pinnedAreaSeparatorWidth, l, c.d, c.i, a);
-                if (b.cq > 0) {
+                this.aw(m.ab(), b, g, b.co, a.pinnedAreaSeparatorWidth, l, c.d, c.i, a);
+                if (b.cr > 0) {
                     m.x = -104;
-                    this.aw(m.ab(), b, j, b.cn, a.pinnedAreaSeparatorWidth, i, c.d, c.i, a);
+                    this.aw(m.ab(), b, j, b.co, a.pinnedAreaSeparatorWidth, i, c.d, c.i, a);
                 }
             }
-            if (b.c0 > 0) {
+            if (b.c1 > 0) {
                 m.a6 = -501;
-                if (b.c3 > 0) {
+                if (b.c4 > 0) {
                     m.x = -100;
-                    this.aw(m.ab(), b, f, b.co, a.pinnedAreaSeparatorWidth, h, c.d, c.i, a);
+                    this.aw(m.ab(), b, f, b.cp, a.pinnedAreaSeparatorWidth, h, c.d, c.i, a);
                 }
                 m.x = -103;
-                this.aw(m.ab(), b, g, b.co, a.pinnedAreaSeparatorWidth, l, c.d, c.i, a);
-                if (b.cq > 0) {
+                this.aw(m.ab(), b, g, b.cp, a.pinnedAreaSeparatorWidth, l, c.d, c.i, a);
+                if (b.cr > 0) {
                     m.x = -104;
-                    this.aw(m.ab(), b, j, b.co, a.pinnedAreaSeparatorWidth, i, c.d, c.i, a);
+                    this.aw(m.ab(), b, j, b.cp, a.pinnedAreaSeparatorWidth, i, c.d, c.i, a);
                 }
             }
         }
@@ -32578,17 +32631,17 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 let i = new CellPath(1, h.m, 0, g);
                 i.bc = h.n;
                 i.af = 2;
-                let j = this.k.containsKey(g) ? this.k.item(g).l : b.ce._inner[0].f(g) + b.ce._inner[0].i;
+                let j = this.k.containsKey(g) ? this.k.item(g).l : b.cf._inner[0].f(g) + b.cf._inner[0].i;
                 let k = this.p(h, a);
                 let l = h.k;
-                let m = b.ce._inner[0].e(g);
+                let m = b.cf._inner[0].e(g);
                 this.ap(a, f, i, b, j, k, l, m);
                 if (a.editMode == 3 && a.cm.j) {
                     let n = i.ab();
                     n.af = 3;
                     n.x = g;
                     n.a6 = -400;
-                    k = b.cj;
+                    k = b.ck;
                     l = b.absoluteWidth;
                     this.ao(a, b, n, j, k, l, m);
                 }
@@ -32604,7 +32657,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
         }
         y(a, b, c, d) {
             this.f = true;
-            let e = b.ce._inner[0];
+            let e = b.cf._inner[0];
             let f = e.k();
             let g = f - e.o;
             let h = d.d;
@@ -32620,7 +32673,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                         continue;
                     }
                     let p = o.b ? d.j : j;
-                    let q = b.b9._inner[o.d];
+                    let q = b.ca._inner[o.d];
                     let r = k.ab();
                     r.x = o.f;
                     r.a6 = o.d;
@@ -32675,13 +32728,13 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             return true;
         }
         w(a, b, c) {
-            if (b.c2 > 0 && a.actualDataSource != null && a.actualDataSource.actualSchema != null && a.actualDataSource.actualSchema.propertyNames.length > 0) {
-                let d = b.b9;
+            if (b.c3 > 0 && a.actualDataSource != null && a.actualDataSource.actualSchema != null && a.actualDataSource.actualSchema.propertyNames.length > 0) {
+                let d = b.ca;
                 let e = Math.max(c.j, c.o.top);
-                e += b.c3;
+                e += b.c4;
                 let f = new CellPath(1, -1, -100, -1);
-                for (let g = 0; g < b.cg.count; g++) {
-                    let h = b.cg._inner[g];
+                for (let g = 0; g < b.ch.count; g++) {
+                    let h = b.ch._inner[g];
                     let i = d._inner[h];
                     let j = f.ab();
                     j.x = -105;
@@ -32691,7 +32744,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     this.aq(j, b, e, c.d, c.f, a);
                 }
                 if (a.rowSeparatorHeight > 0) {
-                    let k = e + b.cw;
+                    let k = e + b.cx;
                     let l = f.ab();
                     l.x = -105;
                     l.a6 = -300;
@@ -32702,19 +32755,19 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
         }
         aq(a, b, c, d, e, f) {
             let g = a.d == 0 ? b.a8 : b.ax;
-            if (b.b9._inner[a.a6].a == 1 || b.b9._inner[a.a6].a == 2 || b.b9._inner[a.a6].a == 3) {
+            if (b.ca._inner[a.a6].a == 1 || b.ca._inner[a.a6].a == 2 || b.ca._inner[a.a6].a == 3) {
                 g = a.d == 0 ? b.bo : b.a3;
             }
-            if (b.b9._inner[a.a6].a == 6) {
+            if (b.ca._inner[a.a6].a == 6) {
                 g = a.d == 0 && f.columns._inner[a.a6].it == 0 ? b.br : b.a6;
             }
-            let h = b.b9._inner[a.a6].l + f.inset.left;
-            let i = b.b9._inner[a.a6].k;
+            let h = b.ca._inner[a.a6].l + f.inset.left;
+            let i = b.ca._inner[a.a6].k;
             if (a.d == 1) {
-                h = d + b.b9._inner[a.a6].l;
+                h = d + b.ca._inner[a.a6].l;
             }
             else if (a.d == 2) {
-                let j = b.b9._inner[a.a6].l;
+                let j = b.ca._inner[a.a6].l;
                 if (e >= b.absoluteWidth) {
                     h = j + f.inset.left;
                 }
@@ -32722,7 +32775,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     h = j - (b.absoluteWidth - e - f.inset.left - f.inset.right);
                 }
             }
-            this.aj(f, b, a, g, 11, h, c, i, b.cw);
+            this.aj(f, b, a, g, 11, h, c, i, b.cx);
         }
         aj(a, b, c, d, e, f, g, h, i) {
             this.ak(a, b, c, d, e, f, g, h, i, false, false, false);
@@ -32748,7 +32801,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
         }
         al(a, b) {
             if (b.l.af == 4) {
-                let c = a.model.b9._inner[b.l.a6];
+                let c = a.model.ca._inner[b.l.a6];
                 if (c.a != 1 && c.a != 3 && c.a != 2) {
                     b.ob = Rect.empty;
                 }
@@ -32907,7 +32960,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 }
             }
             else {
-                if (f.b9._inner[e.a6].a == 1 || f.b9._inner[e.a6].a == 2 || f.b9._inner[e.a6].a == 3) {
+                if (f.ca._inner[e.a6].a == 1 || f.ca._inner[e.a6].a == 2 || f.ca._inner[e.a6].a == 3) {
                     if (j) {
                         o = n != 4 ? f.bb : f.bo;
                     }
@@ -32915,7 +32968,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                         o = q ? f.a1 : f.bm;
                     }
                 }
-                else if (f.b9._inner[e.a6].a == 6) {
+                else if (f.ca._inner[e.a6].a == 6) {
                     q = e.d != 0 || i.columns._inner[e.a6].it != 0;
                     if (j) {
                         o = n != 4 ? f.bc : f.br;
@@ -32934,11 +32987,11 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 }
             }
             if (p == 1) {
-                let t = f.b9._inner[e.a6].l;
+                let t = f.ca._inner[e.a6].l;
                 a = g + t;
             }
             else if (p == 2) {
-                let u = f.b9._inner[e.a6].l;
+                let u = f.ca._inner[e.a6].l;
                 if (h >= f.absoluteWidth) {
                     a = u + i.inset.left;
                 }
@@ -32950,19 +33003,19 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
         }
         ar(a, b, c, d, e, f) {
             let g = a.d == 0 ? b.a8 : b.ax;
-            if (b.b9._inner[a.a6].a == 1 || b.b9._inner[a.a6].a == 2 || b.b9._inner[a.a6].a == 3) {
+            if (b.ca._inner[a.a6].a == 1 || b.ca._inner[a.a6].a == 2 || b.ca._inner[a.a6].a == 3) {
                 g = a.d == 0 ? b.bo : b.a3;
             }
-            if (b.b9._inner[a.a6].a == 6) {
+            if (b.ca._inner[a.a6].a == 6) {
                 g = a.d == 0 && f.columns._inner[a.a6].it == 0 ? b.br : b.a6;
             }
-            let h = b.b9._inner[a.a6].l + f.inset.left;
-            let i = b.b9._inner[a.a6].k;
+            let h = b.ca._inner[a.a6].l + f.inset.left;
+            let i = b.ca._inner[a.a6].k;
             if (a.d == 1) {
-                h = d + b.b9._inner[a.a6].l;
+                h = d + b.ca._inner[a.a6].l;
             }
             else if (a.d == 2) {
-                let j = b.b9._inner[a.a6].l;
+                let j = b.ca._inner[a.a6].l;
                 if (e >= b.absoluteWidth) {
                     h = j + f.inset.left;
                 }
@@ -32970,7 +33023,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                     h = j - (b.absoluteWidth - e - f.inset.left - f.inset.right);
                 }
             }
-            this.aj(f, b, a, g, 0, h, c, i, b.c6);
+            this.aj(f, b, a, g, 0, h, c, i, b.c7);
         }
         aw(a, b, c, d, e, f, g, h, i) {
             let j = b.bs;
@@ -32978,10 +33031,10 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             if (a.h) {
                 k = 7;
                 j = a.d == 0 ? b.a7 : b.aw;
-                if (b.b9._inner[a.a6].a == 1 || b.b9._inner[a.a6].a == 2 || b.b9._inner[a.a6].a == 3) {
+                if (b.ca._inner[a.a6].a == 1 || b.ca._inner[a.a6].a == 2 || b.ca._inner[a.a6].a == 3) {
                     j = a.d == 0 ? b.bn : b.a2;
                 }
-                if (b.b9._inner[a.a6].a == 6) {
+                if (b.ca._inner[a.a6].a == 6) {
                     j = a.d == 0 && i.columns._inner[a.a6].it == 0 ? b.bq : b.a5;
                 }
                 if (a.d == 1) {
@@ -33010,7 +33063,7 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
             this.au(a, b, c, d, e, f, g, false, h);
         }
         au(a, b, c, d, e, f, g, h, i) {
-            let j = g ? b.ce._inner[f].g : b.ce._inner[f].d;
+            let j = g ? b.cf._inner[f].g : b.cf._inner[f].d;
             let k = 3;
             let l = b.bl;
             if (g) {
@@ -33044,9 +33097,9 @@ let VisibilityEngine = /*@__PURE__*/ (() => {
                 let p = h.inset;
                 let q = p.top;
                 let r = Math.max(a.j, q);
-                n = r + c.c6;
+                n = r + c.c7;
                 if (this.i) {
-                    n = a.o.top + c.c6;
+                    n = a.o.top + c.c7;
                 }
                 o = c.a7;
             }
@@ -33093,7 +33146,7 @@ let PinnedRowInfo = /*@__PURE__*/ (() => {
             this.c = a;
             if (this.c != b) {
                 if (this.b != null) {
-                    this.b.da = Math.min(0, this.c ? this.b.da + 1 : this.b.da - 1);
+                    this.b.db = Math.min(0, this.c ? this.b.db + 1 : this.b.db - 1);
                 }
             }
         }
@@ -33146,34 +33199,34 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             b.absoluteHeight = 0;
             b.absoluteWidth = 0;
             b.absoluteHeight = truncate(a.inset.top);
-            b.c1 = truncate(a.inset.top);
-            b.ce.clear();
+            b.c2 = truncate(a.inset.top);
+            b.cf.clear();
             this.c.clear();
-            for (let d = 0; d < a.model.b9.count; d++) {
-                this.c.addItem(a.model.b9._inner[d].o, a.model.b9._inner[d]);
+            for (let d = 0; d < a.model.ca.count; d++) {
+                this.c.addItem(a.model.ca._inner[d].o, a.model.ca._inner[d]);
             }
-            b.dm();
-            b.cz = 0;
+            b.dn();
             b.c0 = 0;
-            b.cx = -1;
+            b.c1 = 0;
             b.cy = -1;
-            a.model.cv = a.columnSpacingWidth;
+            b.cz = -1;
+            a.model.cw = a.columnSpacingWidth;
             if (a.fa == null) {
                 return;
             }
             let e = a.fa.getSectionCount();
             e = Math.max(1, e);
-            a.model.c7 = a.actualHeaderHeight > 0 ? a.rowSeparatorHeight : 0;
-            a.model.c3 = a.actualHeaderHeight + a.model.c7;
-            a.model.c6 = a.actualHeaderHeight;
-            a.model.c2 = a.j9() ? a.actualRowHeight + a.rowSeparatorHeight : 0;
-            a.model.cw = a.j9() ? a.actualRowHeight : 0;
-            a.model.absoluteHeight += a.model.c3 + a.model.c2;
-            a.model.c1 += a.model.c3 + a.model.c2;
-            a.model.cj = a.inset.left;
-            a.model.ck = a.inset.right;
-            a.model.cl = a.inset.top;
-            a.model.ci = a.inset.bottom;
+            a.model.c8 = a.actualHeaderHeight > 0 ? a.rowSeparatorHeight : 0;
+            a.model.c4 = a.actualHeaderHeight + a.model.c8;
+            a.model.c7 = a.actualHeaderHeight;
+            a.model.c3 = a.j9() ? a.actualRowHeight + a.rowSeparatorHeight : 0;
+            a.model.cx = a.j9() ? a.actualRowHeight : 0;
+            a.model.absoluteHeight += a.model.c4 + a.model.c3;
+            a.model.c2 += a.model.c4 + a.model.c3;
+            a.model.ck = a.inset.left;
+            a.model.cl = a.inset.right;
+            a.model.cm = a.inset.top;
+            a.model.cj = a.inset.bottom;
             for (let f = 0; f < e; f++) {
                 let g = new SectionInfo();
                 g.h = f;
@@ -33186,7 +33239,7 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 g.n = a.actualRowHeight;
                 g.q = g.m * g.n;
                 a.model.absoluteHeight += g.l();
-                a.model.ce.add(g);
+                a.model.cf.add(g);
             }
             let h = a.defaultColumnWidth;
             let i = 0;
@@ -33238,39 +33291,39 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 }
                 if (m.hy != 2 && m.hy != 3) {
                     if (m.iu == 0) {
-                        if (b.cx == -1) {
-                            b.cx = i;
+                        if (b.cy == -1) {
+                            b.cy = i;
                         }
                     }
-                    if (b.cy == -1 && m.iu == 2) {
-                        b.cy = i;
+                    if (b.cz == -1 && m.iu == 2) {
+                        b.cz = i;
                     }
                 }
-                a.model.dj(l);
+                a.model.dk(l);
             }
             this.s(b);
             this.c.clear();
-            a.model.cz = 0;
             a.model.c0 = 0;
+            a.model.c1 = 0;
             this.q(a, b, c);
             a.dz.ac();
             a.model.absoluteHeight += truncate(a.inset.bottom);
         }
         s(a) {
             if (this.d.count > 0 || this.e.count > 0) {
-                if (a.cd == null) {
-                    a.cd = new List$1(ColumnInfo.$, 0);
+                if (a.ce == null) {
+                    a.ce = new List$1(ColumnInfo.$, 0);
                 }
                 else {
-                    a.cd.clear();
+                    a.ce.clear();
                 }
-                for (let b = 0; b < a.b9.count; b++) {
-                    a.b9._inner[b].n = this.m(a.b9._inner[b].d, b, a);
+                for (let b = 0; b < a.ca.count; b++) {
+                    a.ca._inner[b].n = this.m(a.ca._inner[b].d, b, a);
                 }
-                for (let c = 0; c < a.b9.count; c++) {
-                    for (let d = 0; d < a.b9.count; d++) {
-                        if (a.b9._inner[d].n == a.cd.count) {
-                            a.cd.add(a.b9._inner[d]);
+                for (let c = 0; c < a.ca.count; c++) {
+                    for (let d = 0; d < a.ca.count; d++) {
+                        if (a.ca._inner[d].n == a.ce.count) {
+                            a.ce.add(a.ca._inner[d]);
                             break;
                         }
                     }
@@ -33279,15 +33332,15 @@ let SpatialEngine = /*@__PURE__*/ (() => {
         }
         q(a, b, c) {
             b.absoluteWidth = 0;
-            b.c4 = 0;
-            b.cz = 0;
+            b.c5 = 0;
             b.c0 = 0;
-            let d = a.model.cv;
-            let e = a.model.cv;
+            b.c1 = 0;
+            let d = a.model.cw;
+            let e = a.model.cw;
             let f = 0;
             let g = new List$1(ColumnInfo.$, 0);
-            let h = b.cf;
-            for (let i of fromEnum(b.b9)) {
+            let h = b.cg;
+            for (let i of fromEnum(b.ca)) {
                 if (i.b.c) {
                     f += i.b.f * this.g(i);
                     g.add(i);
@@ -33296,35 +33349,35 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                     i.k = truncate((Math.max(DeviceUtils.g(i.b.f), i.i)));
                     if (i.a != 3) {
                         if (i.a == 6) {
-                            e += i.k + a.model.cv;
+                            e += i.k + a.model.cw;
                         }
                         else {
-                            e += i.k + a.model.cv - truncate(Math.round(i.f(b)));
+                            e += i.k + a.model.cw - truncate(Math.round(i.f(b)));
                         }
-                        b.c4 += i.k + a.model.cv;
+                        b.c5 += i.k + a.model.cw;
                         if (i.d == 1) {
-                            b.cz += i.k + b.cv - truncate(Math.round(i.f(b)));
+                            b.c0 += i.k + b.cw - truncate(Math.round(i.f(b)));
                         }
                         if (i.d == 2) {
-                            b.c0 += i.k + b.cv - truncate(Math.round(i.f(b)));
+                            b.c1 += i.k + b.cw - truncate(Math.round(i.f(b)));
                         }
                     }
                     if (i.a == 6) {
-                        d += i.k + a.model.cv;
+                        d += i.k + a.model.cw;
                     }
                     else {
-                        d += i.k + a.model.cv - truncate(Math.round(i.f(b)));
+                        d += i.k + a.model.cw - truncate(Math.round(i.f(b)));
                     }
                 }
             }
-            b.cz = Math.max(0, b.cz - b.cv);
+            b.c0 = Math.max(0, b.c0 - b.cw);
             if (f > 0) {
                 let j = e;
                 e = SpatialEngine.p(a, b, c, d, e, f, g);
             }
             a.model.absoluteWidth = e;
             a.model.absoluteWidth += truncate((a.inset.left + a.inset.right));
-            a.model.c4 += truncate((a.inset.left + a.inset.right));
+            a.model.c5 += truncate((a.inset.left + a.inset.right));
         }
         g(a) {
             if (a.a == 6) {
@@ -33339,8 +33392,8 @@ let SpatialEngine = /*@__PURE__*/ (() => {
         static p(a, b, c, d, e, f, g) {
             c -= d;
             c -= truncate((a.inset.left + a.inset.right));
-            c -= (g.count * a.model.cv);
-            c -= a.model.dd + a.model.de;
+            c -= (g.count * a.model.cw);
+            c -= a.model.de + a.model.df;
             let h = 0;
             let i = (c) / f;
             if (i < 0) {
@@ -33366,23 +33419,23 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                         l.k = truncate(l.i);
                         if (l.a != 6) {
                             if (l.a != 3) {
-                                e += (l.k) + a.model.cv - truncate(Math.round(l.f(b)));
-                                b.c4 += l.k + a.model.cv;
+                                e += (l.k) + a.model.cw - truncate(Math.round(l.f(b)));
+                                b.c5 += l.k + a.model.cw;
                             }
                             if (l.a == 6) {
-                                let m = (l.k) + a.model.cv;
+                                let m = (l.k) + a.model.cw;
                                 d += m;
                                 c -= m;
                             }
                             else {
-                                let n = (l.k) + a.model.cv - truncate(Math.round(l.f(b)));
+                                let n = (l.k) + a.model.cw - truncate(Math.round(l.f(b)));
                                 d += n;
                                 c -= n;
                             }
                         }
                         else {
                             e += l.k;
-                            b.c4 += l.k + a.model.cv;
+                            b.c5 += l.k + a.model.cw;
                         }
                     }
                 }
@@ -33396,10 +33449,10 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 if (k.contains(p)) {
                     if (p.a != 3) {
                         if (p.d == 1) {
-                            a.model.cz += p.k + a.model.cv;
+                            a.model.c0 += p.k + a.model.cw;
                         }
                         if (p.d == 2) {
-                            a.model.c0 += p.k + a.model.cv;
+                            a.model.c1 += p.k + a.model.cw;
                         }
                     }
                     continue;
@@ -33413,11 +33466,11 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 else {
                     p.k = truncate(Math.floor(q));
                 }
-                e += a.model.cv;
-                d += a.model.cv;
-                h += a.model.cv;
-                o += a.model.cv;
-                b.c4 += a.model.cv;
+                e += a.model.cw;
+                d += a.model.cw;
+                h += a.model.cw;
+                o += a.model.cw;
+                b.c5 += a.model.cw;
                 if (p.a != 3) {
                     if (p.a == 6) {
                         e += p.k;
@@ -33426,12 +33479,12 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                         e += p.k - truncate(Math.round(p.f(b)));
                     }
                     if (p.d == 1) {
-                        a.model.cz += p.k + a.model.cv;
+                        a.model.c0 += p.k + a.model.cw;
                     }
                     if (p.d == 2) {
-                        a.model.c0 += p.k + a.model.cv;
+                        a.model.c1 += p.k + a.model.cw;
                     }
-                    b.c4 += p.k;
+                    b.c5 += p.k;
                 }
                 if (p.a == 6) {
                     d += p.k;
@@ -33442,20 +33495,20 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                     h += p.k - truncate(Math.round(p.f(b)));
                 }
             }
-            a.model.cz = Math.max(0, a.model.cz - a.model.cv);
+            a.model.c0 = Math.max(0, a.model.c0 - a.model.cw);
             if (h < c) {
-                let s = (c - h - a.model.cv);
+                let s = (c - h - a.model.cw);
                 g._inner[g.count - 1].k += s;
                 e += s;
                 d += s;
-                b.c4 += s;
+                b.c5 += s;
             }
             if (h > c) {
-                let t = (c - h - a.model.cv);
+                let t = (c - h - a.model.cw);
                 g._inner[g.count - 1].k += t;
                 e += t;
                 d += t;
-                b.c4 += t;
+                b.c5 += t;
             }
             return e;
         }
@@ -33464,33 +33517,33 @@ let SpatialEngine = /*@__PURE__*/ (() => {
         }
         l(a, b, c) {
             let d = 0;
-            if (b.b9._inner[a].d == 1) {
-                d += this.h(a, b.b9._inner[a].o, 1, b);
+            if (b.ca._inner[a].d == 1) {
+                d += this.h(a, b.ca._inner[a].o, 1, b);
             }
-            if (b.b9._inner[a].d == 0) {
-                d += this.h(b.b9.count, b.b9._inner[a].o, 1, b);
-                d += this.h(a, b.b9._inner[a].o, 0, b);
+            if (b.ca._inner[a].d == 0) {
+                d += this.h(b.ca.count, b.ca._inner[a].o, 1, b);
+                d += this.h(a, b.ca._inner[a].o, 0, b);
             }
-            if (b.b9._inner[a].d == 2) {
-                d += this.h(b.b9.count, b.b9._inner[a].o, 1, b);
-                d += this.h(b.b9.count, b.b9._inner[a].o, 0, b);
-                d += this.h(a, b.b9._inner[a].o, 2, b);
+            if (b.ca._inner[a].d == 2) {
+                d += this.h(b.ca.count, b.ca._inner[a].o, 1, b);
+                d += this.h(b.ca.count, b.ca._inner[a].o, 0, b);
+                d += this.h(a, b.ca._inner[a].o, 2, b);
             }
-            d += truncate(Math.round(b.cf._inner[a].ad(b.b9._inner[a].o)));
+            d += truncate(Math.round(b.cg._inner[a].ad(b.ca._inner[a].o)));
             if (!c) {
-                d = truncate((d + Math.round(b.b9._inner[a].e(b))));
+                d = truncate((d + Math.round(b.ca._inner[a].e(b))));
             }
             return d;
         }
         h(a, b, c, d) {
             let e = 0;
             for (let f = 0; f < a; f++) {
-                if (d.b9._inner[f].d == c) {
-                    e += truncate(Math.round(d.cf._inner[f].ad(b)));
-                    if (d.b9._inner[f].a != 6) {
-                        e += (d.b9._inner[f].k) + d.cv - truncate(Math.round(d.b9._inner[f].f(d)));
+                if (d.ca._inner[f].d == c) {
+                    e += truncate(Math.round(d.cg._inner[f].ad(b)));
+                    if (d.ca._inner[f].a != 6) {
+                        e += (d.ca._inner[f].k) + d.cw - truncate(Math.round(d.ca._inner[f].f(d)));
                     }
-                    e += truncate(Math.round(d.cf._inner[f].af(b)));
+                    e += truncate(Math.round(d.cg._inner[f].af(b)));
                 }
             }
             return e;
@@ -33500,7 +33553,7 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             if (a == 0) {
                 let e = 0;
                 for (let f = 0; f < b; f++) {
-                    if (c.b9._inner[f].d == 0) {
+                    if (c.ca._inner[f].d == 0) {
                         e++;
                     }
                 }
@@ -33522,30 +33575,30 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                         i++;
                     }
                 }
-                d = c.b9.count - 1 - i;
+                d = c.ca.count - 1 - i;
             }
             return d;
         }
         j(a, b) {
-            for (let c = 0; c < b.b9.count; c++) {
-                if (b.b9._inner[c].n == a) {
+            for (let c = 0; c < b.ca.count; c++) {
+                if (b.ca._inner[c].n == a) {
                     return c;
                 }
             }
             return -1;
         }
         n(a, b, c) {
-            let d = c.b9._inner[a].o;
-            let e = truncate(b.inset.left) + c.cz + c.cv;
-            let f = c.cf;
-            let g = c.b9;
+            let d = c.ca._inner[a].o;
+            let e = truncate(b.inset.left) + c.c0 + c.cw;
+            let f = c.cg;
+            let g = c.ca;
             for (let h = 0; h < a; h++) {
                 if (g._inner[h].d != 0) {
                     continue;
                 }
                 e += truncate(Math.round(f._inner[h].ad(d)));
                 if (g._inner[h].a != 6) {
-                    e += (g._inner[h].k) + b.model.cv - truncate(Math.round(g._inner[h].f(c)));
+                    e += (g._inner[h].k) + b.model.cw - truncate(Math.round(g._inner[h].f(c)));
                 }
                 e += truncate(Math.round(f._inner[h].af(d)));
             }
@@ -33557,15 +33610,15 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             let e = 0;
             let f = truncate(b.inset.left);
             e += f;
-            let g = c.cf;
-            let h = (this.d.count > 0 || this.e.count > 0) && c.cd != null;
-            let i = h ? c.cd : c.b9;
+            let g = c.cg;
+            let h = (this.d.count > 0 || this.e.count > 0) && c.ce != null;
+            let i = h ? c.ce : c.ca;
             let j = i.count;
             for (let k = 0; k < j; k++) {
                 let l = i._inner[k];
                 e += truncate(Math.round(g._inner[d].ad(-1)));
                 if (l.a != 6) {
-                    e += (l.k) + b.model.cv - truncate(Math.round(l.f(c)));
+                    e += (l.k) + b.model.cw - truncate(Math.round(l.f(c)));
                 }
                 if (a <= e) {
                     return d;
@@ -33573,16 +33626,16 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 e += truncate(Math.round(g._inner[d].af(-1)));
                 d++;
             }
-            let m = c.b9.count - 1;
+            let m = c.ca.count - 1;
             if (d > m) {
                 d = m;
             }
             return d;
         }
         b(a, b) {
-            let c = b.ce.count;
+            let c = b.cf.count;
             for (let d = 0; d < c; d++) {
-                let e = b.ce._inner[d];
+                let e = b.cf._inner[d];
                 let f = e.i;
                 let g = f + e.l();
                 if (a <= g) {
@@ -33592,23 +33645,23 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                     return e.a(a);
                 }
             }
-            return new RowPath(b.ce.count - 1, b.ce._inner[b.ce.count - 1].m - 1);
+            return new RowPath(b.cf.count - 1, b.cf._inner[b.cf.count - 1].m - 1);
         }
         v(a, b, c, d) {
             this.ab(a, b, d, false);
-            for (let e = b + 1; e < d.b9.count; e++) {
+            for (let e = b + 1; e < d.ca.count; e++) {
                 this.aa(e, d, false, b);
             }
         }
         t(a, b, c) {
-            for (let d = c.b9.count - 1; d >= a; d--) {
+            for (let d = c.ca.count - 1; d >= a; d--) {
                 this.aa(d, c, true, a);
             }
         }
         x(a, b) {
-            for (let c = 0; c < b.cc.count; c++) {
+            for (let c = 0; c < b.cd.count; c++) {
                 let d = new List$1(CellModel.$, 0);
-                let e = b.cc._inner[c];
+                let e = b.cd._inner[c];
                 for (let f = 0; f < e.o.count; f++) {
                     if (e.p._inner[f]) {
                         continue;
@@ -33632,9 +33685,9 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
         }
         y(a, b, c) {
-            for (let d = 0; d < c.cc.count; d++) {
+            for (let d = 0; d < c.cd.count; d++) {
                 let e = new List$1(CellModel.$, 0);
-                let f = c.cc._inner[d];
+                let f = c.cd._inner[d];
                 let g = new List$1(CellPath.$, 0);
                 for (let h = 0; h < f.o.count; h++) {
                     if (f.p._inner[h]) {
@@ -33666,9 +33719,9 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
         }
         aa(a, b, c, d) {
-            for (let e = 0; e < b.cc.count; e++) {
+            for (let e = 0; e < b.cd.count; e++) {
                 let f = new List$1(CellModel.$, 0);
-                let g = b.cc._inner[e];
+                let g = b.cd._inner[e];
                 for (let h = 0; h < g.o.count; h++) {
                     if (g.p._inner[h]) {
                         continue;
@@ -33692,7 +33745,7 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 }
                 g.g = false;
             }
-            let l = b.cf;
+            let l = b.cg;
             if (c) {
                 if (a == l.count - 1) {
                     l.add(new GridColumnSpacerCollection());
@@ -33712,9 +33765,9 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
         }
         ab(a, b, c, d) {
-            for (let e = 0; e < c.cc.count; e++) {
+            for (let e = 0; e < c.cd.count; e++) {
                 let f = new List$1(CellModel.$, 0);
-                let g = c.cc._inner[e];
+                let g = c.cd._inner[e];
                 for (let h = 0; h < g.o.count; h++) {
                     if (g.p._inner[h]) {
                         continue;
@@ -33738,7 +33791,7 @@ let SpatialEngine = /*@__PURE__*/ (() => {
                 }
                 g.g = false;
             }
-            let l = c.cf;
+            let l = c.cg;
             if (b < l.count) {
                 for (let m = l._inner[b].count - 1; m >= 0; m--) {
                     this.a.add(l._inner[b]._inner[m]);
@@ -33747,9 +33800,9 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
         }
         z(a, b) {
-            for (let c = 0; c < b.cc.count; c++) {
+            for (let c = 0; c < b.cd.count; c++) {
                 let d = new List$1(CellModel.$, 0);
-                let e = b.cc._inner[c];
+                let e = b.cd._inner[c];
                 for (let f = 0; f < e.o.count; f++) {
                     if (e.p._inner[f]) {
                         continue;
@@ -33770,20 +33823,20 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
         }
         w(a, b) {
-            for (let c = 0; c < b.b9.count; c++) {
+            for (let c = 0; c < b.ca.count; c++) {
                 this.ab(a, c, b, false);
             }
         }
         u(a, b, c, d, e) {
             this.ab(a, c, b, true);
-            for (let f = c + 1; f < b.b9.count; f++) {
+            for (let f = c + 1; f < b.ca.count; f++) {
                 this.aa(f, b, false, c);
             }
-            for (let g = b.b9.count - 1; g >= d; g--) {
+            for (let g = b.ca.count - 1; g >= d; g--) {
                 this.aa(g, b, true, d);
             }
             this.z(d, b);
-            let h = b.cf;
+            let h = b.cg;
             for (let i = this.a.count - 1; i >= 0; i--) {
                 h._inner[c].add(this.a._inner[i]);
                 this.a.removeAt(i);
@@ -33795,7 +33848,7 @@ let SpatialEngine = /*@__PURE__*/ (() => {
             }
             let c = 0;
             for (let d = 0; d < b.y; d++) {
-                c += a.ce._inner[d].m;
+                c += a.cf._inner[d].m;
             }
             c += b.x;
             return c;
@@ -34214,15 +34267,15 @@ let ColumnInfo = /*@__PURE__*/ (() => {
                     b = b - 1;
                 }
             }
-            return this.g + b * (this.k + a.cv);
+            return this.g + b * (this.k + a.cw);
         }
         f(a) {
-            let b = Math.abs(this.g + this.h * (this.k + a.cv));
-            if (b < (-1 * (this.k + a.cv))) {
-                b = (-1 * (this.k + a.cv));
+            let b = Math.abs(this.g + this.h * (this.k + a.cw));
+            if (b < (-1 * (this.k + a.cw))) {
+                b = (-1 * (this.k + a.cw));
             }
-            if (b > (this.k + a.cv)) {
-                b = (this.k + a.cv);
+            if (b > (this.k + a.cw)) {
+                b = (this.k + a.cw);
             }
             return b;
         }
@@ -34348,19 +34401,19 @@ let VisualModel = /*@__PURE__*/ (() => {
         set absoluteHeight(a) {
             this._absoluteHeight = a;
         }
-        get cr() {
+        get cs() {
             return truncate(this.actualVisibleRegion.top);
         }
-        get cm() {
+        get cn() {
             return truncate(this.actualVisibleRegion.left);
         }
-        get cp() {
+        get cq() {
             return truncate(this.actualVisibleRegion.right);
         }
-        get ch() {
+        get ci() {
             return truncate(this.actualVisibleRegion.height);
         }
-        get cs() {
+        get ct() {
             return truncate(this.actualVisibleRegion.width);
         }
         get bm() {
@@ -34368,252 +34421,252 @@ let VisualModel = /*@__PURE__*/ (() => {
         }
         set bm(a) {
             this.am = a;
-            this.dn();
+            this.dp();
         }
         get a1() {
             return this.r;
         }
         set a1(a) {
             this.r = a;
-            this.dn();
+            this.dp();
         }
         get at() {
             return this.j;
         }
         set at(a) {
             this.j = a;
-            this.dn();
+            this.dp();
         }
         get bg() {
             return this.ag;
         }
         set bg(a) {
             this.ag = a;
-            this.dn();
+            this.dp();
         }
         get av() {
             return this.l;
         }
         set av(a) {
             this.l = a;
-            this.dn();
+            this.dp();
         }
         get bp() {
             return this.ap;
         }
         set bp(a) {
             this.ap = a;
-            this.dn();
+            this.dp();
         }
         get a4() {
             return this.u;
         }
         set a4(a) {
             this.u = a;
-            this.dn();
+            this.dp();
         }
         get ay() {
             return this.o;
         }
         set ay(a) {
             this.o = a;
-            this.dn();
+            this.dp();
         }
         get ba() {
             return this.aa;
         }
         set ba(a) {
             this.aa = a;
-            this.dn();
+            this.dp();
         }
         get a0() {
             return this.q;
         }
         set a0(a) {
             this.q = a;
-            this.dn();
+            this.dp();
         }
         get au() {
             return this.k;
         }
         set au(a) {
             this.k = a;
-            this.dn();
+            this.dp();
         }
         get bo() {
             return this.ao;
         }
         set bo(a) {
             this.ao = a;
-            this.dn();
+            this.dp();
         }
         get a3() {
             return this.t;
         }
         set a3(a) {
             this.t = a;
-            this.dn();
+            this.dp();
         }
         get a2() {
             return this.s;
         }
         set a2(a) {
             this.s = a;
-            this.dn();
+            this.dp();
         }
         get bn() {
             return this.an;
         }
         set bn(a) {
             this.an = a;
-            this.dn();
+            this.dp();
         }
         get a8() {
             return this.y;
         }
         set a8(a) {
             this.y = a;
-            this.dn();
+            this.dp();
         }
         get a7() {
             return this.x;
         }
         set a7(a) {
             this.x = a;
-            this.dn();
+            this.dp();
         }
         get aw() {
             return this.m;
         }
         set aw(a) {
             this.m = a;
-            this.dn();
+            this.dp();
         }
         get br() {
             return this.ar;
         }
         set br(a) {
             this.ar = a;
-            this.dn();
+            this.dp();
         }
         get a6() {
             return this.w;
         }
         set a6(a) {
             this.w = a;
-            this.dn();
+            this.dp();
         }
         get a5() {
             return this.v;
         }
         set a5(a) {
             this.v = a;
-            this.dn();
+            this.dp();
         }
         get bq() {
             return this.aq;
         }
         set bq(a) {
             this.aq = a;
-            this.dn();
+            this.dp();
         }
         get ax() {
             return this.n;
         }
         set ax(a) {
             this.n = a;
-            this.dn();
+            this.dp();
         }
         get a9() {
             return this.z;
         }
         set a9(a) {
             this.z = a;
-            this.dn();
+            this.dp();
         }
         get az() {
             return this.p;
         }
         set az(a) {
             this.p = a;
-            this.dn();
+            this.dp();
         }
         get bh() {
             return this.ah;
         }
         set bh(a) {
             this.ah = a;
-            this.dn();
+            this.dp();
         }
         get bb() {
             return this.ab;
         }
         set bb(a) {
             this.ab = a;
-            this.dn();
+            this.dp();
         }
         get bc() {
             return this.ac;
         }
         set bc(a) {
             this.ac = a;
-            this.dn();
+            this.dp();
         }
         get bd() {
             return this.ad;
         }
         set bd(a) {
             this.ad = a;
-            this.dn();
+            this.dp();
         }
         get bi() {
             return this.ai;
         }
         set bi(a) {
             this.ai = a;
-            this.dn();
+            this.dp();
         }
         get be() {
             return this.ae;
         }
         set be(a) {
             this.ae = a;
-            this.dn();
+            this.dp();
         }
         get bf() {
             return this.af;
         }
         set bf(a) {
             this.af = a;
-            this.dn();
+            this.dp();
         }
         get bj() {
             return this.aj;
         }
         set bj(a) {
             this.aj = a;
-            this.dn();
+            this.dp();
         }
         get bl() {
             return this.al;
         }
         set bl(a) {
             this.al = a;
-            this.dn();
+            this.dp();
         }
         get bk() {
             return this.ak;
         }
         set bk(a) {
             this.ak = a;
-            this.dn();
+            this.dp();
         }
         get bs() {
             return this.as;
         }
         set bs(a) {
             this.as = a;
-            this.dn();
+            this.dp();
         }
         get bu() {
             return this.bt;
@@ -34624,7 +34677,7 @@ let VisualModel = /*@__PURE__*/ (() => {
         f(a, b) {
             a += this.actualVisibleRegion.left;
             b += this.actualVisibleRegion.top;
-            let c = this.cc;
+            let c = this.cd;
             let d = c.count;
             for (let e = d - 1; e >= 0; e--) {
                 if (c._inner[e] == this.at) {
@@ -34651,7 +34704,7 @@ let VisualModel = /*@__PURE__*/ (() => {
                     return k;
                 }
             }
-            c = this.cc;
+            c = this.cd;
             d = c.count;
             for (let l = d - 1; l >= 0; l--) {
                 let m = c._inner[l].q;
@@ -34676,14 +34729,14 @@ let VisualModel = /*@__PURE__*/ (() => {
         set bz(a) {
             this.by = a;
         }
-        get cf() {
-            while (this.b8.count < this.b9.count) {
-                this.b8.add(new GridColumnSpacerCollection());
+        get cg() {
+            while (this.b9.count < this.ca.count) {
+                this.b9.add(new GridColumnSpacerCollection());
             }
-            return this.b8;
+            return this.b9;
         }
-        set cf(a) {
-            this.b8 = a;
+        set cg(a) {
+            this.b9 = a;
         }
         b4() {
             if (this.bx != null && this.bw != null && this.bx.x >= 0 && this.bw.x >= 0) {
@@ -34692,48 +34745,48 @@ let VisualModel = /*@__PURE__*/ (() => {
             return false;
         }
         h(a) {
-            if (a == this.di) {
+            if (a == this.dj) {
                 return this.g;
             }
             let b = null;
-            if (this.b6.containsKey(a)) {
-                b = this.b9._inner[this.b6.item(a)];
+            if (this.b7.containsKey(a)) {
+                b = this.ca._inner[this.b7.item(a)];
             }
-            this.di = a;
+            this.dj = a;
             this.g = b;
             return b;
         }
-        dj(a) {
-            this.b9.add(a);
-            this.b6.addItem(a.o, this.b9.count - 1);
+        dk(a) {
+            this.ca.add(a);
+            this.b7.addItem(a.o, this.ca.count - 1);
         }
         constructor() {
             super();
             this._actualVisibleRegion = null;
             this._absoluteWidth = 0;
             this._absoluteHeight = 0;
-            this.c3 = 0;
-            this.c6 = 0;
+            this.c4 = 0;
             this.c7 = 0;
-            this.c1 = 0;
-            this.cz = 0;
+            this.c8 = 0;
+            this.c2 = 0;
             this.c0 = 0;
-            this.cv = 0;
-            this.dd = 0;
+            this.c1 = 0;
+            this.cw = 0;
             this.de = 0;
-            this.cn = 0;
+            this.df = 0;
             this.co = 0;
-            this.cx = 0;
+            this.cp = 0;
             this.cy = 0;
-            this.c4 = 0;
-            this.da = 0;
-            this.cq = 0;
-            this.cj = 0;
+            this.cz = 0;
+            this.c5 = 0;
+            this.db = 0;
+            this.cr = 0;
             this.ck = 0;
             this.cl = 0;
-            this.ci = 0;
-            this.c2 = 0;
-            this.cw = 0;
+            this.cm = 0;
+            this.cj = 0;
+            this.c3 = 0;
+            this.cx = 0;
             this.am = null;
             this.r = null;
             this.j = null;
@@ -34775,28 +34828,29 @@ let VisualModel = /*@__PURE__*/ (() => {
             this.bv = null;
             this.d = null;
             this.by = null;
+            this.cf = null;
+            this.ca = null;
             this.ce = null;
-            this.b9 = null;
-            this.cd = null;
             this.b3 = false;
             this.b5 = false;
+            this.b6 = false;
             this.b2 = false;
-            this.b8 = new List$1(GridColumnSpacerCollection.$, 0);
-            this.b6 = null;
+            this.b9 = new List$1(GridColumnSpacerCollection.$, 0);
+            this.b7 = null;
             this.bx = null;
             this.bw = null;
-            this.di = -1;
+            this.dj = -1;
             this.g = null;
-            this.b7 = null;
-            this.cg = null;
-            this.c8 = 0;
-            this.db = 0;
+            this.b8 = null;
+            this.ch = null;
             this.c9 = 0;
             this.dc = 0;
+            this.da = 0;
+            this.dd = 0;
             this.b1 = false;
-            this.dg = 0;
             this.dh = 0;
-            this.df = 0;
+            this.di = 0;
+            this.dg = 0;
             this.actualVisibleRegion = Rect.empty;
             this.am = new GridLayer("SubContentLayer");
             this.j = new GridLayer("ContentLayer");
@@ -34836,62 +34890,62 @@ let VisualModel = /*@__PURE__*/ (() => {
             this.o = new GridLayer("FixedMergedCellsLayer");
             this.aa = new GridLayer("PinnedRowsMergedCellsLayer");
             this.by = new FastIterationDictionary$2(CellPath.$, List$1.$.specialize(CellModel.$), 0);
-            this.dn();
-            this.ce = new List$1(SectionInfo.$, 0);
-            this.b9 = new List$1(ColumnInfo.$, 0);
-            this.b6 = new Dictionary$2(Number_$type, Number_$type, 0);
-            this.cg = new List$1(Number_$type, 0);
+            this.dp();
+            this.cf = new List$1(SectionInfo.$, 0);
+            this.ca = new List$1(ColumnInfo.$, 0);
+            this.b7 = new Dictionary$2(Number_$type, Number_$type, 0);
+            this.ch = new List$1(Number_$type, 0);
+        }
+        dp() {
+            this.b8 = new List$1(GridLayer.$, 0);
+            this.b8.add(this.bm);
+            this.b8.add(this.at);
+            this.b8.add(this.bg);
+            this.b8.add(this.bp);
+            this.b8.add(this.au);
+            this.b8.add(this.bb);
+            this.b8.add(this.a9);
+            this.b8.add(this.bc);
+            this.b8.add(this.a1);
+            this.b8.add(this.av);
+            this.b8.add(this.a4);
+            this.b8.add(this.az);
+            this.b8.add(this.bh);
+            this.b8.add(this.ba);
+            this.b8.add(this.ay);
+            this.b8.add(this.a0);
+            this.b8.add(this.bl);
+            this.b8.add(this.bk);
+            this.b8.add(this.be);
+            this.b8.add(this.bd);
+            this.b8.add(this.bi);
+            this.b8.add(this.bf);
+            this.b8.add(this.bj);
+            this.b8.add(this.bo);
+            this.b8.add(this.bn);
+            this.b8.add(this.a8);
+            this.b8.add(this.a7);
+            this.b8.add(this.br);
+            this.b8.add(this.bq);
+            this.b8.add(this.a3);
+            this.b8.add(this.a2);
+            this.b8.add(this.ax);
+            this.b8.add(this.aw);
+            this.b8.add(this.a6);
+            this.b8.add(this.a5);
+            this.b8.add(this.bs);
         }
-        dn() {
-            this.b7 = new List$1(GridLayer.$, 0);
-            this.b7.add(this.bm);
-            this.b7.add(this.at);
-            this.b7.add(this.bg);
-            this.b7.add(this.bp);
-            this.b7.add(this.au);
-            this.b7.add(this.bb);
-            this.b7.add(this.a9);
-            this.b7.add(this.bc);
-            this.b7.add(this.a1);
-            this.b7.add(this.av);
-            this.b7.add(this.a4);
-            this.b7.add(this.az);
-            this.b7.add(this.bh);
-            this.b7.add(this.ba);
-            this.b7.add(this.ay);
-            this.b7.add(this.a0);
-            this.b7.add(this.bl);
-            this.b7.add(this.bk);
-            this.b7.add(this.be);
-            this.b7.add(this.bd);
-            this.b7.add(this.bi);
-            this.b7.add(this.bf);
-            this.b7.add(this.bj);
-            this.b7.add(this.bo);
-            this.b7.add(this.bn);
-            this.b7.add(this.a8);
-            this.b7.add(this.a7);
-            this.b7.add(this.br);
-            this.b7.add(this.bq);
-            this.b7.add(this.a3);
-            this.b7.add(this.a2);
-            this.b7.add(this.ax);
-            this.b7.add(this.aw);
-            this.b7.add(this.a6);
-            this.b7.add(this.a5);
-            this.b7.add(this.bs);
-        }
-        get cc() {
-            return this.b7;
+        get cd() {
+            return this.b8;
         }
         b0() {
-            for (let a = 0; a < this.b7.count; a++) {
-                for (let b = 0; b < this.b7._inner[a].o.count; b++) {
-                    if (this.b7._inner[a].p._inner[b]) {
+            for (let a = 0; a < this.b8.count; a++) {
+                for (let b = 0; b < this.b8._inner[a].o.count; b++) {
+                    if (this.b8._inner[a].p._inner[b]) {
                         continue;
                     }
-                    let c = this.b7._inner[a].o._inner[b];
-                    let d = this.b7._inner[a].q._inner[b];
+                    let c = this.b8._inner[a].o._inner[b];
+                    let d = this.b8._inner[a].q._inner[b];
                     if (c != d.l) {
                         return false;
                     }
@@ -34899,15 +34953,15 @@ let VisualModel = /*@__PURE__*/ (() => {
             }
             return true;
         }
-        dm() {
+        dn() {
             this.g = null;
-            this.di = -1;
-            this.b9.clear();
-            this.b6.clear();
+            this.dj = -1;
+            this.ca.clear();
+            this.b7.clear();
         }
-        dl() {
-            this.dm();
-            this.ce.clear();
+        dm() {
+            this.dn();
+            this.cf.clear();
             this.bm.u();
             this.at.u();
             this.bp.u();
@@ -34943,18 +34997,18 @@ let VisualModel = /*@__PURE__*/ (() => {
             a.ao = new RectData(this.actualVisibleRegion.x, this.actualVisibleRegion.y, this.actualVisibleRegion.width, this.actualVisibleRegion.height);
             a.ar = this.absoluteWidth;
             a.aq = this.absoluteHeight;
-            a.a4 = this.c6;
-            a.ax = this.c3;
-            a.aw = this.c1;
-            a.au = this.cz;
-            a.av = this.c0;
-            a.as = this.cv;
-            a.a0 = this.dd;
-            a.a1 = this.de;
-            a.a2 = this.cr;
-            a.az = this.cm;
-            a.ay = this.ch;
-            a.a3 = this.cs;
+            a.a4 = this.c7;
+            a.ax = this.c4;
+            a.aw = this.c2;
+            a.au = this.c0;
+            a.av = this.c1;
+            a.as = this.cw;
+            a.a0 = this.de;
+            a.a1 = this.df;
+            a.a2 = this.cs;
+            a.az = this.cn;
+            a.ay = this.ci;
+            a.a3 = this.ct;
             a.ae = this.a(this.bm);
             a.a = this.a(this.at);
             a.ah = this.a(this.bp);
@@ -35002,7 +35056,7 @@ let VisualModel = /*@__PURE__*/ (() => {
             for (let d of fromEnum(a.n)) {
                 let e = d.b(null);
                 if (this.b1 && c) {
-                    e.s += this.cr;
+                    e.s += this.cs;
                 }
                 b.e(e);
             }
@@ -35015,11 +35069,11 @@ let VisualModel = /*@__PURE__*/ (() => {
             f.f = d;
             f.n = b.o;
             f.d = e;
-            this.cf._inner[a].add(f);
+            this.cg._inner[a].add(f);
             return f;
         }
-        dk(a) {
-            let b = this.cf;
+        dl(a) {
+            let b = this.cg;
             for (let c = 0; c < b.count; c++) {
                 let d = b._inner[c];
                 for (let e = d.count - 1; e >= 0; e--) {
@@ -35029,9 +35083,9 @@ let VisualModel = /*@__PURE__*/ (() => {
                 }
             }
         }
-        cb(a) {
+        cc(a) {
             let b = new List$1(GridColumnSpacer.$, 0);
-            let c = this.cf;
+            let c = this.cg;
             for (let d = 0; d < c.count; d++) {
                 let e = c._inner[d];
                 for (let f = e.count - 1; f >= 0; f--) {
@@ -35042,11 +35096,11 @@ let VisualModel = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        ca(a) {
+        cb(a) {
             let b = new List$1(CellModel.$, 0);
-            for (let c = 0; c < this.cc.count; c++) {
+            for (let c = 0; c < this.cd.count; c++) {
                 let d = new List$1(CellModel.$, 0);
-                let e = this.cc._inner[c];
+                let e = this.cd._inner[c];
                 for (let f = 0; f < e.o.count; f++) {
                     if (e.p._inner[f]) {
                         continue;
@@ -35060,8 +35114,8 @@ let VisualModel = /*@__PURE__*/ (() => {
             return b;
         }
         e(a, b, c = 1) {
-            for (let d = 0; d < this.cc.count; d++) {
-                let e = this.cc._inner[d];
+            for (let d = 0; d < this.cd.count; d++) {
+                let e = this.cd._inner[d];
                 for (let f = 0; f < e.o.count; f++) {
                     if (e.p._inner[f]) {
                         continue;
@@ -35074,10 +35128,10 @@ let VisualModel = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        c5() {
+        c6() {
             let a = 0;
-            for (let b = 0; b < this.ce.count; b++) {
-                a += this.ce._inner[b].m;
+            for (let b = 0; b < this.cf.count; b++) {
+                a += this.cf._inner[b].m;
             }
             return a;
         }