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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/License +7 -7
  2. package/README.md +7 -7
  3. package/bundles/igniteui-webcomponents-excel.umd.js +2270 -2190
  4. package/bundles/igniteui-webcomponents-excel.umd.min.js +1 -1
  5. package/esm2015/lib/DefaultStyleHelper_combined.js +452 -405
  6. package/esm2015/lib/ErfUtils.js +4 -4
  7. package/esm2015/lib/WorkbookLoadManagerExcel2007_combined.js +14 -10
  8. package/esm2015/lib/WorkbookSaveManagerExcel2003_combined.js +9 -9
  9. package/esm5/lib/DefaultStyleHelper_combined.js +2243 -2167
  10. package/esm5/lib/ErfUtils.js +4 -4
  11. package/esm5/lib/WorkbookLoadManagerExcel2007_combined.js +14 -10
  12. package/esm5/lib/WorkbookSaveManagerExcel2003_combined.js +9 -9
  13. package/fesm2015/igniteui-webcomponents-excel.js +479 -428
  14. package/fesm5/igniteui-webcomponents-excel.js +2270 -2190
  15. package/lib/DefaultStyleHelper_combined.d.ts +21 -20
  16. package/package.json +2 -2
package/esm2015/lib/DefaultStyleHelper_combined.js CHANGED
@@ -15099,7 +15099,13 @@ export let CellShiftOperation = /*@__PURE__*/ (() => {
15099
15099
  c._bc(a)._setFormatting1(c._cellFormatInternal, j);
15100
15100
  }
15101
15101
  else {
15102
- c._bc(a)._ar(j);
15102
+ let k = this.h._cb(a).b;
15103
+ if (k != null) {
15104
+ c._bc(a)._setFormatting1(k, j);
15105
+ }
15106
+ else {
15107
+ c._bc(a)._ar(j);
15108
+ }
15103
15109
  }
15104
15110
  return;
15105
15111
  }
@@ -15108,16 +15114,16 @@ export let CellShiftOperation = /*@__PURE__*/ (() => {
15108
15114
  }
15109
15115
  }
15110
15116
  else if (f != null) {
15111
- let k = i != null ? i.d._bu() : g;
15112
- let l;
15117
+ let l = i != null ? i.d._bu() : g;
15113
15118
  let m;
15114
- if (((() => { let n = f.tryGetValue(a, m); m = n.p1; return n.ret; })())) {
15115
- l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, m.c, m.d, k);
15119
+ let n;
15120
+ if (((() => { let o = f.tryGetValue(a, n); n = o.p1; return o.ret; })())) {
15121
+ m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, n.c, n.d, l);
15116
15122
  }
15117
15123
  else {
15118
- l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, k);
15124
+ m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, l);
15119
15125
  }
15120
- f.item(a, l);
15126
+ f.item(a, m);
15121
15127
  }
