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

package/esm5/lib/ColumnFilterCondition_combined.js

@@ -6845,7 +6845,7 @@ export var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             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();
@@ -6856,7 +6856,7 @@ export var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
                 var c = this.b.getItemAtIndex(b);
                 this.ac.add1(c);
                 if (c != null) {
-                    this.d.ef = true;
+                    this.d.ei = true;
                 }
             }
             var d = new Array(this.ac.count);
@@ -6867,7 +6867,7 @@ export var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             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 {
@@ -6898,7 +6898,7 @@ export var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             this.b.summaryScope = this.p;
             var 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:
@@ -7650,7 +7650,7 @@ export var EditingManager = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         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;
@@ -8538,7 +8538,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             this.iv = false;
             if (this.selectionMode == 5) {
                 if (a.l.aj && !a.l.a1) {
-                    var g = this.model.b9._inner[a.l.a6].n;
+                    var g = this.model.ca._inner[a.l.a6].n;
                     if (this.selectionBehavior == 1) {
                         if (b) {
                             this.y7(a.l.x, g);
@@ -8699,10 +8699,10 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.dragger != null && this.columnResizingMode != 2 && this.ap.h) {
             var d = this.az.j._inner[a.l.a6];
             if (d.kd) {
-                var e = this.model.b9._inner[this.ap.a6];
+                var 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;
                 var f = this.dragger.view.transformPoint(b, c);
@@ -8721,8 +8721,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGrid.prototype.xa = function (a, b, c) {
         var d = 0;
-        for (var e = 0; e < this.model.b9.count; e++) {
-            var f = this.model.b9._inner[e];
+        for (var e = 0; e < this.model.ca.count; e++) {
+            var f = this.model.ca._inner[e];
             d += f.k;
         }
         var g = this.dragger.view.transformPoint(b, c);
@@ -8812,7 +8812,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 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);
@@ -8858,7 +8858,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             this.externalGrid.setDefaultCursor();
             if (this.columnResizingMode == 0) {
                 if (this.md != -1) {
-                    var c = this.model.b9._inner[this.dragger.cellPath.a6];
+                    var 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");
                 }
@@ -8949,8 +8949,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             var c = this.dragger.cellPath.a6;
             var d = this.oz;
             this.fq = 0;
-            for (var e = 0; e < this.model.b9.count; e++) {
-                var f = this.model.b9._inner[e];
+            for (var e = 0; e < this.model.ca.count; e++) {
+                var f = this.model.ca._inner[e];
                 if (f.a == 3) {
                     continue;
                 }
@@ -8965,13 +8965,13 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     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;
@@ -9011,16 +9011,16 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         this.md = Math.max(this.mq + b, Math.max(c, 10));
         var d = 20;
         if (a.iu == 1) {
-            d = Math.min(20, this.actualVisibleRegion.width - this.model.cz);
-            var e = this.actualVisibleRegion.width - d - this.model.c0;
+            d = Math.min(20, this.actualVisibleRegion.width - this.model.c0);
+            var e = this.actualVisibleRegion.width - d - this.model.c1;
             var 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);
-            var g = this.actualVisibleRegion.width - d - this.model.cz;
+            d = Math.min(20, this.actualVisibleRegion.width - this.model.c1);
+            var g = this.actualVisibleRegion.width - d - this.model.c0;
             var h = this.mo + (this.md - this.mq);
             if (h > g) {
                 this.md = this.md - (h - g);
@@ -9136,10 +9136,10 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             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) {
@@ -9154,7 +9154,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             var o = new Rect(0, n.db, n.dc, n.ib, n.gd);
             if (a.intersectsWith(o)) {
-                var p = this.model.b9._inner[n.l.a6].n;
+                var p = this.model.ca._inner[n.l.a6].n;
                 var q = Math.abs(n.l.x - b);
                 var r = Math.abs(Math.max(0, p) - c);
                 var s = Math.abs(j - b);
@@ -12020,7 +12020,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     });
     Object.defineProperty(DataGrid.prototype, "actualVisibleRegion", {
         get: function () {
-            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);
         },
         enumerable: false,
         configurable: true
@@ -12665,6 +12665,10 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 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") {
@@ -12729,7 +12733,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         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();
             }
         }
@@ -12757,6 +12761,17 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             this.za();
         }
+        if (a == "SummaryRowRoot") {
+            if (b != null) {
+                var 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;
@@ -12769,8 +12784,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             this.i6 = false;
         }
         if (a == "ReactsToSortChanges") {
-            var ac = c;
-            if (!ac) {
+            var ad = c;
+            if (!ad) {
                 this.sortDescriptions.b = null;
             }
             else {
@@ -12780,8 +12795,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         if (a == "ReactsToGroupChanges") {
-            var ad = c;
-            if (!ad) {
+            var ae = c;
+            if (!ae) {
                 this.groupDescriptions.b = null;
             }
             else {
@@ -12791,8 +12806,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         if (a == "ReactsToFilterChanges") {
-            var ae = c;
-            if (!ae) {
+            var af = c;
+            if (!af) {
                 this.filterExpressions.syncTarget = null;
             }
             else {
@@ -12848,8 +12863,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (a == "HeaderHeight") {
             this.x1();
-            var af = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
-            this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + af);
+            var 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);
@@ -12871,8 +12886,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (a == "FilterUIType") {
             this.za();
-            var ag = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
-            this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + ag);
+            var ah = this.j9() ? this.actualRowHeight + this.rowSeparatorHeight : 0;
+            this.externalGrid.setScrollerVerticalTrackInset(this.actualHeaderHeight + this.rowSeparatorHeight + ah);
         }
         if (a == "ScrollbarStyle") {
             this.externalGrid.setScrollbarStyle(this.scrollbarStyle);
@@ -13008,8 +13023,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a != null && stringStartsWith(a, "Actual")) {
             a = a.substr(6);
         }
-        for (var e = 0; e < this.model.b9.count; e++) {
-            var f = this.model.b9._inner[e];
+        for (var e = 0; e < this.model.ca.count; e++) {
+            var f = this.model.ca._inner[e];
             this.c8.s(this, f, a, b, c, d, true, false, false, true);
         }
     };
@@ -13463,7 +13478,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         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);
@@ -13592,7 +13607,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     DataGrid.prototype.cg = function (a) {
         var b = a ? 1 : 2;
         var c = this.actualColumns;
-        var d = this.model.cg;
+        var d = this.model.ch;
         var e = d.count - 1;
         var f = a ? 0 : e;
         var g = d._inner[f];
@@ -13611,7 +13626,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGrid.prototype.cf = function (a) {
         var b = this.actualColumns;
-        var c = this.model.cg;
+        var c = this.model.ch;
         var d = c.count - 1;
         var e = a ? 0 : d;
         var f = c._inner[e];
@@ -13634,7 +13649,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     DataGrid.prototype.xp = function (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;
         var d = c.hy;
         this.ge.u(this.d4, this.model, a, b, c.lr);
         if (!this.j0(c) && d != 3) {
@@ -13842,7 +13857,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var e = 0;
         try {
-            for (var _b = __values(fromEnum(this.model.ce)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(this.model.cf)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
                 if (d + f.m > a) {
                     e = truncate(Math.floor(a - d));
@@ -13869,7 +13884,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_16.error;
             }
         }
-        var h = this.gm.n(this, this.model, new Rect(0, b, c, this.model.cs, this.model.ch));
+        var h = this.gm.n(this, this.model, new Rect(0, b, c, this.model.ct, this.model.ci));
         var i = -1;
         var j = -1;
         var k = false;
@@ -13944,7 +13959,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var e = 0;
         try {
-            for (var _b = __values(fromEnum(this.model.ce)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(this.model.cf)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
                 if (d + f.m > a) {
                     var g = truncate(Math.floor(a - d));
@@ -13972,10 +13987,10 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_17.error;
             }
         }
-        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));
@@ -14009,9 +14024,9 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             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;
         }
         var c = this.columns._inner[b];
         if (c.iu != 0) {
@@ -14022,8 +14037,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.no != -1) {
             e = this.no;
         }
-        var f = d + truncate((this.model.b9._inner[b].k * (a - b)));
-        f -= this.model.cz;
+        var 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));
         }
@@ -14040,9 +14055,9 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             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;
         }
         var c = this.columns._inner[b];
         var d = this.ge.k(b, this, this.model);
@@ -14050,10 +14065,10 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.no != -1) {
             e = this.no;
         }
-        var f = d + truncate((this.model.b9._inner[b].k * (a - b)));
-        var g = this.model.actualVisibleRegion.width - this.model.c0;
+        var f = d + truncate((this.model.ca._inner[b].k * (a - b)));
+        var 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));
@@ -14094,7 +14109,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             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 {
@@ -14134,11 +14149,11 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.ge.i(this.model, this.model.bx);
     };
     DataGrid.prototype.of = function () {
-        var a = this.ge.b(this.model.actualVisibleRegion.top + this.model.c6 + this.model.c7 + this.model.dg, this.model);
+        var 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);
     };
     DataGrid.prototype.ok = function () {
-        var a = this.ge.b(this.model.actualVisibleRegion.bottom - this.model.df, this.model);
+        var a = this.ge.b(this.model.actualVisibleRegion.bottom - this.model.dg, this.model);
         return this.ge.i(this.model, a);
     };
     DataGrid.prototype.y0 = function () {
@@ -14354,8 +14369,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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) {
@@ -14371,13 +14386,13 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.ny = c;
             }
             if (this.nx == -1) {
-                this.nx = this.model.b9._inner[f].n;
+                this.nx = this.model.ca._inner[f].n;
             }
             var 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 {
@@ -14423,7 +14438,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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;
     };
     DataGrid.prototype.oj = function (a) {
@@ -14476,14 +14491,14 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (this.actualColumns._inner[c].kc) {
             var d = c;
-            var e = this.model.b9._inner[c].n;
+            var 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);
@@ -14512,14 +14527,14 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         a = Math.min(a, this.actualColumns.count - 1);
         if (this.actualColumns._inner[a].kc) {
             var b = a;
-            var c = this.model.b9._inner[b].n;
+            var 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);
@@ -14538,16 +14553,16 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (d === void 0) {
             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);
             }
         }
@@ -14600,7 +14615,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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;
     };
     DataGrid.prototype.k4 = function (a, b) {
@@ -14614,14 +14629,14 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             return this.k2(false, false);
         }
         var c = this.ae.s();
-        var d = this.model.b9._inner[c].n;
+        var d = this.model.ca._inner[c].n;
         var e = this.di.b;
         var f = this.di.d;
         if (f == null) {
             return false;
         }
         var g = this.oo(d, false);
-        var h = this.model.b9._inner[g].n;
+        var h = this.model.ca._inner[g].n;
         var i = this.actualColumns._inner[g];
         if (f == i.nx()) {
             return false;
@@ -14633,9 +14648,9 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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) {
@@ -14685,7 +14700,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 return $ret;
             })());
         }
-        this.vo(h, this.model.b9._inner[d].n, true);
+        this.vo(h, this.model.ca._inner[d].n, true);
         return true;
     };
     DataGrid.prototype.k6 = function (a, b) {
@@ -14713,7 +14728,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 return $ret;
             })());
         }
-        this.vo(h, this.model.b9._inner[d].n, false);
+        this.vo(h, this.model.ca._inner[d].n, false);
         return true;
     };
     DataGrid.prototype.k7 = function (a, b) {
@@ -14727,14 +14742,14 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             return this.ky(false, false);
         }
         var c = this.ae.s();
-        var d = this.model.b9._inner[c].n;
+        var d = this.model.ca._inner[c].n;
         var e = this.di.b;
         var f = this.di.d;
         if (f == null) {
             return false;
         }
         var g = this.on(d, false);
-        var h = this.model.b9._inner[g].n;
+        var h = this.model.ca._inner[g].n;
         var i = this.actualColumns._inner[g];
         if (f == i.nx()) {
             return false;
@@ -14746,9 +14761,9 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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) {
@@ -14803,7 +14818,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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);
     };
     DataGrid.prototype.k9 = function (a, b) {
         if (this.activationMode == 0 || this.activeCell == null) {
@@ -14816,7 +14831,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             return true;
         }
         var c = this.ae.s();
-        var d = this.model.b9._inner[c].n;
+        var d = this.model.ca._inner[c].n;
         var e = this.di.b;
         var f = this.di.d;
         var g = e;
@@ -14856,7 +14871,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                         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) {
@@ -14891,7 +14906,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                         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) {
@@ -14914,7 +14929,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     $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();
             }
         }
