igniteui-angular 13.2.16 → 13.2.18

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.
@@ -4450,7 +4450,7 @@ class WorksheetFile {
4450
4450
  const freezeHeaders = worksheetData.options.freezeHeaders ? 2 + multiColumnHeaderLevel : 1;
4451
4451
  if (!isHierarchicalGrid) {
4452
4452
  this.dimension =
4453
- 'A1:' + ExcelStrings.getExcelColumn(worksheetData.columnCount - 1) + (worksheetData.rowCount + owner.maxLevel);
4453
+ 'A1:' + ExcelStrings.getExcelColumn(worksheetData.columnCount - 1) + (worksheetData.rowCount);
4454
4454
  cols += '<cols>';
4455
4455
  if (!hasMultiColumnHeader) {
4456
4456
  for (let j = 0; j < worksheetData.columnCount; j++) {
@@ -4513,7 +4513,7 @@ class WorksheetFile {
4513
4513
  const isHierarchicalGrid = worksheetData.isHierarchical;
4514
4514
  const hasUserSetIndex = worksheetData.owner.columns.some(c => c.exportIndex !== undefined);
4515
4515
  let recordHeaders = [];
4516
- yieldingLoop(worksheetData.rowCount - 1, 1000, (i) => {
4516
+ yieldingLoop(worksheetData.rowCount - worksheetData.multiColumnHeaderRows - 1, 1000, (i) => {
4517
4517
  if (!worksheetData.isEmpty) {
4518
4518
  if (!isHierarchicalGrid) {
4519
4519
  if (hasUserSetIndex) {
@@ -5034,6 +5034,9 @@ class WorksheetData {
5034
5034
  get isHierarchical() {
5035
5035
  return this._isHierarchical;
5036
5036
  }
5037
+ get multiColumnHeaderRows() {
5038
+ return !this.options.ignoreMultiColumnHeaders ? Array.from(this.owners.values()).map(c => c.maxLevel).reduce((a, b) => a + b) : 0;
5039
+ }
5037
5040
  initializeData() {
5038
5041
  this._dataDictionary = new WorksheetDataDictionary(this.columnCount, this.options.columnWidth, this.columnWidths);
5039
5042
  this._hasMultiColumnHeader = Array.from(this.owners.values())
@@ -5050,7 +5053,7 @@ class WorksheetData {
5050
5053
  return;
5051
5054
  }
5052
5055
  this._isSpecialData = ExportUtilities.isSpecialData(this._data[0].data);
5053
- this._rowCount = this._data.length + 1;
5056
+ this._rowCount = this._data.length + this.multiColumnHeaderRows + 1;
5054
5057
  }
5055
5058
  }
5056
5059
 
@@ -36331,6 +36334,12 @@ class IgxComboBaseDirective extends DisplayDensityBase {
36331
36334
  });
36332
36335
  }
36333
36336
  /** @hidden @internal */
36337
+ ngDoCheck() {
36338
+ if (this.data?.length && this.selection.length) {
36339
+ this._value = this.createDisplayText(this.selection, []);
36340
+ }
36341
+ }
36342
+ /** @hidden @internal */
36334
36343
  ngOnDestroy() {
36335
36344
  this.destroy$.next();
36336
36345
  this.destroy$.complete();
@@ -71579,10 +71588,7 @@ class BaseToolbarDirective {
71579
71588
  _setupListeners(toggleRef, actions) {
71580
71589
  if (actions) {
71581
71590
  if (!this.$sub || this.$sub.closed) {
71582
- this.$sub = actions.columnToggled.subscribe((event) => this.columnToggle.emit(event));
71583
- }
71584
- else {
71585
- this.$sub.unsubscribe();
71591
+ this.$sub = actions.columnToggled.pipe(takeUntil(this.$destroy)).subscribe((event) => this.columnToggle.emit(event));
71586
71592
  }
71587
71593
  }
71588
71594
  /** The if statement prevents emitting open and close events twice */