igniteui-webcomponents-grids 5.3.0 → 5.4.0

package/esm2015/lib/ColumnFilterCondition_combined.js

@@ -189,6 +189,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";
@@ -5234,7 +5235,7 @@ export let Pager = /*@__PURE__*/ (() => {
                 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();
@@ -5245,7 +5246,7 @@ export let Pager = /*@__PURE__*/ (() => {
                     let c = this.b.getItemAtIndex(b);
                     this.ac.add1(c);
                     if (c != null) {
-                        this.d.ed = true;
+                        this.d.ef = true;
                     }
                 }
                 let d = new Array(this.ac.count);
@@ -5256,7 +5257,7 @@ export let Pager = /*@__PURE__*/ (() => {
                 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 {
@@ -5287,7 +5288,7 @@ export let Pager = /*@__PURE__*/ (() => {
                 this.b.summaryScope = this.p;
                 let 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:
@@ -5788,13 +5789,13 @@ export let ColumnController = /*@__PURE__*/ (() => {
             let a = new Dictionary$2(String_$type, Boolean_$type, 0);
             for (let b = 0; b < this.i.count; b++) {
                 let c = this.i._inner[b];
-                if (!c.ji) {
+                if (!c.jh) {
                     a.item(c.lo, true);
                 }
             }
             let d = false;
             for (let 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);
                 }
             }
@@ -5857,7 +5858,7 @@ export let ColumnController = /*@__PURE__*/ (() => {
                     break;
             }
             c.lo = a;
-            c.ji = true;
+            c.jh = true;
             c.mf = this.t(a) ? c.lo : (createGuid());
             return c;
         }
@@ -6342,7 +6343,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 }
                 if (a.l.aj) {
                     let 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();
                     }
                 }
@@ -6363,7 +6364,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 if (a.w == 0 && this.headerClickAction != 4) {
                     this.f9.d(this.cf(a.l));
                     let f = this.ay.h(a.l);
-                    f.mz("Sorted");
+                    f.m0("Sorted");
                 }
                 this.ik = false;
                 if (this.selectionMode == 5) {
@@ -6500,7 +6501,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
             this.hu = a.bk && a.bl;
             if (this.dragger != null && this.columnResizingMode != 2 && this.ao.h) {
                 let d = this.ay.j._inner[a.l.a5];
-                if (d.jq) {
+                if (d.jp) {
                     let e = this.model.b9._inner[this.ao.a5];
                     this.mb = e.k;
                     this.l8 = this.model.cz;
@@ -6574,7 +6575,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
             if (this.dragger == null || !this.dragger.isDragActive) {
                 if (a.l.h && this.columnResizingMode != 2) {
                     let d = this.ay.j._inner[a.l.a5];
-                    if (d.jq) {
+                    if (d.jp) {
                         this.externalGrid.setResizeCursor();
                     }
                 }
@@ -6597,7 +6598,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
             this.md = this.model.actualVisibleRegion.top;
             if ((this.dragger == null || !this.dragger.isDragActive) && a.g && !a.h && !a.ay && this.columnMovingMode != 1) {
                 let e = this.cf(a);
-                if (e != null && e.jo) {
+                if (e != null && e.jn) {
                     this.externalGrid.ensureColumnsAreManual();
                 }
                 this.externalGrid.setHandCursor();
@@ -6617,7 +6618,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 }
                 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();
@@ -6658,7 +6659,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     if (this.ly != -1) {
                         let 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);
@@ -6677,11 +6678,11 @@ export let DataGrid = /*@__PURE__*/ (() => {
                                 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;
                         }
@@ -10240,7 +10241,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 this.columnsAutoGenerated(this, a);
             }
             for (let b of fromEnum(this.actualColumns)) {
-                b.jr = false;
+                b.jq = false;
             }
         }
         onSizeChanged(a, b) {
@@ -10323,19 +10324,19 @@ export let DataGrid = /*@__PURE__*/ (() => {
             return this.ay.h(a);
         }
         hideThenRemoveColumn(a) {
-            a.jh = true;
-            a.jp = true;
+            a.jg = true;
+            a.jo = true;
         }
         exchangeColumn(a, b) {
             let 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 {
@@ -10359,7 +10360,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
             }
             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);
@@ -10450,10 +10451,10 @@ export let DataGrid = /*@__PURE__*/ (() => {
             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) {
                 let c = b.ht;
                 b.ht = 1;
                 this.xu();
@@ -10530,7 +10531,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
             }
             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);
@@ -10599,18 +10600,18 @@ export let DataGrid = /*@__PURE__*/ (() => {
             let 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) {
                 let 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 {
                 let 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");
                 }
             }
@@ -10652,7 +10653,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     break;
                 }
                 let j = d._inner[i];
-                if (!j.jp && j.il == g) {
+                if (!j.jo && j.il == g) {
                     h = i;
                 }
             } while (h == -1);
@@ -10775,7 +10776,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     this.yy();
                     break;
                 case "IsHidden":
-                    if (c.jp) {
+                    if (c.jo) {
                         if (this.jm(c)) {
                             let d = c.ht;
                             c.ht = 2;
@@ -10784,7 +10785,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                         }
                         else {
                             c.ht = 3;
-                            if (c.je) {
+                            if (c.jd) {
                                 this.externalGrid.ensureColumnsAreManual();
                                 this.externalGrid.removeExternalColumn(c.externalObject);
                             }
@@ -10809,7 +10810,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                         this.columnHiddenChanged(this, ((() => {
                             let $ret = new ColumnHiddenChangedEventArgs();
                             $ret.a = c;
-                            $ret.b = c.jp;
+                            $ret.b = c.jo;
                             return $ret;
                         })()));
                     }
@@ -11359,7 +11360,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     if (a != null) {
                         let b = this.activeCell.b;
                         let c = this.actualColumns.indexOf(a);
-                        if (a.jm) {
+                        if (a.jl) {
                             let d = this.model.e(c, b);
                             if (d != null) {
                                 this.cj.ab(d);
@@ -11497,13 +11498,13 @@ export let DataGrid = /*@__PURE__*/ (() => {
             let b = this.actualColumns.count - 1;
             let 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);
                 }
@@ -11514,13 +11515,13 @@ export let DataGrid = /*@__PURE__*/ (() => {
             let b = 0;
             let 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);
                 }
@@ -11532,21 +11533,21 @@ export let DataGrid = /*@__PURE__*/ (() => {
             if (!b) {
                 c = this.gb.j(c, this.model);
             }
-            if (this.actualColumns._inner[c].jp) {
+            if (this.actualColumns._inner[c].jo) {
                 let d = c;
                 let 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;
                     }
                 }
@@ -11565,21 +11566,21 @@ export let DataGrid = /*@__PURE__*/ (() => {
         }
         nu(a) {
             a = Math.min(a, this.actualColumns.count - 1);
-            if (this.actualColumns._inner[a].jp) {
+            if (this.actualColumns._inner[a].jo) {
                 let b = a;
                 let 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;
                     }
                 }
@@ -11870,7 +11871,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     }
                     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) {
                         let q = this.n1();
@@ -11903,7 +11904,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     }
                     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) {
                         let u = this.nw();
@@ -12048,7 +12049,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                     else if (this.ju() && this.enterBehavior == 1 && (c == 0 || c == 3)) {
                         let d = this.ad.s();
                         let e = this.actualColumns._inner[d];
-                        if (e != null && e.jm) {
+                        if (e != null && e.jl) {
                             let f = this.model.e(d, this.activeCell.b);
                             return this.lb(f);
                         }
@@ -12153,7 +12154,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 if (this.ju() && (a == 0 || a == 3)) {
                     let b = this.ad.s();
                     let c = this.actualColumns._inner[b];
-                    if (c != null && c.jm) {
+                    if (c != null && c.jl) {
                         let d = this.model.e(b, this.activeCell.b);
                         if (d == null) {
                             this.ap = new CellPath(3, b, this.activeCell.b, 1);
@@ -12181,7 +12182,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 }
             }
             let c = this.cf(a.l);
-            if (!c.jm) {
+            if (!c.jl) {
                 return false;
             }
             this.cj.ad(a);
@@ -13184,7 +13185,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 return;
             }
             let a = this.ay.g(this.activeCell.d);
-            if (a.jm) {
+            if (a.jl) {
                 let b = this.model.h(a.ko);
                 let c = this.model.e(b.n, this.activeCell.b);
                 if (c != null) {
@@ -13374,7 +13375,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                 let 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);
                 let j = "";
                 let k = "";
@@ -13570,7 +13571,7 @@ export let DataGrid = /*@__PURE__*/ (() => {
                                     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;
@@ -15396,7 +15397,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             k.effectsFinished = delegateCombine(k.effectsFinished, (l, m) => {
                 i.ht = 3;
                 c.a = 3;
-                if (i.je) {
+                if (i.jd) {
                     a.externalGrid.ensureColumnsAreManual();
                     a.externalGrid.removeExternalColumn(i.externalObject);
                 }
@@ -15570,7 +15571,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let j = a.columnPropertyUpdatingAnimationMode;
             let k = new ColumnCellsEffect();
             k.bx(i);
-            k.t = 7;
+            k.t = 8;
             k.as = true;
             if (g == 0) {
                 k.v = 5;
@@ -15735,7 +15736,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let m = a.columnPropertyUpdatingAnimationMode;
             let n = new ColumnCellsEffect();
             n.bx(l);
-            n.t = 7;
+            n.t = 8;
             n.as = true;
             if (g) {
                 n.v = 5;
@@ -15937,7 +15938,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             for (let h = b; h <= c; h++) {
                 let i = new RowCellsEffect();
                 g.g(i);
-                i.t = 6;
+                i.t = 7;
                 i.bx(e);
                 i.al = true;
                 i.bq = 1;
@@ -16315,7 +16316,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let h = new CellEffect();
             h.onFinished = delegateCombine(h.onFinished, (i) => this.w(e));
             h.onCanceled = delegateCombine(h.onCanceled, (i, j) => this.v(e));
-            h.t = 8;
+            h.t = 9;
             h.bx(f);
             h.al = true;
             h.bq = 1;
@@ -16392,7 +16393,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let h = new CellEffect();
             h.onFinished = delegateCombine(h.onFinished, (i) => this.w(e));
             h.onCanceled = delegateCombine(h.onCanceled, (i, j) => this.v(e));
-            h.t = 8;
+            h.t = 9;
             h.bx(f);
             h.al = true;
             h.bq = 0;
@@ -16508,7 +16509,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let e = new RowCellsEffect();
             e.onFinished = delegateCombine(e.onFinished, (f) => this.w(c));
             e.onCanceled = delegateCombine(e.onCanceled, (f, g) => this.v(c));
-            e.t = 5;
+            e.t = 6;
             e.bx(d);
             e.al = true;
             e.bq = 1;
@@ -16549,7 +16550,7 @@ export let GridAnimationManager = /*@__PURE__*/ (() => {
             let e = new RowCellsEffect();
             e.onFinished = delegateCombine(e.onFinished, (f) => this.w(c));
             e.onCanceled = delegateCombine(e.onCanceled, (f, g) => this.v(c));
-            e.t = 5;
+            e.t = 6;
             e.bx(d);
             e.al = true;
             e.bq = 0;
@@ -19153,47 +19154,47 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             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;
@@ -19210,20 +19211,20 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             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();
             let a = this.h7;
@@ -19277,10 +19278,10 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        ny() {
+        nz() {
             return GridStyleRepository.bg;
         }
-        nx() {
+        ny() {
             return GridStyleRepository.a7;
         }
         get ht() {
@@ -19396,44 +19397,24 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.et("ActualHeaderText", 8, b, this.ks);
             }
         }
-        get n1() {
-            return this.np;
-        }
-        set n1(a) {
-            let b = this.np;
-            this.np = a;
-            if (this.np != b) {
-                this.et("SelectedBackground", 10, b, this.np);
-            }
-        }
-        get nu() {
-            return this.nk;
-        }
-        set nu(a) {
-            let b = this.nk;
-            this.nk = a;
-            if (this.nk != b) {
-                this.et("ActualSelectedBackground", 2, b, this.nk);
-            }
-        }
-        get nz() {
-            return this.nn;
+        get n2() {
+            return this.nq;
         }
-        set nz(a) {
-            let b = this.nn;
-            this.nn = a;
-            if (this.nn != b) {
-                this.et("RowHoverBackground", 10, b, this.nn);
+        set n2(a) {
+            let b = this.nq;
+            this.nq = a;
+            if (this.nq != b) {
+                this.et("SelectedBackground", 10, b, this.nq);
             }
         }
-        get ns() {
-            return this.ni;
+        get nv() {
+            return this.nl;
         }
-        set ns(a) {
-            let b = this.ni;
-            this.ni = a;
-            if (this.ni != b) {
-                this.et("ActualHoverBackground", 2, b, this.ni);
+        set nv(a) {
+            let b = this.nl;
+            this.nl = a;
+            if (this.nl != b) {
+                this.et("ActualSelectedBackground", 2, b, this.nl);
             }
         }
         get n0() {
@@ -19443,7 +19424,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.no;
             this.no = a;
             if (this.no != b) {
-                this.et("RowHoverTextColor", 10, b, this.no);
+                this.et("RowHoverBackground", 10, b, this.no);
             }
         }
         get nt() {
@@ -19453,7 +19434,27 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.nj;
             this.nj = a;
             if (this.nj != b) {
-                this.et("ActualRowHoverTextColor", 2, b, this.nj);
+                this.et("ActualHoverBackground", 2, b, this.nj);
+            }
+        }
+        get n1() {
+            return this.np;
+        }
+        set n1(a) {
+            let b = this.np;
+            this.np = a;
+            if (this.np != b) {
+                this.et("RowHoverTextColor", 10, b, this.np);
+            }
+        }
+        get nu() {
+            return this.nk;
+        }
+        set nu(a) {
+            let b = this.nk;
+            this.nk = a;
+            if (this.nk != b) {
+                this.et("ActualRowHoverTextColor", 2, b, this.nk);
             }
         }
         get h6() {
@@ -19486,36 +19487,36 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.et("MinWidth", 10, b, a);
             }
         }
-        get jo() {
-            return this.i6;
+        get jn() {
+            return this.i5;
         }
-        set jo(a) {
-            let b = this.i6;
-            this.i6 = a;
-            if (this.i6 != b) {
-                this.et("IsFromMarkup", 10, b, this.i6);
+        set jn(a) {
+            let b = this.i5;
+            this.i5 = a;
+            if (this.i5 != b) {
+                this.et("IsFromMarkup", 10, b, this.i5);
             }
         }
-        get ji() {
-            return this.i0;
+        get jh() {
+            return this.iz;
         }
-        set ji(a) {
-            let b = this.i0;
+        set jh(a) {
+            let 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);
             }
         }
-        get jr() {
-            return this.i9;
+        get jq() {
+            return this.i8;
         }
-        set jr(a) {
+        set jq(a) {
             let self_ = this;
             let value_ = a;
-            this.i9 = value_;
+            this.i8 = value_;
             self_.___mustPassByValue = true;
         }
         get g1() {
@@ -19565,24 +19566,14 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             }
             this.h9.grid = this.grid;
         }
-        get jn() {
-            return this.i5;
-        }
-        set jn(a) {
-            let b = this.i5;
-            this.i5 = a;
-            if (this.i5 != b) {
-                this.et("IsFilteringEnabled", 10, b, this.i5);
-            }
-        }
-        get jq() {
-            return this.i8;
+        get jm() {
+            return this.i4;
         }
-        set jq(a) {
-            let b = this.i8;
-            this.i8 = a;
-            if (this.i8 != b) {
-                this.et("IsResizingEnabled", 10, b, this.i8);
+        set jm(a) {
+            let b = this.i4;
+            this.i4 = a;
+            if (this.i4 != b) {
+                this.et("IsFilteringEnabled", 10, b, this.i4);
             }
         }
         get jp() {
@@ -19592,17 +19583,27 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.i7;
             this.i7 = a;
             if (this.i7 != b) {
-                this.et("IsHidden", 10, b, this.i7);
+                this.et("IsResizingEnabled", 10, b, this.i7);
             }
         }
-        get jt() {
-            return this.ja;
+        get jo() {
+            return this.i6;
         }
-        set jt(a) {
-            let b = this.ja;
-            this.ja = a;
-            if (this.ja != b) {
-                this.et("ShouldRemoveWhenHidden", 10, b, this.ja);
+        set jo(a) {
+            let b = this.i6;
+            this.i6 = a;
+            if (this.i6 != b) {
+                this.et("IsHidden", 10, b, this.i6);
+            }
+        }
+        get js() {
+            return this.i9;
+        }
+        set js(a) {
+            let b = this.i9;
+            this.i9 = a;
+            if (this.i9 != b) {
+                this.et("ShouldRemoveWhenHidden", 10, b, this.i9);
             }
         }
         get hr() {
@@ -19625,21 +19626,21 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.et("Pinned", 11, enumGetBox(PinnedPositions_$type, b), enumGetBox(PinnedPositions_$type, this.ij));
             }
         }
-        get jh() {
-            return this.iz;
+        get jg() {
+            return this.iy;
         }
-        set jh(a) {
-            let b = this.iz;
-            this.iz = a;
-            if (this.iz != b) {
-                this.et("InternalShouldRemoveWhenHidden", 10, b, this.iz);
+        set jg(a) {
+            let b = this.iy;
+            this.iy = a;
+            if (this.iy != b) {
+                this.et("InternalShouldRemoveWhenHidden", 10, b, this.iy);
             }
         }
-        get je() {
-            if (this.iz) {
+        get jd() {
+            if (this.iy) {
                 return true;
             }
-            return this.ja;
+            return this.i9;
         }
         get hi() {
             return this.hg;
@@ -19661,24 +19662,24 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.et("ColumnOptionsIconAlignment", 10, enumGetBox(ColumnOptionsIconAlignment_$type, b), enumGetBox(ColumnOptionsIconAlignment_$type, this.hh));
             }
         }
-        get nq() {
-            return this.ng;
+        get nr() {
+            return this.nh;
         }
-        set nq(a) {
-            let b = this.ng;
-            this.ng = a;
-            if (this.ng != b) {
-                this.et("ActualColumnOptionsIconColor", 2, b, this.ng);
+        set nr(a) {
+            let b = this.nh;
+            this.nh = a;
+            if (this.nh != b) {
+                this.et("ActualColumnOptionsIconColor", 2, b, this.nh);
             }
         }
-        get nv() {
-            return this.nl;
+        get nw() {
+            return this.nm;
         }
-        set nv(a) {
-            let b = this.nl;
-            this.nl = a;
-            if (this.nl != b) {
-                this.et("ColumnOptionsIconColor", 10, b, this.nl);
+        set nw(a) {
+            let b = this.nm;
+            this.nm = a;
+            if (this.nm != b) {
+                this.et("ColumnOptionsIconColor", 10, b, this.nm);
             }
         }
         get hn() {
@@ -19701,44 +19702,24 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.et("ActualColumnOptionsIconBehavior", 4, enumGetBox(ColumnOptionsIconBehavior_$type, b), enumGetBox(ColumnOptionsIconBehavior_$type, this.hk));
             }
         }
-        get jb() {
-            return this.iv;
-        }
-        set jb(a) {
-            let b = this.iv;
-            this.iv = a;
-            if (this.iv != b) {
-                this.et("ActualIsColumnOptionsEnabled", 5, b, this.iv);
-            }
-        }
-        get jj() {
-            return this.i1;
-        }
-        set jj(a) {
-            let b = this.i1;
-            this.i1 = a;
-            if (this.i1 != b) {
-                this.et("IsColumnOptionsEnabled", 10, b, this.i1);
-            }
-        }
-        get jd() {
-            return this.ix;
+        get ja() {
+            return this.iu;
         }
-        set jd(a) {
-            let b = this.ix;
-            this.ix = a;
-            if (this.ix != b) {
-                this.et("ActualIsColumnOptionsSummariesEnabled", 5, b, this.ix);
+        set ja(a) {
+            let b = this.iu;
+            this.iu = a;
+            if (this.iu != b) {
+                this.et("ActualIsColumnOptionsEnabled", 5, b, this.iu);
             }
         }
-        get jl() {
-            return this.i3;
+        get ji() {
+            return this.i0;
         }
-        set jl(a) {
-            let b = this.i3;
-            this.i3 = a;
-            if (b != this.i3) {
-                this.et("IsColumnOptionsSummariesEnabled", 10, b, this.i3);
+        set ji(a) {
+            let b = this.i0;
+            this.i0 = a;
+            if (this.i0 != b) {
+                this.et("IsColumnOptionsEnabled", 10, b, this.i0);
             }
         }
         get jc() {
@@ -19748,7 +19729,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.iw;
             this.iw = a;
             if (this.iw != b) {
-                this.et("ActualIsColumnOptionsGroupingEnabled", 5, b, this.iw);
+                this.et("ActualIsColumnOptionsSummariesEnabled", 5, b, this.iw);
             }
         }
         get jk() {
@@ -19758,37 +19739,57 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             let b = this.i2;
             this.i2 = a;
             if (b != this.i2) {
-                this.et("IsColumnOptionsGroupingEnabled", 10, b, this.i2);
+                this.et("IsColumnOptionsSummariesEnabled", 10, b, this.i2);
             }
         }
-        get jm() {
-            return this.i4;
+        get jb() {
+            return this.iv;
         }
-        set jm(a) {
-            let b = this.i4;
-            this.i4 = a;
-            if (this.i4 != b) {
-                this.et("IsEditable", 10, b, this.i4);
+        set jb(a) {
+            let b = this.iv;
+            this.iv = a;
+            if (this.iv != b) {
+                this.et("ActualIsColumnOptionsGroupingEnabled", 5, b, this.iv);
             }
         }
-        get nw() {
-            return this.nm;
+        get jj() {
+            return this.i1;
         }
-        set nw(a) {
-            let b = this.nm;
-            this.nm = a;
-            if (this.nm != b) {
-                this.et("DeletedTextColor", 10, b, this.nm);
+        set jj(a) {
+            let b = this.i1;
+            this.i1 = a;
+            if (b != this.i1) {
+                this.et("IsColumnOptionsGroupingEnabled", 10, b, this.i1);
             }
         }
-        get nr() {
-            return this.nh;
+        get jl() {
+            return this.i3;
         }
-        set nr(a) {
-            let b = this.nh;
-            this.nh = a;
-            if (this.nh != b) {
-                this.et("ActualDeletedTextColor", 2, b, this.nh);
+        set jl(a) {
+            let b = this.i3;
+            this.i3 = a;
+            if (this.i3 != b) {
+                this.et("IsEditable", 10, b, this.i3);
+            }
+        }
+        get nx() {
+            return this.nn;
+        }
+        set nx(a) {
+            let b = this.nn;
+            this.nn = a;
+            if (this.nn != b) {
+                this.et("DeletedTextColor", 10, b, this.nn);
+            }
+        }
+        get ns() {
+            return this.ni;
+        }
+        set ns(a) {
+            let b = this.ni;
+            this.ni = a;
+            if (this.ni != b) {
+                this.et("ActualDeletedTextColor", 2, b, this.ni);
             }
         }
         get jz() {
@@ -19812,23 +19813,23 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             }
         }
         get textEditStyle() {
-            return this.is;
-        }
-        set textEditStyle(a) {
-            let b = this.is;
-            this.is = a;
-            if (this.is != b) {
-                this.et("EditFontInfo", 10, b, this.is);
-            }
-        }
-        get it() {
             return this.ir;
         }
-        set it(a) {
+        set textEditStyle(a) {
             let b = this.ir;
             this.ir = a;
             if (this.ir != b) {
-                this.et("ActualEditFontInfo", 3, b, this.ir);
+                this.et("EditFontInfo", 10, b, this.ir);
+            }
+        }
+        get is() {
+            return this.iq;
+        }
+        set is(a) {
+            let b = this.iq;
+            this.iq = a;
+            if (this.iq != b) {
+                this.et("ActualEditFontInfo", 3, b, this.iq);
             }
         }
         get hz() {
@@ -19988,7 +19989,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             }
             return this.id == 0 ? this.grid.mergedCellEvaluationCriteria : this.id;
         }
-        js() {
+        jr() {
             let a = this.ig();
             if (a == 3 && this.hr != 0) {
                 return true;
@@ -20036,21 +20037,21 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
         }
         el(a, b, c, d) {
             super.el(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;
@@ -20070,17 +20071,17 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                     let e = c;
                     let 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();
                         }
                     }
@@ -20089,7 +20090,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                     this.k3 = d;
                     break;
                 case "SelectedBackground":
-                    this.nf();
+                    this.ng();
                     break;
                 case "ActualHorizontalAlignment":
                     if (this.header != null) {
@@ -20106,7 +20107,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                     }
                     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) {
@@ -20114,43 +20115,43 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                     }
                     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);
         }
         hb() {
             return this.j;
@@ -20167,13 +20168,13 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             }
             return 1;
         }
-        nc(a, b, c, d, e) {
+        nd(a, b, c, d, e) {
             if (this.columnHeaderCellsPropertyUpdating != null) {
                 this.columnHeaderCellsPropertyUpdating(this, b, c, d, e);
             }
         }
-        my(a, b) {
-            this.nc(this, b.propertyName, b.animationType, b.oldValue, b.newValue);
+        mz(a, b) {
+            this.nd(this, b.propertyName, b.animationType, b.oldValue, b.newValue);
         }
         eq(a, b) {
             if (this.hx != null) {
@@ -20182,8 +20183,8 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             if (this.header != null) {
                 this.header.grid = b;
             }
-            this.nf();
-            this.nf();
+            this.ng();
+            this.ng();
             this.e5();
             this.fh();
             this.e6();
@@ -20195,23 +20196,23 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
             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();
         }
         es(a, b) {
             switch (b.propertyName) {
                 case "CellSelectedBackground":
-                    this.nf();
+                    this.ng();
                     break;
                 case "CellBackground":
                     this.e5();
@@ -20235,77 +20236,77 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                     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;
             }
         }
-        nd() {
-            if (this.nz == null) {
+        ne() {
+            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;
             }
         }
-        ne() {
-            if (this.n0 == null) {
+        nf() {
+            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;
             }
         }
-        nf() {
-            if (this.n1 == null) {
+        ng() {
+            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;
             }
         }
         e5() {
@@ -20357,19 +20358,19 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.bf = this.bm;
             }
         }
-        m9() {
-            if (this.nw == null) {
+        na() {
+            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;
             }
         }
-        nb() {
+        nc() {
             if (isNaN_(this.jz)) {
                 if (this.grid != null && !isNaN_(this.grid.editOpacity)) {
                     this.jy = this.grid.editOpacity;
@@ -20381,16 +20382,16 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.jy = this.jz;
             }
         }
-        na() {
+        nb() {
             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;
             }
         }
         fe() {
@@ -20429,7 +20430,7 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.ga = this.gu;
             }
         }
-        m3() {
+        m4() {
             if (this.hj == 0) {
                 if (this.grid != null && this.grid.columnOptionsIconAlignment != 0) {
                     this.hi = this.grid.columnOptionsIconAlignment;
@@ -20441,19 +20442,19 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.hi = this.hj;
             }
         }
-        m7() {
-            if (this.nv == null) {
+        m8() {
+            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;
             }
         }
-        m6() {
+        m7() {
             if (this.hn == 0) {
                 if (this.grid != null && this.grid.columnOptionsIconBehavior != 0) {
                     this.hm = this.grid.columnOptionsIconBehavior;
@@ -20465,31 +20466,31 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 this.hm = this.hn;
             }
         }
-        m4() {
+        m5() {
             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;
             }
         }
-        m8() {
+        m9() {
             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;
             }
         }
-        m5() {
+        m6() {
             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;
             }
         }
-        m2(a, b, c, d) {
+        m3(a, b, c, d) {
             if (this.columnCellsPropertyUpdating != null) {
                 this.columnCellsPropertyUpdating(this, a, b, c, d);
             }
@@ -20515,15 +20516,15 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
         lt() {
             return this.mf != null && this.mf != "" ? this.mf : this.lo;
         }
-        m1(a, b, c) {
-            if (this.ip == null) {
-                this.ip = new FastIterationDictionary$2(String_$type, Base.$, 0);
+        m2(a, b, c) {
+            if (this.io == null) {
+                this.io = new FastIterationDictionary$2(String_$type, Base.$, 0);
             }
             let 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);
             let e = false;
             if (d == null && c != null) {
                 e = true;
@@ -20534,42 +20535,42 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
                 }
             }
             if (e) {
-                this.nc(this, a, b, d, c);
+                this.nd(this, a, b, d, c);
             }
         }
-        jg() {
-            if (this.ip == null) {
+        jf() {
+            if (this.io == null) {
                 return false;
             }
-            return this.ip.r > 0;
+            return this.io.r > 0;
         }
-        get iq() {
-            return this.ip;
+        get ip() {
+            return this.io;
         }
-        jf(a) {
-            if (this.ip == null) {
+        je(a) {
+            if (this.io == null) {
                 return false;
             }
-            return this.ip.d(a);
+            return this.io.d(a);
         }
-        m0(a) {
-            if (this.ip == null) {
+        m1(a) {
+            if (this.io == null) {
                 return;
             }
-            if (this.ip.d(a)) {
-                this.ip.f(a);
+            if (this.io.d(a)) {
+                this.io.f(a);
             }
         }
         kr(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;
         }
-        mz(a) {
+        m0(a) {
             if (this.ju == null) {
                 this.ju = new List$1(LayoutAction_$type, 0);
             }
@@ -20711,11 +20712,34 @@ export let DataGridColumn = /*@__PURE__*/ (() => {
         set invalidateActions(a) {
             this._invalidateActions = a;
         }
-        get io() {
-            return this.im;
+        im() {
+            if (this.jt == null) {
+                return null;
+            }
+            for (let a of fromEnum(this.jt)) {
+                return a;
+            }
+            return null;
+        }
+        my(a) {
+            if (this.jt == null) {
+                return;
+            }
+            for (let b of fromEnum(this.jt)) {
+                a(b);
+            }
         }
         provideContextAccessor(a) {
-            this.im = a;
+            if (this.jt == null) {
+                this.jt = new HashSet$1(IToolbarContextAccessor_$type, 0);
+            }
+            this.jt.add_1(a);
+        }
+        dismissContextAccessor(a) {
+            if (this.jt == null) {
+                return;
+            }
+            this.jt.remove(a);
         }
         mx() {
             if (this.hx != null) {
@@ -22878,44 +22902,44 @@ export let ComboBoxColumn = /*@__PURE__*/ (() => {
     class ComboBoxColumn extends DataGridColumn {
         constructor() {
             super();
-            this.n3 = null;
+            this.n4 = null;
             this.hz = 4;
         }
-        get n4() {
-            return this.n3;
+        get n5() {
+            return this.n4;
         }
-        set n4(a) {
-            let b = this.n3;
-            this.n3 = a;
-            if (this.n3 != b) {
-                this.et("ActualDataSource", 10, b, this.n3);
+        set n5(a) {
+            let b = this.n4;
+            this.n4 = a;
+            if (this.n4 != b) {
+                this.et("ActualDataSource", 10, b, this.n4);
             }
         }
-        get n5() {
+        get n6() {
             return this.kq;
         }
-        set n5(a) {
+        set n6(a) {
             this.kq = a;
         }
-        get n9() {
+        get oa() {
             return this.lk;
         }
-        set n9(a) {
+        set oa(a) {
             this.lk = a;
         }
-        get oa() {
+        get ob() {
             if (this.gz == null) {
                 return null;
             }
             return this.gz[0];
         }
-        set oa(a) {
+        set ob(a) {
             this.gz = [a];
         }
-        get n2() {
+        get n3() {
             return this.gz;
         }
-        set n2(a) {
+        set n3(a) {
             this.gz = a;
         }
         n(a) {
@@ -22926,14 +22950,14 @@ export let ComboBoxColumn = /*@__PURE__*/ (() => {
         }
         eq(a, b) {
             super.eq(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);
                 }
             }
         }
         dz(a, b, c) {
-            return this.n8(b);
+            return this.n9(b);
         }
         eo(a, b, c, d) {
             super.eo(a, b, c, d);
@@ -22947,68 +22971,68 @@ export let ComboBoxColumn = /*@__PURE__*/ (() => {
             super.ev(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) {
                         let e = c;
-                        e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.ob));
+                        e.schemaChanged = delegateRemove(e.schemaChanged, runOn(this, this.oc));
                     }
-                    if (this.n4 != null) {
-                        let f = this.n4;
-                        f.schemaChanged = delegateCombine(f.schemaChanged, runOn(this, this.ob));
+                    if (this.n5 != null) {
+                        let 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;
             }
         }
-        ob(a, b) {
-            this.oc();
+        oc(a, b) {
+            this.od();
         }
-        oc() {
-            if (this.n4 != null) {
-                if (this.oa != null) {
-                    this.n4.primaryKey = this.gz;
+        od() {
+            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 {
-                    let a = this.n4.actualSchema;
+                    let a = this.n5.actualSchema;
                     if (a != null && a.propertyNames.length > 0) {
-                        this.n4.primaryKey = [a.propertyNames[0]];
+                        this.n5.primaryKey = [a.propertyNames[0]];
                     }
                 }
             }
         }
-        n7(a) {
+        n8(a) {
             if (typeof a === 'string') {
                 return a;
             }
             return null;
         }
-        n8(a) {
+        n9(a) {
             let b = null;
-            if (this.n4 != null && this.n9 != null) {
-                let c = this.n4.indexOfKey(typeCast(Array_$type, a) !== null ? a : [a]);
+            if (this.n5 != null && this.oa != null) {
+                let c = this.n5.indexOfKey(typeCast(Array_$type, a) !== null ? a : [a]);
                 if (c > -1) {
-                    let d = this.n4.getItemPropertyAtIndex(c, this.n9);
+                    let 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;
         }
@@ -23021,122 +23045,122 @@ export let ComboBoxColumn = /*@__PURE__*/ (() => {
  */
 export let DateTimeColumn = /*@__PURE__*/ (() => {
     class DateTimeColumn extends DataGridColumn {
-        get n7() {
-            return this.n6;
+        get n8() {
+            return this.n7;
         }
-        set n7(a) {
-            let b = this.n6;
-            this.n6 = a;
-            if (this.n6 != b) {
-                this.et("DateTimeFormat", 4, enumGetBox(DateTimeFormats_$type, b), enumGetBox(DateTimeFormats_$type, this.n6));
+        set n8(a) {
+            let b = this.n7;
+            this.n7 = a;
+            if (this.n7 != b) {
+                this.et("DateTimeFormat", 4, enumGetBox(DateTimeFormats_$type, b), enumGetBox(DateTimeFormats_$type, this.n7));
             }
         }
-        get op() {
+        get oq() {
+            return this.oh;
+        }
+        set oq(a) {
+            let b = this.oh;
+            this.oh = a;
+            if (this.oh != b) {
+                this.et("FormatString", 8, b, this.oh);
+            }
+        }
+        get oj() {
             return this.og;
         }
-        set op(a) {
+        set oj(a) {
             let b = this.og;
             this.og = a;
             if (this.og != b) {
-                this.et("FormatString", 8, b, this.og);
-            }
-        }
-        get oi() {
-            return this.of;
-        }
-        set oi(a) {
-            let b = this.of;
-            this.of = a;
-            if (this.of != b) {
-                this.et("EditorFormatString", 8, b, this.of);
+                this.et("EditorFormatString", 8, b, this.og);
             }
         }
-        get n3() {
-            return this.n2;
+        get n4() {
+            return this.n3;
         }
-        set n3(a) {
-            let b = this.n2;
-            this.n2 = a;
-            if (this.n2 != b) {
-                this.et("FormatSpecifiers", 9, b, this.n2);
+        set n4(a) {
+            let b = this.n3;
+            this.n3 = a;
+            if (this.n3 != b) {
+                this.et("FormatSpecifiers", 9, b, this.n3);
             }
         }
-        get oe() {
-            return this.oc;
+        get of() {
+            return this.od;
         }
-        set oe(a) {
-            let b = this.oc;
-            this.oc = a;
-            if (this.oc != b) {
-                this.et("FormatOverride", 9, b, this.oc);
+        set of(a) {
+            let b = this.od;
+            this.od = a;
+            if (this.od != b) {
+                this.et("FormatOverride", 9, b, this.od);
             }
         }
-        get oa() {
-            return this.n9;
+        get ob() {
+            return this.oa;
         }
-        set oa(a) {
-            let b = this.n9;
-            this.n9 = a;
-            if (b != this.n9) {
-                this.et("ShowTodayButton", 5, b, this.n9);
+        set ob(a) {
+            let b = this.oa;
+            this.oa = a;
+            if (b != this.oa) {
+                this.et("ShowTodayButton", 5, b, this.oa);
             }
         }
-        get n8() {
+        get n9() {
             return this.hz;
         }
-        set n8(a) {
+        set n9(a) {
             this.hz = a;
         }
-        get od() {
+        get oe() {
             return this.kq;
         }
-        set od(a) {
+        set oe(a) {
             this.kq = a;
         }
-        get ok() {
+        get ol() {
             return this.lk;
         }
-        set ok(a) {
+        set ol(a) {
             this.lk = a;
         }
-        get ol() {
+        get om() {
             if (this.gz == null) {
                 return null;
             }
             return this.gz[0];
         }
-        set ol(a) {
+        set om(a) {
             this.gz = [a];
         }
         ev(a, b, c, d) {
             super.ev(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;
             }
         }
         constructor() {
             super();
-            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;
         }
         n(a) {
             return new DateTimeCellModel();
@@ -23145,24 +23169,24 @@ export let DateTimeColumn = /*@__PURE__*/ (() => {
             return a.af == 4 ? "datetime_mergedCell" : "datetime";
         }
         dz(a, b, c) {
-            return this.om(b);
+            return this.on(b);
         }
         eo(a, b, c, d) {
             super.eo(a, b, c, d);
             let 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);
         }
         el(a, b, c, d) {
             super.el(a, b, c, d);
             let 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;
         }
-        ob(a) {
+        oc(a) {
             if (a == null) {
                 return dateMinValue();
             }
@@ -23171,23 +23195,23 @@ export let DateTimeColumn = /*@__PURE__*/ (() => {
             }
             return dateMinValue();
         }
-        om(a) {
+        on(a) {
             let 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 "";
                 }
                 let date_ = b;
-                return (this.oc.format(date_));
+                return (this.od.format(date_));
             }
-            this.n5.j(this.n7);
-            let c = this.n5.i(b);
+            this.n6.j(this.n8);
+            let c = this.n6.i(b);
             if (c == stringEmpty()) {
                 if (a != null && !(typeCast(Date_$type, a) !== null)) {
                     return a.toString();
@@ -23347,23 +23371,21 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
             }
         }
         a9() {
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsColumnName", 3, this.f.k3);
-            }
+            this.f.my((a) => a.setContextValue("GridColumnOptionsColumnName", 3, this.f.k3));
         }
         bj() {
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsSortAscending", 5, this.e == 1);
-                this.f.io.setContextValue("GridColumnOptionsSortDescending", 5, this.e == 2);
-            }
+            this.f.my((a) => {
+                a.setContextValue("GridColumnOptionsSortAscending", 5, this.e == 1);
+                a.setContextValue("GridColumnOptionsSortDescending", 5, this.e == 2);
+            });
         }
         bg() {
-            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));
-            }
+            this.f.my((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));
+            });
         }
         l(a) {
             let b = this.f;
@@ -23393,12 +23415,12 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
             return this.l(true);
         }
         bh() {
-            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");
-            }
+            this.f.my((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");
+            });
         }
         bc() {
             let a = false;
@@ -23410,16 +23432,12 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                     break;
                 }
             }
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsGroupedIcon", 3, (a) ? "Ungroup" : "Group");
-            }
+            this.f.my((e) => e.setContextValue("GridColumnOptionsGroupedIcon", 3, (a) ? "Ungroup" : "Group"));
         }
         bn() {
             let 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((b) => b.setContextValue("GridColumnOptionsVisibilityIcon", 3, (a) ? "Hide" : "Show"));
         }
         a3(a) {
             this.q.add(a);
@@ -23766,17 +23784,13 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
             return x;
         }
         bk() {
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsSummariesTitle", 3, this.al());
-            }
+            this.f.my((a) => a.setContextValue("GridColumnOptionsSummariesTitle", 3, this.al()));
         }
         bl() {
             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((a) => a.setContextValue("GridColumnOptionsSummariesTitle", 3, this.an()));
             let a = false;
             let b = false;
             let c = false;
@@ -23808,17 +23822,17 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            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((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);
+            });
         }
         b6() {
-            if (this.f.jd && this.f.grid.summaryScope != 3) {
+            if (this.f.jc && this.f.grid.summaryScope != 3) {
                 return 0;
             }
             return 1;
@@ -23835,15 +23849,13 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
         }
         u() {
             let a = 0;
-            if (this.f.io != null) {
-                let b = this.f.io.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
-                let c = this.f.io.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
-                let d = this.f.io.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
-                let e = this.f.io.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
-                let f = this.f.io.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
-                if (b) {
-                    a++;
-                }
+            let b = this.f.im();
+            if (b != null) {
+                let c = b.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
+                let d = b.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
+                let e = b.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
+                let f = b.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
+                let g = b.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
                 if (c) {
                     a++;
                 }
@@ -23856,6 +23868,9 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                 if (f) {
                     a++;
                 }
+                if (g) {
+                    a++;
+                }
             }
             return a;
         }
@@ -23913,11 +23928,11 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                     }
                 }
                 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((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;
@@ -23952,31 +23967,25 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
                 }
             }
             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((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((h) => h.setContextValue("GridColumnOptionsFilterIndexType", 6, 1));
                     break;
                 case 1:
-                    if (this.f.io != null) {
-                        this.f.io.setContextValue("GridColumnOptionsFilterIndexType", 6, 0);
-                    }
+                    this.f.my((h) => h.setContextValue("GridColumnOptionsFilterIndexType", 6, 0));
                     break;
             }
             let h = new LayoutSelectedKeysCollection();
             for (let i of fromEnum(e)) {
                 h.add(new LayoutPrimaryKeyValue(0, [b], [i.value]));
             }
-            if (this.f.io != null) {
-                this.f.io.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, h);
-            }
+            this.f.my((j) => j.setContextValue("GridColumnOptionsFilterSelectedKeys", 7, h));
             this.b3();
         }
         b3() {
@@ -24025,7 +24034,7 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
             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) {
@@ -24180,86 +24189,91 @@ export let DataGridColumnToolbarManager = /*@__PURE__*/ (() => {
             return c;
         }
         a6() {
-            if (this.f.io != null) {
-                let a = this.f.io.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
-                let b = this.f.io.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
-                let c = this.f.io.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
-                let d = this.f.io.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
-                let e = this.f.io.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
-                let f = new HashSet$1(DataSourceSummaryOperand_$type, 0);
-                if (a) {
-                    f.add_1(3);
-                }
+            let a = this.f.im();
+            if (a != null) {
+                let b = a.getContextValue("GridColumnOptionsSummariesAverageChecked", 5);
+                let c = a.getContextValue("GridColumnOptionsSummariesMinimumChecked", 5);
+                let d = a.getContextValue("GridColumnOptionsSummariesMaximumChecked", 5);
+                let e = a.getContextValue("GridColumnOptionsSummariesSumChecked", 5);
+                let f = a.getContextValue("GridColumnOptionsSummariesCountChecked", 5);
+                let 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);
                 }
             }
         }
         a5() {
-            let a = this.f.io.getContextValue("GridColumnOptionsFilterSelectedKeys", 7);
-            let b = EnumUtil.getEnumValue(ToolActionCheckboxListIndexType_$type, this.f.io.getContextValue("GridColumnOptionsFilterIndexType", 6));
-            if (0 == a.count) {
+            let a = this.f.im();
+            if (a == null) {
+                return;
+            }
+            let b = a.getContextValue("GridColumnOptionsFilterSelectedKeys", 7);
+            let c = EnumUtil.getEnumValue(ToolActionCheckboxListIndexType_$type, a.getContextValue("GridColumnOptionsFilterIndexType", 6));
+            if (0 == b.count) {
                 this.a7();
                 return;
             }
-            let c;
             let d;
-            if (b == 0) {
-                d = false;
-                c = 1;
+            let e;
+            if (c == 0) {
+                e = false;
+                d = 1;
             }
             else {
-                d = true;
-                c = 0;
+                e = true;
+                d = 0;
             }
-            let e = new List$1(ColumnComparisonFilterCondition.$, 0);
-            let f = a;
-            for (let g = 0; g < f.count; g++) {
-                let h = f._inner[g];
-                let i = h.value[0];
-                let j = DataGridColumnToolbarManager.b(c, i);
-                e.add(j);
+            let f = new List$1(ColumnComparisonFilterCondition.$, 0);
+            let g = b;
+            for (let h = 0; h < g.count; h++) {
+                let i = g._inner[h];
+                let j = i.value[0];
+                let 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 {
-                let k = new ColumnFilterConditionGroup();
-                k.usesOrOperator = d;
-                for (let l of fromEnum(e)) {
-                    k.add(l);
+                let l = new ColumnFilterConditionGroup();
+                l.usesOrOperator = e;
+                for (let m of fromEnum(f)) {
+                    l.add(m);
                 }
-                this.f.g1 = k;
+                this.f.g1 = l;
             }
-            this.f.mz("Filtered");
+            this.f.m0("Filtered");
         }
         b2() {
-            this.f.jp = !this.f.jp;
+            this.f.jo = !this.f.jo;
         }
         b1() {
             let a = new ColumnGroupDescription(0);
@@ -24573,8 +24587,8 @@ export let EditorDefinition = /*@__PURE__*/ (() => {
                 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;
                 }
             }
         }
@@ -24699,7 +24713,7 @@ export let FilterRowDefinition = /*@__PURE__*/ (() => {
             a.gk = this.g2;
             let e = a;
             let f = b.cf(a.l);
-            e.mq = f.jn;
+            e.mq = f.jm;
         }
         eo(a, b, c, d) {
             super.eo(a, b, c, d);
@@ -24973,8 +24987,8 @@ export let Header = /*@__PURE__*/ (() => {
             super.eo(a, b, c, d);
             let e = b.cf(a.l);
             if (e != null) {
-                if (a.l.g && e.jg()) {
-                    let f = e.iq;
+                if (a.l.g && e.jf()) {
+                    let f = e.ip;
                     let g = f.o;
                     let h = g.count;
                     let i = f.p;
@@ -25138,58 +25152,58 @@ export let HeaderSeparator = /*@__PURE__*/ (() => {
  */
 export let ImageColumn = /*@__PURE__*/ (() => {
     class ImageColumn extends DataGridColumn {
-        get n6() {
-            return this.n5;
+        get n7() {
+            return this.n6;
         }
-        set n6(a) {
-            let b = this.n5;
-            this.n5 = a;
-            if (this.n5 != b) {
-                this.et("ImageStretchOption", 4, enumGetBox(ImageStretchOptions_$type, b), enumGetBox(ImageStretchOptions_$type, this.n5));
+        set n7(a) {
+            let b = this.n6;
+            this.n6 = a;
+            if (this.n6 != b) {
+                this.et("ImageStretchOption", 4, enumGetBox(ImageStretchOptions_$type, b), enumGetBox(ImageStretchOptions_$type, this.n6));
             }
         }
-        get n4() {
-            return this.n3;
+        get n5() {
+            return this.n4;
         }
-        set n4(a) {
-            let b = this.n3;
-            this.n3 = a;
-            if (this.n3 != b) {
-                this.et("ImageResourceType", 11, enumGetBox(ImageResourceType_$type, b), enumGetBox(ImageResourceType_$type, this.n3));
+        set n5(a) {
+            let b = this.n4;
+            this.n4 = a;
+            if (this.n4 != b) {
+                this.et("ImageResourceType", 11, enumGetBox(ImageResourceType_$type, b), enumGetBox(ImageResourceType_$type, this.n4));
             }
         }
-        get n2() {
+        get n3() {
             return this.hz;
         }
-        set n2(a) {
+        set n3(a) {
             this.hz = a;
         }
-        get n7() {
+        get n8() {
             return this.kq;
         }
-        set n7(a) {
+        set n8(a) {
             this.kq = a;
         }
-        get n8() {
+        get n9() {
             return this.lk;
         }
-        set n8(a) {
+        set n9(a) {
             this.lk = a;
         }
-        get n9() {
+        get oa() {
             if (this.gz == null) {
                 return null;
             }
             return this.gz[0];
         }
-        set n9(a) {
+        set oa(a) {
             this.gz = [a];
         }
         constructor() {
             super();
-            this.n5 = 0;
-            this.n3 = 0;
             this.n6 = 0;
+            this.n4 = 0;
+            this.n7 = 0;
             this.j = this.k();
             this.e = this.f();
         }
@@ -25228,15 +25242,15 @@ export let ImageColumn = /*@__PURE__*/ (() => {
             let 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);
             }
         }
         el(a, b, c, d) {
             super.el(a, b, c, d);
         }
-        oa(a) {
+        ob(a) {
             if (a == null) {
                 return "";
             }
@@ -25417,7 +25431,7 @@ export let NumericCellFormatter = /*@__PURE__*/ (() => {
             return NumericCellFormatter.b(a.mh, a.mw, a.my, a.m0, a.mm, a.nt, a.nv, a.no, a.nq, a.mo);
         }
         static d(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 = /*@__PURE__*/ markType(NumericCellFormatter, 'NumericCellFormatter');
@@ -25431,18 +25445,18 @@ export let NumericColumn = /*@__PURE__*/ (() => {
     class NumericColumn extends DataGridColumn {
         constructor() {
             super();
-            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();
         }
         f() {
@@ -25451,54 +25465,44 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             }
             return 2;
         }
-        get ox() {
-            return this.oj;
-        }
-        set ox(a) {
-            let b = this.oj;
-            this.oj = a;
-            if (this.oj != b) {
-                this.et("NegativePrefix", 8, b, this.oj);
-            }
-        }
-        get o1() {
-            return this.ol;
-        }
-        set o1(a) {
-            let b = this.ol;
-            this.ol = a;
-            if (this.ol != b) {
-                this.et("PositivePrefix", 8, b, this.ol);
-            }
-        }
-        get oz() {
+        get oy() {
             return this.ok;
         }
-        set oz(a) {
+        set oy(a) {
             let b = this.ok;
             this.ok = a;
             if (this.ok != b) {
-                this.et("NegativeSuffix", 8, b, this.ok);
+                this.et("NegativePrefix", 8, b, this.ok);
             }
         }
-        get o3() {
+        get o2() {
             return this.om;
         }
-        set o3(a) {
+        set o2(a) {
             let b = this.om;
             this.om = a;
             if (this.om != b) {
-                this.et("PositiveSuffix", 8, b, this.om);
+                this.et("PositivePrefix", 8, b, this.om);
             }
         }
-        get oc() {
-            return this.n9;
+        get o0() {
+            return this.ol;
+        }
+        set o0(a) {
+            let b = this.ol;
+            this.ol = a;
+            if (this.ol != b) {
+                this.et("NegativeSuffix", 8, b, this.ol);
+            }
         }
-        set oc(a) {
-            let b = this.n9;
-            this.n9 = a;
-            if (this.n9 != b) {
-                this.et("MaxFractionDigits", 6, b, this.n9);
+        get o4() {
+            return this.on;
+        }
+        set o4(a) {
+            let b = this.on;
+            this.on = a;
+            if (this.on != b) {
+                this.et("PositiveSuffix", 8, b, this.on);
             }
         }
         get od() {
@@ -25508,7 +25512,7 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             let b = this.oa;
             this.oa = a;
             if (this.oa != b) {
-                this.et("MinFractionDigits", 6, b, this.oa);
+                this.et("MaxFractionDigits", 6, b, this.oa);
             }
         }
         get oe() {
@@ -25518,74 +25522,84 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             let b = this.ob;
             this.ob = a;
             if (this.ob != b) {
-                this.et("MinIntegerDigits", 6, b, this.ob);
+                this.et("MinFractionDigits", 6, b, this.ob);
             }
         }
-        get n7() {
-            return this.n6;
+        get of() {
+            return this.oc;
         }
-        set n7(a) {
-            let b = this.n6;
-            this.n6 = a;
-            if (this.n6 != b) {
-                this.et("ShowGroupingSeparator", 5, b, this.n6);
+        set of(a) {
+            let b = this.oc;
+            this.oc = a;
+            if (this.oc != b) {
+                this.et("MinIntegerDigits", 6, b, this.oc);
             }
         }
-        get os() {
-            return this.oi;
+        get n8() {
+            return this.n7;
         }
-        set os(a) {
-            let b = this.oi;
-            this.oi = a;
-            if (this.oi != b) {
-                this.et("FormatString", 8, b, this.oi);
+        set n8(a) {
+            let b = this.n7;
+            this.n7 = a;
+            if (this.n7 != b) {
+                this.et("ShowGroupingSeparator", 5, b, this.n7);
             }
         }
-        get n3() {
-            return this.n2;
+        get ot() {
+            return this.oj;
         }
-        set n3(a) {
-            let b = this.n2;
-            this.n2 = a;
-            if (this.n2 != b) {
-                this.et("FormatSpecifiers", 9, b, this.n2);
+        set ot(a) {
+            let b = this.oj;
+            this.oj = a;
+            if (this.oj != b) {
+                this.et("FormatString", 8, b, this.oj);
             }
         }
-        get oh() {
-            return this.of;
+        get n4() {
+            return this.n3;
         }
-        set oh(a) {
-            let b = this.of;
-            this.of = a;
-            if (this.of != b) {
-                this.et("FormatOverride", 9, b, this.of);
+        set n4(a) {
+            let b = this.n3;
+            this.n3 = a;
+            if (this.n3 != b) {
+                this.et("FormatSpecifiers", 9, b, this.n3);
             }
         }
-        get n5() {
+        get oi() {
+            return this.og;
+        }
+        set oi(a) {
+            let b = this.og;
+            this.og = a;
+            if (this.og != b) {
+                this.et("FormatOverride", 9, b, this.og);
+            }
+        }
+        get n6() {
             return this.hz;
         }
-        set n5(a) {
+        set n6(a) {
             this.hz = a;
         }
-        get og() {
+        get oh() {
             return this.kq;
         }
-        set og(a) {
+        set oh(a) {
             this.kq = a;
         }
-        get on() {
+        get oo() {
             return this.lk;
         }
-        set on(a) {
+        set oo(a) {
             this.lk = a;
         }
-        get oo() {
+        get op() {
             if (this.gz == null) {
                 return null;
             }
             return this.gz[0];
         }
-        set oo(a) {
+        set op(a) {
             this.gz = [a];
         }
         ev(a, b, c, d) {
@@ -25593,13 +25607,13 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             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;
             }
@@ -25611,32 +25625,32 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             return a.af == 4 ? "numeric_mergedCell" : "numeric";
         }
         dz(a, b, c) {
-            return this.op(b);
+            return this.oq(b);
         }
         eo(a, b, c, d) {
             super.eo(a, b, c, d);
             let e = a;
             {
                 e.mk = false;
-                e.mo = this.n8(c);
+                e.mo = this.n9(c);
             }
         }
         el(a, b, c, d) {
             super.el(a, b, c, d);
             let 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;
-        }
-        n8(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;
+        }
+        n9(a) {
             if (a == null) {
                 return NaN;
             }
@@ -25675,17 +25689,17 @@ export let NumericColumn = /*@__PURE__*/ (() => {
             }
             return NaN;
         }
-        op(a) {
+        oq(a) {
             let b = false;
             let c = 0;
             let d = 0;
             {
                 b = false;
-                d = this.n8(a);
+                d = this.n9(a);
             }
-            if (this.oh != null) {
+            if (this.oi != null) {
                 let val_ = d;
-                let override_ = this.oh;
+                let override_ = this.oi;
                 return (override_.format(val_));
             }
             return NumericCellFormatter.d(this, d);
@@ -26574,7 +26588,7 @@ export let SectionHeader = /*@__PURE__*/ (() => {
                     this.hl();
                     if (this.g4.containsKey(c.f)) {
                         let j = this.g4.item(c.f);
-                        let k = j.n8(b);
+                        let k = j.n9(b);
                         if (k != null) {
                             e = k;
                         }
@@ -27159,7 +27173,7 @@ export let TemplateColumn = /*@__PURE__*/ (() => {
         constructor() {
             super();
             this.cellUpdating = null;
-            this.jm = false;
+            this.jl = false;
         }
         n(a) {
             return new TemplateCellModel();
@@ -27177,7 +27191,7 @@ export let TemplateColumn = /*@__PURE__*/ (() => {
         el(a, b, c, d) {
             super.el(a, b, c, d);
         }
-        n3(a, b) {
+        n4(a, b) {
             if (this.cellUpdating != null) {
                 this.cellUpdating(this, ((() => {
                     let $ret = new TemplateCellUpdatingEventArgs();
@@ -27190,7 +27204,7 @@ export let TemplateColumn = /*@__PURE__*/ (() => {
         ev(a, b, c, d) {
             switch (a) {
                 case "IsEditable":
-                    this.jm = false;
+                    this.jl = false;
                     break;
             }
             super.ev(a, b, c, d);
@@ -27232,43 +27246,43 @@ export let TextColumn = /*@__PURE__*/ (() => {
     class TextColumn extends DataGridColumn {
         constructor() {
             super(...arguments);
-            this.n4 = null;
+            this.n5 = null;
         }
-        get n8() {
-            return this.n4;
+        get n9() {
+            return this.n5;
         }
-        set n8(a) {
-            let b = this.n4;
-            this.n4 = a;
-            if (this.n4 != b) {
-                this.et("FormatString", 8, b, this.n4);
+        set n9(a) {
+            let b = this.n5;
+            this.n5 = a;
+            if (this.n5 != b) {
+                this.et("FormatString", 8, b, this.n5);
             }
         }
-        get n2() {
+        get n3() {
             return this.hz;
         }
-        set n2(a) {
+        set n3(a) {
             this.hz = a;
         }
-        get n3() {
+        get n4() {
             return this.kq;
         }
-        set n3(a) {
+        set n4(a) {
             this.kq = a;
         }
-        get n5() {
+        get n6() {
             return this.lk;
         }
-        set n5(a) {
+        set n6(a) {
             this.lk = a;
         }
-        get n6() {
+        get n7() {
             if (this.gz == null) {
                 return null;
             }
             return this.gz[0];
         }
-        set n6(a) {
+        set n7(a) {
             this.gz = [a];
         }
         n(a) {
@@ -27285,13 +27299,13 @@ export let TextColumn = /*@__PURE__*/ (() => {
         }
         dz(a, b, c) {
             if (b != null) {
-                return this.n7(b);
+                return this.n8(b);
             }
             else {
                 return null;
             }
         }
-        n7(a) {
+        n8(a) {
             if (typeof a === 'string') {
                 return a;
             }
@@ -27326,7 +27340,7 @@ export let TextHeader = /*@__PURE__*/ (() => {
             let e = a;
             let f = b.cf(a.l);
             e.mk = f.hi;
-            e.m2 = f.nq;
+            e.m2 = f.nr;
             e.mm = f.hm;
         }
         eo(a, b, c, d) {
@@ -27336,7 +27350,7 @@ export let TextHeader = /*@__PURE__*/ (() => {
             e.mh = f.k3;
             e.j1 = e.mh;
             e.n = f.hr;
-            e.mq = f.jb;
+            e.mq = f.ja;
             e.mo = this.g0;
         }
     }
@@ -29094,7 +29108,7 @@ export let VisibilityEngine = /*@__PURE__*/ (() => {
                         }
                         else if (!m) {
                             let ab = a.cf(aa);
-                            if (!ab.jn) {
+                            if (!ab.jm) {
                                 l = true;
                             }
                         }
@@ -30119,7 +30133,7 @@ export let VisibilityEngine = /*@__PURE__*/ (() => {
                 return;
             }
             let k = a.actualColumns._inner[b.l.a5];
-            if (!k.js()) {
+            if (!k.jr()) {
                 return;
             }
             let l = k.ic();