@@ -14925,7 +14940,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 $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;
     };
@@ -14971,8 +14986,8 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             $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) {
@@ -14988,13 +15003,13 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.ny = c;
             }
             if (this.nx == -1) {
-                this.nx = this.model.b9._inner[f].n;
+                this.nx = this.model.ca._inner[f].n;
             }
             var 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 {
@@ -15176,7 +15191,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this.cm.ad(a);
         if (a.y == 0) {
-            var d = this.model.b9._inner[a.l.a6].n;
+            var d = this.model.ca._inner[a.l.a6].n;
             this.vo(a.l.x, d, false, a.bq);
         }
         this.nh = a.l.x;
@@ -15662,13 +15677,14 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this.c8.z(this, a, b, true);
         this.model.b5 = true;
+        this.model.b6 = true;
         this.zb();
     };
     DataGrid.prototype.og = function () {
-        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);
     };
     DataGrid.prototype.ol = function () {
-        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);
     };
     DataGrid.prototype.wl = function (a, b) {
         var c = this.ge.i(this.model, a);
@@ -16344,11 +16360,11 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                             for (var o = 0; o < m.count; o++) {
                                 var p = m._inner[o];
                                 var 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;
                                 }
-                                var r = this.model.b9._inner[q];
+                                var r = this.model.ca._inner[q];
                                 var s = this.az.f(r.o);
                                 var t = s != null ? this.actualColumns.indexOf(s) : -1;
                                 n.add(new Tuple$2(DataGridColumn.$, Number_$type, s, t));
@@ -16473,7 +16489,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                             }
                             ak.aa(function (an, ao) { return Base.compareSimple(an.c, ao.c); });
                             var an = new StringBuilder(0);
