igniteui-webcomponents-excel 4.3.1 → 4.3.3-beta.0

package/fesm2015/igniteui-webcomponents-excel.js

@@ -72324,7 +72324,13 @@ let CellShiftOperation = /*@__PURE__*/ (() => {
                         c._bc(a)._setFormatting1(c._cellFormatInternal, j);
                     }
                     else {
-                        c._bc(a)._ar(j);
+                        let k = this.h._cb(a).b;
+                        if (k != null) {
+                            c._bc(a)._setFormatting1(k, j);
+                        }
+                        else {
+                            c._bc(a)._ar(j);
+                        }
                     }
                     return;
                 }
@@ -72333,16 +72339,16 @@ let CellShiftOperation = /*@__PURE__*/ (() => {
                 }
             }
             else if (f != null) {
-                let k = i != null ? i.d._bu() : g;
-                let l;
+                let l = i != null ? i.d._bu() : g;
                 let m;
-                if (((() => { let n = f.tryGetValue(a, m); m = n.p1; return n.ret; })())) {
-                    l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, m.c, m.d, k);
+                let n;
+                if (((() => { let o = f.tryGetValue(a, n); n = o.p1; return o.ret; })())) {
+                    m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, n.c, n.d, l);
                 }
                 else {
-                    l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, k);
+                    m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, l);
                 }
