igniteui-webcomponents-excel 4.3.2 → 4.3.3-beta.1

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 (15) hide show
  1. package/License +1 -1
  2. package/bundles/igniteui-webcomponents-excel.umd.js +399 -354
  3. package/bundles/igniteui-webcomponents-excel.umd.min.js +1 -1
  4. package/esm2015/lib/DefaultStyleHelper_combined.js +350 -314
  5. package/esm2015/lib/ErfUtils.js +4 -4
  6. package/esm2015/lib/WorkbookLoadManagerExcel2007_combined.js +5 -5
  7. package/esm2015/lib/WorkbookSaveManagerExcel2003_combined.js +9 -9
  8. package/esm5/lib/DefaultStyleHelper_combined.js +381 -336
  9. package/esm5/lib/ErfUtils.js +4 -4
  10. package/esm5/lib/WorkbookLoadManagerExcel2007_combined.js +5 -5
  11. package/esm5/lib/WorkbookSaveManagerExcel2003_combined.js +9 -9
  12. package/fesm2015/igniteui-webcomponents-excel.js +368 -332
  13. package/fesm5/igniteui-webcomponents-excel.js +399 -354
  14. package/lib/DefaultStyleHelper_combined.d.ts +20 -19
  15. 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;
34944
34956
  }
34945
- let p = m * 32;
34946
- if (b < p) {
34957
+ let p = null;
34958
+ if (m.hasValue && m.value.b == n) {
34959
+ p = m.value.a;
34960
+ m = toNullable(WorksheetCellFormatBlock.$, null);
34961
+ }
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
  }
@@ -35161,7 +35187,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35161
35187
  if (nullableEquals(d, null) || nullableGreaterThan(d, b)) {
35162
35188
  break;
35163
35189
  }
35164
- } while (this.worksheet._cb(d.value).i);
35190
+ } while (this.worksheet._cb(d.value).j);
35165
35191
  let e;
35166
35192
  if (nullableNotEquals(d, null)) {
35167
35193
  e = Math.min(b, d.value - 1);
@@ -35175,8 +35201,8 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
35175
35201
  break;
35176
35202
  }
35177
35203
  let h = this.worksheet._cb(f);