15122
15128
  else {
15123
15129
  return;
@@ -33370,7 +33376,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
33370
33376
  let b = a != null ? a._p : null;
33371
33377
  for (let c of fromEnum(this.worksheet._ff)) {
33372
33378
  if (c.b._ca(b) == false) {
33373
- for (let d of fromEnum(this._ch(c.q, c.r, true))) {
33379
+ for (let d of fromEnum(this._ch(c.r, c.s, true))) {
33374
33380
  this._bc(d.r);
33375
33381
  }
33376
33382
  }
@@ -33540,7 +33546,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
33540
33546
  if (a != null && a._t == false && this != WorksheetRow._bm) {
33541
33547
  for (let b of fromEnum(a._ff)) {
33542
33548
  if (b.b._cd == false) {
33543
- for (let c = b.q; c <= b.r; c++) {
33549
+ for (let c = b.r; c <= b.s; c++) {
33544
33550
  this._bc(c);
33545
33551
  }
33546
33552
  }
@@ -33663,7 +33669,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
33663
33669
  if ((z.b.formatOptions & y) == 0) {
33664
33670
  continue;
33665
33671
  }
33666
- for (let aa = z.q; aa <= z.r; aa++) {
33672
+ for (let aa = z.r; aa <= z.s; aa++) {
33667
33673
  this._bc(aa);
33668
33674
  }
33669
33675
  }
@@ -34532,48 +34538,52 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
34532
34538
  p = this._a8(h.value);
34533
34539
  }
34534
34540
  for (let q = a; q <= b; q++) {
34535
- let r = this._bc(q);
34536
- r._ar(i);
34541
+ let r = j != null || d != null;
34542
+ let s = this._bc(q, r);
34543
+ if (s == null) {
34544
+ continue;
34545
+ }
34546
+ s._ar(i);
34537
34547
  if (j != null) {
34538
- r._setFormatting1(j, i);
34548
+ s._setFormatting1(j, i);
34539
34549
  if (nullableNotEquals(h, null)) {
34540
- r._a3(r.formatOptions & ~8, true, -97);
34550
+ s._a3(s.formatOptions & ~8, true, -97);
34541
34551
  if (p != null) {
34542
34552
  if (WorkbookColorInfo.l_op_Inequality(p.topBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.topBorderColorInfo, j.topBorderColorInfo) && p.topBorderStyle == j.topBorderStyle) {
34543
- r._bi(p.topBorderColorInfo, true, -97);
34544
- r._bj(p.topBorderStyle, true, -97);
34553
+ s._bi(p.topBorderColorInfo, true, -97);
34554
+ s._bj(p.topBorderStyle, true, -97);
34545
34555
  }
34546
34556
  if (WorkbookColorInfo.l_op_Inequality(p.bottomBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.bottomBorderColorInfo, j.bottomBorderColorInfo) && p.bottomBorderStyle == j.bottomBorderStyle) {
34547
- r._av(p.bottomBorderColorInfo, true, -97);
34548
- r._aw(p.bottomBorderStyle, true, -97);
34557
+ s._av(p.bottomBorderColorInfo, true, -97);
34558
+ s._aw(p.bottomBorderStyle, true, -97);
34549
34559
  }
34550
34560
  if (!c) {
34551
34561
  if (WorkbookColorInfo.l_op_Inequality(p.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.leftBorderColorInfo, j.leftBorderColorInfo) && p.leftBorderStyle == j.leftBorderStyle) {
34552
- r._a9(p.leftBorderColorInfo, true, -97);
34553
- r._ba(p.leftBorderStyle, true, -97);
34562
+ s._a9(p.leftBorderColorInfo, true, -97);
34563
+ s._ba(p.leftBorderStyle, true, -97);
34554
34564
  }
34555
34565
  if (WorkbookColorInfo.l_op_Inequality(p.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.rightBorderColorInfo, j.rightBorderColorInfo) && p.rightBorderStyle == j.rightBorderStyle) {
34556
- r._bd(p.rightBorderColorInfo, true, -97);
34557
- r._be(p.rightBorderStyle, true, -97);
34566
+ s._bd(p.rightBorderColorInfo, true, -97);
34567
+ s._be(p.rightBorderStyle, true, -97);
34558
34568
  }
34559
34569
  }
34560
34570
  }
34561
34571
  }
34562
34572
  }
34563
34573
  else if (d != null) {
34564
- let s = d._bc(q);
34565
- r.setFormatting(s);
34574
+ let t = d._bc(q);
34575
+ s.setFormatting(t);
34566
34576
  if (l != null) {
34567
- r._a3(r.formatOptions & ~8, true, -97);
34568
- let t = l._a8(q);
34569
- if (t != null) {
34570
- if (WorkbookColorInfo.l_op_Inequality(t.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.leftBorderColorInfo, s.leftBorderColorInfo) && t.leftBorderStyle == s.leftBorderStyle) {
34571
- r._a9(t.leftBorderColorInfo, true, -97);
34572
- r._ba(t.leftBorderStyle, true, -97);
34577
+ s._a3(s.formatOptions & ~8, true, -97);
34578
+ let u = l._a8(q);
34579
+ if (u != null) {
34580
+ if (WorkbookColorInfo.l_op_Inequality(u.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.leftBorderColorInfo, t.leftBorderColorInfo) && u.leftBorderStyle == t.leftBorderStyle) {
34581
+ s._a9(u.leftBorderColorInfo, true, -97);
34582
+ s._ba(u.leftBorderStyle, true, -97);
34573
34583
  }
34574
- if (WorkbookColorInfo.l_op_Inequality(t.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.rightBorderColorInfo, s.rightBorderColorInfo) && t.rightBorderStyle == s.rightBorderStyle) {
34575
- r._bd(t.rightBorderColorInfo, true, -97);
34576
- r._be(t.rightBorderStyle, true, -97);
34584
+ if (WorkbookColorInfo.l_op_Inequality(u.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.rightBorderColorInfo, t.rightBorderColorInfo) && u.rightBorderStyle == t.rightBorderStyle) {
34585
+ s._bd(u.rightBorderColorInfo, true, -97);
34586
+ s._be(u.rightBorderStyle, true, -97);
34577
34587
  }
34578
34588
  }
34579
34589
  }
@@ -34774,37 +34784,40 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
34774
34784
  /**
34775
34785
  * @hidden
34776
34786
  */
34777
- _bc(a) {
34778
- let b = this._aj(a);
34779
- return this._bb(b, a);
34787
+ _bc(a, b = true) {
34788
+ let c = this._aj(a);
34789
+ return this._bb(c, a, b);
34780
34790
  }
34781
34791
  /**
34782
34792
  * @hidden
34783
34793
  */
34784
- _bb(a, b) {
34785
- let c = b % 32;
34786
- let d = a[c];
34787
- let e;
34788
- if (d == null) {
34789
- let f = this.worksheet.workbook;
34790
- let g = f == null ? null : f._ca;
34791
- if (g == null) {
34792
- d = new WorksheetCellFormatData(null, 0);
34794
+ _bb(a, b, c = true) {
34795
+ let d = b % 32;
34796
+ let e = a[d];
34797
+ let f;
34798
+ if (e == null) {
34799
+ if (!c) {
34800
+ return null;
34801
+ }
34802
+ let g = this.worksheet.workbook;
34803
+ let h = g == null ? null : g._ca;
34804
+ if (h == null) {
34805
+ e = new WorksheetCellFormatData(null, 0);
34793
34806
  }
34794
34807
  else {
34795
- d = f._ca._p._bu();
34808
+ e = g._ca._p._bu();
34796
34809
  }
34797
- this._dk(b, d);
34798
- e = new WorksheetCellOwnedFormatProxy(d, g, this, b, a);
34799
- a[c] = e._bt;
34810
+ this._dk(b, e);
34811
+ f = new WorksheetCellOwnedFormatProxy(e, h, this, b, a);
34812
+ a[d] = f._bt;
34800
34813
  if (this._a3 != null) {
34801
34814
  this._a3._aj();
34802
34815
  }
34803
34816
  }
34804
34817
  else {
34805
- e = this._be(b, d, a, false);
34818
+ f = this._be(b, e, a, false);
34806
34819
  }
34807
- return e;
34820
+ return f;
34808
34821
  }
34809
34822
  /**
34810
34823
  * @hidden
@@ -34900,72 +34913,85 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
34900
34913
  }
34901
34914
  g = h._ca._p;
34902
34915
  }
34903
- let i = g;
34916
+ let i = null;
34917
+ let j = g;
34904
34918
  if (this._hasCellFormat) {
34905
- i = this._cellFormatInternal.d;
34919
+ j = this._cellFormatInternal.d;
34906
34920
  }
34907
- let j = null;
34908
- let k = -1;
34909
- let l = toNullable(WorksheetCellFormatBlock.$, null);
34921
+ else {
34922
+ i = this.worksheet._cb(a);
34923
+ }
34924
+ let k = null;
34925
+ let l = -1;
34926
+ let m = toNullable(WorksheetCellFormatBlock.$, null);
34910
34927
  while (d != null || f != null) {
34911
- if (j == null && d != null) {
34928
+ if (k == null && d != null) {
34912
34929
  if (++e < this._af.length) {
34913
- j = this._af[e];
34930
+ k = this._af[e];
34914
34931
  }
34915
- if (j == null) {
34932
+ if (k == null) {
34916
34933
  d = null;
34917
34934
  }
34918
34935
  }
34919
- if (nullableEquals(l, null) && f != null) {
34936
+ if (nullableEquals(m, null) && f != null) {
34920
34937
  if (f.moveNext() && f.current.a != null) {
34921
- l = toNullable(WorksheetCellFormatBlock.$, f.current);
34938
+ m = toNullable(WorksheetCellFormatBlock.$, f.current);
34922
34939
  }
34923
34940
  else {
34924
34941
  f.dispose();
34925
34942
  f = null;
34926
34943
  }
34927
34944
  }
34928
- let m = 32767;
34929
- if (j != null) {
34930
- m = Math.min(m, j.w);
34931
- }
34932
- if (l.hasValue) {
34933
- m = Math.min(m, l.value.b);
34945
+ let n = 32767;
34946
+ if (k != null) {
34947
+ n = Math.min(n, k.w);
34934
34948
  }
34935
- let n = null;
34936
- if (j != null && j.w == m) {
34937
- n = j;
34938
- j = null;
34949
+ if (m.hasValue) {
34950
+ n = Math.min(n, m.value.b);
34939
34951
  }
34940
34952
  let o = null;
34941
- if (l.hasValue && l.value.b == m) {
34942
- o = l.value.a;
34943
- l = toNullable(WorksheetCellFormatBlock.$, null);
34953
+ if (k != null && k.w == n) {
34954
+ o = k;
34955
+ k = null;
34956
+ }
34957
+ let p = null;
34958
+ if (m.hasValue && m.value.b == n) {
34959
+ p = m.value.a;
34960
+ m = toNullable(WorksheetCellFormatBlock.$, null);
34944
34961
  }
34945
- let p = m * 32;
34946
- if (b < p) {
34962
+ let q = n * 32;
34963
+ if (b < q) {
34947
34964
  return undefined;
34948
34965
  }
34949
- for (let q = Math.max(0, a - p); q < 32; q++) {
34950
- let r = (p + q);
34951
- if (b < r) {
34966
+ for (let r = Math.max(0, a - q); r < 32; r++) {
34967
+ let s = (q + r);
34968
+ if (b < s) {
34952
34969
  return undefined;
34953
34970
  }
34954
- if (r < k) {
34971
+ if (s < l) {
34955
34972
  continue;
34956
34973
  }
34957
- k = r;
34958
- let s = this._al(n, o == null ? null : o[q], i, g, r);
34959
- if (s == null) {
34974
+ l = s;
34975
+ let t = j;
34976
+ if (i != null) {
34977
+ if (!i.g(s)) {
34978
+ i = this.worksheet._cb(s);
34979
+ }
34980
+ if (i.b != null) {
34981
+ t = i.b;
34982
+ }
34983
+ }
34984
+ let u = this._al(o, p == null ? null : p[r], t, g, s);
34985
+ if (u == null) {
34960
34986
  continue;
34961
34987
  }
34962
- yield s;
34963
- n = s.d;
34964
- if (s.l && o != null) {
34965
- o[q] = null;
34988
+ yield u;
34989
+ o = u.d;
34990
+ if (u.l && p != null) {
34991
+ p[r] = null;
34966
34992
  }
34967
34993
  if (c) {
34968
- s.u();
34994
+ u.u();
34969
34995
  }
34970
34996
  }
34971
34997
  }
@@ -35116,6 +35142,9 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35116
35142
  let d = this._ah;
35117
35143
  let e = this._cp(c);
35118
35144
  let f = this.worksheet != null ? this.worksheet._b3 : null;
35145
+ if (this._hasCellFormat) {
35146
+ f = this._cellFormatInternal.d;
35147
+ }
35119
35148
  if (e >= 0) {
35120
35149
  let g = d[e];
35121
35150
  let h = b % 32;
@@ -35138,7 +35167,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35138
35167
  for (let n = 32 - 1; n >= 0; n--) {
35139
35168
  if (m.a[n] != null && !Base.equalsStatic(f, m.a[n])) {
35140
35169
  let o = m.b * 32 + n;
35141
- if (o > a) {
35170
+ if (o >= a) {
35142
35171
  return toNullable(Number_$type, o);
35143
35172
  }
35144
35173
  return toNullable(Number_$type, null);
@@ -35158,7 +35187,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35158
35187
  if (nullableEquals(d, null) || nullableGreaterThan(d, b)) {
35159
35188
  break;
35160
35189
  }
35161
- } while (this.worksheet._cb(d.value).i);
35190
+ } while (this.worksheet._cb(d.value).j);
35162
35191
  let e;
35163
35192
  if (nullableNotEquals(d, null)) {
35164
35193
  e = Math.min(b, d.value - 1);
@@ -35172,8 +35201,8 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35172
35201
  break;
35173
35202
  }
35174
35203
  let h = this.worksheet._cb(f);
35175
- if (h.i) {
35176
- f = h.r;
35204
+ if (h.j) {
35205
+ f = h.s;
35177
35206
  }
35178
35207
  else if (nullableNotEquals(c, null)) {
35179
35208
  let i = this._a7(f);
@@ -35907,6 +35936,9 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35907
35936
  else if (this._bz) {
35908
35937
  d = true;
35909
35938
  }
35939
+ else if (this._b1 || this.hidden != this.worksheet._dv) {
35940
+ d = true;
35941
+ }
35910
35942
  if (this._af != null) {
35911
35943
  let e = false;
35912
35944
  for (let f = 0; f < this._af.length; f++) {
@@ -36371,15 +36403,15 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36371
36403
  }
36372
36404
  let k = h.b * 32;
36373
36405
  if (k != e) {
36374
- if (g && (f == null || f.r < e)) {
36406
+ if (g && (f == null || f.s < e)) {
36375
36407
  while (e < c) {
36376
36408
  f = this.worksheet._cb(e);
36377
36409
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36378
36410
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
36379
- if (f.r >= k) {
36411
+ if (f.s >= k) {
36380
36412
  break;
36381
36413
  }
36382
- e = f.r + 1;
36414
+ e = f.s + 1;
36383
36415
  }
36384
36416
  }
36385
36417
  else {
@@ -36389,7 +36421,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36389
36421
  let l = h.a;
36390
36422
  for (let m = 0; m < 32; m++) {
36391
36423
  if (l[m] == null) {
36392
- if (g && (f == null || f.r < m + k)) {
36424
+ if (g && (f == null || f.s < m + k)) {
36393
36425
  f = this.worksheet._cb((m + k));
36394
36426
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36395
36427
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
@@ -36432,7 +36464,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36432
36464
  f = this.worksheet._cb(e);
36433
36465
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36434
36466
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
36435
- e = f.r + 1;
36467
+ e = f.s + 1;
36436
36468
  } while (e < c);
36437
36469
  }
36438
36470
  }
@@ -36458,14 +36490,14 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36458
36490
  }
36459
36491
  let l = i.b * 32;
36460
36492
  if (l != f) {
36461
- if (h && (g == null || g.r < f)) {
36493
+ if (h && (g == null || g.s < f)) {
36462
36494
  while (f < c) {
36463
36495
  g = this.worksheet._cb(f);
36464
36496
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36465
- if (g.r >= l) {
36497
+ if (g.s >= l) {
36466
36498
  break;
36467
36499
  }
36468
- f = g.r + 1;
36500
+ f = g.s + 1;
36469
36501
  }
36470
36502
  }
36471
36503
  else {
@@ -36475,7 +36507,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36475
36507
  let m = i.a;
36476
36508
  for (let n = 0; n < 32 && b != 2; n++) {
36477
36509
  if (m[n] == null) {
36478
- if (h && (g == null || g.r < n + l)) {
36510
+ if (h && (g == null || g.s < n + l)) {
36479
36511
  g = this.worksheet._cb((n + l));
36480
36512
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36481
36513
  }
@@ -36503,7 +36535,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36503
36535
  do {
36504
36536
  g = this.worksheet._cb(f);
36505
36537
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36506
- f = g.r + 1;
36538
+ f = g.s + 1;
36507
36539
  } while (f < c);
36508
36540
  }
36509
36541
  }
@@ -37598,7 +37630,10 @@ export let ConditionBase = /*@__PURE__*/ (() => {
37598
37630
  for (let k = 0; k < b._t.count; k++) {
37599
37631
  j._remove2(b._t._inner[k]);
37600
37632
  }
37601
- c.o(j);
37633
+ let l = j.worksheet;
37634
+ for (let m of fromEnum(j._t)) {
37635
+ c.add(new WorksheetRegion(l, m._ac, m._w, m._ae, m._x, false));
37636
+ }
37602
37637
  }
37603
37638
  else {
37604
37639
  if (c != null) {
@@ -38276,13 +38311,13 @@ export let Worksheet_HideUnhideChangeContext = /*@__PURE__*/ (() => {
38276
38311
  for (let h of fromEnum(this.a._ff)) {
38277
38312
  let i = false;
38278
38313
  for (let j of fromEnum(this.f)) {
38279
- if (j.a <= h.r && h.q <= j.b) {
38314
+ if (j.a <= h.s && h.r <= j.b) {
38280
38315
  i = true;
38281
38316
  break;
38282
38317
  }
38283
38318
  }
38284
38319
  if (i) {
38285
- h.i = (h.i == false);
38320
+ h.j = (h.j == false);
38286
38321
  }
38287
38322
  }
38288
38323
  }
@@ -39607,23 +39642,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
39607
39642
  let e = a;
39608
39643
  let f = (a + b - 1);
39609
39644
  let g;
39610
- if (c.r >= f) {
39645
+ if (c.s >= f) {
39611
39646
  g = new Array(1);
39612
39647
  g[0] = c.d(this.workbook, e, f);
39613
39648
  }
39614
39649
  else {
39615
39650
  let h = new List$1(WorksheetColumnBlock.$, 0);
39616
- let i = c.d(this.workbook, e, c.r);
39651
+ let i = c.d(this.workbook, e, c.s);
39617
39652
  h.add(i);
39618
- let j = b - i.t;
39619
- e = (e + i.t);
39653
+ let j = b - i.u;
39654
+ e = (e + i.u);
39620
39655
  while (j > 0) {
39621
39656
  d++;
39622
39657
  c = this._fe._inner[d];
39623
- i = c.d(this.workbook, e, Math.min(c.r, f));
39658
+ i = c.d(this.workbook, e, Math.min(c.s, f));
39624
39659
  h.add(i);
39625
- j -= i.t;
39626
- e += i.t;
39660
+ j -= i.u;
39661
+ e += i.u;
39627
39662
  }
39628
39663
  g = h.toArray();
39629
39664
  }
@@ -39929,7 +39964,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39929
39964
  b = d.p3;
39930
39965
  }
39931
39966
  let e = this._cb(a);
39932
- let f = truncate(MathUtilities.f(e.n(this, 1)));
39967
+ let f = truncate(MathUtilities.f(e.o(this, 1)));
39933
39968
  return new WorksheetItemPosition(1, a, b, f);
39934
39969
  }
39935
39970
  /**
@@ -39946,7 +39981,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39946
39981
  d = f.p2;
39947
39982
  e = f.p3;
39948
39983
  let g = this._cb(e);
39949
- let h = truncate(MathUtilities.f(g.n(this, 1)));
39984
+ let h = truncate(MathUtilities.f(g.o(this, 1)));
39950
39985
  return new WorksheetItemPosition(1, e, a - c, h);
39951
39986
  }
39952
39987
  /**
@@ -39967,7 +40002,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39967
40002
  let k = Math.min(h, c);
39968
40003
  for (let l = g; l <= k; l++) {
39969
40004
  let m = this._cb(l);
39970
- let n = truncate(MathUtilities.f(m.n(this, 1)));
40005
+ let n = truncate(MathUtilities.f(m.o(this, 1)));
39971
40006
  if (n != 0) {
39972
40007
  d.add(new WorksheetItemPosition(1, l, j, n));
39973
40008
  }
@@ -39991,10 +40026,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
39991
40026
  let g = this._columns$i;
39992
40027
  for (let h = e; c ? h <= f : h >= f; h += d) {
39993
40028
  let i = this._cb(h);
39994
- if (i.k) {
40029
+ if (i.l) {
39995
40030
  continue;
39996
40031
  }
39997
- let j = c ? i.r : i.q;
40032
+ let j = c ? i.s : i.r;
39998
40033
  while (true) {
39999
40034
  yield g.item(h);
40000
40035
  if (h == j) {
@@ -40019,11 +40054,11 @@ export let Worksheet = /*@__PURE__*/ (() => {
40019
40054
  */
40020
40055
  _ga(a, b = false) {
40021
40056
  if (a != null) {
40022
- if (b == false && a.i) {
40057
+ if (b == false && a.j) {
40023
40058
  return 0;
40024
40059
  }
40025
- if (a.v >= 0) {
40026
- return a.v;
40060
+ if (a.w >= 0) {
40061
+ return a.w;
40027
40062
  }
40028
40063
  }
40029
40064
  return this.defaultColumnWidth;
@@ -40057,7 +40092,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40057
40092
  */
40058
40093
  _fo(a, b) {
40059
40094
  if (a != null) {
40060
- return a.n(this, 3, b);
40095
+ return a.o(this, 3, b);
40061
40096
  }
40062
40097
  return this.getDefaultColumnWidth(3);
40063
40098
  }
@@ -40366,146 +40401,148 @@ export let Worksheet = /*@__PURE__*/ (() => {
40366
40401
  /**
40367
40402
  * @hidden
40368
40403
  */
40369
- _c4(a, b, c, d, e) {
40370
- let f = c;
40371
- let g = a;
40372
- let h = d;
40373
- let i = b;
40374
- let j = this._ff;
40375
- let k = this._b3;
40376
- for (let l = j.count - 1; l >= 0; l--) {
40377
- let m = j._inner[l];
40378
- if (m.m != 0) {
40379
- f = m.r + 1;
40404
+ _c4(a, b, c, d, e, f = true) {
40405
+ let g = c;
40406
+ let h = a;
40407
+ let i = d;
40408
+ let j = b;
40409
+ let k = this._ff;
40410
+ let l = this._b3;
40411
+ for (let m = k.count - 1; m >= 0; m--) {
40412
+ let n = k._inner[m];
40413
+ if (n.n != 0) {
40414
+ g = n.s + 1;
40380
40415
  break;
40381
40416
  }
40382
- else if (!Base.equalsStatic(m.b, k)) {
40383
- f = m.r;
40417
+ else if (!Base.equalsStatic(n.b, l)) {
40418
+ g = n.s;
40384
40419
  break;
40385
40420
  }
40386
40421
  }
40387
- for (let n = 0; n < j.count; n++) {
40388
- let o = j._inner[n];
40389
- if (o.m != 0) {
40390
- h = o.q;
40422
+ for (let o = 0; o < k.count; o++) {
40423
+ let p = k._inner[o];
40424
+ if (p.n != 0) {
40425
+ i = p.r;
40391
40426
  break;
40392
40427
  }
40393
- else if (!Base.equalsStatic(o.b, k)) {
40394
- h = o.q;
40428
+ else if (!Base.equalsStatic(p.b, l)) {
40429
+ i = p.r;
40395
40430
  break;
40396
40431
  }
40397
40432
  }
40398
- let p = new MutableItemRange(h, f);
40399
- for (let q of fromEnum(this._rows$i._n(a, b, true))) {
40400
- let r = q._a0(p, c, d);
40401
- if (r != null) {
40402
- p = r;
40403
- g = q.index;
40404
- if (i > g) {
40405
- i = g;
40433
+ let q = new MutableItemRange(i, g);
40434
+ for (let r of fromEnum(this._rows$i._n(a, b, true))) {
40435
+ let s = r._a0(q, c, d);
40436
+ if (s != null) {
40437
+ q = s;
40438
+ h = r.index;
40439
+ if (j > h) {
40440
+ j = h;
40406
40441
  }
40407
40442
  }
40408
40443
  }
40409
- h = p.a;
40410
- f = p.b;
40411
- let s = new WorksheetRegionAddress(1, a, b, c, d);
40412
- for (let t of fromEnum(this._tables$i)) {
40413
- let u = t._by;
40414
- if (u._j(s)) {
40415
- if (u._ac < i) {
40416
- i = u._ac;
40417
- }
40418
- if (u._w < h) {
40419
- h = u._w;
40420
- }
40421
- if (u._x > f) {
40422
- f = u._x;
40423
- }
40424
- if (u._ae > g) {
40425
- g = u._ae;
40444
+ i = q.a;
40445
+ g = q.b;
40446
+ let t = new WorksheetRegionAddress(1, a, b, c, d);
40447
+ if (f) {
40448
+ for (let u of fromEnum(this._tables$i)) {
40449
+ let v = u._by;
40450
+ if (v._j(t)) {
40451
+ if (v._ac < j) {
40452
+ j = v._ac;
40453
+ }
40454
+ if (v._w < i) {
40455
+ i = v._w;
40456
+ }
40457
+ if (v._x > g) {
40458
+ g = v._x;
40459
+ }
40460
+ if (v._ae > h) {
40461
+ h = v._ae;
40462
+ }
40426
40463
  }
40427
40464
  }
40428
40465
  }
40429
40466
  if (this._d2) {
40430
- for (let v of fromEnum(this._eu.keys)) {
40431
- if (v.o >= a && v.o <= b) {
40432
- if (v.o < i) {
40433
- i = v.o;
40467
+ for (let w of fromEnum(this._eu.keys)) {
40468
+ if (w.o >= a && w.o <= b) {
40469
+ if (w.o < j) {
40470
+ j = w.o;
40434
40471
  }
40435
- if (v.m < h) {
40436
- h = v.m;
40472
+ if (w.m < i) {
40473
+ i = w.m;
40437
40474
  }
40438
- if (v.m > f) {
40439
- f = v.m;
40475
+ if (w.m > g) {
40476
+ g = w.m;
40440
40477
  }
40441
- if (v.o > g) {
40442
- g = v.o;
40478
+ if (w.o > h) {
40479
+ h = w.o;
40443
40480
  }
40444
40481
  }
40445
40482
  }
40446
40483
  }
40447
40484
  if (this._d1) {
40448
- for (let w of fromEnum(this._es)) {
40449
- let x = w.value._h;
40450
- if (x._j(s)) {
40451
- if (x._ac < i) {
40452
- i = x._ac;
40485
+ for (let x of fromEnum(this._es)) {
40486
+ let y = x.value._h;
40487
+ if (y._j(t)) {
40488
+ if (y._ac < j) {
40489
+ j = y._ac;
40453
40490
  }
40454
- if (x._w < h) {
40455
- h = x._w;
40491
+ if (y._w < i) {
40492
+ i = y._w;
40456
40493
  }
40457
- if (x._x > f) {
40458
- f = x._x;
40494
+ if (y._x > g) {
40495
+ g = y._x;
40459
40496
  }
40460
- if (x._ae > g) {
40461
- g = x._ae;
40497
+ if (y._ae > h) {
40498
+ h = y._ae;
40462
40499
  }
40463
40500
  }
40464
40501
  }
40465
40502
  }
40466
- if (e && (f < d || g < b)) {
40467
- for (let y of fromEnum(this._shapes$i)) {
40468
- let z = y._ah;
40469
- if (z.o < i) {
40470
- i = z.o;
40503
+ if (e && (g < d || h < b)) {
40504
+ for (let z of fromEnum(this._shapes$i)) {
40505
+ let aa = z._ah;
40506
+ if (aa.o < j) {
40507
+ j = aa.o;
40471
40508
  }
40472
- if (z.m < h) {
40473
- h = z.m;
40509
+ if (aa.m < i) {
40510
+ i = aa.m;
40474
40511
  }
40475
- let aa = y._ad;
40476
- if (aa.o > g) {
40477
- g = Math.min(aa.o, b);
40512
+ let ab = z._ad;
40513
+ if (ab.o > h) {
40514
+ h = Math.min(ab.o, b);
40478
40515
  }
40479
- if (aa.m > f) {
40480
- f = Math.min(aa.m, d);
40516
+ if (ab.m > g) {
40517
+ g = Math.min(ab.m, d);
40481
40518
  }
40482
40519
  }
40483
40520
  }
40484
- if (h < c) {
40485
- h = c;
40521
+ if (i < c) {
40522
+ i = c;
40486
40523
  }
40487
- if (i < a) {
40488
- i = a;
40524
+ if (j < a) {
40525
+ j = a;
40489
40526
  }
40490
- if (f > d) {
40491
- f = d;
40492
- }
40493
- else if (f < c) {
40494
- f = c;
40527
+ if (g > d) {
40528
+ g = d;
40495
40529
  }
40496
- if (g > b) {
40497
- g = b;
40530
+ else if (g < c) {
40531
+ g = c;
40498
40532
  }
40499
- else if (g < a) {
40500
- g = a;
40533
+ if (h > b) {
40534
+ h = b;
40501
40535
  }
40502
- if (h > f) {
40503
- h = f;
40536
+ else if (h < a) {
40537
+ h = a;
40504
40538
  }
40505
40539
  if (i > g) {
40506
40540
  i = g;
40507
40541
  }
40508
- return new WorksheetRegionAddress(1, i, g, h, f);
40542
+ if (j > h) {
40543
+ j = h;
40544
+ }
40545
+ return new WorksheetRegionAddress(1, j, h, i, g);
40509
40546
  }
40510
40547
  /**
40511
40548
  * @hidden
@@ -40567,7 +40604,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40567
40604
  * @hidden
40568
40605
  */
40569
40606
  _ec(a) {
40570
- return this._cb(a).i;
40607
+ return this._cb(a).j;
40571
40608
  }
40572
40609
  /**
40573
40610
  * @hidden
@@ -40608,10 +40645,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
40608
40645
  h.b = GenericCacheElementEx.r(WorksheetCellFormatData.$, f, i);
40609
40646
  this._hh();
40610
40647
  }
40611
- h.i = d;
40612
- h.m = e;
40613
- h.v = c;
40614
- h.j = g;
40648
+ h.j = d;
40649
+ h.n = e;
40650
+ h.w = c;
40651
+ h.k = g;
40615
40652
  }
40616
40653
  /**
40617
40654
  * @hidden
@@ -40621,7 +40658,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40621
40658
  let d = ((() => { let e = this._f8(a, b, true, c); c = e.p3; return e.ret; })());
40622
40659
  let e = this.workbook._ff;
40623
40660
  let f = d;
40624
- let g = (c.r + 1);
40661
+ let g = (c.s + 1);
40625
40662
  let h = 0;
40626
40663
  for (let i = d + 1; i < this._fe.count; i++) {
40627
40664
  if (g >= e) {
@@ -40629,10 +40666,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
40629
40666
  continue;
40630
40667
  }
40631
40668
  let j = this._fe._inner[i];
40632
- let k = j.r + 1 - j.q;
40633
- j.q = g;
40634
- j.r = Math.min(g + k - 1, e - 1);
40635
- g = (j.r + 1);
40669
+ let k = j.s + 1 - j.r;
40670
+ j.r = g;
40671
+ j.s = Math.min(g + k - 1, e - 1);
40672
+ g = (j.s + 1);
40636
40673
  }
40637
40674
  while (h > 0) {
40638
40675
  d = this._fe.count - 1;
@@ -40652,28 +40689,28 @@ export let Worksheet = /*@__PURE__*/ (() => {
40652
40689
  let d = this._fe._inner[c];
40653
40690
  let e = b;
40654
40691
  let f = c;
40655
- if (d.q == a && d.q + b >= d.r + 1) {
40656
- e -= d.t;
40692
+ if (d.r == a && d.r + b >= d.s + 1) {
40693
+ e -= d.u;
40657
40694
  this._id(c, d);
40658
40695
  if (c < this._fe.count) {
40659
40696
  let g = this._fe._inner[c];
40660
- let h = g.t;
40661
- g.q = a;
40662
- g.r = (a + h - 1);
40697
+ let h = g.u;
40698
+ g.r = a;
40699
+ g.s = (a + h - 1);
40663
40700
  }
40664
40701
  if (f > 0) {
40665
40702
  f--;
40666
40703
  }
40667
40704
  }
40668
40705
  else {
40669
- let i = Math.min(d.r + 1 - a, b);
40670
- d.r -= i;
40706
+ let i = Math.min(d.s + 1 - a, b);
40707
+ d.s -= i;
40671
40708
  e -= i;
40672
40709
  c++;
40673
40710
  }
40674
40711
  while (e > 0) {
40675
40712
  d = this._fe._inner[c];
40676
- let j = d.t;
40713
+ let j = d.u;
40677
40714
  if (j <= e) {
40678
40715
  e -= j;
40679
40716
  this._id(c, d);
@@ -40681,7 +40718,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40681
40718
  else {
40682
40719
  j -= e;
40683
40720
  e = 0;
40684
- d.r = (d.q + j - 1);
40721
+ d.s = (d.r + j - 1);
40685
40722
  }
40686
40723
  }
40687
40724
  if (this._fe.count == 0) {
@@ -40696,23 +40733,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
40696
40733
  let b = this._fe._inner[this._fe.count - 1];
40697
40734
  let c = (this.workbook._ff - 1);
40698
40735
  do {
40699
- if (b.r <= c) {
40736
+ if (b.s <= c) {
40700
40737
  break;
40701
40738
  }
40702
40739
  if (this._fe.count == 1) {
40703
- b.r = c;
40740
+ b.s = c;
40704
40741
  break;
40705
40742
  }
40706
40743
  GenericCacheElementEx.q(WorksheetCellFormatData.$, b.b);
40707
40744
  this._fe.removeAt(this._fe.count - 1);
40708
40745
  b = this._fe._inner[this._fe.count - 1];
40709
40746
  } while (true);
40710
- if (b.r < c) {
40711
- if (b.k) {
40712
- b.r = c;
40747
+ if (b.s < c) {
40748
+ if (b.l) {
40749
+ b.s = c;
40713
40750
  }
40714
40751
  else {
40715
- let d = new WorksheetColumnBlock(0, (b.r + 1), c, this.workbook._ca._p);
40752
+ let d = new WorksheetColumnBlock(0, (b.s + 1), c, this.workbook._ca._p);
40716
40753
  d.b.k();
40717
40754
  this._fe.add(d);
40718
40755
  }
@@ -40925,45 +40962,45 @@ export let Worksheet = /*@__PURE__*/ (() => {
40925
40962
  * @hidden
40926
40963
  */
40927
40964
  _h9(a) {
40928
- let b = a.q;
40929
- let c = a.r;
40965
+ let b = a.r;
40966
+ let c = a.s;
40930
40967
  let d;
40931
40968
  let e = ((() => { let f = this._f8(b, (c - (b + 1)), false, d); d = f.p3; return f.ret; })());
40932
40969
  let f = d == a;
40933
40970
  let g = 0;
40934
40971
  if (f) {
40935
- if (d.r >= a.r) {
40972
+ if (d.s >= a.s) {
40936
40973
  return;
40937
40974
  }
40938
- g = a.r - d.r;
40939
- d.r = a.r;
40975
+ g = a.s - d.s;
40976
+ d.s = a.s;
40940
40977
  }
40941
40978
  else {
40942
- if (d.q == a.q) {
40943
- if (d.r == a.r) {
40979
+ if (d.r == a.r) {
40980
+ if (d.s == a.s) {
40944
40981
  this._fe._inner[e] = a;
40945
40982
  return;
40946
40983
  }
40947
- if (d.r > a.r) {
40984
+ if (d.s > a.s) {
40948
40985
  this._fe.insert(e, a);
40949
- d.q = (a.r + 1);
40986
+ d.r = (a.s + 1);
40950
40987
  return;
40951
40988
  }
40952
- g = a.r - d.r;
40989
+ g = a.s - d.s;
40953
40990
  this._fe._inner[e] = a;
40954
40991
  }
40955
40992
  else {
40956
- if (a.r >= d.r) {
40957
- g = a.r - d.r;
40958
- d.r = (a.q - 1);
40993
+ if (a.s >= d.s) {
40994
+ g = a.s - d.s;
40995
+ d.s = (a.r - 1);
40959
40996
  this._fe.insert(e + 1, a);
40960
40997
  }
40961
40998
  else {
40962
- let h = d.r;
40963
- d.r = (a.q - 1);
40999
+ let h = d.s;
41000
+ d.s = (a.r - 1);
40964
41001
  this._fe.insert(e + 1, a);
40965
- if (h > a.r) {
40966
- this._fe.insert(e + 2, d.d(this.workbook, (a.r + 1), h));
41002
+ if (h > a.s) {
41003
+ this._fe.insert(e + 2, d.d(this.workbook, (a.s + 1), h));
40967
41004
  }
40968
41005
  }
40969
41006
  }
@@ -40971,12 +41008,12 @@ export let Worksheet = /*@__PURE__*/ (() => {
40971
41008
  while (g > 0) {
40972
41009
  e++;
40973
41010
  d = this._fe._inner[e];
40974
- if (g >= d.t) {
40975
- g -= d.t;
41011
+ if (g >= d.u) {
41012
+ g -= d.u;
40976
41013
  this._fe.removeAt(e);
40977
41014
  }
40978
41015
  else {
40979
- d.q += g;
41016
+ d.r += g;
40980
41017
  g = 0;
40981
41018
  }
40982
41019
  }
@@ -41154,20 +41191,20 @@ export let Worksheet = /*@__PURE__*/ (() => {
41154
41191
  let n = l.e;
41155
41192
  let o = this._f9(m);
41156
41193
  let p = this._ff._inner[o];
41157
- if (p.q < m) {
41158
- this._cc(m, Math.min(p.r, n));
41194
+ if (p.r < m) {
41195
+ this._cc(m, Math.min(p.s, n));
41159
41196
  o++;
41160
41197
  }
41161
41198
  let q = this._f9(n);
41162
41199
  p = this._ff._inner[q];
41163
- if (p.r > n) {
41164
- this._cc(Math.max(p.q, m), n);
41200
+ if (p.s > n) {
41201
+ this._cc(Math.max(p.r, m), n);
41165
41202
  }
41166
41203
  for (let r = o; r <= q; r++) {
41167
41204
  p = this._fe._inner[r];
41168
- p.v = l.c;
41169
- p.j = l.a;
41170
- p.i = l.b;
41205
+ p.w = l.c;
41206
+ p.k = l.a;
41207
+ p.j = l.b;
41171
41208
  }
41172
41209
  this._cd(n);
41173
41210
  this._cd(m);
@@ -41650,16 +41687,16 @@ export let Worksheet = /*@__PURE__*/ (() => {
41650
41687
  _cc(a, b) {
41651
41688
  let c = this._f9(a);
41652
41689
  let d = this._fe._inner[c];
41653
- let e = d.r;
41654
- if (d.q != a) {
41655
- d.r = (a - 1);
41690
+ let e = d.s;
41691
+ if (d.r != a) {
41692
+ d.s = (a - 1);
41656
41693
  let f = new WorksheetColumnBlock(1, a, e, d);
41657
41694
  c++;
41658
41695
  this._fe.insert(c, f);
41659
41696
  d = f;
41660
41697
  }
41661
- if (d.r != b) {
41662
- d.r = b;
41698
+ if (d.s != b) {
41699
+ d.s = b;
41663
41700
  let g = new WorksheetColumnBlock(1, (b + 1), e, d);
41664
41701
  this._fe.insert(c + 1, g);
41665
41702
  }
@@ -41713,23 +41750,24 @@ export let Worksheet = /*@__PURE__*/ (() => {
41713
41750
  _cd(a) {
41714
41751
  let b = this._f9(a);
41715
41752
  let c = this._fe._inner[b];
41716
- if (c.q != 0) {
41717
- let d = this._cb((c.q - 1));
41718
- if (c.equals(d)) {
41753
+ let d = this.defaultColumnWidth;
41754
+ if (c.r != 0) {
41755
+ let e = this._cb((c.r - 1));
41756
+ if (c.i(e, d)) {
41719
41757
  this._ff.removeAt(b);
41720
41758
  GenericCacheElementEx.q(WorksheetCellFormatData.$, c.b);
41721
- d.r = c.r;
41722
- c = d;
41759
+ e.s = c.s;
41760
+ c = e;
41723
41761
  }
41724
41762
  }
41725
- let e = this._columns$i.maxCount - 1;
41726
- if (c.r != e) {
41727
- let f = this._f9((c.r + 1));
41728
- let g = this._fe._inner[f];
41729
- if (c.equals(g)) {
41730
- this._ff.removeAt(f);
41731
- GenericCacheElementEx.q(WorksheetCellFormatData.$, g.b);
41732
- c.r = g.r;
41763
+ let f = this._columns$i.maxCount - 1;
41764
+ if (c.s != f) {
41765
+ let g = this._f9((c.s + 1));
41766
+ let h = this._fe._inner[g];
41767
+ if (c.i(h, d)) {
41768
+ this._ff.removeAt(g);
41769
+ GenericCacheElementEx.q(WorksheetCellFormatData.$, h.b);
41770
+ c.s = h.s;
41733
41771
  }
41734
41772
  }
41735
41773
  return c;
@@ -41947,10 +41985,11 @@ export let Worksheet = /*@__PURE__*/ (() => {
41947
41985
  * @hidden
41948
41986
  */
41949
41987
  _ca(a = 0) {
41950
- let b = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), this.workbook._ca._p);
41951
- b.b.k();
41952
- this._fe.add(b);
41953
- return b;
41988
+ let b = this._b3;
41989
+ let c = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), b);
41990
+ c.b.k();
41991
+ this._fe.add(c);
41992
+ return c;
41954
41993
  }
41955
41994
  /**
41956
41995
  * @hidden
@@ -41971,7 +42010,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
41971
42010
  if (e.g(a)) {
41972
42011
  return d;
41973
42012
  }
41974
- let f = e.q - a;
42013
+ let f = e.r - a;
41975
42014
  if (f < 0) {
41976
42015
  b = d + 1;
41977
42016
  }
@@ -42076,20 +42115,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
42076
42115
  _hj(a) {
42077
42116
  let b = this._fe._inner[a];
42078
42117
  if (a == 0) {
42079
- b.r -= b.q;
42080
- b.q = 0;
42118
+ b.s -= b.r;
42119
+ b.r = 0;
42081
42120
  }
42082
42121
  for (let c = a + 1; c < this._fe.count; c++) {
42083
42122
  let d = this._fe._inner[c];
42084
- let e = d.t;
42085
- d.q = (b.r + 1);
42086
- d.r = (d.q + e - 1);
42123
+ let e = d.u;
42124
+ d.r = (b.s + 1);
42125
+ d.s = (d.r + e - 1);
42087
42126
  b = d;
42088
42127
  }
42089
- if (b.r < this.workbook._ff - 1 && false == b.k) {
42090
- b = this._ca((b.r + 1));
42128
+ if (b.s < this.workbook._ff - 1 && false == b.l) {
42129
+ b = this._ca((b.s + 1));
42130
+ if (b != this._cd(b.r)) {
42131
+ b = this._ff._inner[this._ff.count - 1];
42132
+ }
42091
42133
  }
42092
- b.r = (this.workbook._ff - 1);
42134
+ b.s = (this.workbook._ff - 1);
42093
42135
  }
42094
42136
  /**
42095
42137
  * @hidden
@@ -42100,8 +42142,8 @@ export let Worksheet = /*@__PURE__*/ (() => {
42100
42142
  if (a == 0) {
42101
42143
  d = this._fe._inner[0];
42102
42144
  if (c) {
42103
- if (d.k) {
42104
- d.r = Math.min(d.r + b, f - 1);
42145
+ if (d.l) {
42146
+ d.s = Math.min(d.s + b, f - 1);
42105
42147
  }
42106
42148
  else {
42107
42149
  d = new WorksheetColumnBlock(0, a, (a + b - 1), this.workbook._ca._p);
@@ -42122,7 +42164,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
42122
42164
  }
42123
42165
  d = this._fe._inner[e];
42124
42166
  if (c) {
42125
- d.r = Math.min(d.r + b, f - 1);
42167
+ d.s = Math.min(d.s + b, f - 1);
42126
42168
  }
42127
42169
  }
42128
42170
  return {
@@ -42348,8 +42390,8 @@ export let Worksheet = /*@__PURE__*/ (() => {
42348
42390
  this._cc(f, f);
42349
42391
  this._cc(h, h);
42350
42392
  for (let u of fromEnum(this._ff)) {
42351
- if (f <= u.q && u.r <= h) {
42352
- u.i = d;
42393
+ if (f <= u.r && u.s <= h) {
42394
+ u.j = d;
42353
42395
  }
42354
42396
  }
42355
42397
  }
@@ -43028,15 +43070,15 @@ export let Worksheet = /*@__PURE__*/ (() => {
43028
43070
  */
43029
43071
  get _b3() {
43030
43072
  let a = 0;
43031
- let b = this._ff._inner[0].b;
43073
+ let b = this._ff.count == 0 ? null : this._ff._inner[0].b;
43032
43074
  for (let c = 0; c < this._ff.count; c++) {
43033
43075
  let d = this._ff._inner[c];
43034
- if (a <= d.t) {
43035
- a = d.t;
43076
+ if (a <= d.u) {
43077
+ a = d.u;
43036
43078
  b = d.b;
43037
43079
  }
43038
43080
  }
43039
- if (b._cd) {
43081
+ if (b == null || b._cd) {
43040
43082
  b = this.workbook != null ? this.workbook._ca._p : null;
43041
43083
  }
43042
43084
  return b;
@@ -55339,7 +55381,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55339
55381
  if (b == null) {
55340
55382
  return false;
55341
55383
  }
55342
- return b._cb(a).i;
55384
+ return b._cb(a).j;
55343
55385
  }
55344
55386
  /**
55345
55387
  * @hidden
@@ -55350,7 +55392,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55350
55392
  }
55351
55393
  this._ad();
55352
55394
  this._ak();
55353
- this.worksheet._cb(this.index).i = a;
55395
+ this.worksheet._cb(this.index).j = a;
55354
55396
  this._aj();
55355
55397
  }
55356
55398
  /**
@@ -55550,7 +55592,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55550
55592
  if (b == null) {
55551
55593
  return 0;
55552
55594
  }
55553
- return b._cb(a).m;
55595
+ return b._cb(a).n;
55554
55596
  }
55555
55597
  /**
55556
55598
  * @hidden
@@ -55561,7 +55603,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55561
55603
  }
55562
55604
  this._ad();
55563
55605
  this._ak();
55564
- this.worksheet._cb(this.index).m = a;
55606
+ this.worksheet._cb(this.index).n = a;
55565
55607
  this._aj();
55566
55608
  }
55567
55609
  /**
@@ -55915,7 +55957,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55915
55957
  if (b < 0) {
55916
55958
  return 0;
55917
55959
  }
55918
- return a._cb(b).v;
55960
+ return a._cb(b).w;
55919
55961
  }
55920
55962
  set width(a) {
55921
55963
  this._ad();
@@ -55944,10 +55986,10 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55944
55986
  }
55945
55987
  this._ak();
55946
55988
  let c = this.worksheet._cb(this.index);
55947
- c.v = a;
55948
- c.j = this.width >= 0;
55989
+ c.w = a;
55990
+ c.k = this.width >= 0;
55949
55991
  if (this._l) {
55950
- c.i = false;
55992
+ c.j = false;
55951
55993
  this._y();
55952
55994
  }
55953
55995
  this._aj();
@@ -56193,8 +56235,8 @@ export let HiddenColumnCollection = /*@__PURE__*/ (() => {
56193
56235
  */
56194
56236
  _n(a) {
56195
56237
  for (let b of fromEnum(a._ff)) {
56196
- if (b.i) {
56197
- for (let c = b.q; c <= b.r; c++) {
56238
+ if (b.j) {
56239
+ for (let c = b.r; c <= b.s; c++) {
56198
56240
  this.add_1(a._columns$i.item(c));
56199
56241
  }
56200
56242
  }
@@ -79064,7 +79106,7 @@ export let Function = /*@__PURE__*/ (() => {
79064
79106
  if (b < 0) {
79065
79107
  this._vg = 255;
79066
79108
  this._q5 = true;
79067
- if (b == -3) {
79109
+ if (b == -3 || b == -2) {
79068
79110
  this._rh = true;
79069
79111
  }
79070
79112
  else if (b == -4) {
@@ -81691,7 +81733,7 @@ export let Function = /*@__PURE__*/ (() => {
81691
81733
  return Function._g1("WINDOWS", 91 + 10000, 0, 2, false, 0, 1, null, 96, 64);
81692
81734
  }
81693
81735
  static get _v() {
81694
- return Function._g1("ANCHORARRAY", -3, 1, 1, false, 0, 1, null, 96, 32);
81736
+ return Function._g1("ANCHORARRAY", -3, 1, 1, false, 0, 1, null, 32, 32);
81695
81737
  }
81696
81738
  static get _n0() {
81697
81739
  return Function._g1("SINGLE", -3, 1, 1, false, 0, 1, null, 32, 32);
@@ -86852,14 +86894,14 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86852
86894
  static k(a, b, c, d) {
86853
86895
  let e = new List$1(IndexRange.$, 0);
86854
86896
  for (let f of fromEnum(a._ff)) {
86855
- if (f.r < b) {
86897
+ if (f.s < b) {
86856
86898
  continue;
86857
86899
  }
86858
- if (c < f.q) {
86900
+ if (c < f.r) {
86859
86901
  break;
86860
86902
  }
86861
- if (f.i != d) {
86862
- e.add(new IndexRange(1, Math.max(f.q, b), Math.min(f.r, c)));
86903
+ if (f.j != d) {
86904
+ e.add(new IndexRange(1, Math.max(f.r, b), Math.min(f.s, c)));
86863
86905
  }
86864
86906
  }
86865
86907
  return e;
@@ -86909,16 +86951,16 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86909
86951
  let f = a._dv;
86910
86952
  let g = a.defaultRowHeight;
86911
86953
  for (let h of fromEnum(a._ff)) {
86912
- let i = h.q;
86913
- let j = h.r;
86954
+ let i = h.r;
86955
+ let j = h.s;
86914
86956
  if (j < b) {
86915
86957
  continue;
86916
86958
  }
86917
86959
  let k = d.count == 0 ? null : d._inner[d.count - 1];
86918
- if (k == null || k.c != h.v || k.a != h.j || k.b != h.i) {
86960
+ if (k == null || k.c != h.w || k.a != h.k || k.b != h.j) {
86919
86961
  let l = k == null ? b : k.e + 1;
86920
86962
  let m = Math.min(c, j);
86921
- k = new WorksheetElementResizeState(l, m, h.v, h.i, h.j);
86963
+ k = new WorksheetElementResizeState(l, m, h.w, h.j, h.k);
86922
86964
  d.add(k);
86923
86965
  }
86924
86966
  else {
@@ -86981,15 +87023,15 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86981
87023
  let i = a._ff._inner[h];
86982
87024
  let j = d.count;
86983
87025
  while (true) {
86984
- let k = i.v;
86985
- let l = i.i;
86986
- let m = i.j;
86987
- if (i.r < f.e) {
87026
+ let k = i.w;
87027
+ let l = i.j;
87028
+ let m = i.k;
87029
+ if (i.s < f.e) {
86988
87030
  h++;
86989
87031
  i = a._ff._inner[h];
86990
- if (i.v != k || i.i != l || i.j != m) {
86991
- d.add(new WorksheetElementResizeState(g, i.q - 1, k, l, m));
86992
- g = i.q;
87032
+ if (i.w != k || i.j != l || i.k != m) {
87033
+ d.add(new WorksheetElementResizeState(g, i.r - 1, k, l, m));
87034
+ g = i.r;
86993
87035
  }
86994
87036
  }
86995
87037
  else {
@@ -88501,11 +88543,11 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88501
88543
  constructor(a, ..._rest) {
88502
88544
  super();
88503
88545
  this.a = null;
88504
- this.o = 0;
88505
- this.e = false;
88506
88546
  this.p = 0;
88507
- this.l = 0;
88508
- this.s = -1;
88547
+ this.e = false;
88548
+ this.q = 0;
88549
+ this.m = 0;
88550
+ this.t = -1;
88509
88551
  this.f = false;
88510
88552
  a = (a == void 0) ? 0 : a;
88511
88553
  switch (a) {
@@ -88514,8 +88556,8 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88514
88556
  let c = _rest[0];
88515
88557
  let d = _rest[1];
88516
88558
  let e = _rest[2];
88517
- this.o = c;
88518
- this.p = d;
88559
+ this.p = c;
88560
+ this.q = d;
88519
88561
  this.a = e;
88520
88562
  }
88521
88563
  break;
@@ -88529,13 +88571,13 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88529
88571
  let h = f[0];
88530
88572
  let i = f[1];
88531
88573
  let j = f[2];
88532
- this.o = h;
88533
- this.p = i;
88574
+ this.p = h;
88575
+ this.q = i;
88534
88576
  this.a = j;
88535
88577
  }
88536
88578
  this.e = e.e;
88537
- this.l = e.l;
88538
- this.s = e.s;
88579
+ this.m = e.m;
88580
+ this.t = e.t;
88539
88581
  this.a.k();
88540
88582
  this.f = e.f;
88541
88583
  }
@@ -88547,16 +88589,21 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88547
88589
  if (b == null) {
88548
88590
  return false;
88549
88591
  }
88550
- return this.e == b.e && this.l == b.l && this.s == b.s && this.f == b.f && this.a.equals(b.a);
88592
+ return this.i(b);
88593
+ }
88594
+ i(a, b = -1) {
88595
+ let c = this.t < 0 ? b : this.t;
88596
+ let d = a.t < 0 ? b : a.t;
88597
+ return this.e == a.e && this.m == a.m && c == d && this.f == a.f && this.a.equals(a.a);
88551
88598
  }
88552
88599
  getHashCode() {
88553
- return Base.getHashCodeStatic(this.e) ^ (this.l) ^ (this.s) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
88600
+ return Base.getHashCodeStatic(this.e) ^ (this.m) ^ (this.t) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
88554
88601
  }
88555
88602
  toString() {
88556
88603
  let a = new StringBuilder(0);
88557
- a.r("FirstColumn: {0}, LastColumn: {1}", this.o, this.p);
88558
- if (this.s >= 0) {
88559
- a.q(", Width: {0}", this.s);
88604
+ a.r("FirstColumn: {0}, LastColumn: {1}", this.p, this.q);
88605
+ if (this.t >= 0) {
88606
+ a.q(", Width: {0}", this.t);
88560
88607
  }
88561
88608
  if (this.e) {
88562
88609
  a.l(", Hidden");
@@ -88564,32 +88611,32 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88564
88611
  return a.toString();
88565
88612
  }
88566
88613
  c(a) {
88567
- return this.d(a, this.q, this.r);
88614
+ return this.d(a, this.r, this.s);
88568
88615
  }
88569
88616
  d(a, b, c) {
88570
88617
  let d = new WorksheetColumnBlock(0, b, c, this.b._bv(a));
88571
88618
  d.e = this.e;
88572
- d.l = this.l;
88573
- d.s = this.s;
88619
+ d.m = this.m;
88620
+ d.t = this.t;
88574
88621
  d.f = this.f;
88575
88622
  return d;
88576
88623
  }
88577
88624
  g(a) {
88578
- return a >= this.o && a <= this.p;
88625
+ return a >= this.p && a <= this.q;
88579
88626
  }
88580
- n(a, b, c = false) {
88581
- if (c == false && this.i) {
88627
+ o(a, b, c = false) {
88628
+ if (c == false && this.j) {
88582
88629
  return 0;
88583
88630
  }
88584
- return a._fl(this.v < 0 ? a.defaultColumnWidth : this.v, b);
88631
+ return a._fl(this.w < 0 ? a.defaultColumnWidth : this.w, b);
88585
88632
  }
88586
- x(a, b) {
88587
- if (this.k) {
88633
+ y(a, b) {
88634
+ if (this.l) {
88588
88635
  return;
88589
88636
  }
88590
88637
  let c = Workbook.getMaxColumnCount(b) - 1;
88591
- if (c < this.q) {
88592
- a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.q, c + 1), c));
88638
+ if (c < this.r) {
88639
+ a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.r, c + 1), c));
88593
88640
  }
88594
88641
  }
88595
88642
  get b() {
@@ -88598,47 +88645,47 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88598
88645
  set b(a) {
88599
88646
  this.a = a;
88600
88647
  }
88601
- get t() {
88602
- return this.p + 1 - this.o;
88648
+ get u() {
88649
+ return this.q + 1 - this.p;
88603
88650
  }
88604
- get q() {
88605
- return this.o;
88651
+ get r() {
88652
+ return this.p;
88606
88653
  }
88607
- set q(a) {
88608
- this.o = a;
88654
+ set r(a) {
88655
+ this.p = a;
88609
88656
  }
88610
- get i() {
88657
+ get j() {
88611
88658
  return this.e;
88612
88659
  }
88613
- set i(a) {
88660
+ set j(a) {
88614
88661
  this.e = a;
88615
88662
  }
88616
- get j() {
88663
+ get k() {
88617
88664
  return this.f;
88618
88665
  }
88619
- set j(a) {
88666
+ set k(a) {
88620
88667
  this.f = a;
88621
88668
  }
88622
- get k() {
88623
- return this.e == false && this.l == 0 && this.s == -1 && this.a._cd;
88669
+ get l() {
88670
+ return this.e == false && this.m == 0 && this.t == -1 && this.a._cd;
88624
88671
  }
88625
- get r() {
88626
- return this.p;
88672
+ get s() {
88673
+ return this.q;
88627
88674
  }
88628
- set r(a) {
88629
- this.p = a;
88675
+ set s(a) {
88676
+ this.q = a;
88630
88677
  }
88631
- get m() {
88632
- return this.l;
88678
+ get n() {
88679
+ return this.m;
88633
88680
  }
88634
- set m(a) {
88635
- this.l = a;
88681
+ set n(a) {
88682
+ this.m = a;
88636
88683
  }
88637
- get v() {
88638
- return this.s;
88684
+ get w() {
88685
+ return this.t;
88639
88686
  }
88640
- set v(a) {
88641
- this.s = a;
88687
+ set w(a) {
88688
+ this.t = a;
88642
88689
  }
88643
88690
  }
88644
88691
  WorksheetColumnBlock.$t = /*@__PURE__*/ markType(WorksheetColumnBlock, 'WorksheetColumnBlock');
@@ -91811,11 +91858,11 @@ export let WorkbookSaveManager = /*@__PURE__*/ (() => {
91811
91858
  let h = null;
91812
91859
  for (let i of fromEnum(a._ff)) {
91813
91860
  if (this._ah(a, i, h)) {
91814
- f = Math.max(i.m, f);
91861
+ f = Math.max(i.n, f);
91815
91862
  if (nullableEquals(b, null)) {
91816
- b = toNullable(Number_$type, i.q);
91863
+ b = toNullable(Number_$type, i.r);
91817
91864
  }
91818
- c = toNullable(Number_$type, (i.r + 1));
91865
+ c = toNullable(Number_$type, (i.s + 1));
91819
91866
  }
91820
91867
  h = i;
91821
91868
  }
@@ -91967,25 +92014,25 @@ export let WorkbookSaveManager = /*@__PURE__*/ (() => {
91967
92014
  let e = false;
91968
92015
  if (a.displayOptions._ap) {
91969
92016
  if (c != null) {
91970
- d = c.m;
91971
- e = c.i;
92017
+ d = c.n;
92018
+ e = c.j;
91972
92019
  }
91973
92020
  }
91974
92021
  else {
91975
- let f = (b.r + 1);
92022
+ let f = (b.s + 1);
91976
92023
  if (f < a._columns$i.maxCount) {
91977
92024
  let g = a._cb(f);
91978
92025
  if (g != null) {
91979
- d = g.m;
91980
- e = g.i;
92026
+ d = g.n;
92027
+ e = g.j;
91981
92028
  }
91982
92029
  }
91983
92030
  }
91984
- let h = e && b.m < d;
92031
+ let h = e && b.n < d;
91985
92032
  if (h) {
91986
92033
  this._aw.add_1(b);
91987
92034
  }
91988
- return h || b.m != 0 || b.v >= 0 || b.b._cd == false;
92035
+ return h || b.n != 0 || b.w >= 0 || b.b._cd == false;
91989
92036
  }
91990
92037
  _v(a, b, c) {
91991
92038
  let d = false;
@@ -97037,7 +97084,7 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97037
97084
  */
97038
97085
  _af(a, b) {
97039
97086
  for (let c of fromEnum(this._e._ff)) {
97040
- c.x(a, b);
97087
+ c.y(a, b);
97041
97088
  }
97042
97089
  }
97043
97090
  /**
@@ -97077,16 +97124,16 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97077
97124
  let f = this._e.defaultColumnWidth;
97078
97125
  for (let g of fromEnum(this._e._ff)) {
97079
97126
  let h = 0;
97080
- if (e || g.i == false) {
97081
- if (g.v < 0) {
97127
+ if (e || g.j == false) {
97128
+ if (g.w < 0) {
97082
97129
  h = f;
97083
97130
  }
97084
97131
  else {
97085
- h = g.v;
97132
+ h = g.w;
97086
97133
  }
97087
97134
  }
97088
- let i = Math.max(0, Math.min(g.r, a - 1) - g.q + 1);
97089
- let j = Math.max(0, Math.min(g.r, b - 1) - g.q + 1);
97135
+ let i = Math.max(0, Math.min(g.s, a - 1) - g.r + 1);
97136
+ let j = Math.max(0, Math.min(g.s, b - 1) - g.r + 1);
97090
97137
  if (i == 0 && j == 0) {
97091
97138
  break;
97092
97139
  }
@@ -97108,15 +97155,15 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97108
97155
  let g = this._e.defaultColumnWidth;
97109
97156
  for (let h of fromEnum(this._e._ff)) {
97110
97157
  let i = 0;
97111
- if (e || h.i == false) {
97112
- if (h.v < 0) {
97158
+ if (e || h.j == false) {
97159
+ if (h.w < 0) {
97113
97160
  i = g;
97114
97161
  }
97115
97162
  else {
97116
- i = h.v;
97163
+ i = h.w;
97117
97164
  }
97118
97165
  }
97119
- let j = (h.r - h.q) + 1;
97166
+ let j = (h.s - h.r) + 1;
97120
97167
  let k = i * j;
97121
97168
  if (f == false) {
97122
97169
  if (a < k) {
@@ -97162,10 +97209,10 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97162
97209
  _as(a) {
97163
97210
  let b = new HashSet$1(WorksheetColumn.$, 0);
97164
97211
  for (let c of fromEnum(this._e._ff)) {
97165
- if (c.i == false) {
97212
+ if (c.j == false) {
97166
97213
  continue;
97167
97214
  }
97168
- for (let d = c.q; d <= c.r; d++) {
97215
+ for (let d = c.r; d <= c.s; d++) {
97169
97216
  b.add_1(this.item(d));
97170
97217
  }
97171
97218
  }