-                            var ao = this.model.cg;
+                            var ao = this.model.ch;
                             for (var ap = 0; ap < ak.count; ap++) {
                                 if (ap > 0) {
                                     an.t();
@@ -17039,7 +17055,7 @@ export var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGrid.prototype.oi = function (a) {
         var 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;
@@ -18171,7 +18187,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                         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;
@@ -18179,7 +18195,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                         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;
@@ -18387,12 +18403,12 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         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;
         }
@@ -18548,7 +18564,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                     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;
@@ -18556,7 +18572,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                     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;
@@ -18816,9 +18832,9 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         var j = new GridEffectGroup(1);
         j.effectsFinished = delegateCombine(j.effectsFinished, function (k, l) {
             var m = a.model.h(c.o);
-            var n = a.model.cb(m);
+            var n = a.model.cc(m);
             for (var o_1 = 0; o_1 < n.count; o_1++) {
-                a.model.dk(n._inner[o_1]);
+                a.model.dl(n._inner[o_1]);
             }
             h.hy = 5;
             a.za();
@@ -18845,15 +18861,15 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         }
         var 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);
         }
-        var q = a.model.cb(c);
+        var q = a.model.cc(c);
         for (var r = 0; r < q.count; r++) {
             q._inner[r].e = true;
         }
         var s = c.m;
         var t = null;
-        var u = a.model.cf;
+        var u = a.model.cg;
         if (u._inner[s].count > 0) {
             for (var v = 0; v < u._inner[s].count; v++) {
                 if (u._inner[s]._inner[v].n == c.o) {
@@ -18889,7 +18905,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         var af = c.m;
         var ag = a.ge.k(c.m, a, a.model);
         var 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 = function (ai, aj, ak, al, am) {
             var an = ak;
@@ -18914,7 +18930,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                     ap.h = av + (an - av) * ai;
                 }
                 if (!ad) {
-                    var aw = a.model.ca(ap);
+                    var aw = a.model.cb(ap);
                     for (var ax = 0; ax < aw.count; ax++) {
                         var ay = aw._inner[ax];
                         ay.cz += (ae - ap.h);
@@ -18922,7 +18938,7 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                 }
                 ae = ap.h;
                 af = ap.m;
-                var az = a.model.cb(ap);
+                var az = a.model.cc(ap);
                 ah = _this.n(a, ap, ap.m);
                 ag = _this.q(a, ap, ag, az, ah);
             }
@@ -18961,18 +18977,18 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         a.dz.t(c, ai);
     };
     GridAnimationManager.at = function (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) {
-            var f = a.absoluteWidth - a.ck - a.cp;
+        if (a.cq < a.absoluteWidth - a.cl) {
+            var f = a.absoluteWidth - a.cl - a.cq;
             if (b.d == 2) {
                 d -= truncate(f);
             }
@@ -19100,11 +19116,11 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
                 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;
@@ -19233,374 +19249,387 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
     GridAnimationManager.prototype.r = function (a, b, c, d, e, f, g) {
         var _this = this;
         if (!a.model.b4()) {
-            if (a.filterUIType != 1 && g != 11) {
+            var 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;
             }
         }
-        var h = this.p();
-        this.x(h);
-        var i = this.g.u;
+        var i = this.p();
+        this.x(i);
+        var j = this.g.u;
         if (a.columnAnimationSettings != null && a.columnAnimationSettings.u != null) {
-            i = a.columnAnimationSettings.u;
+            j = a.columnAnimationSettings.u;
         }
-        var j = a.columnPropertyUpdatingAnimationMode;
-        var k = new ColumnCellsEffect();
-        k.bx(i);
-        k.t = 8;
-        k.as = true;
+        var k = a.columnPropertyUpdatingAnimationMode;
+        var 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, function (l) { return _this.w(h); });
-        k.onCanceled = delegateCombine(k.onCanceled, function (l, m) { return _this.v(h); });
-        if (j == 0) {
-            j = 2;
+        l.bs = c;
+        l.al = true;
+        l.bq = f;
+        l.onFinished = delegateCombine(l.onFinished, function (m) { return _this.w(i); });
+        l.onCanceled = delegateCombine(l.onCanceled, function (m, n) { return _this.v(i); });
+        if (k == 0) {
+            k = 2;
         }
         if (d == 11) {
-            k.x = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+            l.x = function (m, n, o, p, q) {
+                var 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 = function (l, m, n, o, p) {
-                var 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 = function (m, n, o, p, q) {
+                var 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 = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+        if (k == 3 && d == 1) {
+            l.x = function (m, n, o, p, q) {
+                var r = p;
+                if (r.w != g) {
                     return;
                 }
-                if (m == null) {
-                    m = 0;
+                if (n == null) {
+                    n = 0;
                 }
-                var r = m;
                 var s = n;
-                var t = r + (s - r) * l;
-                q.mw(c, t);
+                var t = o;
+                var u = s + (t - s) * m;
+                r.mw(c, u);
             };
         }
         if (d == 0) {
-            k.x = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+            l.x = function (m, n, o, p, q) {
+                var r = p;
+                if (r.w != g) {
                     return;
                 }
-                if (m == null) {
-                    m = 0;
+                if (n == null) {
+                    n = 0;
                 }
-                var r = m;
                 var s = n;
-                var t = r + (s - r) * l;
-                q.mw(c, t);
+                var t = o;
+                var u = s + (t - s) * m;
+                r.mw(c, u);
             };
         }
         if (d == 2) {
-            k.x = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+            l.x = function (m, n, o, p, q) {
+                var 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);
                 }
-                var r = m;
                 var s = n;
-                var t = BrushUtil.p(r, l, s, 0);
-                q.mw(c, t);
+                var t = o;
+                var u = BrushUtil.p(s, m, t, 0);
+                r.mw(c, u);
             };
         }
         if (d == 3) {
-            k.x = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+            l.x = function (m, n, o, p, q) {
+                var r = p;
+                if (r.w != g) {
                     return;
                 }
-                var r = m;
                 var s = n;
-                if (r != null) {
-                    r.w(a.externalGrid.renderer);
-                }
+                var t = o;
                 if (s != null) {
                     s.w(a.externalGrid.renderer);
                 }
-                var t = new FontInfo();
-                FontUtil.interpolateFont(t, l, r, s);
-                q.mw(c, t);
+                if (t != null) {
+                    t.w(a.externalGrid.renderer);
+                }
+                var u = new FontInfo();
+                FontUtil.interpolateFont(u, m, s, t);
+                r.mw(c, u);
             };
         }
         if (d == 6) {
-            k.x = function (l, m, n, o, p) {
-                var q = o;
-                if (q.w != g) {
+            l.x = function (m, n, o, p, q) {
+                var r = p;
+                if (r.w != g) {
                     return;
                 }
-                if (m == null) {
-                    m = 0;
+                if (n == null) {
+                    n = 0;
                 }
-                var r = typeGetValue(m);
                 var s = typeGetValue(n);
-                var t = truncate((Math.round(r + (s - r) * l)));
-                q.mw(c, t);
+                var t = typeGetValue(o);
+                var u = truncate((Math.round(s + (t - s) * m)));
+                r.mw(c, u);
             };
         }
-        k.o = function (l, m) {
-            var n = l;
-            return n.ik(c);
+        l.o = function (m, n) {
+            var 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);
         }
     };
     GridAnimationManager.prototype.s = function (a, b, c, d, e, f, g, h, i, j) {
         var _this = this;
         if (!a.model.b4()) {
-            return;
+            var k = false;
+            if (a.az != null && a.actualColumns.count > 0 && (g || j)) {
+                k = true;
+            }
+            if (!k) {
+                return;
+            }
         }
-        var k = this.p();
-        this.x(k);
-        var l = this.g.u;
+        var l = this.p();
+        this.x(l);
+        var m = this.g.u;
         if (a.columnAnimationSettings != null && a.columnAnimationSettings.u != null) {
-            l = a.columnAnimationSettings.u;
+            m = a.columnAnimationSettings.u;
         }
-        var m = a.columnPropertyUpdatingAnimationMode;
-        var n = new ColumnCellsEffect();
-        n.bx(l);
-        n.t = 8;
-        n.as = true;
+        var n = a.columnPropertyUpdatingAnimationMode;
+        var 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, function (o) { return _this.w(k); });
-        n.onCanceled = delegateCombine(n.onCanceled, function (o, p) { return _this.v(k); });
-        if (m == 0) {
-            m = 2;
+        o.bs = c;
+        o.al = true;
+        o.bq = f;
+        o.onFinished = delegateCombine(o.onFinished, function (p) { return _this.w(l); });
+        o.onCanceled = delegateCombine(o.onCanceled, function (p, q) { return _this.v(l); });
+        if (n == 0) {
+            n = 2;
         }
         if (d == 11) {
-            n.x = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+            o.x = function (p, q, r, s, t) {
+                var 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 = function (o, p, q, r, s) {
-                var 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 = function (p, q, r, s, t) {
+                var 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 = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+        if (n == 3 && d == 1) {
+            o.x = function (p, q, r, s, t) {
+                var 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;
                 }
-                var u = p;
                 var v = q;
-                var w = u + (v - u) * o;
-                t.mw(c, w);
+                var w = r;
+                var x = v + (w - v) * p;
+                u.mw(c, x);
             };
         }
         if (d == 0) {
-            n.x = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+            o.x = function (p, q, r, s, t) {
+                var 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;
                 }
-                var u = p;
                 var v = q;
-                var w = u + (v - u) * o;
-                t.mw(c, w);
+                var w = r;
+                var x = v + (w - v) * p;
+                u.mw(c, x);
             };
         }
         if (d == 2) {
-            n.x = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+            o.x = function (p, q, r, s, t) {
+                var 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);
                 }
-                var u = p;
                 var v = q;
-                var w = BrushUtil.p(u, o, v, 0);
-                t.mw(c, w);
+                var w = r;
+                var x = BrushUtil.p(v, p, w, 0);
+                u.mw(c, x);
             };
         }
         if (d == 3) {
-            n.x = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+            o.x = function (p, q, r, s, t) {
+                var 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;
                 }
-                var u = p;
                 var v = q;
-                if (u != null) {
-                    u.w(a.externalGrid.renderer);
-                }
+                var w = r;
                 if (v != null) {
                     v.w(a.externalGrid.renderer);
                 }
-                var w = new FontInfo();
-                FontUtil.interpolateFont(w, o, u, v);
-                t.mw(c, w);
+                if (w != null) {
+                    w.w(a.externalGrid.renderer);
+                }
+                var x = new FontInfo();
+                FontUtil.interpolateFont(x, p, v, w);
+                u.mw(c, x);
             };
         }
         if (d == 6) {
-            n.x = function (o, p, q, r, s) {
-                var t = r;
-                if (g != t.l.g) {
+            o.x = function (p, q, r, s, t) {
+                var 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;
                 }
-                var u = typeGetValue(p);
                 var v = typeGetValue(q);
-                var w = truncate((Math.round(u + (v - u) * o)));
-                t.mw(c, w);
+                var w = typeGetValue(r);
+                var x = truncate((Math.round(v + (w - v) * p)));
+                u.mw(c, x);
             };
         }
-        n.o = function (o, p) {
-            var q = o;
-            return q.ik(c);
+        o.o = function (p, q) {
+            var 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);
         }
     };
     GridAnimationManager.prototype.am = function (a, b, c) {
@@ -19640,8 +19669,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
             };
             var 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;
@@ -19713,8 +19742,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         var i = new GridEffectGroup(1);
         i.effectsFinished = delegateCombine(i.effectsFinished, function (j, k) { return _this.w(e); });
         i.effectsCanceled = delegateCombine(i.effectsCanceled, function (j, k) { return _this.v(e); });
-        for (var j = 0; j < h.b9.count; j++) {
-            var k = h.b9._inner[j];
+        for (var j = 0; j < h.ca.count; j++) {
+            var k = h.ca._inner[j];
             var l = a.az.f(k.o);
             if (l == null) {
                 continue;
@@ -19787,10 +19816,10 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         }
         var h = a.cellDataLoadedAnimationMode;
         var i = a.model;
-        if (d < 0 || d >= i.b9.count) {
+        if (d < 0 || d >= i.ca.count) {
             return;
         }
-        var j = i.b9._inner[d];
+        var j = i.ca._inner[d];
         var k = a.az.f(j.o);
         if (k == null) {
             return;
@@ -19890,10 +19919,10 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -19937,10 +19966,10 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -19980,8 +20009,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -20059,8 +20088,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -20138,8 +20167,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -20179,8 +20208,8 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -20219,10 +20248,10 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -20261,10 +20290,10 @@ export var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super)
         };
         var 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;
@@ -24333,7 +24362,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.i4;
             this.i4 = a;
             if (b != this.i4) {
-                this.ew("ColumnOptionsTextStyle", 10, b, this.i4);
+                this.ew("ActualColumnOptionsTextStyle", 10, b, this.i4);
             }
         },
         enumerable: false,
@@ -24361,7 +24390,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.qt;
             this.qt = a;
             if (b != this.qt) {
-                this.ew("ColumnOptionsHoverBackgroundColor", 2, b, this.qt);
+                this.ew("ActualColumnOptionsHoverBackgroundColor", 2, b, this.qt);
             }
         },
         enumerable: false,
@@ -24389,7 +24418,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var 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);
             }
         },
         enumerable: false,
@@ -24417,7 +24446,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.q1;
             this.q1 = a;
             if (b != this.q1) {
-                this.ew("ColumnOptionsToolTipTextColor", 2, b, this.q1);
+                this.ew("ActualColumnOptionsToolTipTextColor", 2, b, this.q1);
             }
         },
         enumerable: false,
@@ -24445,7 +24474,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.qs;
             this.qs = a;
             if (b != this.qs) {
-                this.ew("ColumnOptionsHighlightColor", 2, b, this.qs);
+                this.ew("ActualColumnOptionsHighlightColor", 2, b, this.qs);
             }
         },
         enumerable: false,
@@ -24557,7 +24586,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.i3;
             this.i3 = a;
             if (b != this.i3) {
-                this.ew("ColumnOptionsGroupHeaderTextStyle", 10, b, this.i3);
+                this.ew("ActualColumnOptionsGroupHeaderTextStyle", 10, b, this.i3);
             }
         },
         enumerable: false,
@@ -24613,7 +24642,7 @@ export var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.k0;
             this.k0 = a;
             if (b != this.k0) {
-                this.ew("ColumnOptionsRowHeight", 10, b, this.k0);
+                this.ew("ActualColumnOptionsRowHeight", 10, b, this.k0);
             }
         },
         enumerable: false,
@@ -26933,7 +26962,7 @@ export var SelectionManager = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (!d) {
             if (a.l.a6 >= 0) {
-                var i = this.a.model.b9._inner[a.l.a6];
+                var i = this.a.model.ca._inner[a.l.a6];
                 for (var j = 0; j < this.s.count; j++) {
                     if (this.s._inner[j].b(a.l.x, i.n)) {
                         d = true;
@@ -27479,9 +27508,9 @@ export var SelectionManager = /** @class */ /*@__PURE__*/ (function (_super) {
             for (var d = 0; d < c.length; d++) {
                 var e = this.a.fa.getRowType(c[d]);
                 if (e == 3) {
-                    for (var f = 0; f < this.a.model.cg.count; f++) {
-                        var g = this.a.model.cg._inner[f];
-                        var h = this.a.model.b9._inner[g].n;
+                    for (var f = 0; f < this.a.model.ch.count; f++) {
+                        var g = this.a.model.ch._inner[f];
+                        var h = this.a.model.ca._inner[g].n;
                         this.x(c[d], h);
                     }
                 }
@@ -27490,9 +27519,9 @@ export var SelectionManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var i = this.a.getFirstVisibleIndex();
         var j = this.a.getLastVisibleIndex();
         for (var k = i; k <= j; k++) {
-            for (var l = 0; l < this.a.model.cg.count; l++) {
-                var m = this.a.model.cg._inner[l];
-                var n = this.a.model.b9._inner[m].n;
+            for (var l = 0; l < this.a.model.ch.count; l++) {
+                var m = this.a.model.ch._inner[l];
+                var n = this.a.model.ca._inner[m].n;
                 this.x(k, n);
             }
         }
@@ -30018,6 +30047,9 @@ export var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function
                 d = b.actualDataSource;
                 e = b.actualDataSource.clone();
             }
+            if (e != null) {
+                e.sourceName = "ColumnOptions";
+            }
         }
         if (null != e) {
             this.bt(d, e);
@@ -30049,6 +30081,10 @@ export var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function
             e.isSectionContentVisible = false;
             e.flushAutoRefresh();
             this.h.pl(function (k) {
+                var 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]);
@@ -30494,6 +30530,12 @@ export var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function
                 b.summaryDescriptions.d(c);
             }
         }
+        for (var e = b.initialSummaryDescriptions.j.count - 1; e >= 0; e--) {
+            var f = b.initialSummaryDescriptions.j.item(e);
+            if (f.ah == this.h.ns && !a.contains(f.i) && f.t) {
+                b.initialSummaryDescriptions.d(e);
+            }
+        }
     };
     DataGridColumnToolbarManager.prototype.ba = function (a, b) {
         var c = new ColumnSummaryDescription(1, this.h.ns);
@@ -33511,14 +33553,16 @@ export var SummaryRow = /** @class */ /*@__PURE__*/ (function (_super) {
         if (h != null) {
             var i = e.getSummaryResults(h.ns);
             if (i.length > 0 && b.summaryDescriptions.j.count > 0) {
-                var j = b.summaryDescriptions.j.item(i[0].summaryIndex);
-                if (j.l != null) {
-                    var k = h.y(j, i[0]);
-                    f = j.ae != null ? j.ae : j.l.displayName;
-                    g = k.d;
-                    var l = h.pe(a, k.b, d);
-                    if (l != null) {
-                        g = l;
+                if (i[0].summaryIndex != -1) {
+                    var j = b.summaryDescriptions.j.item(i[0].summaryIndex);
+                    if (j.l != null) {
+                        var k = h.y(j, i[0]);
+                        f = j.ae != null ? j.ae : j.l.displayName;
+                        g = k.d;
+                        var l = h.pe(a, k.b, d);
+                        if (l != null) {
+                            g = l;
+                        }
                     }
                 }
             }
@@ -34813,12 +34857,12 @@ export var ColumnCellsEffect = /** @class */ /*@__PURE__*/ (function (_super) {
         return false;
     };
     ColumnCellsEffect.prototype.d = function (a) {
-        if (a.c3 > 0) {
+        if (a.c4 > 0) {
             var b = this.g;
             var c = new CellPath(0, b.b, b.a6, -100, -100);
             return c;
         }
-        else if (a.c2 > 0) {
+        else if (a.c3 > 0) {
             var d = this.g;
             var e = new CellPath(0, d.b, d.a6, -100, -105);
             return e;
@@ -34841,10 +34885,10 @@ export var ColumnCellsEffect = /** @class */ /*@__PURE__*/ (function (_super) {
             return 0;
         }
         var f = 0;
-        if (a.c3 > 0) {
+        if (a.c4 > 0) {
             f++;
         }
-        if (a.c2 > 0) {
+        if (a.c3 > 0) {
             f++;
         }
         if (c == null) {
@@ -34864,23 +34908,23 @@ export var ColumnCellsEffect = /** @class */ /*@__PURE__*/ (function (_super) {
         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++;
                     }
                 }
@@ -34891,22 +34935,22 @@ export var ColumnCellsEffect = /** @class */ /*@__PURE__*/ (function (_super) {
             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--;
                     }
                 }
@@ -35039,16 +35083,16 @@ export var RowCellsEffect = /** @class */ /*@__PURE__*/ (function (_super) {
         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;
         }
-        var c = a.b9._inner[this.g.a6].n;
-        var d = a.b9._inner[b.a6].n;
+        var c = a.ca._inner[this.g.a6].n;
+        var 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;
     };
@@ -35337,8 +35381,8 @@ export var GridEffectManager = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.ai(this.k._inner[h].b0, false, this.k._inner[h]);
             }
         }
-        for (var i = 0; i < b.b9.count; i++) {
-            e = b.b9._inner[i];
+        for (var i = 0; i < b.ca.count; i++) {
+            e = b.ca._inner[i];
             for (var j = 0; j < this.k.count; j++) {
                 f = this.k._inner[j];
                 if (f.ah(e, b)) {
@@ -35359,7 +35403,7 @@ export var GridEffectManager = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     GridEffectManager.prototype.h = function (a, b, c) {
         var d = true;
-        var e = b.cf;
+        var e = b.cg;
         var f = new List$1(GridColumnSpacer.$, 0);
         var g = new List$1(SpacerEffect.$, 0);
         for (var h = 0; h < e.count; h++) {
@@ -35394,7 +35438,7 @@ export var GridEffectManager = /** @class */ /*@__PURE__*/ (function (_super) {
             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;
             }
         }
@@ -35428,8 +35472,8 @@ export var GridEffectManager = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             this.i._inner[h].ap = true;
         }
-        for (var j = 0; j < b.cc.count; j++) {
-            var k = b.cc._inner[j];
+        for (var j = 0; j < b.cd.count; j++) {
+            var k = b.cd._inner[j];
             for (var l = 0; l < k.o.count; l++) {
                 if (k.p._inner[l]) {
                     continue;
@@ -35516,7 +35560,7 @@ export var GridLayerController = /** @class */ /*@__PURE__*/ (function (_super)
         return _this;
     }
     GridLayerController.prototype.a = function (a, b) {
-        var c = b.cc;
+        var c = b.cd;
         var d = c.count;
         for (var e = 0; e < d; e++) {
             var f = c._inner[e].b(a);
@@ -35572,12 +35616,12 @@ export var GridLayerController = /** @class */ /*@__PURE__*/ (function (_super)
             var p = false;
             var q = false;
             var r = j.l.a6;
-            var s = (r >= 0 && c.b9._inner[r].n == 0) || a.a1;
+            var s = (r >= 0 && c.ca._inner[r].n == 0) || a.a1;
             if (s) {
                 var 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);
                         }
@@ -35615,12 +35659,12 @@ export var GridLayerController = /** @class */ /*@__PURE__*/ (function (_super)
             var v = false;
             var w = false;
             var x = i.l.a6;
-            var y = (x >= 0 && c.b9._inner[x].n == 0) || a.a1;
+            var y = (x >= 0 && c.ca._inner[x].n == 0) || a.a1;
             if (y) {
                 var 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);
                         }
@@ -35638,9 +35682,9 @@ export var GridLayerController = /** @class */ /*@__PURE__*/ (function (_super)
         }
     };
     GridLayerController.prototype.d = function (a, b) {
-        for (var c = 0; c < b.cc.count; c++) {
-            if (b.cc._inner[c].d(a)) {
-                return b.cc._inner[c];
+        for (var c = 0; c < b.cd.count; c++) {
+            if (b.cd._inner[c].d(a)) {
+                return b.cd._inner[c];
             }
         }
         return null;
@@ -35697,16 +35741,16 @@ export var GridLayerController = /** @class */ /*@__PURE__*/ (function (_super)
         this.e.c(d);
     };
     GridLayerController.prototype.c = function (a, b) {
-        for (var c = 0; c < b.cc.count; c++) {
-            if (b.cc._inner[c].d(a)) {
-                return b.cc._inner[c].item(a);
+        for (var c = 0; c < b.cd.count; c++) {
+            if (b.cd._inner[c].d(a)) {
+                return b.cd._inner[c].item(a);
             }
         }
         return null;
     };
     GridLayerController.prototype.h = function (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);
@@ -35770,39 +35814,39 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         if (e.width == 0 || e.height == 0) {
             return;
         }
-        if (b.b9.count == 0) {
+        if (b.ca.count == 0) {
             return;
         }
         if (a.fa == null) {
             return;
         }
         var f = this.a(a, b, c, e);
-        for (var g = 0; g < b.cg.count; g++) {
-            var h = b.cg._inner[g];
+        for (var g = 0; g < b.ch.count; g++) {
+            var h = b.ch._inner[g];
             var 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;
         var 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;
         }
@@ -35834,51 +35878,51 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         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();
-        var g = b.cz + truncate(a.inset.left);
+        b.ch.clear();
+        var g = b.c0 + truncate(a.inset.left);
         var h = g;
         var i = 0;
         var j = 0;
-        var k = b.c0;
-        for (var l = 0; l < b.b9.count; l++) {
-            var m = b.b9._inner[l];
-            var n = b.cf._inner[l];
-            var o = b.b9._inner[l].d == 0;
+        var k = b.c1;
+        for (var l = 0; l < b.ca.count; l++) {
+            var m = b.ca._inner[l];
+            var n = b.cg._inner[l];
+            var 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++;
                 }
             }
@@ -35887,9 +35931,9 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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;
     };
@@ -35920,8 +35964,8 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 u.add_1(v[w]);
             }
         }
-        for (var x = 0; x < b.cc.count; x++) {
-            var y = b.cc._inner[x];
+        for (var x = 0; x < b.cd.count; x++) {
+            var y = b.cd._inner[x];
             y.g = true;
             for (var z = 0; z < y.o.count; z++) {
                 if (y.p._inner[z]) {
@@ -35939,11 +35983,11 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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) {
@@ -35996,16 +36040,16 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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)) {
@@ -36031,6 +36075,9 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                         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;
                         }
@@ -36038,8 +36085,13 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                             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) {
@@ -36052,15 +36104,16 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             y.g = false;
         }
         b.b5 = false;
+        b.b6 = false;
     };
     VisibilityEngine.prototype.af = function (a, b, c, d) {
         var e = this.d.x;
         var f = this.c.x;
-        var g = b.ce._inner[0];
+        var g = b.cf._inner[0];
         var h = g.k();
         var i = h - g.o;
-        for (var j = 0; j < b.cc.count; j++) {
-            var k = b.cc._inner[j];
+        for (var j = 0; j < b.cd.count; j++) {
+            var k = b.cd._inner[j];
             if (this.h(k, b)) {
                 k.g = true;
                 for (var l = 0; l < k.o.count; l++) {
@@ -36104,7 +36157,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                             o = true;
                         }
                         else {
-                            if (!b.cg.contains(m.a6)) {
+                            if (!b.ch.contains(m.a6)) {
                                 o = true;
                             }
                             if (!n.bq) {
@@ -36133,7 +36186,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     VisibilityEngine.prototype.ab = function (a, b, c, d, e) {
         var f = d.b;
         var g = d.a;
-        var h = c.ce;
+        var h = c.cf;
         var i = b.d4;
         var j = g.y;
         var k = d.d;
@@ -36174,7 +36227,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         var h = d.a.y;
         var i = d.b.y;
         var j = new CellPath(1, 0, 0, 0);
-        var k = b.ce._inner[0];
+        var k = b.cf._inner[0];
         var l = a.fa.getStickyRowsInRange(g.x, f.x);
         var m = -1;
         var n = -1;
@@ -36187,9 +36240,9 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         t.clear();
         this.o = 0;
         var 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)) {
-            var v = c.top + b.c3 + b.c2;
+            var v = c.top + b.c4 + b.c3;
             var w = c.bottom;
             var _loop_4 = function (x) {
                 var y = l[x];
@@ -36221,7 +36274,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                         ab.l += (c.bottom - ab.j);
                         ab.h = true;
                         q = true;
-                        b.cq++;
+                        b.cr++;
                     }
                     return "continue";
                 }
@@ -36280,7 +36333,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (z == 4) {
                     ab.l += (c.bottom - ab.j);
                     ab.h = true;
-                    b.cq++;
+                    b.cr++;
                     q = true;
                     this_3.am(a, x - 1, x, 4, l, t);
                 }
@@ -36346,7 +36399,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     var 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;
@@ -36508,7 +36561,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         d.av = m;
         d.ai = n;
         d.an = false;
-        var o = b.b9;
+        var o = b.ca;
         var p = c.d;
         var q = c.f;
         var r = c.e;
@@ -36521,13 +36574,13 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             u = a.fa.isRowSpanning(t) && a.groupSummaryDisplayMode != 1;
         }
         if (u) {
-            var v = a.shiftSectionContent ? b.cz : 0;
-            var w = a.shiftSectionContent ? b.c0 : 0;
+            var v = a.shiftSectionContent ? b.c0 : 0;
+            var w = a.shiftSectionContent ? b.c1 : 0;
             var x = p;
             var 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;
@@ -36536,14 +36589,14 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             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 (var z = 0; z < b.cg.count; z++) {
-                var aa = b.cg._inner[z];
+            for (var z = 0; z < b.ch.count; z++) {
+                var aa = b.ch._inner[z];
                 var ab = o._inner[aa];
                 d.a6 = ab.m;
                 d.bc = ab.n;
@@ -36554,22 +36607,22 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var 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));
         }
         var 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;
         }
         var 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;
@@ -36628,20 +36681,20 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     VisibilityEngine.prototype.x = function (a, b, c, d) {
-        var e = b.b9;
+        var e = b.ca;
         var f = a.inset;
         var g = f.top;
         if (a.itemsSource == null) {
             return;
         }
-        if (b.c3 > 0) {
+        if (b.c4 > 0) {
             var h = Math.max(c.j, g);
             b.b1 = this.i;
             if (this.i) {
                 h = g;
             }
-            for (var i = 0; i < b.cg.count; i++) {
-                var j = b.cg._inner[i];
+            for (var i = 0; i < b.ch.count; i++) {
+                var j = b.ch._inner[i];
                 var k = e._inner[j];
                 var l = new CellPath(1, k.m, -100, -100);
                 l.d = k.d;
@@ -36651,72 +36704,72 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     m.d = k.d;
                     var n = a.n4(a.headerSeparatorWidth);
                     var o = a.headerSeparatorWidth + n * 2;
-                    var 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);
+                    var 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) {
                 var 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) {
             var 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) {
             var 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);
         }
     };
     VisibilityEngine.prototype.z = function (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) {
-            var e = b.b9._inner[b.cy].l - a.pinnedAreaSeparatorWidth;
+        if (b.cz > -1) {
+            var 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);
             }
         }
-        var f = Math.max(c.j - b.c3 - b.c2, a.inset.top);
+        var f = Math.max(c.j - b.c4 - b.c3, a.inset.top);
         var g = c.j;
-        var h = b.c3 + b.c2;
-        var i = b.cq * (a.actualRowHeight + a.rowSeparatorHeight + a.rowSpacingHeight) + (b.cq > 0 ? a.rowSeparatorHeight : 0);
+        var h = b.c4 + b.c3;
+        var i = b.cr * (a.actualRowHeight + a.rowSeparatorHeight + a.rowSpacingHeight) + (b.cr > 0 ? a.rowSeparatorHeight : 0);
         var j = c.g - i;
         var k = Math.min(b.absoluteHeight - i, c.g - i);
         var l = Math.max(0, k - g);
         var 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);
             }
         }
     };
@@ -36750,17 +36803,17 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             var i = new CellPath(1, h.m, 0, g);
             i.bc = h.n;
             i.af = 2;
-            var j = this.k.containsKey(g) ? this.k.item(g).l : b.ce._inner[0].f(g) + b.ce._inner[0].i;
+            var j = this.k.containsKey(g) ? this.k.item(g).l : b.cf._inner[0].f(g) + b.cf._inner[0].i;
             var k = this.p(h, a);
             var l = h.k;
-            var m = b.ce._inner[0].e(g);
+            var m = b.cf._inner[0].e(g);
             this.ap(a, f, i, b, j, k, l, m);
             if (a.editMode == 3 && a.cm.j) {
                 var 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);
             }
@@ -36776,7 +36829,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     VisibilityEngine.prototype.y = function (a, b, c, d) {
         this.f = true;
-        var e = b.ce._inner[0];
+        var e = b.cf._inner[0];
         var f = e.k();
         var g = f - e.o;
         var h = d.d;
@@ -36792,7 +36845,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     continue;
                 }
                 var p = o.b ? d.j : j;
-                var q = b.b9._inner[o.d];
+                var q = b.ca._inner[o.d];
                 var r = k.ab();
                 r.x = o.f;
                 r.a6 = o.d;
@@ -36847,13 +36900,13 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         return true;
     };
     VisibilityEngine.prototype.w = function (a, b, c) {
-        if (b.c2 > 0 && a.actualDataSource != null && a.actualDataSource.actualSchema != null && a.actualDataSource.actualSchema.propertyNames.length > 0) {
-            var d = b.b9;
+        if (b.c3 > 0 && a.actualDataSource != null && a.actualDataSource.actualSchema != null && a.actualDataSource.actualSchema.propertyNames.length > 0) {
+            var d = b.ca;
             var e = Math.max(c.j, c.o.top);
-            e += b.c3;
+            e += b.c4;
             var f = new CellPath(1, -1, -100, -1);
-            for (var g = 0; g < b.cg.count; g++) {
-                var h = b.cg._inner[g];
+            for (var g = 0; g < b.ch.count; g++) {
+                var h = b.ch._inner[g];
                 var i = d._inner[h];
                 var j = f.ab();
                 j.x = -105;
@@ -36863,7 +36916,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.aq(j, b, e, c.d, c.f, a);
             }
             if (a.rowSeparatorHeight > 0) {
-                var k = e + b.cw;
+                var k = e + b.cx;
                 var l = f.ab();
                 l.x = -105;
                 l.a6 = -300;
@@ -36874,19 +36927,19 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     VisibilityEngine.prototype.aq = function (a, b, c, d, e, f) {
         var 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;
         }
-        var h = b.b9._inner[a.a6].l + f.inset.left;
-        var i = b.b9._inner[a.a6].k;
+        var h = b.ca._inner[a.a6].l + f.inset.left;
+        var 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) {
-            var j = b.b9._inner[a.a6].l;
+            var j = b.ca._inner[a.a6].l;
             if (e >= b.absoluteWidth) {
                 h = j + f.inset.left;
             }
@@ -36894,7 +36947,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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);
     };
     VisibilityEngine.prototype.aj = function (a, b, c, d, e, f, g, h, i) {
         this.ak(a, b, c, d, e, f, g, h, i, false, false, false);
@@ -36920,7 +36973,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     VisibilityEngine.prototype.al = function (a, b) {
         if (b.l.af == 4) {
-            var c = a.model.b9._inner[b.l.a6];
+            var c = a.model.ca._inner[b.l.a6];
             if (c.a != 1 && c.a != 3 && c.a != 2) {
                 b.ob = Rect.empty;
             }
@@ -37083,7 +37136,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         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;
                 }
@@ -37091,7 +37144,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     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;
@@ -37110,11 +37163,11 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         if (p == 1) {
-            var t = f.b9._inner[e.a6].l;
+            var t = f.ca._inner[e.a6].l;
             a = g + t;
         }
         else if (p == 2) {
-            var u = f.b9._inner[e.a6].l;
+            var u = f.ca._inner[e.a6].l;
             if (h >= f.absoluteWidth) {
                 a = u + i.inset.left;
             }
@@ -37126,19 +37179,19 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     VisibilityEngine.prototype.ar = function (a, b, c, d, e, f) {
         var 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;
         }
-        var h = b.b9._inner[a.a6].l + f.inset.left;
-        var i = b.b9._inner[a.a6].k;
+        var h = b.ca._inner[a.a6].l + f.inset.left;
+        var 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) {
-            var j = b.b9._inner[a.a6].l;
+            var j = b.ca._inner[a.a6].l;
             if (e >= b.absoluteWidth) {
                 h = j + f.inset.left;
             }
@@ -37146,7 +37199,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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);
     };
     VisibilityEngine.prototype.aw = function (a, b, c, d, e, f, g, h, i) {
         var j = b.bs;
@@ -37154,10 +37207,10 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         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) {
@@ -37186,7 +37239,7 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         this.au(a, b, c, d, e, f, g, false, h);
     };
     VisibilityEngine.prototype.au = function (a, b, c, d, e, f, g, h, i) {
-        var j = g ? b.ce._inner[f].g : b.ce._inner[f].d;
+        var j = g ? b.cf._inner[f].g : b.cf._inner[f].d;
         var k = 3;
         var l = b.bl;
         if (g) {
@@ -37220,9 +37273,9 @@ export var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             var p = h.inset;
             var q = p.top;
             var 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;
         }
@@ -37276,7 +37329,7 @@ export var PinnedRowInfo = /** @class */ /*@__PURE__*/ (function (_super) {
             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);
                 }
             }
         },
@@ -37338,34 +37391,34 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         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 (var d = 0; d < a.model.b9.count; d++) {
-            this.c.addItem(a.model.b9._inner[d].o, a.model.b9._inner[d]);
+        for (var 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;
         }
         var 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 (var f = 0; f < e; f++) {
             var g = new SectionInfo();
             g.h = f;
@@ -37378,7 +37431,7 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             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);
         }
         var h = a.defaultColumnWidth;
         var i = 0;
@@ -37430,39 +37483,39 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             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);
     };
     SpatialEngine.prototype.s = function (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 (var b = 0; b < a.b9.count; b++) {
-                a.b9._inner[b].n = this.m(a.b9._inner[b].d, b, a);
+            for (var b = 0; b < a.ca.count; b++) {
+                a.ca._inner[b].n = this.m(a.ca._inner[b].d, b, a);
             }
-            for (var c = 0; c < a.b9.count; c++) {
-                for (var d = 0; d < a.b9.count; d++) {
-                    if (a.b9._inner[d].n == a.cd.count) {
-                        a.cd.add(a.b9._inner[d]);
+            for (var c = 0; c < a.ca.count; c++) {
+                for (var d = 0; d < a.ca.count; d++) {
+                    if (a.ca._inner[d].n == a.ce.count) {
+                        a.ce.add(a.ca._inner[d]);
                         break;
                     }
                 }
@@ -37472,16 +37525,16 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     SpatialEngine.prototype.q = function (a, b, c) {
         var e_30, _a;
         b.absoluteWidth = 0;
-        b.c4 = 0;
-        b.cz = 0;
+        b.c5 = 0;
         b.c0 = 0;
-        var d = a.model.cv;
-        var e = a.model.cv;
+        b.c1 = 0;
+        var d = a.model.cw;
+        var e = a.model.cw;
         var f = 0;
         var g = new List$1(ColumnInfo.$, 0);
-        var h = b.cf;
+        var h = b.cg;
         try {
-            for (var _b = __values(fromEnum(b.b9)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(b.ca)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
                 if (i.b.c) {
                     f += i.b.f * this.g(i);
@@ -37491,24 +37544,24 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     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)));
                     }
                 }
             }
@@ -37526,14 +37579,14 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_30.error;
             }
         }
-        b.cz = Math.max(0, b.cz - b.cv);
+        b.c0 = Math.max(0, b.c0 - b.cw);
         if (f > 0) {
             var 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));
     };
     SpatialEngine.prototype.g = function (a) {
         if (a.a == 6) {
@@ -37549,8 +37602,8 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         var e_31, _a, e_32, _b;
         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;
         var h = 0;
         var i = (c) / f;
         if (i < 0) {
@@ -37578,23 +37631,23 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                         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) {
-                                var m = (l.k) + a.model.cv;
+                                var m = (l.k) + a.model.cw;
                                 d += m;
                                 c -= m;
                             }
                             else {
-                                var n = (l.k) + a.model.cv - truncate(Math.round(l.f(b)));
+                                var 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;
                         }
                     }
                 }
@@ -37624,10 +37677,10 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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;
@@ -37641,11 +37694,11 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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;
@@ -37654,12 +37707,12 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                         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;
@@ -37684,20 +37737,20 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_32.error;
             }
         }
-        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) {
-            var s = (c - h - a.model.cv);
+            var 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) {
-            var t = (c - h - a.model.cv);
+            var 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;
     };
@@ -37706,33 +37759,33 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     SpatialEngine.prototype.l = function (a, b, c) {
         var 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;
     };
     SpatialEngine.prototype.h = function (a, b, c, d) {
         var e = 0;
         for (var 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;
@@ -37742,7 +37795,7 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a == 0) {
             var e = 0;
             for (var f = 0; f < b; f++) {
-                if (c.b9._inner[f].d == 0) {
+                if (c.ca._inner[f].d == 0) {
                     e++;
                 }
             }
@@ -37764,30 +37817,30 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     i++;
                 }
             }
-            d = c.b9.count - 1 - i;
+            d = c.ca.count - 1 - i;
         }
         return d;
     };
     SpatialEngine.prototype.j = function (a, b) {
-        for (var c = 0; c < b.b9.count; c++) {
-            if (b.b9._inner[c].n == a) {
+        for (var c = 0; c < b.ca.count; c++) {
+            if (b.ca._inner[c].n == a) {
                 return c;
             }
         }
         return -1;
     };
     SpatialEngine.prototype.n = function (a, b, c) {
-        var d = c.b9._inner[a].o;
-        var e = truncate(b.inset.left) + c.cz + c.cv;
-        var f = c.cf;
-        var g = c.b9;
+        var d = c.ca._inner[a].o;
+        var e = truncate(b.inset.left) + c.c0 + c.cw;
+        var f = c.cg;
+        var g = c.ca;
         for (var 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)));
         }
@@ -37799,15 +37852,15 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = 0;
         var f = truncate(b.inset.left);
         e += f;
-        var g = c.cf;
-        var h = (this.d.count > 0 || this.e.count > 0) && c.cd != null;
-        var i = h ? c.cd : c.b9;
+        var g = c.cg;
+        var h = (this.d.count > 0 || this.e.count > 0) && c.ce != null;
+        var i = h ? c.ce : c.ca;
         var j = i.count;
         for (var k = 0; k < j; k++) {
             var 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;
@@ -37815,16 +37868,16 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             e += truncate(Math.round(g._inner[d].af(-1)));
             d++;
         }
-        var m = c.b9.count - 1;
+        var m = c.ca.count - 1;
         if (d > m) {
             d = m;
         }
         return d;
     };
     SpatialEngine.prototype.b = function (a, b) {
-        var c = b.ce.count;
+        var c = b.cf.count;
         for (var d = 0; d < c; d++) {
-            var e = b.ce._inner[d];
+            var e = b.cf._inner[d];
             var f = e.i;
             var g = f + e.l();
             if (a <= g) {
@@ -37834,23 +37887,23 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 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);
     };
     SpatialEngine.prototype.v = function (a, b, c, d) {
         this.ab(a, b, d, false);
-        for (var e = b + 1; e < d.b9.count; e++) {
+        for (var e = b + 1; e < d.ca.count; e++) {
             this.aa(e, d, false, b);
         }
     };
     SpatialEngine.prototype.t = function (a, b, c) {
-        for (var d = c.b9.count - 1; d >= a; d--) {
+        for (var d = c.ca.count - 1; d >= a; d--) {
             this.aa(d, c, true, a);
         }
     };
     SpatialEngine.prototype.x = function (a, b) {
-        for (var c = 0; c < b.cc.count; c++) {
+        for (var c = 0; c < b.cd.count; c++) {
             var d = new List$1(CellModel.$, 0);
-            var e = b.cc._inner[c];
+            var e = b.cd._inner[c];
             for (var f = 0; f < e.o.count; f++) {
                 if (e.p._inner[f]) {
                     continue;
@@ -37874,9 +37927,9 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.y = function (a, b, c) {
-        for (var d = 0; d < c.cc.count; d++) {
+        for (var d = 0; d < c.cd.count; d++) {
             var e = new List$1(CellModel.$, 0);
-            var f = c.cc._inner[d];
+            var f = c.cd._inner[d];
             var g = new List$1(CellPath.$, 0);
             for (var h = 0; h < f.o.count; h++) {
                 if (f.p._inner[h]) {
@@ -37908,9 +37961,9 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.aa = function (a, b, c, d) {
-        for (var e = 0; e < b.cc.count; e++) {
+        for (var e = 0; e < b.cd.count; e++) {
             var f = new List$1(CellModel.$, 0);
-            var g = b.cc._inner[e];
+            var g = b.cd._inner[e];
             for (var h = 0; h < g.o.count; h++) {
                 if (g.p._inner[h]) {
                     continue;
@@ -37934,7 +37987,7 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             g.g = false;
         }
-        var l = b.cf;
+        var l = b.cg;
         if (c) {
             if (a == l.count - 1) {
                 l.add(new GridColumnSpacerCollection());
@@ -37954,9 +38007,9 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.ab = function (a, b, c, d) {
-        for (var e = 0; e < c.cc.count; e++) {
+        for (var e = 0; e < c.cd.count; e++) {
             var f = new List$1(CellModel.$, 0);
-            var g = c.cc._inner[e];
+            var g = c.cd._inner[e];
             for (var h = 0; h < g.o.count; h++) {
                 if (g.p._inner[h]) {
                     continue;
@@ -37980,7 +38033,7 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             g.g = false;
         }
-        var l = c.cf;
+        var l = c.cg;
         if (b < l.count) {
             for (var m = l._inner[b].count - 1; m >= 0; m--) {
                 this.a.add(l._inner[b]._inner[m]);
@@ -37989,9 +38042,9 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.z = function (a, b) {
-        for (var c = 0; c < b.cc.count; c++) {
+        for (var c = 0; c < b.cd.count; c++) {
             var d = new List$1(CellModel.$, 0);
-            var e = b.cc._inner[c];
+            var e = b.cd._inner[c];
             for (var f = 0; f < e.o.count; f++) {
                 if (e.p._inner[f]) {
                     continue;
@@ -38012,20 +38065,20 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.w = function (a, b) {
-        for (var c = 0; c < b.b9.count; c++) {
+        for (var c = 0; c < b.ca.count; c++) {
             this.ab(a, c, b, false);
         }
     };
     SpatialEngine.prototype.u = function (a, b, c, d, e) {
         this.ab(a, c, b, true);
-        for (var f = c + 1; f < b.b9.count; f++) {
+        for (var f = c + 1; f < b.ca.count; f++) {
             this.aa(f, b, false, c);
         }
-        for (var g = b.b9.count - 1; g >= d; g--) {
+        for (var g = b.ca.count - 1; g >= d; g--) {
             this.aa(g, b, true, d);
         }
         this.z(d, b);
-        var h = b.cf;
+        var h = b.cg;
         for (var i = this.a.count - 1; i >= 0; i--) {
             h._inner[c].add(this.a._inner[i]);
             this.a.removeAt(i);
@@ -38037,7 +38090,7 @@ export var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var c = 0;
         for (var d = 0; d < b.y; d++) {
-            c += a.ce._inner[d].m;
+            c += a.cf._inner[d].m;
         }
         c += b.x;
         return c;
@@ -38497,15 +38550,15 @@ export var ColumnInfo = /** @class */ /*@__PURE__*/ (function (_super) {
                 b = b - 1;
             }
         }
-        return this.g + b * (this.k + a.cv);
+        return this.g + b * (this.k + a.cw);
     };
     ColumnInfo.prototype.f = function (a) {
-        var b = Math.abs(this.g + this.h * (this.k + a.cv));
-        if (b < (-1 * (this.k + a.cv))) {
-            b = (-1 * (this.k + a.cv));
+        var 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;
     };
@@ -38621,28 +38674,28 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_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;
@@ -38684,28 +38737,29 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         _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");
@@ -38745,11 +38799,11 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         _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);
         return _this;
     }
     Object.defineProperty(VisualModel.prototype, "actualVisibleRegion", {
@@ -38782,35 +38836,35 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "cr", {
+    Object.defineProperty(VisualModel.prototype, "cs", {
         get: function () {
             return truncate(this.actualVisibleRegion.top);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "cm", {
+    Object.defineProperty(VisualModel.prototype, "cn", {
         get: function () {
             return truncate(this.actualVisibleRegion.left);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "cp", {
+    Object.defineProperty(VisualModel.prototype, "cq", {
         get: function () {
             return truncate(this.actualVisibleRegion.right);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "ch", {
+    Object.defineProperty(VisualModel.prototype, "ci", {
         get: function () {
             return truncate(this.actualVisibleRegion.height);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "cs", {
+    Object.defineProperty(VisualModel.prototype, "ct", {
         get: function () {
             return truncate(this.actualVisibleRegion.width);
         },
@@ -38823,7 +38877,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.am = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38834,7 +38888,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.r = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38845,7 +38899,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.j = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38856,7 +38910,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ag = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38867,7 +38921,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.l = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38878,7 +38932,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ap = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38889,7 +38943,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.u = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38900,7 +38954,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.o = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38911,7 +38965,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.aa = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38922,7 +38976,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.q = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38933,7 +38987,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.k = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38944,7 +38998,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ao = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38955,7 +39009,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.t = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38966,7 +39020,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.s = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38977,7 +39031,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.an = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38988,7 +39042,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.y = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -38999,7 +39053,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.x = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39010,7 +39064,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.m = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39021,7 +39075,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ar = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39032,7 +39086,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.w = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39043,7 +39097,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.v = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39054,7 +39108,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.aq = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39065,7 +39119,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.n = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39076,7 +39130,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.z = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39087,7 +39141,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.p = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39098,7 +39152,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ah = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39109,7 +39163,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ab = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39120,7 +39174,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ac = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39131,7 +39185,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ad = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39142,7 +39196,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ai = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39153,7 +39207,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ae = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39164,7 +39218,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.af = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39175,7 +39229,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.aj = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39186,7 +39240,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.al = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39197,7 +39251,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.ak = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39208,7 +39262,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         },
         set: function (a) {
             this.as = a;
-            this.dn();
+            this.dp();
         },
         enumerable: false,
         configurable: true
@@ -39226,7 +39280,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
     VisualModel.prototype.f = function (a, b) {
         a += this.actualVisibleRegion.left;
         b += this.actualVisibleRegion.top;
-        var c = this.cc;
+        var c = this.cd;
         var d = c.count;
         for (var e = d - 1; e >= 0; e--) {
             if (c._inner[e] == this.at) {
@@ -39253,7 +39307,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
                 return k;
             }
         }
-        c = this.cc;
+        c = this.cd;
         d = c.count;
         for (var l = d - 1; l >= 0; l--) {
             var m = c._inner[l].q;
@@ -39282,15 +39336,15 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(VisualModel.prototype, "cf", {
+    Object.defineProperty(VisualModel.prototype, "cg", {
         get: function () {
-            while (this.b8.count < this.b9.count) {
-                this.b8.add(new GridColumnSpacerCollection());
+            while (this.b9.count < this.ca.count) {
+                this.b9.add(new GridColumnSpacerCollection());
             }
-            return this.b8;
+            return this.b9;
         },
         set: function (a) {
-            this.b8 = a;
+            this.b9 = a;
         },
         enumerable: false,
         configurable: true
@@ -39302,75 +39356,75 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         return false;
     };
     VisualModel.prototype.h = function (a) {
-        if (a == this.di) {
+        if (a == this.dj) {
             return this.g;
         }
         var 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;
     };
-    VisualModel.prototype.dj = function (a) {
-        this.b9.add(a);
-        this.b6.addItem(a.o, this.b9.count - 1);
-    };
-    VisualModel.prototype.dn = function () {
-        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);
-    };
-    Object.defineProperty(VisualModel.prototype, "cc", {
+    VisualModel.prototype.dk = function (a) {
+        this.ca.add(a);
+        this.b7.addItem(a.o, this.ca.count - 1);
+    };
+    VisualModel.prototype.dp = function () {
+        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);
+    };
+    Object.defineProperty(VisualModel.prototype, "cd", {
         get: function () {
-            return this.b7;
+            return this.b8;
         },
         enumerable: false,
         configurable: true
     });
     VisualModel.prototype.b0 = function () {
-        for (var a = 0; a < this.b7.count; a++) {
-            for (var b = 0; b < this.b7._inner[a].o.count; b++) {
-                if (this.b7._inner[a].p._inner[b]) {
+        for (var a = 0; a < this.b8.count; a++) {
+            for (var b = 0; b < this.b8._inner[a].o.count; b++) {
+                if (this.b8._inner[a].p._inner[b]) {
                     continue;
                 }
-                var c = this.b7._inner[a].o._inner[b];
-                var d = this.b7._inner[a].q._inner[b];
+                var c = this.b8._inner[a].o._inner[b];
+                var d = this.b8._inner[a].q._inner[b];
                 if (c != d.l) {
                     return false;
                 }
@@ -39378,15 +39432,15 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return true;
     };
-    VisualModel.prototype.dm = function () {
+    VisualModel.prototype.dn = function () {
         this.g = null;
-        this.di = -1;
-        this.b9.clear();
-        this.b6.clear();
+        this.dj = -1;
+        this.ca.clear();
+        this.b7.clear();
     };
-    VisualModel.prototype.dl = function () {
-        this.dm();
-        this.ce.clear();
+    VisualModel.prototype.dm = function () {
+        this.dn();
+        this.cf.clear();
         this.bm.u();
         this.at.u();
         this.bp.u();
@@ -39422,18 +39476,18 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         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);
@@ -39484,7 +39538,7 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
                 var d = _c.value;
                 var e = d.b(null);
                 if (this.b1 && c) {
-                    e.s += this.cr;
+                    e.s += this.cs;
                 }
                 b.e(e);
             }
@@ -39511,11 +39565,11 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         f.f = d;
         f.n = b.o;
         f.d = e;
-        this.cf._inner[a].add(f);
+        this.cg._inner[a].add(f);
         return f;
     };
-    VisualModel.prototype.dk = function (a) {
-        var b = this.cf;
+    VisualModel.prototype.dl = function (a) {
+        var b = this.cg;
         for (var c = 0; c < b.count; c++) {
             var d = b._inner[c];
             for (var e = d.count - 1; e >= 0; e--) {
@@ -39525,9 +39579,9 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    VisualModel.prototype.cb = function (a) {
+    VisualModel.prototype.cc = function (a) {
         var b = new List$1(GridColumnSpacer.$, 0);
-        var c = this.cf;
+        var c = this.cg;
         for (var d = 0; d < c.count; d++) {
             var e = c._inner[d];
             for (var f = e.count - 1; f >= 0; f--) {
@@ -39538,11 +39592,11 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    VisualModel.prototype.ca = function (a) {
+    VisualModel.prototype.cb = function (a) {
         var b = new List$1(CellModel.$, 0);
-        for (var c = 0; c < this.cc.count; c++) {
+        for (var c = 0; c < this.cd.count; c++) {
             var d = new List$1(CellModel.$, 0);
-            var e = this.cc._inner[c];
+            var e = this.cd._inner[c];
             for (var f = 0; f < e.o.count; f++) {
                 if (e.p._inner[f]) {
                     continue;
@@ -39559,8 +39613,8 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         if (c === void 0) {
             c = 1;
         }
-        for (var d = 0; d < this.cc.count; d++) {
-            var e = this.cc._inner[d];
+        for (var d = 0; d < this.cd.count; d++) {
+            var e = this.cd._inner[d];
             for (var f = 0; f < e.o.count; f++) {
                 if (e.p._inner[f]) {
                     continue;
@@ -39573,10 +39627,10 @@ export var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    VisualModel.prototype.c5 = function () {
+    VisualModel.prototype.c6 = function () {
         var a = 0;
-        for (var b = 0; b < this.ce.count; b++) {
-            a += this.ce._inner[b].m;
+        for (var b = 0; b < this.cf.count; b++) {
+            a += this.cf._inner[b].m;
         }
         return a;
     };