35178
- if (h.i) {
35179
- f = h.r;
35204
+ if (h.j) {
35205
+ f = h.s;
35180
35206
  }
35181
35207
  else if (nullableNotEquals(c, null)) {
35182
35208
  let i = this._a7(f);
@@ -36377,15 +36403,15 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36377
36403
  }
36378
36404
  let k = h.b * 32;
36379
36405
  if (k != e) {
36380
- if (g && (f == null || f.r < e)) {
36406
+ if (g && (f == null || f.s < e)) {
36381
36407
  while (e < c) {
36382
36408
  f = this.worksheet._cb(e);
36383
36409
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36384
36410
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
36385
- if (f.r >= k) {
36411
+ if (f.s >= k) {
36386
36412
  break;
36387
36413
  }
36388
- e = f.r + 1;
36414
+ e = f.s + 1;
36389
36415
  }
36390
36416
  }
36391
36417
  else {
@@ -36395,7 +36421,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36395
36421
  let l = h.a;
36396
36422
  for (let m = 0; m < 32; m++) {
36397
36423
  if (l[m] == null) {
36398
- if (g && (f == null || f.r < m + k)) {
36424
+ if (g && (f == null || f.s < m + k)) {
36399
36425
  f = this.worksheet._cb((m + k));
36400
36426
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36401
36427
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
@@ -36438,7 +36464,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36438
36464
  f = this.worksheet._cb(e);
36439
36465
  a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
36440
36466
  b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
36441
- e = f.r + 1;
36467
+ e = f.s + 1;
36442
36468
  } while (e < c);
36443
36469
  }
36444
36470
  }
@@ -36464,14 +36490,14 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36464
36490
  }
36465
36491
  let l = i.b * 32;
36466
36492
  if (l != f) {
36467
- if (h && (g == null || g.r < f)) {
36493
+ if (h && (g == null || g.s < f)) {
36468
36494
  while (f < c) {
36469
36495
  g = this.worksheet._cb(f);
36470
36496
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36471
- if (g.r >= l) {
36497
+ if (g.s >= l) {
36472
36498
  break;
36473
36499
  }
36474
- f = g.r + 1;
36500
+ f = g.s + 1;
36475
36501
  }
36476
36502
  }
36477
36503
  else {
@@ -36481,7 +36507,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36481
36507
  let m = i.a;
36482
36508
  for (let n = 0; n < 32 && b != 2; n++) {
36483
36509
  if (m[n] == null) {
36484
- if (h && (g == null || g.r < n + l)) {
36510
+ if (h && (g == null || g.s < n + l)) {
36485
36511
  g = this.worksheet._cb((n + l));
36486
36512
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36487
36513
  }
@@ -36509,7 +36535,7 @@ export let WorksheetRow = /*@__PURE__*/ (() => {
36509
36535
  do {
36510
36536
  g = this.worksheet._cb(f);
36511
36537
  b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
36512
- f = g.r + 1;
36538
+ f = g.s + 1;
36513
36539
  } while (f < c);
36514
36540
  }
36515
36541
  }
@@ -38285,13 +38311,13 @@ export let Worksheet_HideUnhideChangeContext = /*@__PURE__*/ (() => {
38285
38311
  for (let h of fromEnum(this.a._ff)) {
38286
38312
  let i = false;
38287
38313
  for (let j of fromEnum(this.f)) {
38288
- if (j.a <= h.r && h.q <= j.b) {
38314
+ if (j.a <= h.s && h.r <= j.b) {
38289
38315
  i = true;
38290
38316
  break;
38291
38317
  }
38292
38318
  }
38293
38319
  if (i) {
38294
- h.i = (h.i == false);
38320
+ h.j = (h.j == false);
38295
38321
  }
38296
38322
  }
38297
38323
  }
@@ -39616,23 +39642,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
39616
39642
  let e = a;
39617
39643
  let f = (a + b - 1);
39618
39644
  let g;
39619
- if (c.r >= f) {
39645
+ if (c.s >= f) {
39620
39646
  g = new Array(1);
39621
39647
  g[0] = c.d(this.workbook, e, f);
39622
39648
  }
39623
39649
  else {
39624
39650
  let h = new List$1(WorksheetColumnBlock.$, 0);
39625
- let i = c.d(this.workbook, e, c.r);
39651
+ let i = c.d(this.workbook, e, c.s);
39626
39652
  h.add(i);
39627
- let j = b - i.t;
39628
- e = (e + i.t);
39653
+ let j = b - i.u;
39654
+ e = (e + i.u);
39629
39655
  while (j > 0) {
39630
39656
  d++;
39631
39657
  c = this._fe._inner[d];
39632
- i = c.d(this.workbook, e, Math.min(c.r, f));
39658
+ i = c.d(this.workbook, e, Math.min(c.s, f));
39633
39659
  h.add(i);
39634
- j -= i.t;
39635
- e += i.t;
39660
+ j -= i.u;
39661
+ e += i.u;
39636
39662
  }
39637
39663
  g = h.toArray();
39638
39664
  }
@@ -39938,7 +39964,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39938
39964
  b = d.p3;
39939
39965
  }
39940
39966
  let e = this._cb(a);
39941
- let f = truncate(MathUtilities.f(e.n(this, 1)));
39967
+ let f = truncate(MathUtilities.f(e.o(this, 1)));
39942
39968
  return new WorksheetItemPosition(1, a, b, f);
39943
39969
  }
39944
39970
  /**
@@ -39955,7 +39981,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39955
39981
  d = f.p2;
39956
39982
  e = f.p3;
39957
39983
  let g = this._cb(e);
39958
- let h = truncate(MathUtilities.f(g.n(this, 1)));
39984
+ let h = truncate(MathUtilities.f(g.o(this, 1)));
39959
39985
  return new WorksheetItemPosition(1, e, a - c, h);
39960
39986
  }
39961
39987
  /**
@@ -39976,7 +40002,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
39976
40002
  let k = Math.min(h, c);
39977
40003
  for (let l = g; l <= k; l++) {
39978
40004
  let m = this._cb(l);
39979
- let n = truncate(MathUtilities.f(m.n(this, 1)));
40005
+ let n = truncate(MathUtilities.f(m.o(this, 1)));
39980
40006
  if (n != 0) {
39981
40007
  d.add(new WorksheetItemPosition(1, l, j, n));
39982
40008
  }
@@ -40000,10 +40026,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
40000
40026
  let g = this._columns$i;
40001
40027
  for (let h = e; c ? h <= f : h >= f; h += d) {
40002
40028
  let i = this._cb(h);
40003
- if (i.k) {
40029
+ if (i.l) {
40004
40030
  continue;
40005
40031
  }
40006
- let j = c ? i.r : i.q;
40032
+ let j = c ? i.s : i.r;
40007
40033
  while (true) {
40008
40034
  yield g.item(h);
40009
40035
  if (h == j) {
@@ -40028,11 +40054,11 @@ export let Worksheet = /*@__PURE__*/ (() => {
40028
40054
  */
40029
40055
  _ga(a, b = false) {
40030
40056
  if (a != null) {
40031
- if (b == false && a.i) {
40057
+ if (b == false && a.j) {
40032
40058
  return 0;
40033
40059
  }
40034
- if (a.v >= 0) {
40035
- return a.v;
40060
+ if (a.w >= 0) {
40061
+ return a.w;
40036
40062
  }
40037
40063
  }
40038
40064
  return this.defaultColumnWidth;
@@ -40066,7 +40092,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40066
40092
  */
40067
40093
  _fo(a, b) {
40068
40094
  if (a != null) {
40069
- return a.n(this, 3, b);
40095
+ return a.o(this, 3, b);
40070
40096
  }
40071
40097
  return this.getDefaultColumnWidth(3);
40072
40098
  }
@@ -40384,23 +40410,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
40384
40410
  let l = this._b3;
40385
40411
  for (let m = k.count - 1; m >= 0; m--) {
40386
40412
  let n = k._inner[m];
40387
- if (n.m != 0) {
40388
- g = n.r + 1;
40413
+ if (n.n != 0) {
40414
+ g = n.s + 1;
40389
40415
  break;
40390
40416
  }
40391
40417
  else if (!Base.equalsStatic(n.b, l)) {
40392
- g = n.r;
40418
+ g = n.s;
40393
40419
  break;
40394
40420
  }
40395
40421
  }
40396
40422
  for (let o = 0; o < k.count; o++) {
40397
40423
  let p = k._inner[o];
40398
- if (p.m != 0) {
40399
- i = p.q;
40424
+ if (p.n != 0) {
40425
+ i = p.r;
40400
40426
  break;
40401
40427
  }
40402
40428
  else if (!Base.equalsStatic(p.b, l)) {
40403
- i = p.q;
40429
+ i = p.r;
40404
40430
  break;
40405
40431
  }
40406
40432
  }
@@ -40578,7 +40604,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40578
40604
  * @hidden
40579
40605
  */
40580
40606
  _ec(a) {
40581
- return this._cb(a).i;
40607
+ return this._cb(a).j;
40582
40608
  }
40583
40609
  /**
40584
40610
  * @hidden
@@ -40619,10 +40645,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
40619
40645
  h.b = GenericCacheElementEx.r(WorksheetCellFormatData.$, f, i);
40620
40646
  this._hh();
40621
40647
  }
40622
- h.i = d;
40623
- h.m = e;
40624
- h.v = c;
40625
- h.j = g;
40648
+ h.j = d;
40649
+ h.n = e;
40650
+ h.w = c;
40651
+ h.k = g;
40626
40652
  }
40627
40653
  /**
40628
40654
  * @hidden
@@ -40632,7 +40658,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40632
40658
  let d = ((() => { let e = this._f8(a, b, true, c); c = e.p3; return e.ret; })());
40633
40659
  let e = this.workbook._ff;
40634
40660
  let f = d;
40635
- let g = (c.r + 1);
40661
+ let g = (c.s + 1);
40636
40662
  let h = 0;
40637
40663
  for (let i = d + 1; i < this._fe.count; i++) {
40638
40664
  if (g >= e) {
@@ -40640,10 +40666,10 @@ export let Worksheet = /*@__PURE__*/ (() => {
40640
40666
  continue;
40641
40667
  }
40642
40668
  let j = this._fe._inner[i];
40643
- let k = j.r + 1 - j.q;
40644
- j.q = g;
40645
- j.r = Math.min(g + k - 1, e - 1);
40646
- 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);
40647
40673
  }
40648
40674
  while (h > 0) {
40649
40675
  d = this._fe.count - 1;
@@ -40663,28 +40689,28 @@ export let Worksheet = /*@__PURE__*/ (() => {
40663
40689
  let d = this._fe._inner[c];
40664
40690
  let e = b;
40665
40691
  let f = c;
40666
- if (d.q == a && d.q + b >= d.r + 1) {
40667
- e -= d.t;
40692
+ if (d.r == a && d.r + b >= d.s + 1) {
40693
+ e -= d.u;
40668
40694
  this._id(c, d);
40669
40695
  if (c < this._fe.count) {
40670
40696
  let g = this._fe._inner[c];
40671
- let h = g.t;
40672
- g.q = a;
40673
- g.r = (a + h - 1);
40697
+ let h = g.u;
40698
+ g.r = a;
40699
+ g.s = (a + h - 1);
40674
40700
  }
40675
40701
  if (f > 0) {
40676
40702
  f--;
40677
40703
  }
40678
40704
  }
40679
40705
  else {
40680
- let i = Math.min(d.r + 1 - a, b);
40681
- d.r -= i;
40706
+ let i = Math.min(d.s + 1 - a, b);
40707
+ d.s -= i;
40682
40708
  e -= i;
40683
40709
  c++;
40684
40710
  }
40685
40711
  while (e > 0) {
40686
40712
  d = this._fe._inner[c];
40687
- let j = d.t;
40713
+ let j = d.u;
40688
40714
  if (j <= e) {
40689
40715
  e -= j;
40690
40716
  this._id(c, d);
@@ -40692,7 +40718,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
40692
40718
  else {
40693
40719
  j -= e;
40694
40720
  e = 0;
40695
- d.r = (d.q + j - 1);
40721
+ d.s = (d.r + j - 1);
40696
40722
  }
40697
40723
  }
40698
40724
  if (this._fe.count == 0) {
@@ -40707,23 +40733,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
40707
40733
  let b = this._fe._inner[this._fe.count - 1];
40708
40734
  let c = (this.workbook._ff - 1);
40709
40735
  do {
40710
- if (b.r <= c) {
40736
+ if (b.s <= c) {
40711
40737
  break;
40712
40738
  }
40713
40739
  if (this._fe.count == 1) {
40714
- b.r = c;
40740
+ b.s = c;
40715
40741
  break;
40716
40742
  }
40717
40743
  GenericCacheElementEx.q(WorksheetCellFormatData.$, b.b);
40718
40744
  this._fe.removeAt(this._fe.count - 1);
40719
40745
  b = this._fe._inner[this._fe.count - 1];
40720
40746
  } while (true);
40721
- if (b.r < c) {
40722
- if (b.k) {
40723
- b.r = c;
40747
+ if (b.s < c) {
40748
+ if (b.l) {
40749
+ b.s = c;
40724
40750
  }
40725
40751
  else {
40726
- 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);
40727
40753
  d.b.k();
40728
40754
  this._fe.add(d);
40729
40755
  }
@@ -40936,45 +40962,45 @@ export let Worksheet = /*@__PURE__*/ (() => {
40936
40962
  * @hidden
40937
40963
  */
40938
40964
  _h9(a) {
40939
- let b = a.q;
40940
- let c = a.r;
40965
+ let b = a.r;
40966
+ let c = a.s;
40941
40967
  let d;
40942
40968
  let e = ((() => { let f = this._f8(b, (c - (b + 1)), false, d); d = f.p3; return f.ret; })());
40943
40969
  let f = d == a;
40944
40970
  let g = 0;
40945
40971
  if (f) {
40946
- if (d.r >= a.r) {
40972
+ if (d.s >= a.s) {
40947
40973
  return;
40948
40974
  }
40949
- g = a.r - d.r;
40950
- d.r = a.r;
40975
+ g = a.s - d.s;
40976
+ d.s = a.s;
40951
40977
  }
40952
40978
  else {
40953
- if (d.q == a.q) {
40954
- if (d.r == a.r) {
40979
+ if (d.r == a.r) {
40980
+ if (d.s == a.s) {
40955
40981
  this._fe._inner[e] = a;
40956
40982
  return;
40957
40983
  }
40958
- if (d.r > a.r) {
40984
+ if (d.s > a.s) {
40959
40985
  this._fe.insert(e, a);
40960
- d.q = (a.r + 1);
40986
+ d.r = (a.s + 1);
40961
40987
  return;
40962
40988
  }
40963
- g = a.r - d.r;
40989
+ g = a.s - d.s;
40964
40990
  this._fe._inner[e] = a;
40965
40991
  }
40966
40992
  else {
40967
- if (a.r >= d.r) {
40968
- g = a.r - d.r;
40969
- d.r = (a.q - 1);
40993
+ if (a.s >= d.s) {
40994
+ g = a.s - d.s;
40995
+ d.s = (a.r - 1);
40970
40996
  this._fe.insert(e + 1, a);
40971
40997
  }
40972
40998
  else {
40973
- let h = d.r;
40974
- d.r = (a.q - 1);
40999
+ let h = d.s;
41000
+ d.s = (a.r - 1);
40975
41001
  this._fe.insert(e + 1, a);
40976
- if (h > a.r) {
40977
- 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));
40978
41004
  }
40979
41005
  }
40980
41006
  }
@@ -40982,12 +41008,12 @@ export let Worksheet = /*@__PURE__*/ (() => {
40982
41008
  while (g > 0) {
40983
41009
  e++;
40984
41010
  d = this._fe._inner[e];
40985
- if (g >= d.t) {
40986
- g -= d.t;
41011
+ if (g >= d.u) {
41012
+ g -= d.u;
40987
41013
  this._fe.removeAt(e);
40988
41014
  }
40989
41015
  else {
40990
- d.q += g;
41016
+ d.r += g;
40991
41017
  g = 0;
40992
41018
  }
40993
41019
  }
@@ -41165,20 +41191,20 @@ export let Worksheet = /*@__PURE__*/ (() => {
41165
41191
  let n = l.e;
41166
41192
  let o = this._f9(m);
41167
41193
  let p = this._ff._inner[o];
41168
- if (p.q < m) {
41169
- this._cc(m, Math.min(p.r, n));
41194
+ if (p.r < m) {
41195
+ this._cc(m, Math.min(p.s, n));
41170
41196
  o++;
41171
41197
  }
41172
41198
  let q = this._f9(n);
41173
41199
  p = this._ff._inner[q];
41174
- if (p.r > n) {
41175
- this._cc(Math.max(p.q, m), n);
41200
+ if (p.s > n) {
41201
+ this._cc(Math.max(p.r, m), n);
41176
41202
  }
41177
41203
  for (let r = o; r <= q; r++) {
41178
41204
  p = this._fe._inner[r];
41179
- p.v = l.c;
41180
- p.j = l.a;
41181
- p.i = l.b;
41205
+ p.w = l.c;
41206
+ p.k = l.a;
41207
+ p.j = l.b;
41182
41208
  }
41183
41209
  this._cd(n);
41184
41210
  this._cd(m);
@@ -41661,16 +41687,16 @@ export let Worksheet = /*@__PURE__*/ (() => {
41661
41687
  _cc(a, b) {
41662
41688
  let c = this._f9(a);
41663
41689
  let d = this._fe._inner[c];
41664
- let e = d.r;
41665
- if (d.q != a) {
41666
- d.r = (a - 1);
41690
+ let e = d.s;
41691
+ if (d.r != a) {
41692
+ d.s = (a - 1);
41667
41693
  let f = new WorksheetColumnBlock(1, a, e, d);
41668
41694
  c++;
41669
41695
  this._fe.insert(c, f);
41670
41696
  d = f;
41671
41697
  }
41672
- if (d.r != b) {
41673
- d.r = b;
41698
+ if (d.s != b) {
41699
+ d.s = b;
41674
41700
  let g = new WorksheetColumnBlock(1, (b + 1), e, d);
41675
41701
  this._fe.insert(c + 1, g);
41676
41702
  }
@@ -41724,23 +41750,24 @@ export let Worksheet = /*@__PURE__*/ (() => {
41724
41750
  _cd(a) {
41725
41751
  let b = this._f9(a);
41726
41752
  let c = this._fe._inner[b];
41727
- if (c.q != 0) {
41728
- let d = this._cb((c.q - 1));
41729
- 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)) {
41730
41757
  this._ff.removeAt(b);
41731
41758
  GenericCacheElementEx.q(WorksheetCellFormatData.$, c.b);
41732
- d.r = c.r;
41733
- c = d;
41759
+ e.s = c.s;
41760
+ c = e;
41734
41761
  }
41735
41762
  }
41736
- let e = this._columns$i.maxCount - 1;
41737
- if (c.r != e) {
41738
- let f = this._f9((c.r + 1));
41739
- let g = this._fe._inner[f];
41740
- if (c.equals(g)) {
41741
- this._ff.removeAt(f);
41742
- GenericCacheElementEx.q(WorksheetCellFormatData.$, g.b);
41743
- 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;
41744
41771
  }
41745
41772
  }
41746
41773
  return c;
@@ -41958,10 +41985,11 @@ export let Worksheet = /*@__PURE__*/ (() => {
41958
41985
  * @hidden
41959
41986
  */
41960
41987
  _ca(a = 0) {
41961
- let b = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), this.workbook._ca._p);
41962
- b.b.k();
41963
- this._fe.add(b);
41964
- 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;
41965
41993
  }
41966
41994
  /**
41967
41995
  * @hidden
@@ -41982,7 +42010,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
41982
42010
  if (e.g(a)) {
41983
42011
  return d;
41984
42012
  }
41985
- let f = e.q - a;
42013
+ let f = e.r - a;
41986
42014
  if (f < 0) {
41987
42015
  b = d + 1;
41988
42016
  }
@@ -42087,20 +42115,23 @@ export let Worksheet = /*@__PURE__*/ (() => {
42087
42115
  _hj(a) {
42088
42116
  let b = this._fe._inner[a];
42089
42117
  if (a == 0) {
42090
- b.r -= b.q;
42091
- b.q = 0;
42118
+ b.s -= b.r;
42119
+ b.r = 0;
42092
42120
  }
42093
42121
  for (let c = a + 1; c < this._fe.count; c++) {
42094
42122
  let d = this._fe._inner[c];
42095
- let e = d.t;
42096
- d.q = (b.r + 1);
42097
- d.r = (d.q + e - 1);
42123
+ let e = d.u;
42124
+ d.r = (b.s + 1);
42125
+ d.s = (d.r + e - 1);
42098
42126
  b = d;
42099
42127
  }
42100
- if (b.r < this.workbook._ff - 1 && false == b.k) {
42101
- 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
+ }
42102
42133
  }
42103
- b.r = (this.workbook._ff - 1);
42134
+ b.s = (this.workbook._ff - 1);
42104
42135
  }
42105
42136
  /**
42106
42137
  * @hidden
@@ -42111,8 +42142,8 @@ export let Worksheet = /*@__PURE__*/ (() => {
42111
42142
  if (a == 0) {
42112
42143
  d = this._fe._inner[0];
42113
42144
  if (c) {
42114
- if (d.k) {
42115
- d.r = Math.min(d.r + b, f - 1);
42145
+ if (d.l) {
42146
+ d.s = Math.min(d.s + b, f - 1);
42116
42147
  }
42117
42148
  else {
42118
42149
  d = new WorksheetColumnBlock(0, a, (a + b - 1), this.workbook._ca._p);
@@ -42133,7 +42164,7 @@ export let Worksheet = /*@__PURE__*/ (() => {
42133
42164
  }
42134
42165
  d = this._fe._inner[e];
42135
42166
  if (c) {
42136
- d.r = Math.min(d.r + b, f - 1);
42167
+ d.s = Math.min(d.s + b, f - 1);
42137
42168
  }
42138
42169
  }
42139
42170
  return {
@@ -42359,8 +42390,8 @@ export let Worksheet = /*@__PURE__*/ (() => {
42359
42390
  this._cc(f, f);
42360
42391
  this._cc(h, h);
42361
42392
  for (let u of fromEnum(this._ff)) {
42362
- if (f <= u.q && u.r <= h) {
42363
- u.i = d;
42393
+ if (f <= u.r && u.s <= h) {
42394
+ u.j = d;
42364
42395
  }
42365
42396
  }
42366
42397
  }
@@ -43039,15 +43070,15 @@ export let Worksheet = /*@__PURE__*/ (() => {
43039
43070
  */
43040
43071
  get _b3() {
43041
43072
  let a = 0;
43042
- let b = this._ff._inner[0].b;
43073
+ let b = this._ff.count == 0 ? null : this._ff._inner[0].b;
43043
43074
  for (let c = 0; c < this._ff.count; c++) {
43044
43075
  let d = this._ff._inner[c];
43045
- if (a <= d.t) {
43046
- a = d.t;
43076
+ if (a <= d.u) {
43077
+ a = d.u;
43047
43078
  b = d.b;
43048
43079
  }
43049
43080
  }
43050
- if (b._cd) {
43081
+ if (b == null || b._cd) {
43051
43082
  b = this.workbook != null ? this.workbook._ca._p : null;
43052
43083
  }
43053
43084
  return b;
@@ -55350,7 +55381,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55350
55381
  if (b == null) {
55351
55382
  return false;
55352
55383
  }
55353
- return b._cb(a).i;
55384
+ return b._cb(a).j;
55354
55385
  }
55355
55386
  /**
55356
55387
  * @hidden
@@ -55361,7 +55392,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55361
55392
  }
55362
55393
  this._ad();
55363
55394
  this._ak();
55364
- this.worksheet._cb(this.index).i = a;
55395
+ this.worksheet._cb(this.index).j = a;
55365
55396
  this._aj();
55366
55397
  }
55367
55398
  /**
@@ -55561,7 +55592,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55561
55592
  if (b == null) {
55562
55593
  return 0;
55563
55594
  }
55564
- return b._cb(a).m;
55595
+ return b._cb(a).n;
55565
55596
  }
55566
55597
  /**
55567
55598
  * @hidden
@@ -55572,7 +55603,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55572
55603
  }
55573
55604
  this._ad();
55574
55605
  this._ak();
55575
- this.worksheet._cb(this.index).m = a;
55606
+ this.worksheet._cb(this.index).n = a;
55576
55607
  this._aj();
55577
55608
  }
55578
55609
  /**
@@ -55926,7 +55957,7 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55926
55957
  if (b < 0) {
55927
55958
  return 0;
55928
55959
  }
55929
- return a._cb(b).v;
55960
+ return a._cb(b).w;
55930
55961
  }
55931
55962
  set width(a) {
55932
55963
  this._ad();
@@ -55955,10 +55986,10 @@ export let WorksheetColumn = /*@__PURE__*/ (() => {
55955
55986
  }
55956
55987
  this._ak();
55957
55988
  let c = this.worksheet._cb(this.index);
55958
- c.v = a;
55959
- c.j = this.width >= 0;
55989
+ c.w = a;
55990
+ c.k = this.width >= 0;
55960
55991
  if (this._l) {
55961
- c.i = false;
55992
+ c.j = false;
55962
55993
  this._y();
55963
55994
  }
55964
55995
  this._aj();
@@ -56204,8 +56235,8 @@ export let HiddenColumnCollection = /*@__PURE__*/ (() => {
56204
56235
  */
56205
56236
  _n(a) {
56206
56237
  for (let b of fromEnum(a._ff)) {
56207
- if (b.i) {
56208
- for (let c = b.q; c <= b.r; c++) {
56238
+ if (b.j) {
56239
+ for (let c = b.r; c <= b.s; c++) {
56209
56240
  this.add_1(a._columns$i.item(c));
56210
56241
  }
56211
56242
  }
@@ -86863,14 +86894,14 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86863
86894
  static k(a, b, c, d) {
86864
86895
  let e = new List$1(IndexRange.$, 0);
86865
86896
  for (let f of fromEnum(a._ff)) {
86866
- if (f.r < b) {
86897
+ if (f.s < b) {
86867
86898
  continue;
86868
86899
  }
86869
- if (c < f.q) {
86900
+ if (c < f.r) {
86870
86901
  break;
86871
86902
  }
86872
- if (f.i != d) {
86873
- 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)));
86874
86905
  }
86875
86906
  }
86876
86907
  return e;
@@ -86920,16 +86951,16 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86920
86951
  let f = a._dv;
86921
86952
  let g = a.defaultRowHeight;
86922
86953
  for (let h of fromEnum(a._ff)) {
86923
- let i = h.q;
86924
- let j = h.r;
86954
+ let i = h.r;
86955
+ let j = h.s;
86925
86956
  if (j < b) {
86926
86957
  continue;
86927
86958
  }
86928
86959
  let k = d.count == 0 ? null : d._inner[d.count - 1];
86929
- 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) {
86930
86961
  let l = k == null ? b : k.e + 1;
86931
86962
  let m = Math.min(c, j);
86932
- k = new WorksheetElementResizeState(l, m, h.v, h.i, h.j);
86963
+ k = new WorksheetElementResizeState(l, m, h.w, h.j, h.k);
86933
86964
  d.add(k);
86934
86965
  }
86935
86966
  else {
@@ -86992,15 +87023,15 @@ export let WorksheetElementResizeContext = /*@__PURE__*/ (() => {
86992
87023
  let i = a._ff._inner[h];
86993
87024
  let j = d.count;
86994
87025
  while (true) {
86995
- let k = i.v;
86996
- let l = i.i;
86997
- let m = i.j;
86998
- 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) {
86999
87030
  h++;
87000
87031
  i = a._ff._inner[h];
87001
- if (i.v != k || i.i != l || i.j != m) {
87002
- d.add(new WorksheetElementResizeState(g, i.q - 1, k, l, m));
87003
- 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;
87004
87035
  }
87005
87036
  }
87006
87037
  else {
@@ -88512,11 +88543,11 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88512
88543
  constructor(a, ..._rest) {
88513
88544
  super();
88514
88545
  this.a = null;
88515
- this.o = 0;
88516
- this.e = false;
88517
88546
  this.p = 0;
88518
- this.l = 0;
88519
- this.s = -1;
88547
+ this.e = false;
88548
+ this.q = 0;
88549
+ this.m = 0;
88550
+ this.t = -1;
88520
88551
  this.f = false;
88521
88552
  a = (a == void 0) ? 0 : a;
88522
88553
  switch (a) {
@@ -88525,8 +88556,8 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88525
88556
  let c = _rest[0];
88526
88557
  let d = _rest[1];
88527
88558
  let e = _rest[2];
88528
- this.o = c;
88529
- this.p = d;
88559
+ this.p = c;
88560
+ this.q = d;
88530
88561
  this.a = e;
88531
88562
  }
88532
88563
  break;
@@ -88540,13 +88571,13 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88540
88571
  let h = f[0];
88541
88572
  let i = f[1];
88542
88573
  let j = f[2];
88543
- this.o = h;
88544
- this.p = i;
88574
+ this.p = h;
88575
+ this.q = i;
88545
88576
  this.a = j;
88546
88577
  }
88547
88578
  this.e = e.e;
88548
- this.l = e.l;
88549
- this.s = e.s;
88579
+ this.m = e.m;
88580
+ this.t = e.t;
88550
88581
  this.a.k();
88551
88582
  this.f = e.f;
88552
88583
  }
@@ -88558,16 +88589,21 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88558
88589
  if (b == null) {
88559
88590
  return false;
88560
88591
  }
88561
- 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);
88562
88598
  }
88563
88599
  getHashCode() {
88564
- 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();
88565
88601
  }
88566
88602
  toString() {
88567
88603
  let a = new StringBuilder(0);
88568
- a.r("FirstColumn: {0}, LastColumn: {1}", this.o, this.p);
88569
- if (this.s >= 0) {
88570
- 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);
88571
88607
  }
88572
88608
  if (this.e) {
88573
88609
  a.l(", Hidden");
@@ -88575,32 +88611,32 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88575
88611
  return a.toString();
88576
88612
  }
88577
88613
  c(a) {
88578
- return this.d(a, this.q, this.r);
88614
+ return this.d(a, this.r, this.s);
88579
88615
  }
88580
88616
  d(a, b, c) {
88581
88617
  let d = new WorksheetColumnBlock(0, b, c, this.b._bv(a));
88582
88618
  d.e = this.e;
88583
- d.l = this.l;
88584
- d.s = this.s;
88619
+ d.m = this.m;
88620
+ d.t = this.t;
88585
88621
  d.f = this.f;
88586
88622
  return d;
88587
88623
  }
88588
88624
  g(a) {
88589
- return a >= this.o && a <= this.p;
88625
+ return a >= this.p && a <= this.q;
88590
88626
  }
88591
- n(a, b, c = false) {
88592
- if (c == false && this.i) {
88627
+ o(a, b, c = false) {
88628
+ if (c == false && this.j) {
88593
88629
  return 0;
88594
88630
  }
88595
- return a._fl(this.v < 0 ? a.defaultColumnWidth : this.v, b);
88631
+ return a._fl(this.w < 0 ? a.defaultColumnWidth : this.w, b);
88596
88632
  }
88597
- x(a, b) {
88598
- if (this.k) {
88633
+ y(a, b) {
88634
+ if (this.l) {
88599
88635
  return;
88600
88636
  }
88601
88637
  let c = Workbook.getMaxColumnCount(b) - 1;
88602
- if (c < this.q) {
88603
- 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));
88604
88640
  }
88605
88641
  }
88606
88642
  get b() {
@@ -88609,47 +88645,47 @@ export let WorksheetColumnBlock = /*@__PURE__*/ (() => {
88609
88645
  set b(a) {
88610
88646
  this.a = a;
88611
88647
  }
88612
- get t() {
88613
- return this.p + 1 - this.o;
88648
+ get u() {
88649
+ return this.q + 1 - this.p;
88614
88650
  }
88615
- get q() {
88616
- return this.o;
88651
+ get r() {
88652
+ return this.p;
88617
88653
  }
88618
- set q(a) {
88619
- this.o = a;
88654
+ set r(a) {
88655
+ this.p = a;
88620
88656
  }
88621
- get i() {
88657
+ get j() {
88622
88658
  return this.e;
88623
88659
  }
88624
- set i(a) {
88660
+ set j(a) {
88625
88661
  this.e = a;
88626
88662
  }
88627
- get j() {
88663
+ get k() {
88628
88664
  return this.f;
88629
88665
  }
88630
- set j(a) {
88666
+ set k(a) {
88631
88667
  this.f = a;
88632
88668
  }
88633
- get k() {
88634
- 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;
88635
88671
  }
88636
- get r() {
88637
- return this.p;
88672
+ get s() {
88673
+ return this.q;
88638
88674
  }
88639
- set r(a) {
88640
- this.p = a;
88675
+ set s(a) {
88676
+ this.q = a;
88641
88677
  }
88642
- get m() {
88643
- return this.l;
88678
+ get n() {
88679
+ return this.m;
88644
88680
  }
88645
- set m(a) {
88646
- this.l = a;
88681
+ set n(a) {
88682
+ this.m = a;
88647
88683
  }
88648
- get v() {
88649
- return this.s;
88684
+ get w() {
88685
+ return this.t;
88650
88686
  }
88651
- set v(a) {
88652
- this.s = a;
88687
+ set w(a) {
88688
+ this.t = a;
88653
88689
  }
88654
88690
  }
88655
88691
  WorksheetColumnBlock.$t = /*@__PURE__*/ markType(WorksheetColumnBlock, 'WorksheetColumnBlock');
@@ -91822,11 +91858,11 @@ export let WorkbookSaveManager = /*@__PURE__*/ (() => {
91822
91858
  let h = null;
91823
91859
  for (let i of fromEnum(a._ff)) {
91824
91860
  if (this._ah(a, i, h)) {
91825
- f = Math.max(i.m, f);
91861
+ f = Math.max(i.n, f);
91826
91862
  if (nullableEquals(b, null)) {
91827
- b = toNullable(Number_$type, i.q);
91863
+ b = toNullable(Number_$type, i.r);
91828
91864
  }
91829
- c = toNullable(Number_$type, (i.r + 1));
91865
+ c = toNullable(Number_$type, (i.s + 1));
91830
91866
  }
91831
91867
  h = i;
91832
91868
  }
@@ -91978,25 +92014,25 @@ export let WorkbookSaveManager = /*@__PURE__*/ (() => {
91978
92014
  let e = false;
91979
92015
  if (a.displayOptions._ap) {
91980
92016
  if (c != null) {
91981
- d = c.m;
91982
- e = c.i;
92017
+ d = c.n;
92018
+ e = c.j;
91983
92019
  }
91984
92020
  }
91985
92021
  else {
91986
- let f = (b.r + 1);
92022
+ let f = (b.s + 1);
91987
92023
  if (f < a._columns$i.maxCount) {
91988
92024
  let g = a._cb(f);
91989
92025
  if (g != null) {
91990
- d = g.m;
91991
- e = g.i;
92026
+ d = g.n;
92027
+ e = g.j;
91992
92028
  }
91993
92029
  }
91994
92030
  }
91995
- let h = e && b.m < d;
92031
+ let h = e && b.n < d;
91996
92032
  if (h) {
91997
92033
  this._aw.add_1(b);
91998
92034
  }
91999
- 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;
92000
92036
  }
92001
92037
  _v(a, b, c) {
92002
92038
  let d = false;
@@ -97048,7 +97084,7 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97048
97084
  */
97049
97085
  _af(a, b) {
97050
97086
  for (let c of fromEnum(this._e._ff)) {
97051
- c.x(a, b);
97087
+ c.y(a, b);
97052
97088
  }
97053
97089
  }
97054
97090
  /**
@@ -97088,16 +97124,16 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97088
97124
  let f = this._e.defaultColumnWidth;
97089
97125
  for (let g of fromEnum(this._e._ff)) {
97090
97126
  let h = 0;
97091
- if (e || g.i == false) {
97092
- if (g.v < 0) {
97127
+ if (e || g.j == false) {
97128
+ if (g.w < 0) {
97093
97129
  h = f;
97094
97130
  }
97095
97131
  else {
97096
- h = g.v;
97132
+ h = g.w;
97097
97133
  }
97098
97134
  }
97099
- let i = Math.max(0, Math.min(g.r, a - 1) - g.q + 1);
97100
- 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);
97101
97137
  if (i == 0 && j == 0) {
97102
97138
  break;
97103
97139
  }
@@ -97119,15 +97155,15 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97119
97155
  let g = this._e.defaultColumnWidth;
97120
97156
  for (let h of fromEnum(this._e._ff)) {
97121
97157
  let i = 0;
97122
- if (e || h.i == false) {
97123
- if (h.v < 0) {
97158
+ if (e || h.j == false) {
97159
+ if (h.w < 0) {
97124
97160
  i = g;
97125
97161
  }
97126
97162
  else {
97127
- i = h.v;
97163
+ i = h.w;
97128
97164
  }
97129
97165
  }
97130
- let j = (h.r - h.q) + 1;
97166
+ let j = (h.s - h.r) + 1;
97131
97167
  let k = i * j;
97132
97168
  if (f == false) {
97133
97169
  if (a < k) {
@@ -97173,10 +97209,10 @@ export let WorksheetColumnCollection = /*@__PURE__*/ (() => {
97173
97209
  _as(a) {
97174
97210
  let b = new HashSet$1(WorksheetColumn.$, 0);
97175
97211
  for (let c of fromEnum(this._e._ff)) {
97176
- if (c.i == false) {
97212
+ if (c.j == false) {
97177
97213
  continue;
97178
97214
  }
97179
- for (let d = c.q; d <= c.r; d++) {
97215
+ for (let d = c.r; d <= c.s; d++) {
97180
97216
  b.add_1(this.item(d));
97181
97217
  }
97182
97218
  }