igniteui-webcomponents-grids 5.3.0 → 5.4.0

package/esm5/lib/ColumnFilterCondition_combined.js

@@ -190,6 +190,7 @@ import { LayoutAction_$type } from "./LayoutAction";
 import { ToolActionInfo } from "igniteui-webcomponents-core";
 import { ICommandAvailabilityListener_$type } from "igniteui-webcomponents-core";
 import { ICommandStateChangedListener_$type } from "igniteui-webcomponents-core";
+import { IToolbarContextAccessor_$type } from "igniteui-webcomponents-core";
 import { Stack$1 } from "igniteui-webcomponents-core";
 import { DataSourceSpecialRow } from "igniteui-webcomponents-core";
 import { RowRange } from "./RowRange";
@@ -6065,7 +6066,7 @@ var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.b.isVirtual) {
                 this.b.firstVisibleIndexRequested = a;
                 this.b.lastVisibleIndexRequested = a + this.ah;
-                this.d.ed = false;
+                this.d.ef = false;
             }
             this.b2();
             this.ac.clear();
@@ -6076,7 +6077,7 @@ var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
                 var c = this.b.getItemAtIndex(b);
                 this.ac.add1(c);
                 if (c != null) {
-                    this.d.ed = true;
+                    this.d.ef = true;
                 }
             }
             var d = new Array(this.ac.count);