-                f.item(a, l);
+                f.item(a, m);
             }
             else {
                 return;
@@ -90595,7 +90601,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
             let b = a != null ? a._p : null;
             for (let c of fromEnum(this.worksheet._ff)) {
                 if (c.b._ca(b) == false) {
-                    for (let d of fromEnum(this._ch(c.q, c.r, true))) {
+                    for (let d of fromEnum(this._ch(c.r, c.s, true))) {
                         this._bc(d.r);
                     }
                 }
@@ -90765,7 +90771,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
             if (a != null && a._t == false && this != WorksheetRow._bm) {
                 for (let b of fromEnum(a._ff)) {
                     if (b.b._cd == false) {
-                        for (let c = b.q; c <= b.r; c++) {
+                        for (let c = b.r; c <= b.s; c++) {
                             this._bc(c);
                         }
                     }
@@ -90888,7 +90894,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     if ((z.b.formatOptions & y) == 0) {
                         continue;
                     }
-                    for (let aa = z.q; aa <= z.r; aa++) {
+                    for (let aa = z.r; aa <= z.s; aa++) {
                         this._bc(aa);
                     }
                 }
@@ -91757,48 +91763,52 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     p = this._a8(h.value);
                 }
                 for (let q = a; q <= b; q++) {
-                    let r = this._bc(q);
-                    r._ar(i);
+                    let r = j != null || d != null;
+                    let s = this._bc(q, r);
+                    if (s == null) {
+                        continue;
+                    }
+                    s._ar(i);
                     if (j != null) {
-                        r._setFormatting1(j, i);
+                        s._setFormatting1(j, i);
                         if (nullableNotEquals(h, null)) {
-                            r._a3(r.formatOptions & ~8, true, -97);
+                            s._a3(s.formatOptions & ~8, true, -97);
                             if (p != null) {
                                 if (WorkbookColorInfo.l_op_Inequality(p.topBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.topBorderColorInfo, j.topBorderColorInfo) && p.topBorderStyle == j.topBorderStyle) {
-                                    r._bi(p.topBorderColorInfo, true, -97);
-                                    r._bj(p.topBorderStyle, true, -97);
+                                    s._bi(p.topBorderColorInfo, true, -97);
+                                    s._bj(p.topBorderStyle, true, -97);
                                 }
                                 if (WorkbookColorInfo.l_op_Inequality(p.bottomBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.bottomBorderColorInfo, j.bottomBorderColorInfo) && p.bottomBorderStyle == j.bottomBorderStyle) {
-                                    r._av(p.bottomBorderColorInfo, true, -97);
-                                    r._aw(p.bottomBorderStyle, true, -97);
+                                    s._av(p.bottomBorderColorInfo, true, -97);
+                                    s._aw(p.bottomBorderStyle, true, -97);
                                 }
                                 if (!c) {
                                     if (WorkbookColorInfo.l_op_Inequality(p.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.leftBorderColorInfo, j.leftBorderColorInfo) && p.leftBorderStyle == j.leftBorderStyle) {
-                                        r._a9(p.leftBorderColorInfo, true, -97);
-                                        r._ba(p.leftBorderStyle, true, -97);
+                                        s._a9(p.leftBorderColorInfo, true, -97);
+                                        s._ba(p.leftBorderStyle, true, -97);
                                     }
                                     if (WorkbookColorInfo.l_op_Inequality(p.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.rightBorderColorInfo, j.rightBorderColorInfo) && p.rightBorderStyle == j.rightBorderStyle) {
-                                        r._bd(p.rightBorderColorInfo, true, -97);
-                                        r._be(p.rightBorderStyle, true, -97);
+                                        s._bd(p.rightBorderColorInfo, true, -97);
+                                        s._be(p.rightBorderStyle, true, -97);
                                     }
                                 }
                             }
                         }
                     }
                     else if (d != null) {
-                        let s = d._bc(q);
-                        r.setFormatting(s);
+                        let t = d._bc(q);
+                        s.setFormatting(t);
                         if (l != null) {
-                            r._a3(r.formatOptions & ~8, true, -97);
-                            let t = l._a8(q);
-                            if (t != null) {
-                                if (WorkbookColorInfo.l_op_Inequality(t.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.leftBorderColorInfo, s.leftBorderColorInfo) && t.leftBorderStyle == s.leftBorderStyle) {
-                                    r._a9(t.leftBorderColorInfo, true, -97);
-                                    r._ba(t.leftBorderStyle, true, -97);
+                            s._a3(s.formatOptions & ~8, true, -97);
+                            let u = l._a8(q);
+                            if (u != null) {
+                                if (WorkbookColorInfo.l_op_Inequality(u.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.leftBorderColorInfo, t.leftBorderColorInfo) && u.leftBorderStyle == t.leftBorderStyle) {
+                                    s._a9(u.leftBorderColorInfo, true, -97);
+                                    s._ba(u.leftBorderStyle, true, -97);
                                 }
-                                if (WorkbookColorInfo.l_op_Inequality(t.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.rightBorderColorInfo, s.rightBorderColorInfo) && t.rightBorderStyle == s.rightBorderStyle) {
-                                    r._bd(t.rightBorderColorInfo, true, -97);
-                                    r._be(t.rightBorderStyle, true, -97);
+                                if (WorkbookColorInfo.l_op_Inequality(u.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.rightBorderColorInfo, t.rightBorderColorInfo) && u.rightBorderStyle == t.rightBorderStyle) {
+                                    s._bd(u.rightBorderColorInfo, true, -97);
+                                    s._be(u.rightBorderStyle, true, -97);
                                 }
                             }
                         }
@@ -91999,37 +92009,40 @@ let WorksheetRow = /*@__PURE__*/ (() => {
         /**
          * @hidden
          */
-        _bc(a) {
-            let b = this._aj(a);
-            return this._bb(b, a);
+        _bc(a, b = true) {
+            let c = this._aj(a);
+            return this._bb(c, a, b);
         }
         /**
          * @hidden
          */
-        _bb(a, b) {
-            let c = b % 32;
-            let d = a[c];
-            let e;
-            if (d == null) {
-                let f = this.worksheet.workbook;
-                let g = f == null ? null : f._ca;
-                if (g == null) {
-                    d = new WorksheetCellFormatData(null, 0);
+        _bb(a, b, c = true) {
+            let d = b % 32;
+            let e = a[d];
+            let f;
+            if (e == null) {
+                if (!c) {
+                    return null;
+                }
+                let g = this.worksheet.workbook;
+                let h = g == null ? null : g._ca;
+                if (h == null) {
+                    e = new WorksheetCellFormatData(null, 0);
                 }
                 else {
-                    d = f._ca._p._bu();
+                    e = g._ca._p._bu();
                 }
-                this._dk(b, d);
-                e = new WorksheetCellOwnedFormatProxy(d, g, this, b, a);
-                a[c] = e._bt;
+                this._dk(b, e);
+                f = new WorksheetCellOwnedFormatProxy(e, h, this, b, a);
+                a[d] = f._bt;
                 if (this._a3 != null) {
                     this._a3._aj();
                 }
             }
             else {
-                e = this._be(b, d, a, false);
+                f = this._be(b, e, a, false);
             }
-            return e;
+            return f;
         }
         /**
          * @hidden
@@ -92125,72 +92138,85 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                 }
                 g = h._ca._p;
             }
-            let i = g;
+            let i = null;
+            let j = g;
             if (this._hasCellFormat) {
-                i = this._cellFormatInternal.d;
+                j = this._cellFormatInternal.d;
             }
-            let j = null;
-            let k = -1;
-            let l = toNullable(WorksheetCellFormatBlock.$, null);
+            else {
+                i = this.worksheet._cb(a);
+            }
+            let k = null;
+            let l = -1;
+            let m = toNullable(WorksheetCellFormatBlock.$, null);
             while (d != null || f != null) {
-                if (j == null && d != null) {
+                if (k == null && d != null) {
                     if (++e < this._af.length) {
-                        j = this._af[e];
+                        k = this._af[e];
                     }
-                    if (j == null) {
+                    if (k == null) {
                         d = null;
                     }
                 }
-                if (nullableEquals(l, null) && f != null) {
+                if (nullableEquals(m, null) && f != null) {
                     if (f.moveNext() && f.current.a != null) {
-                        l = toNullable(WorksheetCellFormatBlock.$, f.current);
+                        m = toNullable(WorksheetCellFormatBlock.$, f.current);
                     }
                     else {
                         f.dispose();
                         f = null;
                     }
                 }
-                let m = 32767;
-                if (j != null) {
-                    m = Math.min(m, j.w);
-                }
-                if (l.hasValue) {
-                    m = Math.min(m, l.value.b);
+                let n = 32767;
+                if (k != null) {
+                    n = Math.min(n, k.w);
                 }
-                let n = null;
-                if (j != null && j.w == m) {
-                    n = j;
-                    j = null;
+                if (m.hasValue) {
+                    n = Math.min(n, m.value.b);
                 }
                 let o = null;
-                if (l.hasValue && l.value.b == m) {
-                    o = l.value.a;
-                    l = toNullable(WorksheetCellFormatBlock.$, null);
+                if (k != null && k.w == n) {
+                    o = k;
+                    k = null;
                 }
-                let p = m * 32;
-                if (b < p) {
+                let p = null;
+                if (m.hasValue && m.value.b == n) {
+                    p = m.value.a;
+                    m = toNullable(WorksheetCellFormatBlock.$, null);
+                }
+                let q = n * 32;
+                if (b < q) {
                     return undefined;
                 }
-                for (let q = Math.max(0, a - p); q < 32; q++) {
-                    let r = (p + q);
-                    if (b < r) {
+                for (let r = Math.max(0, a - q); r < 32; r++) {
+                    let s = (q + r);
+                    if (b < s) {
                         return undefined;
                     }
-                    if (r < k) {
+                    if (s < l) {
                         continue;
                     }
-                    k = r;
-                    let s = this._al(n, o == null ? null : o[q], i, g, r);
-                    if (s == null) {
+                    l = s;
+                    let t = j;
+                    if (i != null) {
+                        if (!i.g(s)) {
+                            i = this.worksheet._cb(s);
+                        }
+                        if (i.b != null) {
+                            t = i.b;
+                        }
+                    }
+                    let u = this._al(o, p == null ? null : p[r], t, g, s);
+                    if (u == null) {
                         continue;
                     }
-                    yield s;
-                    n = s.d;
-                    if (s.l && o != null) {
-                        o[q] = null;
+                    yield u;
+                    o = u.d;
+                    if (u.l && p != null) {
+                        p[r] = null;
                     }
                     if (c) {
-                        s.u();
+                        u.u();
                     }
                 }
             }
@@ -92341,6 +92367,9 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                 let d = this._ah;
                 let e = this._cp(c);
                 let f = this.worksheet != null ? this.worksheet._b3 : null;
+                if (this._hasCellFormat) {
+                    f = this._cellFormatInternal.d;
+                }
                 if (e >= 0) {
                     let g = d[e];
                     let h = b % 32;
@@ -92363,7 +92392,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     for (let n = 32 - 1; n >= 0; n--) {
                         if (m.a[n] != null && !Base.equalsStatic(f, m.a[n])) {
                             let o = m.b * 32 + n;
-                            if (o > a) {
+                            if (o >= a) {
                                 return toNullable(Number_$type, o);
                             }
                             return toNullable(Number_$type, null);
@@ -92383,7 +92412,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                 if (nullableEquals(d, null) || nullableGreaterThan(d, b)) {
                     break;
                 }
-            } while (this.worksheet._cb(d.value).i);
+            } while (this.worksheet._cb(d.value).j);
             let e;
             if (nullableNotEquals(d, null)) {
                 e = Math.min(b, d.value - 1);
@@ -92397,8 +92426,8 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     break;
                 }
                 let h = this.worksheet._cb(f);
-                if (h.i) {
-                    f = h.r;
+                if (h.j) {
+                    f = h.s;
                 }
                 else if (nullableNotEquals(c, null)) {
                     let i = this._a7(f);
@@ -93132,6 +93161,9 @@ let WorksheetRow = /*@__PURE__*/ (() => {
             else if (this._bz) {
                 d = true;
             }
+            else if (this._b1 || this.hidden != this.worksheet._dv) {
+                d = true;
+            }
             if (this._af != null) {
                 let e = false;
                 for (let f = 0; f < this._af.length; f++) {
@@ -93596,15 +93628,15 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                 }
                 let k = h.b * 32;
                 if (k != e) {
-                    if (g && (f == null || f.r < e)) {
+                    if (g && (f == null || f.s < e)) {
                         while (e < c) {
                             f = this.worksheet._cb(e);
                             a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                             b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
-                            if (f.r >= k) {
+                            if (f.s >= k) {
                                 break;
                             }
-                            e = f.r + 1;
+                            e = f.s + 1;
                         }
                     }
                     else {
@@ -93614,7 +93646,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                 let l = h.a;
                 for (let m = 0; m < 32; m++) {
                     if (l[m] == null) {
-                        if (g && (f == null || f.r < m + k)) {
+                        if (g && (f == null || f.s < m + k)) {
                             f = this.worksheet._cb((m + k));
                             a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                             b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
@@ -93657,7 +93689,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                         f = this.worksheet._cb(e);
                         a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                         b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
-                        e = f.r + 1;
+                        e = f.s + 1;
                     } while (e < c);
                 }
             }
@@ -93683,14 +93715,14 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     }
                     let l = i.b * 32;
                     if (l != f) {
-                        if (h && (g == null || g.r < f)) {
+                        if (h && (g == null || g.s < f)) {
                             while (f < c) {
                                 g = this.worksheet._cb(f);
                                 b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
-                                if (g.r >= l) {
+                                if (g.s >= l) {
                                     break;
                                 }
-                                f = g.r + 1;
+                                f = g.s + 1;
                             }
                         }
                         else {
@@ -93700,7 +93732,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                     let m = i.a;
                     for (let n = 0; n < 32 && b != 2; n++) {
                         if (m[n] == null) {
-                            if (h && (g == null || g.r < n + l)) {
+                            if (h && (g == null || g.s < n + l)) {
                                 g = this.worksheet._cb((n + l));
                                 b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
                             }
@@ -93728,7 +93760,7 @@ let WorksheetRow = /*@__PURE__*/ (() => {
                         do {
                             g = this.worksheet._cb(f);
                             b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
-                            f = g.r + 1;
+                            f = g.s + 1;
                         } while (f < c);
                     }
                 }
@@ -94823,7 +94855,10 @@ let ConditionBase = /*@__PURE__*/ (() => {
                     for (let k = 0; k < b._t.count; k++) {
                         j._remove2(b._t._inner[k]);
                     }
-                    c.o(j);
+                    let l = j.worksheet;
+                    for (let m of fromEnum(j._t)) {
+                        c.add(new WorksheetRegion(l, m._ac, m._w, m._ae, m._x, false));
+                    }
                 }
                 else {
                     if (c != null) {
@@ -95501,13 +95536,13 @@ let Worksheet_HideUnhideChangeContext = /*@__PURE__*/ (() => {
                 for (let h of fromEnum(this.a._ff)) {
                     let i = false;
                     for (let j of fromEnum(this.f)) {
-                        if (j.a <= h.r && h.q <= j.b) {
+                        if (j.a <= h.s && h.r <= j.b) {
                             i = true;
                             break;
                         }
                     }
                     if (i) {
-                        h.i = (h.i == false);
+                        h.j = (h.j == false);
                     }
                 }
             }
@@ -96832,23 +96867,23 @@ let Worksheet = /*@__PURE__*/ (() => {
             let e = a;
             let f = (a + b - 1);
             let g;
-            if (c.r >= f) {
+            if (c.s >= f) {
                 g = new Array(1);
                 g[0] = c.d(this.workbook, e, f);
             }
             else {
                 let h = new List$1(WorksheetColumnBlock.$, 0);
-                let i = c.d(this.workbook, e, c.r);
+                let i = c.d(this.workbook, e, c.s);
                 h.add(i);
-                let j = b - i.t;
-                e = (e + i.t);
+                let j = b - i.u;
+                e = (e + i.u);
                 while (j > 0) {
                     d++;
                     c = this._fe._inner[d];
-                    i = c.d(this.workbook, e, Math.min(c.r, f));
+                    i = c.d(this.workbook, e, Math.min(c.s, f));
                     h.add(i);
-                    j -= i.t;
-                    e += i.t;
+                    j -= i.u;
+                    e += i.u;
                 }
                 g = h.toArray();
             }
@@ -97154,7 +97189,7 @@ let Worksheet = /*@__PURE__*/ (() => {
                 b = d.p3;
             }
             let e = this._cb(a);
-            let f = truncate(MathUtilities.f(e.n(this, 1)));
+            let f = truncate(MathUtilities.f(e.o(this, 1)));
             return new WorksheetItemPosition(1, a, b, f);
         }
         /**
@@ -97171,7 +97206,7 @@ let Worksheet = /*@__PURE__*/ (() => {
             d = f.p2;
             e = f.p3;
             let g = this._cb(e);
-            let h = truncate(MathUtilities.f(g.n(this, 1)));
+            let h = truncate(MathUtilities.f(g.o(this, 1)));
             return new WorksheetItemPosition(1, e, a - c, h);
         }
         /**
@@ -97192,7 +97227,7 @@ let Worksheet = /*@__PURE__*/ (() => {
             let k = Math.min(h, c);
             for (let l = g; l <= k; l++) {
                 let m = this._cb(l);
-                let n = truncate(MathUtilities.f(m.n(this, 1)));
+                let n = truncate(MathUtilities.f(m.o(this, 1)));
                 if (n != 0) {
                     d.add(new WorksheetItemPosition(1, l, j, n));
                 }
@@ -97216,10 +97251,10 @@ let Worksheet = /*@__PURE__*/ (() => {
             let g = this._columns$i;
             for (let h = e; c ? h <= f : h >= f; h += d) {
                 let i = this._cb(h);
-                if (i.k) {
+                if (i.l) {
                     continue;
                 }
-                let j = c ? i.r : i.q;
+                let j = c ? i.s : i.r;
                 while (true) {
                     yield g.item(h);
                     if (h == j) {
@@ -97244,11 +97279,11 @@ let Worksheet = /*@__PURE__*/ (() => {
          */
         _ga(a, b = false) {
             if (a != null) {
-                if (b == false && a.i) {
+                if (b == false && a.j) {
                     return 0;
                 }
-                if (a.v >= 0) {
-                    return a.v;
+                if (a.w >= 0) {
+                    return a.w;
                 }
             }
             return this.defaultColumnWidth;
@@ -97282,7 +97317,7 @@ let Worksheet = /*@__PURE__*/ (() => {
          */
         _fo(a, b) {
             if (a != null) {
-                return a.n(this, 3, b);
+                return a.o(this, 3, b);
             }
             return this.getDefaultColumnWidth(3);
         }
@@ -97591,146 +97626,148 @@ let Worksheet = /*@__PURE__*/ (() => {
         /**
          * @hidden
          */
-        _c4(a, b, c, d, e) {
-            let f = c;
-            let g = a;
-            let h = d;
-            let i = b;
-            let j = this._ff;
-            let k = this._b3;
-            for (let l = j.count - 1; l >= 0; l--) {
-                let m = j._inner[l];
-                if (m.m != 0) {
-                    f = m.r + 1;
+        _c4(a, b, c, d, e, f = true) {
+            let g = c;
+            let h = a;
+            let i = d;
+            let j = b;
+            let k = this._ff;
+            let l = this._b3;
+            for (let m = k.count - 1; m >= 0; m--) {
+                let n = k._inner[m];
+                if (n.n != 0) {
+                    g = n.s + 1;
                     break;
                 }
-                else if (!Base.equalsStatic(m.b, k)) {
-                    f = m.r;
+                else if (!Base.equalsStatic(n.b, l)) {
+                    g = n.s;
                     break;
                 }
             }
-            for (let n = 0; n < j.count; n++) {
-                let o = j._inner[n];
-                if (o.m != 0) {
-                    h = o.q;
+            for (let o = 0; o < k.count; o++) {
+                let p = k._inner[o];
+                if (p.n != 0) {
+                    i = p.r;
                     break;
                 }
-                else if (!Base.equalsStatic(o.b, k)) {
-                    h = o.q;
+                else if (!Base.equalsStatic(p.b, l)) {
+                    i = p.r;
                     break;
                 }
             }
-            let p = new MutableItemRange(h, f);
-            for (let q of fromEnum(this._rows$i._n(a, b, true))) {
-                let r = q._a0(p, c, d);
-                if (r != null) {
-                    p = r;
-                    g = q.index;
-                    if (i > g) {
-                        i = g;
+            let q = new MutableItemRange(i, g);
+            for (let r of fromEnum(this._rows$i._n(a, b, true))) {
+                let s = r._a0(q, c, d);
+                if (s != null) {
+                    q = s;
+                    h = r.index;
+                    if (j > h) {
+                        j = h;
                     }
                 }
             }
-            h = p.a;
-            f = p.b;
-            let s = new WorksheetRegionAddress(1, a, b, c, d);
-            for (let t of fromEnum(this._tables$i)) {
-                let u = t._by;
-                if (u._j(s)) {
-                    if (u._ac < i) {
-                        i = u._ac;
-                    }
-                    if (u._w < h) {
-                        h = u._w;
-                    }
-                    if (u._x > f) {
-                        f = u._x;
-                    }
-                    if (u._ae > g) {
-                        g = u._ae;
+            i = q.a;
+            g = q.b;
+            let t = new WorksheetRegionAddress(1, a, b, c, d);
+            if (f) {
+                for (let u of fromEnum(this._tables$i)) {
+                    let v = u._by;
+                    if (v._j(t)) {
+                        if (v._ac < j) {
+                            j = v._ac;
+                        }
+                        if (v._w < i) {
+                            i = v._w;
+                        }
+                        if (v._x > g) {
+                            g = v._x;
+                        }
+                        if (v._ae > h) {
+                            h = v._ae;
+                        }
                     }
                 }
             }
             if (this._d2) {
-                for (let v of fromEnum(this._eu.keys)) {
-                    if (v.o >= a && v.o <= b) {
-                        if (v.o < i) {
-                            i = v.o;
+                for (let w of fromEnum(this._eu.keys)) {
+                    if (w.o >= a && w.o <= b) {
+                        if (w.o < j) {
+                            j = w.o;
                         }
-                        if (v.m < h) {
-                            h = v.m;
+                        if (w.m < i) {
+                            i = w.m;
                         }
-                        if (v.m > f) {
-                            f = v.m;
+                        if (w.m > g) {
+                            g = w.m;
                         }
-                        if (v.o > g) {
-                            g = v.o;
+                        if (w.o > h) {
+                            h = w.o;
                         }
                     }
                 }
             }
             if (this._d1) {
-                for (let w of fromEnum(this._es)) {
-                    let x = w.value._h;
-                    if (x._j(s)) {
-                        if (x._ac < i) {
-                            i = x._ac;
+                for (let x of fromEnum(this._es)) {
+                    let y = x.value._h;
+                    if (y._j(t)) {
+                        if (y._ac < j) {
+                            j = y._ac;
                         }
-                        if (x._w < h) {
-                            h = x._w;
+                        if (y._w < i) {
+                            i = y._w;
                         }
-                        if (x._x > f) {
-                            f = x._x;
+                        if (y._x > g) {
+                            g = y._x;
                         }
-                        if (x._ae > g) {
-                            g = x._ae;
+                        if (y._ae > h) {
+                            h = y._ae;
                         }
                     }
                 }
             }
-            if (e && (f < d || g < b)) {
-                for (let y of fromEnum(this._shapes$i)) {
-                    let z = y._ah;
-                    if (z.o < i) {
-                        i = z.o;
+            if (e && (g < d || h < b)) {
+                for (let z of fromEnum(this._shapes$i)) {
+                    let aa = z._ah;
+                    if (aa.o < j) {
+                        j = aa.o;
                     }
-                    if (z.m < h) {
-                        h = z.m;
+                    if (aa.m < i) {
+                        i = aa.m;
                     }
-                    let aa = y._ad;
-                    if (aa.o > g) {
-                        g = Math.min(aa.o, b);
+                    let ab = z._ad;
+                    if (ab.o > h) {
+                        h = Math.min(ab.o, b);
                     }
-                    if (aa.m > f) {
-                        f = Math.min(aa.m, d);
+                    if (ab.m > g) {
+                        g = Math.min(ab.m, d);
                     }
                 }
             }
-            if (h < c) {
-                h = c;
-            }
-            if (i < a) {
-                i = a;
+            if (i < c) {
+                i = c;
             }
-            if (f > d) {
-                f = d;
+            if (j < a) {
+                j = a;
             }
-            else if (f < c) {
-                f = c;
+            if (g > d) {
+                g = d;
             }
-            if (g > b) {
-                g = b;
+            else if (g < c) {
+                g = c;
             }
-            else if (g < a) {
-                g = a;
+            if (h > b) {
+                h = b;
             }
-            if (h > f) {
-                h = f;
+            else if (h < a) {
+                h = a;
             }
             if (i > g) {
                 i = g;
             }
-            return new WorksheetRegionAddress(1, i, g, h, f);
+            if (j > h) {
+                j = h;
+            }
+            return new WorksheetRegionAddress(1, j, h, i, g);
         }
         /**
          * @hidden
@@ -97792,7 +97829,7 @@ let Worksheet = /*@__PURE__*/ (() => {
          * @hidden
          */
         _ec(a) {
-            return this._cb(a).i;
+            return this._cb(a).j;
         }
         /**
          * @hidden
@@ -97833,10 +97870,10 @@ let Worksheet = /*@__PURE__*/ (() => {
                 h.b = GenericCacheElementEx.r(WorksheetCellFormatData.$, f, i);
                 this._hh();
             }
-            h.i = d;
-            h.m = e;
-            h.v = c;
-            h.j = g;
+            h.j = d;
+            h.n = e;
+            h.w = c;
+            h.k = g;
         }
         /**
          * @hidden
@@ -97846,7 +97883,7 @@ let Worksheet = /*@__PURE__*/ (() => {
             let d = ((() => { let e = this._f8(a, b, true, c); c = e.p3; return e.ret; })());
             let e = this.workbook._ff;
             let f = d;
-            let g = (c.r + 1);
+            let g = (c.s + 1);
             let h = 0;
             for (let i = d + 1; i < this._fe.count; i++) {
                 if (g >= e) {
@@ -97854,10 +97891,10 @@ let Worksheet = /*@__PURE__*/ (() => {
                     continue;
                 }
                 let j = this._fe._inner[i];
-                let k = j.r + 1 - j.q;
-                j.q = g;
-                j.r = Math.min(g + k - 1, e - 1);
-                g = (j.r + 1);
+                let k = j.s + 1 - j.r;
+                j.r = g;
+                j.s = Math.min(g + k - 1, e - 1);
+                g = (j.s + 1);
             }
             while (h > 0) {
                 d = this._fe.count - 1;
@@ -97877,28 +97914,28 @@ let Worksheet = /*@__PURE__*/ (() => {
             let d = this._fe._inner[c];
             let e = b;
             let f = c;
-            if (d.q == a && d.q + b >= d.r + 1) {
-                e -= d.t;
+            if (d.r == a && d.r + b >= d.s + 1) {
+                e -= d.u;
                 this._id(c, d);
                 if (c < this._fe.count) {
                     let g = this._fe._inner[c];
-                    let h = g.t;
-                    g.q = a;
-                    g.r = (a + h - 1);
+                    let h = g.u;
+                    g.r = a;
+                    g.s = (a + h - 1);
                 }
                 if (f > 0) {
                     f--;
                 }
             }
             else {
-                let i = Math.min(d.r + 1 - a, b);
-                d.r -= i;
+                let i = Math.min(d.s + 1 - a, b);
+                d.s -= i;
                 e -= i;
                 c++;
             }
             while (e > 0) {
                 d = this._fe._inner[c];
-                let j = d.t;
+                let j = d.u;
                 if (j <= e) {
                     e -= j;
                     this._id(c, d);
@@ -97906,7 +97943,7 @@ let Worksheet = /*@__PURE__*/ (() => {
                 else {
                     j -= e;
                     e = 0;
-                    d.r = (d.q + j - 1);
+                    d.s = (d.r + j - 1);
                 }
             }
             if (this._fe.count == 0) {
@@ -97921,23 +97958,23 @@ let Worksheet = /*@__PURE__*/ (() => {
             let b = this._fe._inner[this._fe.count - 1];
             let c = (this.workbook._ff - 1);
             do {
-                if (b.r <= c) {
+                if (b.s <= c) {
                     break;
                 }
                 if (this._fe.count == 1) {
-                    b.r = c;
+                    b.s = c;
                     break;
                 }
                 GenericCacheElementEx.q(WorksheetCellFormatData.$, b.b);
                 this._fe.removeAt(this._fe.count - 1);
                 b = this._fe._inner[this._fe.count - 1];
             } while (true);
-            if (b.r < c) {
-                if (b.k) {
-                    b.r = c;
+            if (b.s < c) {
+                if (b.l) {
+                    b.s = c;
                 }
                 else {
-                    let d = new WorksheetColumnBlock(0, (b.r + 1), c, this.workbook._ca._p);
+                    let d = new WorksheetColumnBlock(0, (b.s + 1), c, this.workbook._ca._p);
                     d.b.k();
                     this._fe.add(d);
                 }
@@ -98150,45 +98187,45 @@ let Worksheet = /*@__PURE__*/ (() => {
          * @hidden
          */
         _h9(a) {
-            let b = a.q;
-            let c = a.r;
+            let b = a.r;
+            let c = a.s;
             let d;
             let e = ((() => { let f = this._f8(b, (c - (b + 1)), false, d); d = f.p3; return f.ret; })());
             let f = d == a;
             let g = 0;
             if (f) {
-                if (d.r >= a.r) {
+                if (d.s >= a.s) {
                     return;
                 }
-                g = a.r - d.r;
-                d.r = a.r;
+                g = a.s - d.s;
+                d.s = a.s;
             }
             else {
-                if (d.q == a.q) {
-                    if (d.r == a.r) {
+                if (d.r == a.r) {
+                    if (d.s == a.s) {
                         this._fe._inner[e] = a;
                         return;
                     }
-                    if (d.r > a.r) {
+                    if (d.s > a.s) {
                         this._fe.insert(e, a);
-                        d.q = (a.r + 1);
+                        d.r = (a.s + 1);
                         return;
                     }
-                    g = a.r - d.r;
+                    g = a.s - d.s;
                     this._fe._inner[e] = a;
                 }
                 else {
-                    if (a.r >= d.r) {
-                        g = a.r - d.r;
-                        d.r = (a.q - 1);
+                    if (a.s >= d.s) {
+                        g = a.s - d.s;
+                        d.s = (a.r - 1);
                         this._fe.insert(e + 1, a);
                     }
                     else {
-                        let h = d.r;
-                        d.r = (a.q - 1);
+                        let h = d.s;
+                        d.s = (a.r - 1);
                         this._fe.insert(e + 1, a);
-                        if (h > a.r) {
-                            this._fe.insert(e + 2, d.d(this.workbook, (a.r + 1), h));
+                        if (h > a.s) {
+                            this._fe.insert(e + 2, d.d(this.workbook, (a.s + 1), h));
                         }
                     }
                 }
@@ -98196,12 +98233,12 @@ let Worksheet = /*@__PURE__*/ (() => {
             while (g > 0) {
                 e++;
                 d = this._fe._inner[e];
-                if (g >= d.t) {
-                    g -= d.t;
+                if (g >= d.u) {
+                    g -= d.u;
                     this._fe.removeAt(e);
                 }
                 else {
-                    d.q += g;
+                    d.r += g;
                     g = 0;
                 }
             }
@@ -98379,20 +98416,20 @@ let Worksheet = /*@__PURE__*/ (() => {
                 let n = l.e;
                 let o = this._f9(m);
                 let p = this._ff._inner[o];
-                if (p.q < m) {
-                    this._cc(m, Math.min(p.r, n));
+                if (p.r < m) {
+                    this._cc(m, Math.min(p.s, n));
                     o++;
                 }
                 let q = this._f9(n);
                 p = this._ff._inner[q];
-                if (p.r > n) {
-                    this._cc(Math.max(p.q, m), n);
+                if (p.s > n) {
+                    this._cc(Math.max(p.r, m), n);
                 }
                 for (let r = o; r <= q; r++) {
                     p = this._fe._inner[r];
-                    p.v = l.c;
-                    p.j = l.a;
-                    p.i = l.b;
+                    p.w = l.c;
+                    p.k = l.a;
+                    p.j = l.b;
                 }
                 this._cd(n);
                 this._cd(m);
@@ -98875,16 +98912,16 @@ let Worksheet = /*@__PURE__*/ (() => {
         _cc(a, b) {
             let c = this._f9(a);
             let d = this._fe._inner[c];
-            let e = d.r;
-            if (d.q != a) {
-                d.r = (a - 1);
+            let e = d.s;
+            if (d.r != a) {
+                d.s = (a - 1);
                 let f = new WorksheetColumnBlock(1, a, e, d);
                 c++;
                 this._fe.insert(c, f);
                 d = f;
             }
-            if (d.r != b) {
-                d.r = b;
+            if (d.s != b) {
+                d.s = b;
                 let g = new WorksheetColumnBlock(1, (b + 1), e, d);
                 this._fe.insert(c + 1, g);
             }
@@ -98938,23 +98975,24 @@ let Worksheet = /*@__PURE__*/ (() => {
         _cd(a) {
             let b = this._f9(a);
             let c = this._fe._inner[b];
-            if (c.q != 0) {
-                let d = this._cb((c.q - 1));
-                if (c.equals(d)) {
+            let d = this.defaultColumnWidth;
+            if (c.r != 0) {
+                let e = this._cb((c.r - 1));
+                if (c.i(e, d)) {
                     this._ff.removeAt(b);
                     GenericCacheElementEx.q(WorksheetCellFormatData.$, c.b);
-                    d.r = c.r;
-                    c = d;
+                    e.s = c.s;
+                    c = e;
                 }
             }
-            let e = this._columns$i.maxCount - 1;
-            if (c.r != e) {
-                let f = this._f9((c.r + 1));
-                let g = this._fe._inner[f];
-                if (c.equals(g)) {
-                    this._ff.removeAt(f);
-                    GenericCacheElementEx.q(WorksheetCellFormatData.$, g.b);
-                    c.r = g.r;
+            let f = this._columns$i.maxCount - 1;
+            if (c.s != f) {
+                let g = this._f9((c.s + 1));
+                let h = this._fe._inner[g];
+                if (c.i(h, d)) {
+                    this._ff.removeAt(g);
+                    GenericCacheElementEx.q(WorksheetCellFormatData.$, h.b);
+                    c.s = h.s;
                 }
             }
             return c;
@@ -99172,10 +99210,11 @@ let Worksheet = /*@__PURE__*/ (() => {
          * @hidden
          */
         _ca(a = 0) {
-            let b = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), this.workbook._ca._p);
-            b.b.k();
-            this._fe.add(b);
-            return b;
+            let b = this._b3;
+            let c = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), b);
+            c.b.k();
+            this._fe.add(c);
+            return c;
         }
         /**
          * @hidden
@@ -99196,7 +99235,7 @@ let Worksheet = /*@__PURE__*/ (() => {
                 if (e.g(a)) {
                     return d;
                 }
-                let f = e.q - a;
+                let f = e.r - a;
                 if (f < 0) {
                     b = d + 1;
                 }
@@ -99301,20 +99340,23 @@ let Worksheet = /*@__PURE__*/ (() => {
         _hj(a) {
             let b = this._fe._inner[a];
             if (a == 0) {
-                b.r -= b.q;
-                b.q = 0;
+                b.s -= b.r;
+                b.r = 0;
             }
             for (let c = a + 1; c < this._fe.count; c++) {
                 let d = this._fe._inner[c];
-                let e = d.t;
-                d.q = (b.r + 1);
-                d.r = (d.q + e - 1);
+                let e = d.u;
+                d.r = (b.s + 1);
+                d.s = (d.r + e - 1);
                 b = d;
             }
-            if (b.r < this.workbook._ff - 1 && false == b.k) {
-                b = this._ca((b.r + 1));
+            if (b.s < this.workbook._ff - 1 && false == b.l) {
+                b = this._ca((b.s + 1));
+                if (b != this._cd(b.r)) {
+                    b = this._ff._inner[this._ff.count - 1];
+                }
             }
-            b.r = (this.workbook._ff - 1);
+            b.s = (this.workbook._ff - 1);
         }
         /**
          * @hidden
@@ -99325,8 +99367,8 @@ let Worksheet = /*@__PURE__*/ (() => {
             if (a == 0) {
                 d = this._fe._inner[0];
                 if (c) {
-                    if (d.k) {
-                        d.r = Math.min(d.r + b, f - 1);
+                    if (d.l) {
+                        d.s = Math.min(d.s + b, f - 1);
                     }
                     else {
                         d = new WorksheetColumnBlock(0, a, (a + b - 1), this.workbook._ca._p);
@@ -99347,7 +99389,7 @@ let Worksheet = /*@__PURE__*/ (() => {
                 }
                 d = this._fe._inner[e];
                 if (c) {
-                    d.r = Math.min(d.r + b, f - 1);
+                    d.s = Math.min(d.s + b, f - 1);
                 }
             }
             return {
@@ -99573,8 +99615,8 @@ let Worksheet = /*@__PURE__*/ (() => {
                 this._cc(f, f);
                 this._cc(h, h);
                 for (let u of fromEnum(this._ff)) {
-                    if (f <= u.q && u.r <= h) {
-                        u.i = d;
+                    if (f <= u.r && u.s <= h) {
+                        u.j = d;
                     }
                 }
             }
@@ -100253,15 +100295,15 @@ let Worksheet = /*@__PURE__*/ (() => {
          */
         get _b3() {
             let a = 0;
-            let b = this._ff._inner[0].b;
+            let b = this._ff.count == 0 ? null : this._ff._inner[0].b;
             for (let c = 0; c < this._ff.count; c++) {
                 let d = this._ff._inner[c];
-                if (a <= d.t) {
-                    a = d.t;
+                if (a <= d.u) {
+                    a = d.u;
                     b = d.b;
                 }
             }
-            if (b._cd) {
+            if (b == null || b._cd) {
                 b = this.workbook != null ? this.workbook._ca._p : null;
             }
             return b;
@@ -112564,7 +112606,7 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             if (b == null) {
                 return false;
             }
-            return b._cb(a).i;
+            return b._cb(a).j;
         }
         /**
          * @hidden
@@ -112575,7 +112617,7 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             }
             this._ad();
             this._ak();
-            this.worksheet._cb(this.index).i = a;
+            this.worksheet._cb(this.index).j = a;
             this._aj();
         }
         /**
@@ -112775,7 +112817,7 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             if (b == null) {
                 return 0;
             }
-            return b._cb(a).m;
+            return b._cb(a).n;
         }
         /**
          * @hidden
@@ -112786,7 +112828,7 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             }
             this._ad();
             this._ak();
-            this.worksheet._cb(this.index).m = a;
+            this.worksheet._cb(this.index).n = a;
             this._aj();
         }
         /**
@@ -113140,7 +113182,7 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             if (b < 0) {
                 return 0;
             }
-            return a._cb(b).v;
+            return a._cb(b).w;
         }
         set width(a) {
             this._ad();
@@ -113169,10 +113211,10 @@ let WorksheetColumn = /*@__PURE__*/ (() => {
             }
             this._ak();
             let c = this.worksheet._cb(this.index);
-            c.v = a;
-            c.j = this.width >= 0;
+            c.w = a;
+            c.k = this.width >= 0;
             if (this._l) {
-                c.i = false;
+                c.j = false;
                 this._y();
             }
             this._aj();
@@ -113418,8 +113460,8 @@ let HiddenColumnCollection = /*@__PURE__*/ (() => {
          */
         _n(a) {
             for (let b of fromEnum(a._ff)) {
-                if (b.i) {
-                    for (let c = b.q; c <= b.r; c++) {
+                if (b.j) {
+                    for (let c = b.r; c <= b.s; c++) {
                         this.add_1(a._columns$i.item(c));
                     }
                 }
@@ -136289,7 +136331,7 @@ let Function = /*@__PURE__*/ (() => {
             if (b < 0) {
                 this._vg = 255;
                 this._q5 = true;
-                if (b == -3) {
+                if (b == -3 || b == -2) {
                     this._rh = true;
                 }
                 else if (b == -4) {
@@ -138916,7 +138958,7 @@ let Function = /*@__PURE__*/ (() => {
             return Function._g1("WINDOWS", 91 + 10000, 0, 2, false, 0, 1, null, 96, 64);
         }
         static get _v() {
-            return Function._g1("ANCHORARRAY", -3, 1, 1, false, 0, 1, null, 96, 32);
+            return Function._g1("ANCHORARRAY", -3, 1, 1, false, 0, 1, null, 32, 32);
         }
         static get _n0() {
             return Function._g1("SINGLE", -3, 1, 1, false, 0, 1, null, 32, 32);
@@ -144077,14 +144119,14 @@ let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
         static k(a, b, c, d) {
             let e = new List$1(IndexRange.$, 0);
             for (let f of fromEnum(a._ff)) {
-                if (f.r < b) {
+                if (f.s < b) {
                     continue;
                 }
-                if (c < f.q) {
+                if (c < f.r) {
                     break;
                 }
-                if (f.i != d) {
-                    e.add(new IndexRange(1, Math.max(f.q, b), Math.min(f.r, c)));
+                if (f.j != d) {
+                    e.add(new IndexRange(1, Math.max(f.r, b), Math.min(f.s, c)));
                 }
             }
             return e;
@@ -144134,16 +144176,16 @@ let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
             let f = a._dv;
             let g = a.defaultRowHeight;
             for (let h of fromEnum(a._ff)) {
-                let i = h.q;
-                let j = h.r;
+                let i = h.r;
+                let j = h.s;
                 if (j < b) {
                     continue;
                 }
                 let k = d.count == 0 ? null : d._inner[d.count - 1];
-                if (k == null || k.c != h.v || k.a != h.j || k.b != h.i) {
+                if (k == null || k.c != h.w || k.a != h.k || k.b != h.j) {
                     let l = k == null ? b : k.e + 1;
                     let m = Math.min(c, j);
-                    k = new WorksheetElementResizeState(l, m, h.v, h.i, h.j);
+                    k = new WorksheetElementResizeState(l, m, h.w, h.j, h.k);
                     d.add(k);
                 }
                 else {
@@ -144206,15 +144248,15 @@ let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
                 let i = a._ff._inner[h];
                 let j = d.count;
                 while (true) {
-                    let k = i.v;
-                    let l = i.i;
-                    let m = i.j;
-                    if (i.r < f.e) {
+                    let k = i.w;
+                    let l = i.j;
+                    let m = i.k;
+                    if (i.s < f.e) {
                         h++;
                         i = a._ff._inner[h];
-                        if (i.v != k || i.i != l || i.j != m) {
-                            d.add(new WorksheetElementResizeState(g, i.q - 1, k, l, m));
-                            g = i.q;
+                        if (i.w != k || i.j != l || i.k != m) {
+                            d.add(new WorksheetElementResizeState(g, i.r - 1, k, l, m));
+                            g = i.r;
                         }
                     }
                     else {
@@ -145726,11 +145768,11 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
         constructor(a, ..._rest) {
             super();
             this.a = null;
-            this.o = 0;
-            this.e = false;
             this.p = 0;
-            this.l = 0;
-            this.s = -1;
+            this.e = false;
+            this.q = 0;
+            this.m = 0;
+            this.t = -1;
             this.f = false;
             a = (a == void 0) ? 0 : a;
             switch (a) {
@@ -145739,8 +145781,8 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
                         let c = _rest[0];
                         let d = _rest[1];
                         let e = _rest[2];
-                        this.o = c;
-                        this.p = d;
+                        this.p = c;
+                        this.q = d;
                         this.a = e;
                     }
                     break;
@@ -145754,13 +145796,13 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
                             let h = f[0];
                             let i = f[1];
                             let j = f[2];
-                            this.o = h;
-                            this.p = i;
+                            this.p = h;
+                            this.q = i;
                             this.a = j;
                         }
                         this.e = e.e;
-                        this.l = e.l;
-                        this.s = e.s;
+                        this.m = e.m;
+                        this.t = e.t;
                         this.a.k();
                         this.f = e.f;
                     }
@@ -145772,16 +145814,21 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
             if (b == null) {
                 return false;
             }
-            return this.e == b.e && this.l == b.l && this.s == b.s && this.f == b.f && this.a.equals(b.a);
+            return this.i(b);
+        }
+        i(a, b = -1) {
+            let c = this.t < 0 ? b : this.t;
+            let d = a.t < 0 ? b : a.t;
+            return this.e == a.e && this.m == a.m && c == d && this.f == a.f && this.a.equals(a.a);
         }
         getHashCode() {
-            return Base.getHashCodeStatic(this.e) ^ (this.l) ^ (this.s) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
+            return Base.getHashCodeStatic(this.e) ^ (this.m) ^ (this.t) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
         }
         toString() {
             let a = new StringBuilder(0);
-            a.r("FirstColumn: {0}, LastColumn: {1}", this.o, this.p);
-            if (this.s >= 0) {
-                a.q(", Width: {0}", this.s);
+            a.r("FirstColumn: {0}, LastColumn: {1}", this.p, this.q);
+            if (this.t >= 0) {
+                a.q(", Width: {0}", this.t);
             }
             if (this.e) {
                 a.l(", Hidden");
@@ -145789,32 +145836,32 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
             return a.toString();
         }
         c(a) {
-            return this.d(a, this.q, this.r);
+            return this.d(a, this.r, this.s);
         }
         d(a, b, c) {
             let d = new WorksheetColumnBlock(0, b, c, this.b._bv(a));
             d.e = this.e;
-            d.l = this.l;
-            d.s = this.s;
+            d.m = this.m;
+            d.t = this.t;
             d.f = this.f;
             return d;
         }
         g(a) {
-            return a >= this.o && a <= this.p;
+            return a >= this.p && a <= this.q;
         }
-        n(a, b, c = false) {
-            if (c == false && this.i) {
+        o(a, b, c = false) {
+            if (c == false && this.j) {
                 return 0;
             }
-            return a._fl(this.v < 0 ? a.defaultColumnWidth : this.v, b);
+            return a._fl(this.w < 0 ? a.defaultColumnWidth : this.w, b);
         }
-        x(a, b) {
-            if (this.k) {
+        y(a, b) {
+            if (this.l) {
                 return;
             }
             let c = Workbook.getMaxColumnCount(b) - 1;
-            if (c < this.q) {
-                a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.q, c + 1), c));
+            if (c < this.r) {
+                a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.r, c + 1), c));
             }
         }
         get b() {
@@ -145823,47 +145870,47 @@ let WorksheetColumnBlock = /*@__PURE__*/ (() => {
         set b(a) {
             this.a = a;
         }
-        get t() {
-            return this.p + 1 - this.o;
+        get u() {
+            return this.q + 1 - this.p;
         }
-        get q() {
-            return this.o;
+        get r() {
+            return this.p;
         }
-        set q(a) {
-            this.o = a;
+        set r(a) {
+            this.p = a;
         }
-        get i() {
+        get j() {
             return this.e;
         }
-        set i(a) {
+        set j(a) {
             this.e = a;
         }
-        get j() {
+        get k() {
             return this.f;
         }
-        set j(a) {
+        set k(a) {
             this.f = a;
         }
-        get k() {
-            return this.e == false && this.l == 0 && this.s == -1 && this.a._cd;
+        get l() {
+            return this.e == false && this.m == 0 && this.t == -1 && this.a._cd;
         }
-        get r() {
-            return this.p;
+        get s() {
+            return this.q;
         }
-        set r(a) {
-            this.p = a;
+        set s(a) {
+            this.q = a;
         }
-        get m() {
-            return this.l;
+        get n() {
+            return this.m;
         }
-        set m(a) {
-            this.l = a;
+        set n(a) {
+            this.m = a;
         }
-        get v() {
-            return this.s;
+        get w() {
+            return this.t;
         }
-        set v(a) {
-            this.s = a;
+        set w(a) {
+            this.t = a;
         }
     }
     WorksheetColumnBlock.$t = /*@__PURE__*/ markType(WorksheetColumnBlock, 'WorksheetColumnBlock');
@@ -149036,11 +149083,11 @@ let WorkbookSaveManager = /*@__PURE__*/ (() => {
             let h = null;
             for (let i of fromEnum(a._ff)) {
                 if (this._ah(a, i, h)) {
-                    f = Math.max(i.m, f);
+                    f = Math.max(i.n, f);
                     if (nullableEquals(b, null)) {
-                        b = toNullable(Number_$type, i.q);
+                        b = toNullable(Number_$type, i.r);
                     }
-                    c = toNullable(Number_$type, (i.r + 1));
+                    c = toNullable(Number_$type, (i.s + 1));
                 }
                 h = i;
             }
@@ -149192,25 +149239,25 @@ let WorkbookSaveManager = /*@__PURE__*/ (() => {
             let e = false;
             if (a.displayOptions._ap) {
                 if (c != null) {
-                    d = c.m;
-                    e = c.i;
+                    d = c.n;
+                    e = c.j;
                 }
             }
             else {
-                let f = (b.r + 1);
+                let f = (b.s + 1);
                 if (f < a._columns$i.maxCount) {
                     let g = a._cb(f);
                     if (g != null) {
-                        d = g.m;
-                        e = g.i;
+                        d = g.n;
+                        e = g.j;
                     }
                 }
             }
-            let h = e && b.m < d;
+            let h = e && b.n < d;
             if (h) {
                 this._aw.add_1(b);
             }
-            return h || b.m != 0 || b.v >= 0 || b.b._cd == false;
+            return h || b.n != 0 || b.w >= 0 || b.b._cd == false;
         }
         _v(a, b, c) {
             let d = false;
@@ -154262,7 +154309,7 @@ let WorksheetColumnCollection = /*@__PURE__*/ (() => {
          */
         _af(a, b) {
             for (let c of fromEnum(this._e._ff)) {
-                c.x(a, b);
+                c.y(a, b);
             }
         }
         /**
@@ -154302,16 +154349,16 @@ let WorksheetColumnCollection = /*@__PURE__*/ (() => {
             let f = this._e.defaultColumnWidth;
             for (let g of fromEnum(this._e._ff)) {
                 let h = 0;
-                if (e || g.i == false) {
-                    if (g.v < 0) {
+                if (e || g.j == false) {
+                    if (g.w < 0) {
                         h = f;
                     }
                     else {
-                        h = g.v;
+                        h = g.w;
                     }
                 }
-                let i = Math.max(0, Math.min(g.r, a - 1) - g.q + 1);
-                let j = Math.max(0, Math.min(g.r, b - 1) - g.q + 1);
+                let i = Math.max(0, Math.min(g.s, a - 1) - g.r + 1);
+                let j = Math.max(0, Math.min(g.s, b - 1) - g.r + 1);
                 if (i == 0 && j == 0) {
                     break;
                 }
@@ -154333,15 +154380,15 @@ let WorksheetColumnCollection = /*@__PURE__*/ (() => {
             let g = this._e.defaultColumnWidth;
             for (let h of fromEnum(this._e._ff)) {
                 let i = 0;
-                if (e || h.i == false) {
-                    if (h.v < 0) {
+                if (e || h.j == false) {
+                    if (h.w < 0) {
                         i = g;
                     }
                     else {
-                        i = h.v;
+                        i = h.w;
                     }
                 }
-                let j = (h.r - h.q) + 1;
+                let j = (h.s - h.r) + 1;
                 let k = i * j;
                 if (f == false) {
                     if (a < k) {
@@ -154387,10 +154434,10 @@ let WorksheetColumnCollection = /*@__PURE__*/ (() => {
         _as(a) {
             let b = new HashSet$1(WorksheetColumn.$, 0);
             for (let c of fromEnum(this._e._ff)) {
-                if (c.i == false) {
+                if (c.j == false) {
                     continue;
                 }
-                for (let d = c.q; d <= c.r; d++) {
+                for (let d = c.r; d <= c.s; d++) {
                     b.add_1(this.item(d));
                 }
             }
@@ -206160,7 +206207,7 @@ let ErfUtils = /*@__PURE__*/ (() => {
                 }
                 j = a * a;
                 k = 0.12837916709551256 + j * (-0.3250421072470015 + j * (-0.02848174957559851 + j * (-0.0057702702964894416 + j * -2.3763016656650163E-05)));
-                h = 1 + j * (0.39791722395915535 + j * (0.0650222499887673 + j * (0.0050813062818757656 + j * (0.00013249473800432165 + j * -3.9602282787753681E-06))));
+                h = 1 + j * (0.39791722395915535 + j * (0.0650222499887673 + j * (0.0050813062818757656 + j * (0.00013249473800432164 + j * -3.9602282787753681E-06))));
                 i = k / h;
                 return a + a * i;
             }
@@ -206190,7 +206237,7 @@ let ErfUtils = /*@__PURE__*/ (() => {
                 e = 1 + h * (19.651271667439257 + h * (137.65775414351904 + h * (434.56587747522923 + h * (645.38727173326788 + h * (429.00814002756783 + h * (108.63500554177944 + h * (6.5702497703192817 + h * -0.0604244152148581)))))));
             }
             else {
-                d = -0.0098649429247001 + h * (-0.799283237680523 + h * (-17.757954917754752 + h * (-160.63638485582192 + h * (-637.56644336838963 + h * (-1025.0951316110773 + h * -483.5191916086514)))));
+                d = -0.0098649429247001 + h * (-0.799283237680523 + h * (-17.757954917754752 + h * (-160.63638485582192 + h * (-637.56644336838963 + h * (-1025.0951316110772 + h * -483.5191916086514)))));
                 e = 1 + h * (30.338060743482458 + h * (325.79251299657392 + h * (1536.729586084437 + h * (3199.8582195085955 + h * (2553.0504064331644 + h * (474.52854120695537 + h * -22.440952446585818))))));
             }
             j = ErfUtils.a8(a);
@@ -206222,7 +206269,7 @@ let ErfUtils = /*@__PURE__*/ (() => {
                 }
                 j = a * a;
                 k = 0.12837916709551256 + j * (-0.3250421072470015 + j * (-0.02848174957559851 + j * (-0.0057702702964894416 + j * -2.3763016656650163E-05)));
-                h = 1 + j * (0.39791722395915535 + j * (0.0650222499887673 + j * (0.0050813062818757656 + j * (0.00013249473800432165 + j * -3.9602282787753681E-06))));
+                h = 1 + j * (0.39791722395915535 + j * (0.0650222499887673 + j * (0.0050813062818757656 + j * (0.00013249473800432164 + j * -3.9602282787753681E-06))));
                 i = k / h;
                 if (b < 1070596096) {
                     return 1 - (a + a * i);
@@ -206257,7 +206304,7 @@ let ErfUtils = /*@__PURE__*/ (() => {
                     if (b < 0 && c >= 1075314688) {
                         return 2 - 1E-300;
                     }
-                    d = -0.0098649429247001 + h * (-0.799283237680523 + h * (-17.757954917754752 + h * (-160.63638485582192 + h * (-637.56644336838963 + h * (-1025.0951316110773 + h * -483.5191916086514)))));
+                    d = -0.0098649429247001 + h * (-0.799283237680523 + h * (-17.757954917754752 + h * (-160.63638485582192 + h * (-637.56644336838963 + h * (-1025.0951316110772 + h * -483.5191916086514)))));
                     e = 1 + h * (30.338060743482458 + h * (325.79251299657392 + h * (1536.729586084437 + h * (3199.8582195085955 + h * (2553.0504064331644 + h * (474.52854120695537 + h * -22.440952446585818))))));
                 }
                 j = ErfUtils.a8(a);
@@ -247703,18 +247750,18 @@ let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
         }
         f6(a, b) {
             let c = 0;
-            if (b.v >= 0) {
-                c = b.v / 256;
+            if (b.w >= 0) {
+                c = b.w / 256;
             }
             else {
                 c = this.bl.defaultColumnWidth / 256;
             }
-            SpreadsheetMLMain.zy(this, intSToU((b.q + 1)), intSToU((b.r + 1)), toNullable(Number_$type, c), b.b._cd ? 0 : a._a8(b.b), b.i, void 0, b.v >= 0 && (b.v != this.bl.defaultColumnWidth || b.j), void 0, b.m, a._ae(b));
+            SpreadsheetMLMain.zy(this, intSToU((b.r + 1)), intSToU((b.s + 1)), toNullable(Number_$type, c), b.b._cd ? 0 : a._a8(b.b), b.j, void 0, b.w >= 0 && (b.w != this.bl.defaultColumnWidth || b.k), void 0, b.n, a._ae(b));
             this.ad.k();
         }
         f7(a) {
             let b = this.bl._ff;
-            if (b.count == 1 && b._inner[0].k) {
+            if (b.count == 1 && b._inner[0].l) {
                 return;
             }
             SpreadsheetMLMain.z3(this);
@@ -247850,12 +247897,13 @@ let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             this.ad.k();
         }
         ge(at, au) {
-            let av = this.bl._cx(au.p, au.n, Math.max(0, au.q - 1), Math.max(0, au.o - 1));
-            if (av == null) {
+            let av = this.bl._c4(au.p, Math.max(0, au.q - 1), au.n, Math.max(0, au.o - 1), false, false);
+            let aw = this.bl._cw(av);
+            if (aw == null) {
                 return;
             }
-            let aw = av._u ? av._k._c7(av._v, 1, false, true, true) : av._toString2(1, false, true, true);
-            SpreadsheetMLMain.aa1(this, aw);
+            let ax = aw._u ? aw._k._c7(aw._v, 1, false, true, true) : aw._toString2(1, false, true, true);
+            SpreadsheetMLMain.aa1(this, ax);
             this.ad.k();
         }
         static gf(at, au) {
@@ -248264,7 +248312,7 @@ let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
         }
         g1() {
             let at = this.bl._ek ? toNullable(Number_$type, this.bl.getDefaultColumnWidth(0)) : toNullable(Number_$type, null);
-            if (nullableNotEquals(at, null) && Enumerable.b(WorksheetColumnBlock.$, this.bl._ff, (au) => au.i)) {
+            if (nullableNotEquals(at, null) && Enumerable.b(WorksheetColumnBlock.$, this.bl._ff, (au) => au.j)) {
                 at = toNullable(Number_$type, 0);
             }
             SpreadsheetMLMain.adj(this, this.bl.defaultRowHeight / 20, truncate(MathUtilities.j(this.bl.getDefaultColumnWidth(2))), at, this.bl._d4, this.bl._dv, this.bl._dt, this.bl._ds);
@@ -288755,7 +288803,7 @@ let ChartSerializer = /*@__PURE__*/ (() => {
             let i = h.l;
             let j = a.chartType == -4169;
             ChartSerializer.bt(i, g, b, e, d, false, j);
-            if (f == false) {
+            if (f == false || c.xValues != null) {
                 let k = c.xValues != null ? typeCast(SeriesValuesBase.$, c.xValues) : typeCast(SeriesValuesBase.$, c.values);
                 if (d > 0 && b.xValues != null && b.xValues._ad == false) {
                     k = b.xValues;
@@ -296758,6 +296806,7 @@ let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
                                 let $ret = new CT_NonVisualDrawingProps();
                                 $ret.c = new ST_DrawingElementId(1, intSToU(h.value));
                                 $ret.f = i;
+                                $ret.d = a.visible == false;
                                 return $ret;
                             })());
                             $ret.b = new CT_NonVisualGraphicFrameProperties();
@@ -296803,6 +296852,7 @@ let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
                             let $ret = new CT_NonVisualDrawingProps();
                             $ret.c = new ST_DrawingElementId(1, intSToU(h.value));
                             $ret.f = i;
+                            $ret.d = a.visible == false;
                             return $ret;
                         })());
                         $ret.b = new CT_NonVisualGraphicFrameProperties();
@@ -296856,6 +296906,7 @@ let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
                     $ret.a = ((() => {
                         let $ret = new CT_NonVisualDrawingProps();
                         $ret.c = ST_DrawingElementId.a(c.c);
+                        $ret.d = a.visible == false;
                         $ret.f = a._b9;
                         return $ret;
                     })());
@@ -307276,11 +307327,11 @@ let WorkbookSaveManagerExcel2003 = /*@__PURE__*/ (() => {
         }
         _dg(a) {
             let b = new List$1(WorksheetColumnBlock.$, 1, a._ff);
-            if (b.count == 1 && b._inner[0].k) {
+            if (b.count == 1 && b._inner[0].l) {
                 return;
             }
             for (let c of fromEnum(b)) {
-                if (c.k) {
+                if (c.l) {
                     continue;
                 }
                 this._ca.k(c);
@@ -317433,24 +317484,24 @@ let COLINFORecord = /*@__PURE__*/ (() => {
             if (c == null) {
                 return;
             }
-            a._cl._write17(b.q);
-            let d = b.r;
+            a._cl._write17(b.r);
+            let d = b.s;
             if (d == 255) {
                 d = 256;
             }
             a._cl._write17(d);
-            if (b.v < 0) {
+            if (b.w < 0) {
                 a._cl._write17(c.defaultColumnWidth);
             }
             else {
-                a._cl._write17(b.v);
+                a._cl._write17(b.w);
             }
             a._cl._write17(a._a8(b.b));
             let e = 2;
-            if (b.i) {
+            if (b.j) {
                 e |= 1;
             }
-            e |= (b.m << 8);
+            e |= (b.n << 8);
             if (a._ae(b)) {
                 e |= 4096;
             }
@@ -321646,7 +321697,7 @@ let STANDARDWIDTHRecord = /*@__PURE__*/ (() => {
                 return;
             }
             let c = b.defaultColumnWidth;
-            if (Enumerable.b(WorksheetColumnBlock.$, b._ff, (d) => d.i)) {
+            if (Enumerable.b(WorksheetColumnBlock.$, b._ff, (d) => d.j)) {
                 c = 0;
             }
             a._cl._write17(c);