@@ -6087,7 +6088,7 @@ var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.targetGrid != null) {
                 this.targetGrid.actualDataSource.queueAutoRefresh();
                 this.targetGrid.actualDataSource.flushAutoRefresh();
-                if (this.b.isVirtual && this.d.ed) {
+                if (this.b.isVirtual && this.d.ef) {
                     this.targetGrid.wk(0, this.ao - 1);
                 }
                 else {
@@ -6118,7 +6119,7 @@ var Pager = /** @class */ /*@__PURE__*/ (function (_super) {
             this.b.summaryScope = this.p;
             var b = this.b;
             b.schemaChanged = delegateCombine(b.schemaChanged, runOn(this, this.bj));
-            this.d.ec = this.b;
+            this.d.ee = this.b;
             switch (this.l) {
                 case 1:
                 case 0:
@@ -6658,13 +6659,13 @@ var ColumnController = /** @class */ /*@__PURE__*/ (function (_super) {
         var a = new Dictionary$2(String_$type, Boolean_$type, 0);
         for (var b = 0; b < this.i.count; b++) {
             var c = this.i._inner[b];
-            if (!c.ji) {
+            if (!c.jh) {
                 a.item(c.lo, true);
             }
         }
         var d = false;
         for (var e = this.i.count - 1; e >= 0; e--) {
-            if (this.i._inner[e].ji) {
+            if (this.i._inner[e].jh) {
                 this.k.removeExternalColumn(this.i._inner[e].externalObject);
             }
         }
@@ -6727,7 +6728,7 @@ var ColumnController = /** @class */ /*@__PURE__*/ (function (_super) {
                 break;
         }
         c.lo = a;
-        c.ji = true;
+        c.jh = true;
         c.mf = this.t(a) ? c.lo : (createGuid());
         return c;
     };
@@ -7656,7 +7657,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             if (a.l.aj) {
                 var e = this.ay.h(a.l);
-                if (e.jm && !this.cj.j && this.editOnKeyPress) {
+                if (e.jl && !this.cj.j && this.editOnKeyPress) {
                     this.cj.x();
                 }
             }
@@ -7677,7 +7678,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             if (a.w == 0 && this.headerClickAction != 4) {
                 this.f9.d(this.cf(a.l));
                 var f = this.ay.h(a.l);
-                f.mz("Sorted");
+                f.m0("Sorted");
             }
             this.ik = false;
             if (this.selectionMode == 5) {
@@ -7842,7 +7843,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         this.hu = a.bk && a.bl;
         if (this.dragger != null && this.columnResizingMode != 2 && this.ao.h) {
             var d = this.ay.j._inner[a.l.a5];
-            if (d.jq) {
+            if (d.jp) {
                 var e = this.model.b9._inner[this.ao.a5];
                 this.mb = e.k;
                 this.l8 = this.model.cz;
@@ -7920,7 +7921,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.dragger == null || !this.dragger.isDragActive) {
             if (a.l.h && this.columnResizingMode != 2) {
                 var d = this.ay.j._inner[a.l.a5];
-                if (d.jq) {
+                if (d.jp) {
                     this.externalGrid.setResizeCursor();
                 }
             }
@@ -7943,7 +7944,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         this.md = this.model.actualVisibleRegion.top;
         if ((this.dragger == null || !this.dragger.isDragActive) && a.g && !a.h && !a.ay && this.columnMovingMode != 1) {
             var e = this.cf(a);
-            if (e != null && e.jo) {
+            if (e != null && e.jn) {
                 this.externalGrid.ensureColumnsAreManual();
             }
             this.externalGrid.setHandCursor();
@@ -7963,7 +7964,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             this.dragger.dragStart(b, c, this.model.actualVisibleRegion.x, this.model.actualVisibleRegion.y, 0, a, d);
         }
-        else if (this.selectionMode == 2 && this.mouseDragSelectionEnabled && a.aj) {
+        else if (this.selectionMode == 2 && this.mouseDragSelectionEnabled && (a.aj || (a.ay && !a.g))) {
             if (!d) {
                 this.je = true;
                 this.selectedKeys.clear();
@@ -8004,7 +8005,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (this.ly != -1) {
                     var c = this.model.b9._inner[this.dragger.cellPath.a5];
                     this.c5.ah(this, this.columnAnimationSettings, c, this.ly);
-                    this.columns._inner[this.dragger.cellPath.a5].mz("Resized");
+                    this.columns._inner[this.dragger.cellPath.a5].m0("Resized");
                 }
                 else {
                     this.renderingEngine.refresh(this.model, false);
@@ -8023,11 +8024,11 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                             this.moveColumn(this.dragger.cellPath.a5, this.nk);
                             this.ld = false;
                             this.pinColumn(this.columns._inner[this.nk], this.fn);
-                            this.columns._inner[this.nk].mz("Pinned");
+                            this.columns._inner[this.nk].m0("Pinned");
                         }
                         else {
                             this.moveColumn(this.dragger.cellPath.a5, this.nk);
-                            this.columns._inner[this.nk].mz("Moved");
+                            this.columns._inner[this.nk].m0("Moved");
                         }
                         d = false;
                     }
@@ -12110,7 +12111,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _b = __values(fromEnum(this.actualColumns)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var b = _c.value;
-                b.jr = false;
+                b.jq = false;
             }
         }
         catch (e_15_1) {
@@ -12215,19 +12216,19 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.ay.h(a);
     };
     DataGrid.prototype.hideThenRemoveColumn = function (a) {
-        a.jh = true;
-        a.jp = true;
+        a.jg = true;
+        a.jo = true;
     };
     DataGrid.prototype.exchangeColumn = function (a, b) {
         var c = this.columns.indexOf(b);
         if (c == -1) {
             return;
         }
-        if ((a != null && a.jo) || (b != null && b.jo)) {
+        if ((a != null && a.jn) || (b != null && b.jn)) {
             throw new InvalidOperationException(1, "Cannot exchange a column created from markup");
         }
         if (this.columns.contains(a)) {
-            if (a.jp) {
+            if (a.jo) {
                 this.externalGrid.removeExternalColumn(a.externalObject);
             }
             else {
@@ -12251,7 +12252,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.il = a.il;
         if (!this.jl(a)) {
-            a.jp = false;
+            a.jo = false;
             a.ht = 5;
             this.externalGrid.removeExternalColumn(b.externalObject);
             this.v6(a);
@@ -12343,10 +12344,10 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         b.columnCellsPropertyUpdating = delegateCombine(b.columnCellsPropertyUpdating, runOn(this, this.ue));
         b.columnHeaderCellsPropertyUpdating = delegateCombine(b.columnHeaderCellsPropertyUpdating, runOn(this, this.uh));
         this.gb.t(a, b, this.model);
-        if (b.jp) {
+        if (b.jo) {
             b.ht = 3;
         }
-        if (this.jj(b) && !b.jp && b.ht != 3) {
+        if (this.jj(b) && !b.jo && b.ht != 3) {
             var c = b.ht;
             b.ht = 1;
             this.xu();
@@ -12423,7 +12424,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (b == "SortDirection" && false == this.j3) {
             this.f9.f(a, a.hr);
-            a.mz("Sorted");
+            a.m0("Sorted");
         }
         if (stringStartsWith(b, "transition@@@")) {
             this.c5.r(this, f, b, c, d, e, 1);
@@ -12493,18 +12494,18 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         var c = this.columns._inner[a];
         b = Math.min(this.columns.count - 1, Math.max(0, b));
         this.lc = true;
-        if (c != null && c.jo) {
+        if (c != null && c.jn) {
             throw new InvalidOperationException(1, "Can't move a column that was created from markup");
         }
         if (b > a) {
             var d = this.columns._inner[b - 1];
-            if (d.jo) {
+            if (d.jn) {
                 throw new InvalidOperationException(1, "Can't move a column to before columns created from markup");
             }
         }
         else {
             var e = this.columns._inner[b];
-            if (e.jo) {
+            if (e.jn) {
                 throw new InvalidOperationException(1, "Can't move a column to before columns created from markup");
             }
         }
@@ -12546,7 +12547,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 break;
             }
             var j = d._inner[i];
-            if (!j.jp && j.il == g) {
+            if (!j.jo && j.il == g) {
                 h = i;
             }
         } while (h == -1);
@@ -12669,7 +12670,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.yy();
                 break;
             case "IsHidden":
-                if (c.jp) {
+                if (c.jo) {
                     if (this.jm(c)) {
                         var d = c.ht;
                         c.ht = 2;
@@ -12678,7 +12679,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                     else {
                         c.ht = 3;
-                        if (c.je) {
+                        if (c.jd) {
                             this.externalGrid.ensureColumnsAreManual();
                             this.externalGrid.removeExternalColumn(c.externalObject);
                         }
@@ -12703,7 +12704,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                     this.columnHiddenChanged(this, ((function () {
                         var $ret = new ColumnHiddenChangedEventArgs();
                         $ret.a = c;
-                        $ret.b = c.jp;
+                        $ret.b = c.jo;
                         return $ret;
                     })()));
                 }
@@ -13306,7 +13307,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (a != null) {
                     var b = this.activeCell.b;
                     var c = this.actualColumns.indexOf(a);
-                    if (a.jm) {
+                    if (a.jl) {
                         var d = this.model.e(c, b);
                         if (d != null) {
                             this.cj.ab(d);
@@ -13447,13 +13448,13 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         var b = this.actualColumns.count - 1;
         var c = this.gb.j(b, this.model);
         if (a) {
-            while (b > 0 && (this.actualColumns._inner[c].jp || this.actualColumns._inner[c].il == 1)) {
+            while (b > 0 && (this.actualColumns._inner[c].jo || this.actualColumns._inner[c].il == 1)) {
                 b--;
                 c = this.gb.j(b, this.model);
             }
         }
         else {
-            while (b > 0 && (this.actualColumns._inner[c].jp || this.actualColumns._inner[c].il != 0)) {
+            while (b > 0 && (this.actualColumns._inner[c].jo || this.actualColumns._inner[c].il != 0)) {
                 b--;
                 c = this.gb.j(b, this.model);
             }
@@ -13467,13 +13468,13 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         var b = 0;
         var c = this.gb.j(b, this.model);
         if (a) {
-            while (b < this.actualColumns.count - 1 && (this.actualColumns._inner[c].jp || this.actualColumns._inner[c].il == 2)) {
+            while (b < this.actualColumns.count - 1 && (this.actualColumns._inner[c].jo || this.actualColumns._inner[c].il == 2)) {
                 b++;
                 c = this.gb.j(b, this.model);
             }
         }
         else {
-            while (b < this.actualColumns.count - 1 && (this.actualColumns._inner[c].jp || this.actualColumns._inner[c].il != 0)) {
+            while (b < this.actualColumns.count - 1 && (this.actualColumns._inner[c].jo || this.actualColumns._inner[c].il != 0)) {
                 b++;
                 c = this.gb.j(b, this.model);
             }
@@ -13488,21 +13489,21 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
         if (!b) {
             c = this.gb.j(c, this.model);
         }
-        if (this.actualColumns._inner[c].jp) {
+        if (this.actualColumns._inner[c].jo) {
             var d = c;
             var e = this.model.b9._inner[c].n;
-            while (e > 0 && this.actualColumns._inner[d].jp) {
+            while (e > 0 && this.actualColumns._inner[d].jo) {
                 e--;
                 d = this.gb.j(e, this.model);
             }
-            if (this.actualColumns._inner[d].jp) {
+            if (this.actualColumns._inner[d].jo) {
                 d = c;
                 e = this.model.b9._inner[c].n;
-                while (e < this.actualColumns.count - 1 && this.actualColumns._inner[d].jp) {
+                while (e < this.actualColumns.count - 1 && this.actualColumns._inner[d].jo) {
                     e++;
                     d = this.gb.j(e, this.model);
                 }
-                if (!this.actualColumns._inner[d].jp) {
+                if (!this.actualColumns._inner[d].jo) {
                     c = d;
                 }
             }
@@ -13524,21 +13525,21 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGrid.prototype.nu = function (a) {
         a = Math.min(a, this.actualColumns.count - 1);
-        if (this.actualColumns._inner[a].jp) {
+        if (this.actualColumns._inner[a].jo) {
             var b = a;
             var c = this.model.b9._inner[b].n;
-            while (c < this.actualColumns.count - 1 && this.actualColumns._inner[b].jp) {
+            while (c < this.actualColumns.count - 1 && this.actualColumns._inner[b].jo) {
                 c++;
                 b = this.gb.j(c, this.model);
             }
-            if (this.actualColumns._inner[b].jp) {
+            if (this.actualColumns._inner[b].jo) {
                 b = a;
                 c = this.model.b9._inner[b].n;
-                while (c > 0 && this.actualColumns._inner[b].jp) {
+                while (c > 0 && this.actualColumns._inner[b].jo) {
                     c--;
                     b = this.gb.j(c, this.model);
                 }
-                if (!this.actualColumns._inner[b].jp) {
+                if (!this.actualColumns._inner[b].jo) {
                     a = b;
                 }
             }
@@ -13832,7 +13833,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 d = this.model.b9._inner[o].n;
                 h = p.lt();
-            } while (this.cj.j && g >= 0 && (!l || !p.jm));
+            } while (this.cj.j && g >= 0 && (!l || !p.jl));
             if (this.groupSummaryDisplayMode != 1) {
                 if (j == 1 || j == 2) {
                     var q = this.n1();
@@ -13865,7 +13866,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 d = this.model.b9._inner[s].n;
                 h = t.lt();
-            } while (this.cj.j && g < this.e7.getRowCount() && (!l || !t.jm));
+            } while (this.cj.j && g < this.e7.getRowCount() && (!l || !t.jl));
             if (this.groupSummaryDisplayMode != 1) {
                 if (j == 1 || j == 2) {
                     var u = this.nw();
@@ -14010,7 +14011,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                 else if (this.ju() && this.enterBehavior == 1 && (c == 0 || c == 3)) {
                     var d = this.ad.s();
                     var e = this.actualColumns._inner[d];
-                    if (e != null && e.jm) {
+                    if (e != null && e.jl) {
                         var f = this.model.e(d, this.activeCell.b);
                         return this.lb(f);
                     }
@@ -14115,7 +14116,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.ju() && (a == 0 || a == 3)) {
                 var b = this.ad.s();
                 var c = this.actualColumns._inner[b];
-                if (c != null && c.jm) {
+                if (c != null && c.jl) {
                     var d = this.model.e(b, this.activeCell.b);
                     if (d == null) {
                         this.ap = new CellPath(3, b, this.activeCell.b, 1);
@@ -14143,7 +14144,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         var c = this.cf(a.l);
-        if (!c.jm) {
+        if (!c.jl) {
             return false;
         }
         this.cj.ad(a);
@@ -15174,7 +15175,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             return;
         }
         var a = this.ay.g(this.activeCell.d);
-        if (a.jm) {
+        if (a.jl) {
             var b = this.model.h(a.ko);
             var c = this.model.e(b.n, this.activeCell.b);
             if (c != null) {
@@ -15396,7 +15397,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
             var i = new SaveLayoutColumn();
             i.o = h.lo;
             i.e = h.width;
-            i.i = toNullable(Boolean_$type, h.jp);
+            i.i = toNullable(Boolean_$type, h.jo);
             i.j = toNullable(PinnedPositions_$type, h.il);
             var j = "";
             var k = "";
@@ -15592,7 +15593,7 @@ var DataGrid = /** @class */ /*@__PURE__*/ (function (_super) {
                                 j.width = o;
                             }
                             if (nullableNotEquals(i.i, null)) {
-                                j.jp = i.i.value;
+                                j.jo = i.i.value;
                             }
                             if (nullableNotEquals(i.j, null)) {
                                 j.il = i.j.value;
@@ -17574,7 +17575,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         k.effectsFinished = delegateCombine(k.effectsFinished, function (l, m) {
             i.ht = 3;
             c.a = 3;
-            if (i.je) {
+            if (i.jd) {
                 a.externalGrid.ensureColumnsAreManual();
                 a.externalGrid.removeExternalColumn(i.externalObject);
             }
@@ -17749,7 +17750,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var j = a.columnPropertyUpdatingAnimationMode;
         var k = new ColumnCellsEffect();
         k.bx(i);
-        k.t = 7;
+        k.t = 8;
         k.as = true;
         if (g == 0) {
             k.v = 5;
@@ -17915,7 +17916,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var m = a.columnPropertyUpdatingAnimationMode;
         var n = new ColumnCellsEffect();
         n.bx(l);
-        n.t = 7;
+        n.t = 8;
         n.as = true;
         if (g) {
             n.v = 5;
@@ -18118,7 +18119,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var h = b; h <= c; h++) {
             var i = new RowCellsEffect();
             g.g(i);
-            i.t = 6;
+            i.t = 7;
             i.bx(e);
             i.al = true;
             i.bq = 1;
@@ -18503,7 +18504,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var h = new CellEffect();
         h.onFinished = delegateCombine(h.onFinished, function (i) { return _this.w(e); });
         h.onCanceled = delegateCombine(h.onCanceled, function (i, j) { return _this.v(e); });
-        h.t = 8;
+        h.t = 9;
         h.bx(f);
         h.al = true;
         h.bq = 1;
@@ -18582,7 +18583,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var h = new CellEffect();
         h.onFinished = delegateCombine(h.onFinished, function (i) { return _this.w(e); });
         h.onCanceled = delegateCombine(h.onCanceled, function (i, j) { return _this.v(e); });
-        h.t = 8;
+        h.t = 9;
         h.bx(f);
         h.al = true;
         h.bq = 0;
@@ -18701,7 +18702,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = new RowCellsEffect();
         e.onFinished = delegateCombine(e.onFinished, function (f) { return _this.w(c); });
         e.onCanceled = delegateCombine(e.onCanceled, function (f, g) { return _this.v(c); });
-        e.t = 5;
+        e.t = 6;
         e.bx(d);
         e.al = true;
         e.bq = 1;
@@ -18743,7 +18744,7 @@ var GridAnimationManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = new RowCellsEffect();
         e.onFinished = delegateCombine(e.onFinished, function (f) { return _this.w(c); });
         e.onCanceled = delegateCombine(e.onCanceled, function (f, g) { return _this.v(c); });
-        e.t = 5;
+        e.t = 6;
         e.bx(d);
         e.al = true;
         e.bq = 0;
@@ -21728,47 +21729,47 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.ku = null;
         _this.kv = null;
         _this.ks = null;
-        _this.np = null;
-        _this.nk = null;
-        _this.nn = null;
-        _this.ni = null;
+        _this.nq = null;
+        _this.nl = null;
         _this.no = null;
         _this.nj = null;
+        _this.np = null;
+        _this.nk = null;
         _this.h5 = null;
         _this.hu = null;
         _this.jx = NaN;
-        _this.i6 = false;
-        _this.i0 = false;
-        _this.i9 = false;
+        _this.i5 = false;
+        _this.iz = false;
+        _this.i8 = false;
         _this.g0 = null;
         _this.g2 = null;
         _this.h9 = null;
-        _this.i5 = true;
-        _this.i8 = true;
-        _this.i7 = false;
-        _this.ja = false;
+        _this.i4 = true;
+        _this.i7 = true;
+        _this.i6 = false;
+        _this.i9 = false;
         _this.hq = 0;
         _this.ij = 0;
-        _this.iz = false;
+        _this.iy = false;
         _this.hg = 0;
         _this.hh = 0;
-        _this.ng = null;
-        _this.nl = null;
+        _this.nh = null;
+        _this.nm = null;
         _this.hl = 0;
         _this.hk = 0;
+        _this.iu = true;
+        _this.i0 = true;
+        _this.iw = true;
+        _this.i2 = true;
         _this.iv = true;
         _this.i1 = true;
-        _this.ix = true;
         _this.i3 = true;
-        _this.iw = true;
-        _this.i2 = true;
-        _this.i4 = true;
-        _this.nm = null;
-        _this.nh = null;
+        _this.nn = null;
+        _this.ni = null;
         _this.jw = NaN;
         _this.jv = 0;
-        _this.is = null;
         _this.ir = null;
+        _this.iq = null;
         _this.hy = 0;
         _this.kp = null;
         _this.kt = null;
@@ -21785,20 +21786,20 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.h7 = null;
         _this.columnCellsPropertyUpdating = null;
         _this.columnHeaderCellsPropertyUpdating = null;
-        _this.ip = null;
-        _this.iy = false;
+        _this.io = null;
+        _this.ix = false;
         _this.ju = null;
         _this.hw = null;
         _this._commandCompleted = null;
         _this._invalidateActions = null;
-        _this.im = null;
-        _this.iy = true;
+        _this.jt = null;
+        _this.ix = true;
         _this.header = new TextHeader();
-        _this.iy = false;
+        _this.ix = false;
         _this.e = _this.f();
         _this.j = _this.k();
-        _this.nu = _this.ny();
-        _this.ns = _this.nx();
+        _this.nv = _this.nz();
+        _this.nt = _this.ny();
         _this.ko = DataGridColumn.kn++;
         _this.h7 = new GridFilterOperandsCollection();
         var a = _this.h7;
@@ -21853,10 +21854,10 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return false;
     };
-    DataGridColumn.prototype.ny = function () {
+    DataGridColumn.prototype.nz = function () {
         return GridStyleRepository.bg;
     };
-    DataGridColumn.prototype.nx = function () {
+    DataGridColumn.prototype.ny = function () {
         return GridStyleRepository.a7;
     };
     Object.defineProperty(DataGridColumn.prototype, "ht", {
@@ -22024,85 +22025,85 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "n1", {
+    Object.defineProperty(DataGridColumn.prototype, "n2", {
         get: function () {
-            return this.np;
+            return this.nq;
         },
         set: function (a) {
-            var b = this.np;
-            this.np = a;
-            if (this.np != b) {
-                this.et("SelectedBackground", 10, b, this.np);
+            var b = this.nq;
+            this.nq = a;
+            if (this.nq != b) {
+                this.et("SelectedBackground", 10, b, this.nq);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nu", {
+    Object.defineProperty(DataGridColumn.prototype, "nv", {
         get: function () {
-            return this.nk;
+            return this.nl;
         },
         set: function (a) {
-            var b = this.nk;
-            this.nk = a;
-            if (this.nk != b) {
-                this.et("ActualSelectedBackground", 2, b, this.nk);
+            var b = this.nl;
+            this.nl = a;
+            if (this.nl != b) {
+                this.et("ActualSelectedBackground", 2, b, this.nl);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nz", {
+    Object.defineProperty(DataGridColumn.prototype, "n0", {
         get: function () {
-            return this.nn;
+            return this.no;
         },
         set: function (a) {
-            var b = this.nn;
-            this.nn = a;
-            if (this.nn != b) {
-                this.et("RowHoverBackground", 10, b, this.nn);
+            var b = this.no;
+            this.no = a;
+            if (this.no != b) {
+                this.et("RowHoverBackground", 10, b, this.no);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "ns", {
+    Object.defineProperty(DataGridColumn.prototype, "nt", {
         get: function () {
-            return this.ni;
+            return this.nj;
         },
         set: function (a) {
-            var b = this.ni;
-            this.ni = a;
-            if (this.ni != b) {
-                this.et("ActualHoverBackground", 2, b, this.ni);
+            var b = this.nj;
+            this.nj = a;
+            if (this.nj != b) {
+                this.et("ActualHoverBackground", 2, b, this.nj);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "n0", {
+    Object.defineProperty(DataGridColumn.prototype, "n1", {
         get: function () {
-            return this.no;
+            return this.np;
         },
         set: function (a) {
-            var b = this.no;
-            this.no = a;
-            if (this.no != b) {
-                this.et("RowHoverTextColor", 10, b, this.no);
+            var b = this.np;
+            this.np = a;
+            if (this.np != b) {
+                this.et("RowHoverTextColor", 10, b, this.np);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nt", {
+    Object.defineProperty(DataGridColumn.prototype, "nu", {
         get: function () {
-            return this.nj;
+            return this.nk;
         },
         set: function (a) {
-            var b = this.nj;
-            this.nj = a;
-            if (this.nj != b) {
-                this.et("ActualRowHoverTextColor", 2, b, this.nj);
+            var b = this.nk;
+            this.nk = a;
+            if (this.nk != b) {
+                this.et("ActualRowHoverTextColor", 2, b, this.nk);
             }
         },
         enumerable: false,
@@ -22150,45 +22151,45 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jo", {
+    Object.defineProperty(DataGridColumn.prototype, "jn", {
         get: function () {
-            return this.i6;
+            return this.i5;
         },
         set: function (a) {
-            var b = this.i6;
-            this.i6 = a;
-            if (this.i6 != b) {
-                this.et("IsFromMarkup", 10, b, this.i6);
+            var b = this.i5;
+            this.i5 = a;
+            if (this.i5 != b) {
+                this.et("IsFromMarkup", 10, b, this.i5);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "ji", {
+    Object.defineProperty(DataGridColumn.prototype, "jh", {
         get: function () {
-            return this.i0;
+            return this.iz;
         },
         set: function (a) {
-            var b = this.i0;
+            var b = this.iz;
             if (a) {
-                this.jr = true;
+                this.jq = true;
             }
-            this.i0 = a;
-            if (this.i0 != b) {
-                this.et("IsAutoGenerated", 10, b, this.i0);
+            this.iz = a;
+            if (this.iz != b) {
+                this.et("IsAutoGenerated", 10, b, this.iz);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jr", {
+    Object.defineProperty(DataGridColumn.prototype, "jq", {
         get: function () {
-            return this.i9;
+            return this.i8;
         },
         set: function (a) {
             var self_ = this;
             var value_ = a;
-            this.i9 = value_;
+            this.i8 = value_;
             self_.___mustPassByValue = true;
         },
         enumerable: false,
@@ -22253,57 +22254,57 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jn", {
+    Object.defineProperty(DataGridColumn.prototype, "jm", {
         get: function () {
-            return this.i5;
+            return this.i4;
         },
         set: function (a) {
-            var b = this.i5;
-            this.i5 = a;
-            if (this.i5 != b) {
-                this.et("IsFilteringEnabled", 10, b, this.i5);
+            var b = this.i4;
+            this.i4 = a;
+            if (this.i4 != b) {
+                this.et("IsFilteringEnabled", 10, b, this.i4);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jq", {
+    Object.defineProperty(DataGridColumn.prototype, "jp", {
         get: function () {
-            return this.i8;
+            return this.i7;
         },
         set: function (a) {
-            var b = this.i8;
-            this.i8 = a;
-            if (this.i8 != b) {
-                this.et("IsResizingEnabled", 10, b, this.i8);
+            var b = this.i7;
+            this.i7 = a;
+            if (this.i7 != b) {
+                this.et("IsResizingEnabled", 10, b, this.i7);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jp", {
+    Object.defineProperty(DataGridColumn.prototype, "jo", {
         get: function () {
-            return this.i7;
+            return this.i6;
         },
         set: function (a) {
-            var b = this.i7;
-            this.i7 = a;
-            if (this.i7 != b) {
-                this.et("IsHidden", 10, b, this.i7);
+            var b = this.i6;
+            this.i6 = a;
+            if (this.i6 != b) {
+                this.et("IsHidden", 10, b, this.i6);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jt", {
+    Object.defineProperty(DataGridColumn.prototype, "js", {
         get: function () {
-            return this.ja;
+            return this.i9;
         },
         set: function (a) {
-            var b = this.ja;
-            this.ja = a;
-            if (this.ja != b) {
-                this.et("ShouldRemoveWhenHidden", 10, b, this.ja);
+            var b = this.i9;
+            this.i9 = a;
+            if (this.i9 != b) {
+                this.et("ShouldRemoveWhenHidden", 10, b, this.i9);
             }
         },
         enumerable: false,
@@ -22337,26 +22338,26 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jh", {
+    Object.defineProperty(DataGridColumn.prototype, "jg", {
         get: function () {
-            return this.iz;
+            return this.iy;
         },
         set: function (a) {
-            var b = this.iz;
-            this.iz = a;
-            if (this.iz != b) {
-                this.et("InternalShouldRemoveWhenHidden", 10, b, this.iz);
+            var b = this.iy;
+            this.iy = a;
+            if (this.iy != b) {
+                this.et("InternalShouldRemoveWhenHidden", 10, b, this.iy);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "je", {
+    Object.defineProperty(DataGridColumn.prototype, "jd", {
         get: function () {
-            if (this.iz) {
+            if (this.iy) {
                 return true;
             }
-            return this.ja;
+            return this.i9;
         },
         enumerable: false,
         configurable: true
@@ -22389,29 +22390,29 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nq", {
+    Object.defineProperty(DataGridColumn.prototype, "nr", {
         get: function () {
-            return this.ng;
+            return this.nh;
         },
         set: function (a) {
-            var b = this.ng;
-            this.ng = a;
-            if (this.ng != b) {
-                this.et("ActualColumnOptionsIconColor", 2, b, this.ng);
+            var b = this.nh;
+            this.nh = a;
+            if (this.nh != b) {
+                this.et("ActualColumnOptionsIconColor", 2, b, this.nh);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nv", {
+    Object.defineProperty(DataGridColumn.prototype, "nw", {
         get: function () {
-            return this.nl;
+            return this.nm;
         },
         set: function (a) {
-            var b = this.nl;
-            this.nl = a;
-            if (this.nl != b) {
-                this.et("ColumnOptionsIconColor", 10, b, this.nl);
+            var b = this.nm;
+            this.nm = a;
+            if (this.nm != b) {
+                this.et("ColumnOptionsIconColor", 10, b, this.nm);
             }
         },
         enumerable: false,
@@ -22445,127 +22446,127 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jb", {
+    Object.defineProperty(DataGridColumn.prototype, "ja", {
         get: function () {
-            return this.iv;
+            return this.iu;
         },
         set: function (a) {
-            var b = this.iv;
-            this.iv = a;
-            if (this.iv != b) {
-                this.et("ActualIsColumnOptionsEnabled", 5, b, this.iv);
+            var b = this.iu;
+            this.iu = a;
+            if (this.iu != b) {
+                this.et("ActualIsColumnOptionsEnabled", 5, b, this.iu);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jj", {
+    Object.defineProperty(DataGridColumn.prototype, "ji", {
         get: function () {
-            return this.i1;
+            return this.i0;
         },
         set: function (a) {
-            var b = this.i1;
-            this.i1 = a;
-            if (this.i1 != b) {
-                this.et("IsColumnOptionsEnabled", 10, b, this.i1);
+            var b = this.i0;
+            this.i0 = a;
+            if (this.i0 != b) {
+                this.et("IsColumnOptionsEnabled", 10, b, this.i0);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jd", {
+    Object.defineProperty(DataGridColumn.prototype, "jc", {
         get: function () {
-            return this.ix;
+            return this.iw;
         },
         set: function (a) {
-            var b = this.ix;
-            this.ix = a;
-            if (this.ix != b) {
-                this.et("ActualIsColumnOptionsSummariesEnabled", 5, b, this.ix);
+            var b = this.iw;
+            this.iw = a;
+            if (this.iw != b) {
+                this.et("ActualIsColumnOptionsSummariesEnabled", 5, b, this.iw);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jl", {
+    Object.defineProperty(DataGridColumn.prototype, "jk", {
         get: function () {
-            return this.i3;
+            return this.i2;
         },
         set: function (a) {
-            var b = this.i3;
-            this.i3 = a;
-            if (b != this.i3) {
-                this.et("IsColumnOptionsSummariesEnabled", 10, b, this.i3);
+            var b = this.i2;
+            this.i2 = a;
+            if (b != this.i2) {
+                this.et("IsColumnOptionsSummariesEnabled", 10, b, this.i2);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jc", {
+    Object.defineProperty(DataGridColumn.prototype, "jb", {
         get: function () {
-            return this.iw;
+            return this.iv;
         },
         set: function (a) {
-            var b = this.iw;
-            this.iw = a;
-            if (this.iw != b) {
-                this.et("ActualIsColumnOptionsGroupingEnabled", 5, b, this.iw);
+            var b = this.iv;
+            this.iv = a;
+            if (this.iv != b) {
+                this.et("ActualIsColumnOptionsGroupingEnabled", 5, b, this.iv);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jk", {
+    Object.defineProperty(DataGridColumn.prototype, "jj", {
         get: function () {
-            return this.i2;
+            return this.i1;
         },
         set: function (a) {
-            var b = this.i2;
-            this.i2 = a;
-            if (b != this.i2) {
-                this.et("IsColumnOptionsGroupingEnabled", 10, b, this.i2);
+            var b = this.i1;
+            this.i1 = a;
+            if (b != this.i1) {
+                this.et("IsColumnOptionsGroupingEnabled", 10, b, this.i1);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "jm", {
+    Object.defineProperty(DataGridColumn.prototype, "jl", {
         get: function () {
-            return this.i4;
+            return this.i3;
         },
         set: function (a) {
-            var b = this.i4;
-            this.i4 = a;
-            if (this.i4 != b) {
-                this.et("IsEditable", 10, b, this.i4);
+            var b = this.i3;
+            this.i3 = a;
+            if (this.i3 != b) {
+                this.et("IsEditable", 10, b, this.i3);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nw", {
+    Object.defineProperty(DataGridColumn.prototype, "nx", {
         get: function () {
-            return this.nm;
+            return this.nn;
         },
         set: function (a) {
-            var b = this.nm;
-            this.nm = a;
-            if (this.nm != b) {
-                this.et("DeletedTextColor", 10, b, this.nm);
+            var b = this.nn;
+            this.nn = a;
+            if (this.nn != b) {
+                this.et("DeletedTextColor", 10, b, this.nn);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "nr", {
+    Object.defineProperty(DataGridColumn.prototype, "ns", {
         get: function () {
-            return this.nh;
+            return this.ni;
         },
         set: function (a) {
-            var b = this.nh;
-            this.nh = a;
-            if (this.nh != b) {
-                this.et("ActualDeletedTextColor", 2, b, this.nh);
+            var b = this.ni;
+            this.ni = a;
+            if (this.ni != b) {
+                this.et("ActualDeletedTextColor", 2, b, this.ni);
             }
         },
         enumerable: false,
@@ -22601,27 +22602,27 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     });
     Object.defineProperty(DataGridColumn.prototype, "textEditStyle", {
         get: function () {
-            return this.is;
+            return this.ir;
         },
         set: function (a) {
-            var b = this.is;
-            this.is = a;
-            if (this.is != b) {
-                this.et("EditFontInfo", 10, b, this.is);
+            var b = this.ir;
+            this.ir = a;
+            if (this.ir != b) {
+                this.et("EditFontInfo", 10, b, this.ir);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "it", {
+    Object.defineProperty(DataGridColumn.prototype, "is", {
         get: function () {
-            return this.ir;
+            return this.iq;
         },
         set: function (a) {
-            var b = this.ir;
-            this.ir = a;
-            if (this.ir != b) {
-                this.et("ActualEditFontInfo", 3, b, this.ir);
+            var b = this.iq;
+            this.iq = a;
+            if (this.iq != b) {
+                this.et("ActualEditFontInfo", 3, b, this.iq);
             }
         },
         enumerable: false,
@@ -22840,7 +22841,7 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return this.id == 0 ? this.grid.mergedCellEvaluationCriteria : this.id;
     };
-    DataGridColumn.prototype.js = function () {
+    DataGridColumn.prototype.jr = function () {
         var a = this.ig();
         if (a == 3 && this.hr != 0) {
             return true;
@@ -22888,21 +22889,21 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     DataGridColumn.prototype.el = function (a, b, c, d) {
         _super.prototype.el.call(this, a, b, c, d);
-        a.l9 = this.nu;
-        a.l5 = this.ns;
-        a.l6 = this.nt;
+        a.l9 = this.nv;
+        a.l5 = this.nt;
+        a.l6 = this.nu;
         a.gm = this.kk;
         a.gq = this.km;
         a.go = this.kl;
         a.gk = this.kj;
         if (this.grid != null) {
-            if (this.it != null) {
-                this.it.w(this.grid.externalGrid.renderer);
+            if (this.is != null) {
+                this.is.w(this.grid.externalGrid.renderer);
             }
         }
-        a.af = this.it;
+        a.af = this.is;
         a.ck = this.jy;
-        a.l1 = this.nr;
+        a.l1 = this.ns;
         if (a.l.af == 4) {
             a.be = false;
             a.i = this.g8;
@@ -22922,17 +22923,17 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                 var e = c;
                 var f = d;
                 if (e != null) {
-                    e.definitionPropertyUpdated = delegateRemove(e.definitionPropertyUpdated, runOn(this, this.my));
+                    e.definitionPropertyUpdated = delegateRemove(e.definitionPropertyUpdated, runOn(this, this.mz));
                 }
                 if (f != null) {
-                    f.definitionPropertyUpdated = delegateCombine(f.definitionPropertyUpdated, runOn(this, this.my));
+                    f.definitionPropertyUpdated = delegateCombine(f.definitionPropertyUpdated, runOn(this, this.mz));
                     if (f.g == 4) {
                         f.e = this.g5();
                     }
                     if (f.l == 4) {
                         f.j = this.hb();
                     }
-                    if (!this.iy) {
+                    if (!this.ix) {
                         f.ey();
                     }
                 }
@@ -22941,7 +22942,7 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.k3 = d;
                 break;
             case "SelectedBackground":
-                this.nf();
+                this.ng();
                 break;
             case "ActualHorizontalAlignment":
                 if (this.header != null) {
@@ -22958,7 +22959,7 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 break;
             case "SortDirection":
-                this.nc(this, "SortDirection", 11, c, d);
+                this.nd(this, "SortDirection", 11, c, d);
                 break;
             case "ActualLastStickyRowBackground":
                 if (c != null && this.ga == null) {
@@ -22966,43 +22967,43 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 break;
             case "ColumnOptionsIconAlignment":
-                this.m3();
+                this.m4();
                 break;
             case "ColumnOptionsIconColor":
-                this.m7();
+                this.m8();
                 break;
             case "ColumnOptionsIconBehavior":
-                this.m6();
+                this.m7();
                 break;
             case "IsColumnOptionsEnabled":
-                this.m4();
+                this.m5();
                 break;
             case "IsColumnOptionsSummariesEnabled":
-                this.m8();
+                this.m9();
                 break;
             case "IsColumnOptionsGroupingEnabled":
-                this.m5();
+                this.m6();
                 break;
             case "DeletedTextColor":
-                this.m9();
+                this.na();
                 break;
             case "EditOpacity":
-                this.nb();
+                this.nc();
                 break;
             case "EditFontInfo":
-                this.na();
+                this.nb();
                 break;
             case "RowHoverBackground":
-                this.nd();
+                this.ne();
                 break;
             case "RowHoverTextColor":
-                this.ne();
+                this.nf();
                 break;
             case "MergedCellVerticalAlignment":
                 this.g8 = this.g9();
                 break;
         }
-        this.m2(a, b, c, d);
+        this.m3(a, b, c, d);
     };
     DataGridColumn.prototype.hb = function () {
         return this.j;
@@ -23019,13 +23020,13 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 1;
     };
-    DataGridColumn.prototype.nc = function (a, b, c, d, e) {
+    DataGridColumn.prototype.nd = function (a, b, c, d, e) {
         if (this.columnHeaderCellsPropertyUpdating != null) {
             this.columnHeaderCellsPropertyUpdating(this, b, c, d, e);
         }
     };
-    DataGridColumn.prototype.my = function (a, b) {
-        this.nc(this, b.propertyName, b.animationType, b.oldValue, b.newValue);
+    DataGridColumn.prototype.mz = function (a, b) {
+        this.nd(this, b.propertyName, b.animationType, b.oldValue, b.newValue);
     };
     DataGridColumn.prototype.eq = function (a, b) {
         if (this.hx != null) {
@@ -23034,8 +23035,8 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.header != null) {
             this.header.grid = b;
         }
-        this.nf();
-        this.nf();
+        this.ng();
+        this.ng();
         this.e5();
         this.fh();
         this.e6();
@@ -23047,23 +23048,23 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         this.fd();
         this.fe();
         this.ff();
+        this.nc();
         this.nb();
         this.na();
-        this.m9();
-        this.m3();
-        this.m7();
-        this.m6();
         this.m4();
         this.m8();
+        this.m7();
         this.m5();
-        this.nd();
+        this.m9();
+        this.m6();
         this.ne();
+        this.nf();
         this.g8 = this.g9();
     };
     DataGridColumn.prototype.es = function (a, b) {
         switch (b.propertyName) {
             case "CellSelectedBackground":
-                this.nf();
+                this.ng();
                 break;
             case "CellBackground":
                 this.e5();
@@ -23087,77 +23088,77 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.ff();
                 break;
             case "ColumnOptionsIconAlignment":
-                this.m3();
+                this.m4();
                 break;
             case "ColumnOptionsIconColor":
-                this.m7();
+                this.m8();
                 break;
             case "ColumnOptionsIconBehavior":
-                this.m6();
+                this.m7();
                 break;
             case "IsColumnOptionsEnabled":
-                this.m4();
+                this.m5();
                 break;
             case "IsColumnOptionsSummariesEnabled":
-                this.m8();
+                this.m9();
                 break;
             case "IsColumnOptionsGroupingEnabled":
-                this.m5();
+                this.m6();
                 break;
             case "DeletedTextColor":
-                this.m9();
+                this.na();
                 break;
             case "EditOpacity":
-                this.nb();
+                this.nc();
                 break;
             case "EditTextStyle":
-                this.na();
+                this.nb();
                 break;
             case "RowHoverBackground":
-                this.nd();
+                this.ne();
                 break;
             case "RowHoverTextColor":
-                this.ne();
+                this.nf();
                 break;
             case "MergedCellVerticalAlignment":
                 this.g8 = this.g9();
                 break;
         }
     };
-    DataGridColumn.prototype.nd = function () {
-        if (this.nz == null) {
+    DataGridColumn.prototype.ne = function () {
+        if (this.n0 == null) {
             if (this.grid != null && this.grid.rowHoverBackground != null) {
-                this.ns = this.grid.rowHoverBackground;
+                this.nt = this.grid.rowHoverBackground;
                 return;
             }
-            this.ns = this.nx();
+            this.nt = this.ny();
         }
         else {
-            this.ns = this.nz;
+            this.nt = this.n0;
         }
     };
-    DataGridColumn.prototype.ne = function () {
-        if (this.n0 == null) {
+    DataGridColumn.prototype.nf = function () {
+        if (this.n1 == null) {
             if (this.grid != null && this.grid.rowHoverTextColor != null) {
-                this.nt = this.grid.rowHoverTextColor;
+                this.nu = this.grid.rowHoverTextColor;
                 return;
             }
-            this.nt = null;
+            this.nu = null;
         }
         else {
-            this.nt = this.n0;
+            this.nu = this.n1;
         }
     };
-    DataGridColumn.prototype.nf = function () {
-        if (this.n1 == null) {
+    DataGridColumn.prototype.ng = function () {
+        if (this.n2 == null) {
             if (this.grid != null && this.grid.cellSelectedBackground != null) {
-                this.nu = this.grid.cellSelectedBackground;
+                this.nv = this.grid.cellSelectedBackground;
                 return;
             }
-            this.nu = this.ny();
+            this.nv = this.nz();
         }
         else {
-            this.nu = this.n1;
+            this.nv = this.n2;
         }
     };
     DataGridColumn.prototype.e5 = function () {
@@ -23209,19 +23210,19 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             this.bf = this.bm;
         }
     };
-    DataGridColumn.prototype.m9 = function () {
-        if (this.nw == null) {
+    DataGridColumn.prototype.na = function () {
+        if (this.nx == null) {
             if (this.grid != null && this.grid.deletedTextColor != null) {
-                this.nr = this.grid.deletedTextColor;
+                this.ns = this.grid.deletedTextColor;
                 return;
             }
-            this.nr = GridStyleRepository.bs;
+            this.ns = GridStyleRepository.bs;
         }
         else {
-            this.nr = this.nw;
+            this.ns = this.nx;
         }
     };
-    DataGridColumn.prototype.nb = function () {
+    DataGridColumn.prototype.nc = function () {
         if (isNaN_(this.jz)) {
             if (this.grid != null && !isNaN_(this.grid.editOpacity)) {
                 this.jy = this.grid.editOpacity;
@@ -23233,16 +23234,16 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             this.jy = this.jz;
         }
     };
-    DataGridColumn.prototype.na = function () {
+    DataGridColumn.prototype.nb = function () {
         if (this.textEditStyle == null) {
             if (this.grid != null && this.grid.editTextStyle != null) {
-                this.it = this.grid.editTextStyle;
+                this.is = this.grid.editTextStyle;
                 return;
             }
-            this.it = GridStyleRepository.m;
+            this.is = GridStyleRepository.m;
         }
         else {
-            this.it = this.textEditStyle;
+            this.is = this.textEditStyle;
         }
     };
     DataGridColumn.prototype.fe = function () {
@@ -23281,7 +23282,7 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             this.ga = this.gu;
         }
     };
-    DataGridColumn.prototype.m3 = function () {
+    DataGridColumn.prototype.m4 = function () {
         if (this.hj == 0) {
             if (this.grid != null && this.grid.columnOptionsIconAlignment != 0) {
                 this.hi = this.grid.columnOptionsIconAlignment;
@@ -23293,19 +23294,19 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             this.hi = this.hj;
         }
     };
-    DataGridColumn.prototype.m7 = function () {
-        if (this.nv == null) {
+    DataGridColumn.prototype.m8 = function () {
+        if (this.nw == null) {
             if (this.grid != null && this.grid.columnOptionsIconColor != null) {
-                this.nq = this.grid.columnOptionsIconColor;
+                this.nr = this.grid.columnOptionsIconColor;
                 return;
             }
-            this.nq = GridStyleRepository.a5;
+            this.nr = GridStyleRepository.a5;
         }
         else {
-            this.nq = this.nv;
+            this.nr = this.nw;
         }
     };
-    DataGridColumn.prototype.m6 = function () {
+    DataGridColumn.prototype.m7 = function () {
         if (this.hn == 0) {
             if (this.grid != null && this.grid.columnOptionsIconBehavior != 0) {
                 this.hm = this.grid.columnOptionsIconBehavior;
@@ -23317,31 +23318,31 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             this.hm = this.hn;
         }
     };
-    DataGridColumn.prototype.m4 = function () {
+    DataGridColumn.prototype.m5 = function () {
         if (this.grid != null) {
-            this.jb = this.grid.isColumnOptionsEnabled && this.jj;
+            this.ja = this.grid.isColumnOptionsEnabled && this.ji;
         }
         else {
-            this.jb = true;
+            this.ja = true;
         }
     };
-    DataGridColumn.prototype.m8 = function () {
+    DataGridColumn.prototype.m9 = function () {
         if (this.grid != null) {
-            this.jd = this.grid.isColumnOptionsSummariesEnabled && this.jl;
+            this.jc = this.grid.isColumnOptionsSummariesEnabled && this.jk;
         }
         else {
-            this.jd = false;
+            this.jc = false;
         }
     };
-    DataGridColumn.prototype.m5 = function () {
+    DataGridColumn.prototype.m6 = function () {
         if (this.grid != null) {
-            this.jc = this.grid.isColumnOptionsGroupingEnabled && this.jk;
+            this.jb = this.grid.isColumnOptionsGroupingEnabled && this.jj;
         }
         else {
-            this.jc = false;
+            this.jb = false;
         }
     };
-    DataGridColumn.prototype.m2 = function (a, b, c, d) {
+    DataGridColumn.prototype.m3 = function (a, b, c, d) {
         if (this.columnCellsPropertyUpdating != null) {
             this.columnCellsPropertyUpdating(this, a, b, c, d);
         }
@@ -23367,15 +23368,15 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     DataGridColumn.prototype.lt = function () {
         return this.mf != null && this.mf != "" ? this.mf : this.lo;
     };
-    DataGridColumn.prototype.m1 = function (a, b, c) {
-        if (this.ip == null) {
-            this.ip = new FastIterationDictionary$2(String_$type, Base.$, 0);
+    DataGridColumn.prototype.m2 = function (a, b, c) {
+        if (this.io == null) {
+            this.io = new FastIterationDictionary$2(String_$type, Base.$, 0);
         }
         var d = null;
-        if (this.ip.d(a)) {
-            d = this.ip.item(a);
+        if (this.io.d(a)) {
+            d = this.io.item(a);
         }
-        this.ip.item(a, c);
+        this.io.item(a, c);
         var e = false;
         if (d == null && c != null) {
             e = true;
@@ -23386,46 +23387,46 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         if (e) {
-            this.nc(this, a, b, d, c);
+            this.nd(this, a, b, d, c);
         }
     };
-    DataGridColumn.prototype.jg = function () {
-        if (this.ip == null) {
+    DataGridColumn.prototype.jf = function () {
+        if (this.io == null) {
             return false;
         }
-        return this.ip.r > 0;
+        return this.io.r > 0;
     };
-    Object.defineProperty(DataGridColumn.prototype, "iq", {
+    Object.defineProperty(DataGridColumn.prototype, "ip", {
         get: function () {
-            return this.ip;
+            return this.io;
         },
         enumerable: false,
         configurable: true
     });
-    DataGridColumn.prototype.jf = function (a) {
-        if (this.ip == null) {
+    DataGridColumn.prototype.je = function (a) {
+        if (this.io == null) {
             return false;
         }
-        return this.ip.d(a);
+        return this.io.d(a);
     };
-    DataGridColumn.prototype.m0 = function (a) {
-        if (this.ip == null) {
+    DataGridColumn.prototype.m1 = function (a) {
+        if (this.io == null) {
             return;
         }
-        if (this.ip.d(a)) {
-            this.ip.f(a);
+        if (this.io.d(a)) {
+            this.io.f(a);
         }
     };
     DataGridColumn.prototype.kr = function (a) {
-        if (this.ip == null) {
+        if (this.io == null) {
             return null;
         }
-        if (this.ip.d(a)) {
-            return this.ip.item(a);
+        if (this.io.d(a)) {
+            return this.io.item(a);
         }
         return null;
     };
-    DataGridColumn.prototype.mz = function (a) {
+    DataGridColumn.prototype.m0 = function (a) {
         if (this.ju == null) {
             this.ju = new List$1(LayoutAction_$type, 0);
         }
@@ -23580,15 +23581,68 @@ var DataGridColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DataGridColumn.prototype, "io", {
-        get: function () {
-            return this.im;
-        },
-        enumerable: false,
-        configurable: true
-    });
+    DataGridColumn.prototype.im = function () {
+        var e_23, _a;
+        if (this.jt == null) {
+            return null;
+        }
+        try {
+            for (var _b = __values(fromEnum(this.jt)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var a = _c.value;
+                return a;
+            }
+        }
+        catch (e_23_1) {
+            e_23 = { error: e_23_1 };
+        }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return))
+                    _a.call(_b);
+            }
+            finally {
+                if (e_23)
+                    throw e_23.error;
+            }
+        }
+        return null;
+    };
+    DataGridColumn.prototype.my = function (a) {
+        var e_24, _a;
+        if (this.jt == null) {
+            return;
+        }
+        try {
+            for (var _b = __values(fromEnum(this.jt)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var b = _c.value;
+                a(b);
+            }
+        }
+        catch (e_24_1) {
+            e_24 = { error: e_24_1 };
+        }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return))
+                    _a.call(_b);
+            }
+            finally {
+                if (e_24)
+                    throw e_24.error;
+            }
+        }
+    };
     DataGridColumn.prototype.provideContextAccessor = function (a) {
-        this.im = a;
+        if (this.jt == null) {
+            this.jt = new HashSet$1(IToolbarContextAccessor_$type, 0);
+        }
+        this.jt.add_1(a);
+    };
+    DataGridColumn.prototype.dismissContextAccessor = function (a) {
+        if (this.jt == null) {
+            return;
+        }
+        this.jt.remove(a);
     };
     DataGridColumn.prototype.mx = function () {
         if (this.hx != null) {
@@ -25828,25 +25882,25 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ComboBoxColumn, _super);
     function ComboBoxColumn() {
         var _this = _super.call(this) || this;
-        _this.n3 = null;
+        _this.n4 = null;
         _this.hz = 4;
         return _this;
     }
-    Object.defineProperty(ComboBoxColumn.prototype, "n4", {
+    Object.defineProperty(ComboBoxColumn.prototype, "n5", {
         get: function () {
-            return this.n3;
+            return this.n4;
         },
         set: function (a) {
-            var b = this.n3;
-            this.n3 = a;
-            if (this.n3 != b) {
-                this.et("ActualDataSource", 10, b, this.n3);
+            var b = this.n4;
+            this.n4 = a;
+            if (this.n4 != b) {
+                this.et("ActualDataSource", 10, b, this.n4);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ComboBoxColumn.prototype, "n5", {
+    Object.defineProperty(ComboBoxColumn.prototype, "n6", {
         get: function () {
             return this.kq;
         },
@@ -25856,7 +25910,7 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ComboBoxColumn.prototype, "n9", {
+    Object.defineProperty(ComboBoxColumn.prototype, "oa", {
         get: function () {
             return this.lk;
         },
@@ -25866,7 +25920,7 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ComboBoxColumn.prototype, "oa", {
+    Object.defineProperty(ComboBoxColumn.prototype, "ob", {
         get: function () {
             if (this.gz == null) {
                 return null;
@@ -25879,7 +25933,7 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ComboBoxColumn.prototype, "n2", {
+    Object.defineProperty(ComboBoxColumn.prototype, "n3", {
         get: function () {
             return this.gz;
         },
@@ -25897,14 +25951,14 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ComboBoxColumn.prototype.eq = function (a, b) {
         _super.prototype.eq.call(this, a, b);
-        if (this.n4 == null && this.n5 != null) {
+        if (this.n5 == null && this.n6 != null) {
             if (b != null) {
-                this.n4 = b.externalGrid.createLocalDataSource(this.n5);
+                this.n5 = b.externalGrid.createLocalDataSource(this.n6);
             }
         }
     };
     ComboBoxColumn.prototype.dz = function (a, b, c) {
-        return this.n8(b);
+        return this.n9(b);
     };
     ComboBoxColumn.prototype.eo = function (a, b, c, d) {
         _super.prototype.eo.call(this, a, b, c, d);
@@ -25918,68 +25972,68 @@ var ComboBoxColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         _super.prototype.ev.call(this, a, b, c, d);
         switch (a) {
             case "EditorItemsSourceInternal":
-                if (typeCast(IDataSource_$type, this.n5) !== null) {
-                    this.n4 = this.n5;
+                if (typeCast(IDataSource_$type, this.n6) !== null) {
+                    this.n5 = this.n6;
                 }
                 else if (this.grid != null) {
-                    this.n4 = this.grid.externalGrid.createLocalDataSource(this.n5);
+                    this.n5 = this.grid.externalGrid.createLocalDataSource(this.n6);
                 }
                 break;
             case "ActualDataSource":
                 if (c != null) {
                     var e = c;
-                    e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.ob));
+                    e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.oc));
                 }
-                if (this.n4 != null) {
-                    var f = this.n4;
-                    f.schemaChanged = delegateCombine(f.schemaChanged, runOn(this, this.ob));
+                if (this.n5 != null) {
+                    var f = this.n5;
+                    f.schemaChanged = delegateCombine(f.schemaChanged, runOn(this, this.oc));
                 }
-                this.oc();
+                this.od();
                 break;
             case "EditorTextFieldInternal":
             case "EditorValueFieldInternal":
-                this.oc();
+                this.od();
                 break;
         }
     };
-    ComboBoxColumn.prototype.ob = function (a, b) {
-        this.oc();
+    ComboBoxColumn.prototype.oc = function (a, b) {
+        this.od();
     };
-    ComboBoxColumn.prototype.oc = function () {
-        if (this.n4 != null) {
-            if (this.oa != null) {
-                this.n4.primaryKey = this.gz;
+    ComboBoxColumn.prototype.od = function () {
+        if (this.n5 != null) {
+            if (this.ob != null) {
+                this.n5.primaryKey = this.gz;
             }
-            else if (this.n9 != null) {
-                this.n4.primaryKey = [this.n9];
+            else if (this.oa != null) {
+                this.n5.primaryKey = [this.oa];
             }
             else {
-                var a = this.n4.actualSchema;
+                var a = this.n5.actualSchema;
                 if (a != null && a.propertyNames.length > 0) {
-                    this.n4.primaryKey = [a.propertyNames[0]];
+                    this.n5.primaryKey = [a.propertyNames[0]];
                 }
             }
         }
     };
-    ComboBoxColumn.prototype.n7 = function (a) {
+    ComboBoxColumn.prototype.n8 = function (a) {
         if (typeof a === 'string') {
             return a;
         }
         return null;
     };
-    ComboBoxColumn.prototype.n8 = function (a) {
+    ComboBoxColumn.prototype.n9 = function (a) {
         var b = null;
-        if (this.n4 != null && this.n9 != null) {
-            var c = this.n4.indexOfKey(typeCast(Array_$type, a) !== null ? a : [a]);
+        if (this.n5 != null && this.oa != null) {
+            var c = this.n5.indexOfKey(typeCast(Array_$type, a) !== null ? a : [a]);
             if (c > -1) {
-                var d = this.n4.getItemPropertyAtIndex(c, this.n9);
+                var d = this.n5.getItemPropertyAtIndex(c, this.oa);
                 if (d != null) {
-                    b = this.n7(d);
+                    b = this.n8(d);
                 }
             }
         }
         if (b == null && a != null) {
-            b = this.n7(a);
+            b = this.n8(a);
         }
         return b;
     };
@@ -25994,101 +26048,101 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(DateTimeColumn, _super);
     function DateTimeColumn() {
         var _this = _super.call(this) || this;
-        _this.n5 = new DateTimeColumnValueFormatter();
-        _this.n6 = 0;
+        _this.n6 = new DateTimeColumnValueFormatter();
+        _this.n7 = 0;
+        _this.oh = null;
         _this.og = null;
-        _this.of = null;
-        _this.n2 = null;
-        _this.oc = null;
-        _this.n9 = false;
-        _this.n4 = null;
+        _this.n3 = null;
+        _this.od = null;
+        _this.oa = false;
+        _this.n5 = null;
         return _this;
     }
-    Object.defineProperty(DateTimeColumn.prototype, "n7", {
+    Object.defineProperty(DateTimeColumn.prototype, "n8", {
         get: function () {
-            return this.n6;
+            return this.n7;
         },
         set: function (a) {
-            var b = this.n6;
-            this.n6 = a;
-            if (this.n6 != b) {
-                this.et("DateTimeFormat", 4, enumGetBox(DateTimeFormats_$type, b), enumGetBox(DateTimeFormats_$type, this.n6));
+            var b = this.n7;
+            this.n7 = a;
+            if (this.n7 != b) {
+                this.et("DateTimeFormat", 4, enumGetBox(DateTimeFormats_$type, b), enumGetBox(DateTimeFormats_$type, this.n7));
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "op", {
+    Object.defineProperty(DateTimeColumn.prototype, "oq", {
         get: function () {
-            return this.og;
+            return this.oh;
         },
         set: function (a) {
-            var b = this.og;
-            this.og = a;
-            if (this.og != b) {
-                this.et("FormatString", 8, b, this.og);
+            var b = this.oh;
+            this.oh = a;
+            if (this.oh != b) {
+                this.et("FormatString", 8, b, this.oh);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "oi", {
+    Object.defineProperty(DateTimeColumn.prototype, "oj", {
         get: function () {
-            return this.of;
+            return this.og;
         },
         set: function (a) {
-            var b = this.of;
-            this.of = a;
-            if (this.of != b) {
-                this.et("EditorFormatString", 8, b, this.of);
+            var b = this.og;
+            this.og = a;
+            if (this.og != b) {
+                this.et("EditorFormatString", 8, b, this.og);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "n3", {
+    Object.defineProperty(DateTimeColumn.prototype, "n4", {
         get: function () {
-            return this.n2;
+            return this.n3;
         },
         set: function (a) {
-            var b = this.n2;
-            this.n2 = a;
-            if (this.n2 != b) {
-                this.et("FormatSpecifiers", 9, b, this.n2);
+            var b = this.n3;
+            this.n3 = a;
+            if (this.n3 != b) {
+                this.et("FormatSpecifiers", 9, b, this.n3);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "oe", {
+    Object.defineProperty(DateTimeColumn.prototype, "of", {
         get: function () {
-            return this.oc;
+            return this.od;
         },
         set: function (a) {
-            var b = this.oc;
-            this.oc = a;
-            if (this.oc != b) {
-                this.et("FormatOverride", 9, b, this.oc);
+            var b = this.od;
+            this.od = a;
+            if (this.od != b) {
+                this.et("FormatOverride", 9, b, this.od);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "oa", {
+    Object.defineProperty(DateTimeColumn.prototype, "ob", {
         get: function () {
-            return this.n9;
+            return this.oa;
         },
         set: function (a) {
-            var b = this.n9;
-            this.n9 = a;
-            if (b != this.n9) {
-                this.et("ShowTodayButton", 5, b, this.n9);
+            var b = this.oa;
+            this.oa = a;
+            if (b != this.oa) {
+                this.et("ShowTodayButton", 5, b, this.oa);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "n8", {
+    Object.defineProperty(DateTimeColumn.prototype, "n9", {
         get: function () {
             return this.hz;
         },
@@ -26098,7 +26152,7 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "od", {
+    Object.defineProperty(DateTimeColumn.prototype, "oe", {
         get: function () {
             return this.kq;
         },
@@ -26108,7 +26162,7 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "ok", {
+    Object.defineProperty(DateTimeColumn.prototype, "ol", {
         get: function () {
             return this.lk;
         },
@@ -26118,7 +26172,7 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DateTimeColumn.prototype, "ol", {
+    Object.defineProperty(DateTimeColumn.prototype, "om", {
         get: function () {
             if (this.gz == null) {
                 return null;
@@ -26135,17 +26189,17 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         _super.prototype.ev.call(this, a, b, c, d);
         switch (a) {
             case "DateTimeFormat":
-                this.n5.k();
+                this.n6.k();
                 break;
             case "FormatString":
             case "FormatSpecifiers":
-                if (this.op != null) {
-                    this.n4 = new BindingFormatter();
-                    this.n4.j = this.op;
-                    this.n4.d = this.n3;
+                if (this.oq != null) {
+                    this.n5 = new BindingFormatter();
+                    this.n5.j = this.oq;
+                    this.n5.d = this.n4;
                 }
                 else {
-                    this.n4 = null;
+                    this.n5 = null;
                 }
                 break;
         }
@@ -26157,24 +26211,24 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         return a.af == 4 ? "datetime_mergedCell" : "datetime";
     };
     DateTimeColumn.prototype.dz = function (a, b, c) {
-        return this.om(b);
+        return this.on(b);
     };
     DateTimeColumn.prototype.eo = function (a, b, c, d) {
         _super.prototype.eo.call(this, a, b, c, d);
         var e = a;
-        e.mp = this.ob(c);
-        e.mj = this.n5;
-        this.n5.j(e.ml);
+        e.mp = this.oc(c);
+        e.mj = this.n6;
+        this.n6.j(e.ml);
     };
     DateTimeColumn.prototype.el = function (a, b, c, d) {
         _super.prototype.el.call(this, a, b, c, d);
         var e = a;
-        e.ml = this.n7;
-        e.m6 = this.op;
-        e.mg = this.n3;
-        e.mz = this.oe;
+        e.ml = this.n8;
+        e.m6 = this.oq;
+        e.mg = this.n4;
+        e.mz = this.of;
     };
-    DateTimeColumn.prototype.ob = function (a) {
+    DateTimeColumn.prototype.oc = function (a) {
         if (a == null) {
             return dateMinValue();
         }
@@ -26183,23 +26237,23 @@ var DateTimeColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return dateMinValue();
     };
-    DateTimeColumn.prototype.om = function (a) {
+    DateTimeColumn.prototype.on = function (a) {
         var b = (typeCast(Date_$type, a) !== null) ? a : dateMinValue();
-        if (this.n4 != null) {
+        if (this.n5 != null) {
             if (+b == +(dateMinValue())) {
                 return "";
             }
-            return this.n4.i(b);
+            return this.n5.i(b);
         }
-        if (this.oc != null) {
+        if (this.od != null) {
             if (+b == +(dateMinValue())) {
                 return "";
             }
             var date_ = b;
-            return (this.oc.format(date_));
+            return (this.od.format(date_));
         }
-        this.n5.j(this.n7);
-        var c = this.n5.i(b);
+        this.n6.j(this.n8);
+        var c = this.n6.i(b);
         if (c == stringEmpty()) {
             if (a != null && !(typeCast(Date_$type, a) !== null)) {
                 return a.toString();
@@ -26376,23 +26430,24 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
         }
     };
     DataGridColumnToolbarManager.prototype.a9 = function () {
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsColumnName", 3, this.f.k3);
-        }
+        var _this = this;
+        this.f.my(function (a) { return a.setContextValue("GridColumnOptionsColumnName", 3, _this.f.k3); });
     };
     DataGridColumnToolbarManager.prototype.bj = function () {
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsSortAscending", 5, this.e == 1);
-            this.f.io.setContextValue("GridColumnOptionsSortDescending", 5, this.e == 2);
-        }
+        var _this = this;
+        this.f.my(function (a) {
+            a.setContextValue("GridColumnOptionsSortAscending", 5, _this.e == 1);
+            a.setContextValue("GridColumnOptionsSortDescending", 5, _this.e == 2);
+        });
     };
     DataGridColumnToolbarManager.prototype.bg = function () {
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsMoveLeftSelected", 5, false);
-            this.f.io.setContextValue("GridColumnOptionsMoveRightSelected", 5, false);
-            this.f.io.setContextValue("GridColumnOptionsMoveLeftDisabled", 5, !this.m(this.f));
-            this.f.io.setContextValue("GridColumnOptionsMoveRightDisabled", 5, !this.n(this.f));
-        }
+        var _this = this;
+        this.f.my(function (a) {
+            a.setContextValue("GridColumnOptionsMoveLeftSelected", 5, false);
+            a.setContextValue("GridColumnOptionsMoveRightSelected", 5, false);
+            a.setContextValue("GridColumnOptionsMoveLeftDisabled", 5, !_this.m(_this.f));
+            a.setContextValue("GridColumnOptionsMoveRightDisabled", 5, !_this.n(_this.f));
+        });
     };
     DataGridColumnToolbarManager.prototype.l = function (a) {
         var b = this.f;
@@ -26422,12 +26477,13 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
         return this.l(true);
     };
     DataGridColumnToolbarManager.prototype.bh = function () {
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsPinnedLeft", 5, this.f.il == 1);
-            this.f.io.setContextValue("GridColumnOptionsPinnedRight", 5, this.f.il == 2);
-            this.f.io.setContextValue("GridColumnOptionsPinnedLeftIcon", 3, (this.f.il == 1) ? "UnpinLeft" : "PinLeft");
-            this.f.io.setContextValue("GridColumnOptionsPinnedRightIcon", 3, (this.f.il == 2) ? "UnpinRight" : "PinRight");
-        }
+        var _this = this;
+        this.f.my(function (a) {
+            a.setContextValue("GridColumnOptionsPinnedLeft", 5, _this.f.il == 1);
+            a.setContextValue("GridColumnOptionsPinnedRight", 5, _this.f.il == 2);
+            a.setContextValue("GridColumnOptionsPinnedLeftIcon", 3, (_this.f.il == 1) ? "UnpinLeft" : "PinLeft");
+            a.setContextValue("GridColumnOptionsPinnedRightIcon", 3, (_this.f.il == 2) ? "UnpinRight" : "PinRight");
+        });
     };
     DataGridColumnToolbarManager.prototype.bc = function () {
         var a = false;
@@ -26439,16 +26495,12 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                 break;
             }
         }
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsGroupedIcon", 3, (a) ? "Ungroup" : "Group");
-        }
+        this.f.my(function (e) { return e.setContextValue("GridColumnOptionsGroupedIcon", 3, (a) ? "Ungroup" : "Group"); });
     };
     DataGridColumnToolbarManager.prototype.bn = function () {
         var a = false;
-        a = !this.f.jp;
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsVisibilityIcon", 3, (a) ? "Hide" : "Show");
-        }
+        a = !this.f.jo;
+        this.f.my(function (b) { return b.setContextValue("GridColumnOptionsVisibilityIcon", 3, (a) ? "Hide" : "Show"); });
     };
     DataGridColumnToolbarManager.prototype.a3 = function (a) {
         this.q.add(a);
@@ -26799,17 +26851,15 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
         return x;
     };
     DataGridColumnToolbarManager.prototype.bk = function () {
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsSummariesTitle", 3, this.al());
-        }
+        var _this = this;
+        this.f.my(function (a) { return a.setContextValue("GridColumnOptionsSummariesTitle", 3, _this.al()); });
     };
     DataGridColumnToolbarManager.prototype.bl = function () {
+        var _this = this;
         if (this.f == null || this.f.grid == null) {
             return;
         }
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsSummariesTitle", 3, this.an());
-        }
+        this.f.my(function (a) { return a.setContextValue("GridColumnOptionsSummariesTitle", 3, _this.an()); });
         var a = false;
         var b = false;
         var c = false;
@@ -26841,17 +26891,17 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                 }
             }
         }
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsSummariesVisible", 6, this.b6());
-            this.f.io.setContextValue("GridColumnOptionsSummariesAverageChecked", 5, a);
-            this.f.io.setContextValue("GridColumnOptionsSummariesMinimumChecked", 5, b);
-            this.f.io.setContextValue("GridColumnOptionsSummariesMaximumChecked", 5, c);
-            this.f.io.setContextValue("GridColumnOptionsSummariesSumChecked", 5, e);
-            this.f.io.setContextValue("GridColumnOptionsSummariesCountChecked", 5, d);
-        }
+        this.f.my(function (j) {
+            j.setContextValue("GridColumnOptionsSummariesVisible", 6, _this.b6());
+            j.setContextValue("GridColumnOptionsSummariesAverageChecked", 5, a);
+            j.setContextValue("GridColumnOptionsSummariesMinimumChecked", 5, b);
+            j.setContextValue("GridColumnOptionsSummariesMaximumChecked", 5, c);
+            j.setContextValue("GridColumnOptionsSummariesSumChecked", 5, e);
+            j.setContextValue("GridColumnOptionsSummariesCountChecked", 5, d);
+        });
     };
     DataGridColumnToolbarManager.prototype.b6 = function () {
-        if (this.f.jd && this.f.grid.summaryScope != 3) {
+        if (this.f.jc && this.f.grid.summaryScope != 3) {
             return 0;
         }
         return 1;
@@ -26868,15 +26918,13 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
     };
     DataGridColumnToolbarManager.prototype.u = function () {
         var a = 0;
-        if (this.f.io != null) {
-            var b = this.f.io.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
-            var c = this.f.io.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
-            var d = this.f.io.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
-            var e = this.f.io.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
-            var f = this.f.io.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
-            if (b) {
-                a++;
-            }
+        var b = this.f.im();
+        if (b != null) {
+            var c = b.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
+            var d = b.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
+            var e = b.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
+            var f = b.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
+            var g = b.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
             if (c) {
                 a++;
             }
@@ -26889,6 +26937,9 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
             if (f) {
                 a++;
             }
+            if (g) {
+                a++;
+            }
         }
         return a;
     };
@@ -26946,11 +26997,11 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                 }
             }
             e.flushAutoRefresh();
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsFilterItemsSource", 7, e);
-                this.f.io.setContextValue("GridColumnOptionsFilterDataMemberPath", 3, c);
-                this.f.io.setContextValue("GridColumnOptionsFilterPrimaryKey", 7, [c]);
-            }
+            this.f.my(function (k) {
+                k.setContextValue("GridColumnOptionsFilterItemsSource", 7, e);
+                k.setContextValue("GridColumnOptionsFilterDataMemberPath", 3, c);
+                k.setContextValue("GridColumnOptionsFilterPrimaryKey", 7, [c]);
+            });
             e.shouldEmitSectionHeaders = true;
             e.isSectionHeaderNormalRow = true;
             e.isSectionExpandedDefault = false;
@@ -26962,7 +27013,7 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
     DataGridColumnToolbarManager.prototype.b5 = function (a, b) {
     };
     DataGridColumnToolbarManager.prototype.b4 = function () {
-        var e_23, _a;
+        var e_25, _a;
         var a = this.f;
         var b = (null != a) ? a.lo : null;
         var c = true;
@@ -26986,22 +27037,18 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
             }
         }
         if (e.count == 0 || !c) {
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsFilterIndexType", 6, 0);
-            }
-            this.f.io.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, new LayoutSelectedKeysCollection());
+            this.f.my(function (h) {
+                h.setContextValue("GridColumnOptionsFilterIndexType", 6, 0);
+                h.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, new LayoutSelectedKeysCollection());
+            });
             return;
         }
         switch (d.value) {
             case 0:
-                if (this.f.io != null) {
-                    this.f.io.setContextValue("GridColumnOptionsFilterIndexType", 6, 1);
-                }
+                this.f.my(function (h) { return h.setContextValue("GridColumnOptionsFilterIndexType", 6, 1); });
                 break;
             case 1:
-                if (this.f.io != null) {
-                    this.f.io.setContextValue("GridColumnOptionsFilterIndexType", 6, 0);
-                }
+                this.f.my(function (h) { return h.setContextValue("GridColumnOptionsFilterIndexType", 6, 0); });
                 break;
         }
         var h = new LayoutSelectedKeysCollection();
@@ -27011,8 +27058,8 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                 h.add(new LayoutPrimaryKeyValue(0, [b], [i.value]));
             }
         }
-        catch (e_23_1) {
-            e_23 = { error: e_23_1 };
+        catch (e_25_1) {
+            e_25 = { error: e_25_1 };
         }
         finally {
             try {
@@ -27020,13 +27067,11 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                     _a.call(_b);
             }
             finally {
-                if (e_23)
-                    throw e_23.error;
+                if (e_25)
+                    throw e_25.error;
             }
         }
-        if (this.f.io != null) {
-            this.f.io.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, h);
-        }
+        this.f.my(function (j) { return j.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, h); });
         this.b3();
     };
     DataGridColumnToolbarManager.prototype.b3 = function () {
@@ -27075,7 +27120,7 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
         if (this.f.grid != null && this.f.grid.filterUIType != 0) {
             return false;
         }
-        if (!this.f.jn) {
+        if (!this.f.jm) {
             return false;
         }
         if (this.f.grid == null || this.f.grid.actualDataSource == null || !this.f.grid.actualDataSource.isGroupingSupported || !this.f.grid.actualDataSource.isFilteringSupported) {
@@ -27230,86 +27275,91 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
         return c;
     };
     DataGridColumnToolbarManager.prototype.a6 = function () {
-        if (this.f.io != null) {
-            var a = this.f.io.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
-            var b = this.f.io.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
-            var c = this.f.io.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
-            var d = this.f.io.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
-            var e = this.f.io.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
-            var f = new HashSet$1(DataSourceSummaryOperand_$type, 0);
-            if (a) {
-                f.add_1(3);
-            }
+        var a = this.f.im();
+        if (a != null) {
+            var b = a.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
+            var c = a.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
+            var d = a.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
+            var e = a.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
+            var f = a.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
+            var g = new HashSet$1(DataSourceSummaryOperand_$type, 0);
             if (b) {
-                f.add_1(0);
+                g.add_1(3);
             }
             if (c) {
-                f.add_1(1);
+                g.add_1(0);
             }
             if (d) {
-                f.add_1(2);
-            }
-            if (e) {
-                f.add_1(4);
-            }
-            this.by(f);
-            if (a) {
-                this.bm(a, 3);
+                g.add_1(1);
             }
             if (e) {
-                this.bm(e, 4);
+                g.add_1(2);
             }
-            if (c) {
-                this.bm(c, 1);
+            if (f) {
+                g.add_1(4);
             }
+            this.by(g);
             if (b) {
-                this.bm(b, 0);
+                this.bm(b, 3);
+            }
+            if (f) {
+                this.bm(f, 4);
             }
             if (d) {
-                this.bm(d, 2);
+                this.bm(d, 1);
+            }
+            if (c) {
+                this.bm(c, 0);
+            }
+            if (e) {
+                this.bm(e, 2);
             }
         }
     };
     DataGridColumnToolbarManager.prototype.a5 = function () {
-        var e_24, _a;
-        var a = this.f.io.getContextValue("GridColumnOptionsFilterSelectedKeys", 7);
-        var b = EnumUtil.getEnumValue(ToolActionCheckboxListIndexType_$type, this.f.io.getContextValue("GridColumnOptionsFilterIndexType", 6));
-        if (0 == a.count) {
+        var e_26, _a;
+        var a = this.f.im();
+        if (a == null) {
+            return;
+        }
+        var b = a.getContextValue("GridColumnOptionsFilterSelectedKeys", 7);
+        var c = EnumUtil.getEnumValue(ToolActionCheckboxListIndexType_$type, a.getContextValue("GridColumnOptionsFilterIndexType", 6));
+        if (0 == b.count) {
             this.a7();
             return;
         }
-        var c;
         var d;
-        if (b == 0) {
-            d = false;
-            c = 1;
+        var e;
+        if (c == 0) {
+            e = false;
+            d = 1;
         }
         else {
-            d = true;
-            c = 0;
+            e = true;
+            d = 0;
         }
-        var e = new List$1(ColumnComparisonFilterCondition.$, 0);
-        var f = a;
-        for (var g = 0; g < f.count; g++) {
-            var h = f._inner[g];
-            var i = h.value[0];
-            var j = DataGridColumnToolbarManager.b(c, i);
-            e.add(j);
+        var f = new List$1(ColumnComparisonFilterCondition.$, 0);
+        var g = b;
+        for (var h = 0; h < g.count; h++) {
+            var i = g._inner[h];
+            var j = i.value[0];
+            var k = DataGridColumnToolbarManager.b(d, j);
+            f.add(k);
         }
-        if (e.count == 1) {
-            this.f.g1 = e._inner[0];
+        if (f.count == 1) {
+            this.f.g1 = f._inner[0];
         }
         else {
-            var k = new ColumnFilterConditionGroup();
-            k.usesOrOperator = d;
+            var l = new ColumnFilterConditionGroup();
+            l.usesOrOperator = e;
             try {
-                for (var _b = __values(fromEnum(e)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var l = _c.value;
-                    k.add(l);
+                for (var _b = __values(fromEnum(f)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var m = _c.value;
+                    l.add(m);
                 }
             }
-            catch (e_24_1) {
-                e_24 = { error: e_24_1 };
+            catch (e_26_1) {
+                e_26 = { error: e_26_1 };
             }
             finally {
                 try {
@@ -27317,16 +27367,16 @@ var DataGridColumnToolbarManager = /** @class */ /*@__PURE__*/ (function (_super
                         _a.call(_b);
                 }
                 finally {
-                    if (e_24)
-                        throw e_24.error;
+                    if (e_26)
+                        throw e_26.error;
                 }
             }
-            this.f.g1 = k;
+            this.f.g1 = l;
         }
-        this.f.mz("Filtered");
+        this.f.m0("Filtered");
     };
     DataGridColumnToolbarManager.prototype.b2 = function () {
-        this.f.jp = !this.f.jp;
+        this.f.jo = !this.f.jo;
     };
     DataGridColumnToolbarManager.prototype.b1 = function () {
         var a = new ColumnGroupDescription(0);
@@ -27657,8 +27707,8 @@ var EditorDefinition = /** @class */ /*@__PURE__*/ (function (_super) {
             e.mg = f.gz;
             e.mi = b.actualDataSource.resolveSchemaPropertyType(f.lo);
             if (typeCast(DateTimeColumn.$, f) !== null) {
-                e.nf = (typeCast(DateTimeColumn.$, f)).oi;
-                e.ms = (typeCast(DateTimeColumn.$, f)).oa;
+                e.nf = (typeCast(DateTimeColumn.$, f)).oj;
+                e.ms = (typeCast(DateTimeColumn.$, f)).ob;
             }
         }
     };
@@ -27800,7 +27850,7 @@ var FilterRowDefinition = /** @class */ /*@__PURE__*/ (function (_super) {
         a.gk = this.g2;
         var e = a;
         var f = b.cf(a.l);
-        e.mq = f.jn;
+        e.mq = f.jm;
     };
     FilterRowDefinition.prototype.eo = function (a, b, c, d) {
         _super.prototype.eo.call(this, a, b, c, d);
@@ -28107,8 +28157,8 @@ var Header = /** @class */ /*@__PURE__*/ (function (_super) {
         _super.prototype.eo.call(this, a, b, c, d);
         var e = b.cf(a.l);
         if (e != null) {
-            if (a.l.g && e.jg()) {
-                var f = e.iq;
+            if (a.l.g && e.jf()) {
+                var f = e.ip;
                 var g = f.o;
                 var h = g.count;
                 var i = f.p;
@@ -28286,42 +28336,42 @@ var ImageColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ImageColumn, _super);
     function ImageColumn() {
         var _this = _super.call(this) || this;
-        _this.n5 = 0;
-        _this.n3 = 0;
         _this.n6 = 0;
+        _this.n4 = 0;
+        _this.n7 = 0;
         _this.j = _this.k();
         _this.e = _this.f();
         return _this;
     }
-    Object.defineProperty(ImageColumn.prototype, "n6", {
+    Object.defineProperty(ImageColumn.prototype, "n7", {
         get: function () {
-            return this.n5;
+            return this.n6;
         },
         set: function (a) {
-            var b = this.n5;
-            this.n5 = a;
-            if (this.n5 != b) {
-                this.et("ImageStretchOption", 4, enumGetBox(ImageStretchOptions_$type, b), enumGetBox(ImageStretchOptions_$type, this.n5));
+            var b = this.n6;
+            this.n6 = a;
+            if (this.n6 != b) {
+                this.et("ImageStretchOption", 4, enumGetBox(ImageStretchOptions_$type, b), enumGetBox(ImageStretchOptions_$type, this.n6));
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ImageColumn.prototype, "n4", {
+    Object.defineProperty(ImageColumn.prototype, "n5", {
         get: function () {
-            return this.n3;
+            return this.n4;
         },
         set: function (a) {
-            var b = this.n3;
-            this.n3 = a;
-            if (this.n3 != b) {
-                this.et("ImageResourceType", 11, enumGetBox(ImageResourceType_$type, b), enumGetBox(ImageResourceType_$type, this.n3));
+            var b = this.n4;
+            this.n4 = a;
+            if (this.n4 != b) {
+                this.et("ImageResourceType", 11, enumGetBox(ImageResourceType_$type, b), enumGetBox(ImageResourceType_$type, this.n4));
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ImageColumn.prototype, "n2", {
+    Object.defineProperty(ImageColumn.prototype, "n3", {
         get: function () {
             return this.hz;
         },
@@ -28331,7 +28381,7 @@ var ImageColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ImageColumn.prototype, "n7", {
+    Object.defineProperty(ImageColumn.prototype, "n8", {
         get: function () {
             return this.kq;
         },
@@ -28341,7 +28391,7 @@ var ImageColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ImageColumn.prototype, "n8", {
+    Object.defineProperty(ImageColumn.prototype, "n9", {
         get: function () {
             return this.lk;
         },
@@ -28351,7 +28401,7 @@ var ImageColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ImageColumn.prototype, "n9", {
+    Object.defineProperty(ImageColumn.prototype, "oa", {
         get: function () {
             if (this.gz == null) {
                 return null;
@@ -28399,15 +28449,15 @@ var ImageColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = a;
         if (c != null) {
             e.j1 = c.toString();
-            e.mi = this.n6;
-            e.mg = this.n4;
-            e.mn = this.oa(c);
+            e.mi = this.n7;
+            e.mg = this.n5;
+            e.mn = this.ob(c);
         }
     };
     ImageColumn.prototype.el = function (a, b, c, d) {
         _super.prototype.el.call(this, a, b, c, d);
     };
-    ImageColumn.prototype.oa = function (a) {
+    ImageColumn.prototype.ob = function (a) {
         if (a == null) {
             return "";
         }
@@ -28591,7 +28641,7 @@ var NumericCellFormatter = /** @class */ /*@__PURE__*/ (function (_super) {
         return NumericCellFormatter.b(a.mh, a.mw, a.my, a.m0, a.mm, a.nt, a.nv, a.no, a.nq, a.mo);
     };
     NumericCellFormatter.d = function (a, b) {
-        return NumericCellFormatter.b(a.n4, a.oc, a.od, a.oe, a.n7, a.o1, a.o3, a.ox, a.oz, b);
+        return NumericCellFormatter.b(a.n5, a.od, a.oe, a.of, a.n8, a.o2, a.o4, a.oy, a.o0, b);
     };
     NumericCellFormatter.$t = markType(NumericCellFormatter, 'NumericCellFormatter');
     NumericCellFormatter.a = null;
@@ -28605,18 +28655,18 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(NumericColumn, _super);
     function NumericColumn() {
         var _this = _super.call(this) || this;
-        _this.oj = null;
-        _this.ol = null;
         _this.ok = null;
-        _this.om = "";
-        _this.n9 = 10;
-        _this.oa = 0;
-        _this.ob = -1;
-        _this.n6 = false;
-        _this.oi = null;
-        _this.n2 = null;
-        _this.of = null;
-        _this.n4 = null;
+        _this.om = null;
+        _this.ol = null;
+        _this.on = "";
+        _this.oa = 10;
+        _this.ob = 0;
+        _this.oc = -1;
+        _this.n7 = false;
+        _this.oj = null;
+        _this.n3 = null;
+        _this.og = null;
+        _this.n5 = null;
         _this.e = _this.f();
         return _this;
     }
@@ -28626,35 +28676,7 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 2;
     };
-    Object.defineProperty(NumericColumn.prototype, "ox", {
-        get: function () {
-            return this.oj;
-        },
-        set: function (a) {
-            var b = this.oj;
-            this.oj = a;
-            if (this.oj != b) {
-                this.et("NegativePrefix", 8, b, this.oj);
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(NumericColumn.prototype, "o1", {
-        get: function () {
-            return this.ol;
-        },
-        set: function (a) {
-            var b = this.ol;
-            this.ol = a;
-            if (this.ol != b) {
-                this.et("PositivePrefix", 8, b, this.ol);
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(NumericColumn.prototype, "oz", {
+    Object.defineProperty(NumericColumn.prototype, "oy", {
         get: function () {
             return this.ok;
         },
@@ -28662,13 +28684,13 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.ok;
             this.ok = a;
             if (this.ok != b) {
-                this.et("NegativeSuffix", 8, b, this.ok);
+                this.et("NegativePrefix", 8, b, this.ok);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "o3", {
+    Object.defineProperty(NumericColumn.prototype, "o2", {
         get: function () {
             return this.om;
         },
@@ -28676,21 +28698,35 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.om;
             this.om = a;
             if (this.om != b) {
-                this.et("PositiveSuffix", 8, b, this.om);
+                this.et("PositivePrefix", 8, b, this.om);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(NumericColumn.prototype, "o0", {
+        get: function () {
+            return this.ol;
+        },
+        set: function (a) {
+            var b = this.ol;
+            this.ol = a;
+            if (this.ol != b) {
+                this.et("NegativeSuffix", 8, b, this.ol);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "oc", {
+    Object.defineProperty(NumericColumn.prototype, "o4", {
         get: function () {
-            return this.n9;
+            return this.on;
         },
         set: function (a) {
-            var b = this.n9;
-            this.n9 = a;
-            if (this.n9 != b) {
-                this.et("MaxFractionDigits", 6, b, this.n9);
+            var b = this.on;
+            this.on = a;
+            if (this.on != b) {
+                this.et("PositiveSuffix", 8, b, this.on);
             }
         },
         enumerable: false,
@@ -28704,7 +28740,7 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.oa;
             this.oa = a;
             if (this.oa != b) {
-                this.et("MinFractionDigits", 6, b, this.oa);
+                this.et("MaxFractionDigits", 6, b, this.oa);
             }
         },
         enumerable: false,
@@ -28718,69 +28754,83 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.ob;
             this.ob = a;
             if (this.ob != b) {
-                this.et("MinIntegerDigits", 6, b, this.ob);
+                this.et("MinFractionDigits", 6, b, this.ob);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "n7", {
+    Object.defineProperty(NumericColumn.prototype, "of", {
         get: function () {
-            return this.n6;
+            return this.oc;
         },
         set: function (a) {
-            var b = this.n6;
-            this.n6 = a;
-            if (this.n6 != b) {
-                this.et("ShowGroupingSeparator", 5, b, this.n6);
+            var b = this.oc;
+            this.oc = a;
+            if (this.oc != b) {
+                this.et("MinIntegerDigits", 6, b, this.oc);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "os", {
+    Object.defineProperty(NumericColumn.prototype, "n8", {
         get: function () {
-            return this.oi;
+            return this.n7;
         },
         set: function (a) {
-            var b = this.oi;
-            this.oi = a;
-            if (this.oi != b) {
-                this.et("FormatString", 8, b, this.oi);
+            var b = this.n7;
+            this.n7 = a;
+            if (this.n7 != b) {
+                this.et("ShowGroupingSeparator", 5, b, this.n7);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "n3", {
+    Object.defineProperty(NumericColumn.prototype, "ot", {
         get: function () {
-            return this.n2;
+            return this.oj;
         },
         set: function (a) {
-            var b = this.n2;
-            this.n2 = a;
-            if (this.n2 != b) {
-                this.et("FormatSpecifiers", 9, b, this.n2);
+            var b = this.oj;
+            this.oj = a;
+            if (this.oj != b) {
+                this.et("FormatString", 8, b, this.oj);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "oh", {
+    Object.defineProperty(NumericColumn.prototype, "n4", {
         get: function () {
-            return this.of;
+            return this.n3;
         },
         set: function (a) {
-            var b = this.of;
-            this.of = a;
-            if (this.of != b) {
-                this.et("FormatOverride", 9, b, this.of);
+            var b = this.n3;
+            this.n3 = a;
+            if (this.n3 != b) {
+                this.et("FormatSpecifiers", 9, b, this.n3);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "n5", {
+    Object.defineProperty(NumericColumn.prototype, "oi", {
+        get: function () {
+            return this.og;
+        },
+        set: function (a) {
+            var b = this.og;
+            this.og = a;
+            if (this.og != b) {
+                this.et("FormatOverride", 9, b, this.og);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(NumericColumn.prototype, "n6", {
         get: function () {
             return this.hz;
         },
@@ -28790,7 +28840,7 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "og", {
+    Object.defineProperty(NumericColumn.prototype, "oh", {
         get: function () {
             return this.kq;
         },
@@ -28800,7 +28850,7 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "on", {
+    Object.defineProperty(NumericColumn.prototype, "oo", {
         get: function () {
             return this.lk;
         },
@@ -28810,7 +28860,7 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(NumericColumn.prototype, "oo", {
+    Object.defineProperty(NumericColumn.prototype, "op", {
         get: function () {
             if (this.gz == null) {
                 return null;
@@ -28828,13 +28878,13 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case "FormatString":
             case "FormatSpecifiers":
-                if (this.os != null) {
-                    this.n4 = new BindingFormatter();
-                    this.n4.j = this.os;
-                    this.n4.d = this.n3;
+                if (this.ot != null) {
+                    this.n5 = new BindingFormatter();
+                    this.n5.j = this.ot;
+                    this.n5.d = this.n4;
                 }
                 else {
-                    this.n4 = null;
+                    this.n5 = null;
                 }
                 break;
         }
@@ -28846,32 +28896,32 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         return a.af == 4 ? "numeric_mergedCell" : "numeric";
     };
     NumericColumn.prototype.dz = function (a, b, c) {
-        return this.op(b);
+        return this.oq(b);
     };
     NumericColumn.prototype.eo = function (a, b, c, d) {
         _super.prototype.eo.call(this, a, b, c, d);
         var e = a;
         {
             e.mk = false;
-            e.mo = this.n8(c);
+            e.mo = this.n9(c);
         }
     };
     NumericColumn.prototype.el = function (a, b, c, d) {
         _super.prototype.el.call(this, a, b, c, d);
         var e = a;
-        e.my = this.od;
-        e.mw = this.oc;
-        e.m0 = this.oe;
-        e.nt = this.o1;
-        e.no = this.ox;
-        e.nv = this.o3;
-        e.nq = this.oz;
-        e.ni = this.os;
-        e.mg = this.n3;
-        e.na = this.oh;
-        e.mm = this.n7;
-    };
-    NumericColumn.prototype.n8 = function (a) {
+        e.my = this.oe;
+        e.mw = this.od;
+        e.m0 = this.of;
+        e.nt = this.o2;
+        e.no = this.oy;
+        e.nv = this.o4;
+        e.nq = this.o0;
+        e.ni = this.ot;
+        e.mg = this.n4;
+        e.na = this.oi;
+        e.mm = this.n8;
+    };
+    NumericColumn.prototype.n9 = function (a) {
         if (a == null) {
             return NaN;
         }
@@ -28910,17 +28960,17 @@ var NumericColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return NaN;
     };
-    NumericColumn.prototype.op = function (a) {
+    NumericColumn.prototype.oq = function (a) {
         var b = false;
         var c = 0;
         var d = 0;
         {
             b = false;
-            d = this.n8(a);
+            d = this.n9(a);
         }
-        if (this.oh != null) {
+        if (this.oi != null) {
             var val_ = d;
-            var override_ = this.oh;
+            var override_ = this.oi;
             return (override_.format(val_));
         }
         return NumericCellFormatter.d(this, d);
@@ -29849,7 +29899,7 @@ var SectionHeader = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.hl();
                 if (this.g4.containsKey(c.f)) {
                     var j = this.g4.item(c.f);
-                    var k = j.n8(b);
+                    var k = j.n9(b);
                     if (k != null) {
                         e = k;
                     }
@@ -30487,7 +30537,7 @@ var TemplateColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     function TemplateColumn() {
         var _this = _super.call(this) || this;
         _this.cellUpdating = null;
-        _this.jm = false;
+        _this.jl = false;
         return _this;
     }
     TemplateColumn.prototype.n = function (a) {
@@ -30506,7 +30556,7 @@ var TemplateColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     TemplateColumn.prototype.el = function (a, b, c, d) {
         _super.prototype.el.call(this, a, b, c, d);
     };
-    TemplateColumn.prototype.n3 = function (a, b) {
+    TemplateColumn.prototype.n4 = function (a, b) {
         if (this.cellUpdating != null) {
             this.cellUpdating(this, ((function () {
                 var $ret = new TemplateCellUpdatingEventArgs();
@@ -30519,7 +30569,7 @@ var TemplateColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     TemplateColumn.prototype.ev = function (a, b, c, d) {
         switch (a) {
             case "IsEditable":
-                this.jm = false;
+                this.jl = false;
                 break;
         }
         _super.prototype.ev.call(this, a, b, c, d);
@@ -30570,24 +30620,24 @@ var TextColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(TextColumn, _super);
     function TextColumn() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.n4 = null;
+        _this.n5 = null;
         return _this;
     }
-    Object.defineProperty(TextColumn.prototype, "n8", {
+    Object.defineProperty(TextColumn.prototype, "n9", {
         get: function () {
-            return this.n4;
+            return this.n5;
         },
         set: function (a) {
-            var b = this.n4;
-            this.n4 = a;
-            if (this.n4 != b) {
-                this.et("FormatString", 8, b, this.n4);
+            var b = this.n5;
+            this.n5 = a;
+            if (this.n5 != b) {
+                this.et("FormatString", 8, b, this.n5);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(TextColumn.prototype, "n2", {
+    Object.defineProperty(TextColumn.prototype, "n3", {
         get: function () {
             return this.hz;
         },
@@ -30597,7 +30647,7 @@ var TextColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(TextColumn.prototype, "n3", {
+    Object.defineProperty(TextColumn.prototype, "n4", {
         get: function () {
             return this.kq;
         },
@@ -30607,7 +30657,7 @@ var TextColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(TextColumn.prototype, "n5", {
+    Object.defineProperty(TextColumn.prototype, "n6", {
         get: function () {
             return this.lk;
         },
@@ -30617,7 +30667,7 @@ var TextColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(TextColumn.prototype, "n6", {
+    Object.defineProperty(TextColumn.prototype, "n7", {
         get: function () {
             if (this.gz == null) {
                 return null;
@@ -30644,13 +30694,13 @@ var TextColumn = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     TextColumn.prototype.dz = function (a, b, c) {
         if (b != null) {
-            return this.n7(b);
+            return this.n8(b);
         }
         else {
             return null;
         }
     };
-    TextColumn.prototype.n7 = function (a) {
+    TextColumn.prototype.n8 = function (a) {
         if (typeof a === 'string') {
             return a;
         }
@@ -30686,7 +30736,7 @@ var TextHeader = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = a;
         var f = b.cf(a.l);
         e.mk = f.hi;
-        e.m2 = f.nq;
+        e.m2 = f.nr;
         e.mm = f.hm;
     };
     TextHeader.prototype.eo = function (a, b, c, d) {
@@ -30696,7 +30746,7 @@ var TextHeader = /** @class */ /*@__PURE__*/ (function (_super) {
         e.mh = f.k3;
         e.j1 = e.mh;
         e.n = f.hr;
-        e.mq = f.jb;
+        e.mq = f.ja;
         e.mo = this.g0;
     };
     TextHeader.$t = markType(TextHeader, 'TextHeader', Header.$);
@@ -32580,7 +32630,7 @@ var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                     else if (!m) {
                         var ab = a.cf(aa);
-                        if (!ab.jn) {
+                        if (!ab.jm) {
                             l = true;
                         }
                     }
@@ -33614,7 +33664,7 @@ var VisibilityEngine = /** @class */ /*@__PURE__*/ (function (_super) {
             return;
         }
         var k = a.actualColumns._inner[b.l.a5];
-        if (!k.js()) {
+        if (!k.jr()) {
             return;
         }
         var l = k.ic();
@@ -34095,7 +34145,7 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     SpatialEngine.prototype.q = function (a, b, c) {
-        var e_25, _a;
+        var e_27, _a;
         b.absoluteWidth = 0;
         b.c4 = 0;
         b.cz = 0;
@@ -34138,8 +34188,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_25_1) {
-            e_25 = { error: e_25_1 };
+        catch (e_27_1) {
+            e_27 = { error: e_27_1 };
         }
         finally {
             try {
@@ -34147,8 +34197,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     _a.call(_b);
             }
             finally {
-                if (e_25)
-                    throw e_25.error;
+                if (e_27)
+                    throw e_27.error;
             }
         }
         b.cz = Math.max(0, b.cz - b.cv);
@@ -34171,7 +34221,7 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         return b;
     };
     SpatialEngine.p = function (a, b, c, d, e, f, g) {
-        var e_26, _a, e_27, _b;
+        var e_28, _a, e_29, _b;
         c -= d;
         c -= truncate((a.inset.left + a.inset.right));
         c -= (g.count * a.model.cv);
@@ -34189,7 +34239,7 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
         while (f > 0 && !j) {
             j = true;
             try {
-                for (var _c = (e_26 = void 0, __values(fromEnum(g))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = (e_28 = void 0, __values(fromEnum(g))), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var l = _d.value;
                     if (k.contains(l)) {
                         continue;
@@ -34224,8 +34274,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
             }
-            catch (e_26_1) {
-                e_26 = { error: e_26_1 };
+            catch (e_28_1) {
+                e_28 = { error: e_28_1 };
             }
             finally {
                 try {
@@ -34233,8 +34283,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                         _a.call(_c);
                 }
                 finally {
-                    if (e_26)
-                        throw e_26.error;
+                    if (e_28)
+                        throw e_28.error;
                 }
             }
             i = (c) / f;
@@ -34296,8 +34346,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_27_1) {
-            e_27 = { error: e_27_1 };
+        catch (e_29_1) {
+            e_29 = { error: e_29_1 };
         }
         finally {
             try {
@@ -34305,8 +34355,8 @@ var SpatialEngine = /** @class */ /*@__PURE__*/ (function (_super) {
                     _b.call(_e);
             }
             finally {
-                if (e_27)
-                    throw e_27.error;
+                if (e_29)
+                    throw e_29.error;
             }
         }
         a.model.cz = Math.max(0, a.model.cz - a.model.cv);
@@ -36112,7 +36162,7 @@ var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
         return a;
     };
     VisualModel.prototype.a = function (a) {
-        var e_28, _a;
+        var e_30, _a;
         var b = new GridLayerExport(a.v);
         var c = a == this.a8;
         try {
@@ -36125,8 +36175,8 @@ var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
                 b.e(e);
             }
         }
-        catch (e_28_1) {
-            e_28 = { error: e_28_1 };
+        catch (e_30_1) {
+            e_30 = { error: e_30_1 };
         }
         finally {
             try {
@@ -36134,8 +36184,8 @@ var VisualModel = /** @class */ /*@__PURE__*/ (function (_super) {
                     _a.call(_b);
             }
             finally {
-                if (e_28)
-                    throw e_28.error;
+                if (e_30)
+                    throw e_30.error;
             }
         }
         return b;