@rivet-health/design-system 32.0.0 → 32.0.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.
- package/esm2020/lib/table/simple-table/simple-table.component.mjs +27 -6
- package/fesm2015/rivet-health-design-system.mjs +26 -5
- package/fesm2015/rivet-health-design-system.mjs.map +1 -1
- package/fesm2020/rivet-health-design-system.mjs +26 -5
- package/fesm2020/rivet-health-design-system.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -20,10 +20,19 @@ export class SimpleTableComponent {
|
|
|
20
20
|
const allowedTypes = RivTable.ColumnDataTypes.join(', ');
|
|
21
21
|
throw new Error(`Each header cell must define an appropriate dataType, one of ${allowedTypes}`);
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const newAlignment = RivTable.getColumnAlignment(dataType, i === 0);
|
|
24
|
+
const newLeftPinOffset = runningWidthTotal;
|
|
25
25
|
runningWidthTotal += headerCell.width;
|
|
26
|
-
headerCell.
|
|
26
|
+
const changed = headerCell.alignment != newAlignment ||
|
|
27
|
+
headerCell.leftPinOffset != newLeftPinOffset;
|
|
28
|
+
headerCell.alignment = newAlignment;
|
|
29
|
+
headerCell.leftPinOffset = newLeftPinOffset;
|
|
30
|
+
// Only mark for check when changed to prevent infinite cycles
|
|
31
|
+
if (changed) {
|
|
32
|
+
queueMicrotask(() => {
|
|
33
|
+
headerCell.cdr.markForCheck();
|
|
34
|
+
});
|
|
35
|
+
}
|
|
27
36
|
});
|
|
28
37
|
const getCellCoordinates = createCellCoordinateCalculator(dataCells.map(dataCell => {
|
|
29
38
|
const element = dataCell.elementRef.nativeElement;
|
|
@@ -36,13 +45,25 @@ export class SimpleTableComponent {
|
|
|
36
45
|
dataCells.forEach((dataCell, cellIndex) => {
|
|
37
46
|
const bounds = getCellCoordinates(cellIndex);
|
|
38
47
|
const headerCell = headerCells.get(bounds.start.col);
|
|
48
|
+
let changed = false;
|
|
39
49
|
if (headerCell) {
|
|
50
|
+
changed =
|
|
51
|
+
dataCell.alignment != headerCell.alignment ||
|
|
52
|
+
dataCell.pinned != headerCell.pinned ||
|
|
53
|
+
dataCell.leftPinOffset != headerCell.leftPinOffset;
|
|
40
54
|
dataCell.alignment = headerCell.alignment;
|
|
41
55
|
dataCell.pinned = headerCell.pinned;
|
|
42
56
|
dataCell.leftPinOffset = headerCell.leftPinOffset;
|
|
43
57
|
}
|
|
44
|
-
|
|
45
|
-
dataCell.
|
|
58
|
+
const newIsLastRow = bounds.end.row === maxRow;
|
|
59
|
+
changed = changed || dataCell.isLastRow != newIsLastRow;
|
|
60
|
+
dataCell.isLastRow = newIsLastRow;
|
|
61
|
+
// Only mark for check when changed to prevent infinite cycles
|
|
62
|
+
if (changed) {
|
|
63
|
+
queueMicrotask(() => {
|
|
64
|
+
dataCell.cdr.markForCheck();
|
|
65
|
+
});
|
|
66
|
+
}
|
|
46
67
|
});
|
|
47
68
|
}
|
|
48
69
|
}
|
|
@@ -61,4 +82,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
|
|
|
61
82
|
type: ContentChildren,
|
|
62
83
|
args: [SimpleTableCellComponent, { descendants: true }]
|
|
63
84
|
}] } });
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"simple-table.component.js","sourceRoot":"","sources":["../../../../../../projects/riv/src/lib/table/simple-table/simple-table.component.ts","../../../../../../projects/riv/src/lib/table/simple-table/simple-table.component.html"],"names":[],"mappings":"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","sourcesContent":["import {\n  AfterContentChecked,\n  ChangeDetectionStrategy,\n  Component,\n  ContentChild,\n  ContentChildren,\n  QueryList,\n  TemplateRef,\n} from '@angular/core';\nimport { RivTable } from '../table/state';\nimport { createCellCoordinateCalculator } from './coordinate-helper';\nimport { SimpleTableCellComponent } from './simple-table-cell.component';\nimport { SimpleTableHeaderCellComponent } from './simple-table-header-cell.component';\n\n@Component({\n  selector: 'riv-simple-table',\n  templateUrl: './simple-table.component.html',\n  styleUrls: ['./simple-table.component.css'],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n})\nexport class SimpleTableComponent implements AfterContentChecked {\n  @ContentChild('header')\n  headerTemplate?: TemplateRef<void>;\n\n  @ContentChildren(SimpleTableHeaderCellComponent, { descendants: true })\n  private headerCells?: QueryList<SimpleTableHeaderCellComponent>;\n\n  @ContentChildren(SimpleTableCellComponent, { descendants: true })\n  private dataCells?: QueryList<SimpleTableCellComponent>;\n\n  ngAfterContentChecked() {\n    this.setCellProperties();\n  }\n\n  private setCellProperties() {\n    const { headerCells, dataCells } = this;\n    if (!headerCells || !dataCells) return;\n\n    let runningWidthTotal = 0;\n    headerCells.forEach((headerCell, i) => {\n      const { dataType } = headerCell;\n      if (!dataType) {\n        const allowedTypes = RivTable.ColumnDataTypes.join(', ');\n        throw new Error(\n          `Each header cell must define an appropriate dataType, one of ${allowedTypes}`,\n        );\n      }\n\n      const newAlignment = RivTable.getColumnAlignment(dataType, i === 0);\n      const newLeftPinOffset = runningWidthTotal;\n      runningWidthTotal += headerCell.width;\n\n      const changed =\n        headerCell.alignment != newAlignment ||\n        headerCell.leftPinOffset != newLeftPinOffset;\n      headerCell.alignment = newAlignment;\n      headerCell.leftPinOffset = newLeftPinOffset;\n\n      // Only mark for check when changed to prevent infinite cycles\n      if (changed) {\n        queueMicrotask(() => {\n          headerCell.cdr.markForCheck();\n        });\n      }\n    });\n\n    const getCellCoordinates = createCellCoordinateCalculator(\n      dataCells.map(dataCell => {\n        const element = dataCell.elementRef.nativeElement;\n        return {\n          rowspan: parseInt(element.getAttribute('rowspan') || '1', 10),\n          colspan: parseInt(element.getAttribute('colspan') || '1', 10),\n        };\n      }),\n      headerCells.length,\n    );\n\n    const maxRow = Math.max(\n      ...dataCells.map((_, i) => getCellCoordinates(i).end.row),\n    );\n\n    dataCells.forEach((dataCell, cellIndex) => {\n      const bounds = getCellCoordinates(cellIndex);\n\n      const headerCell = headerCells.get(bounds.start.col);\n      let changed = false;\n      if (headerCell) {\n        changed =\n          dataCell.alignment != headerCell.alignment ||\n          dataCell.pinned != headerCell.pinned ||\n          dataCell.leftPinOffset != headerCell.leftPinOffset;\n\n        dataCell.alignment = headerCell.alignment;\n        dataCell.pinned = headerCell.pinned;\n        dataCell.leftPinOffset = headerCell.leftPinOffset;\n      }\n\n      const newIsLastRow = bounds.end.row === maxRow;\n      changed = changed || dataCell.isLastRow != newIsLastRow;\n      dataCell.isLastRow = newIsLastRow;\n\n      // Only mark for check when changed to prevent infinite cycles\n      if (changed) {\n        queueMicrotask(() => {\n          dataCell.cdr.markForCheck();\n        });\n      }\n    });\n  }\n}\n","<header *ngIf=\"headerTemplate\">\n  <ng-container *ngTemplateOutlet=\"headerTemplate\"></ng-container>\n</header>\n<div class=\"container\">\n  <table>\n    <ng-content></ng-content>\n  </table>\n</div>\n"]}
|
|
@@ -6762,10 +6762,19 @@ class SimpleTableComponent {
|
|
|
6762
6762
|
const allowedTypes = RivTable.ColumnDataTypes.join(', ');
|
|
6763
6763
|
throw new Error(`Each header cell must define an appropriate dataType, one of ${allowedTypes}`);
|
|
6764
6764
|
}
|
|
6765
|
-
|
|
6766
|
-
|
|
6765
|
+
const newAlignment = RivTable.getColumnAlignment(dataType, i === 0);
|
|
6766
|
+
const newLeftPinOffset = runningWidthTotal;
|
|
6767
6767
|
runningWidthTotal += headerCell.width;
|
|
6768
|
-
headerCell.
|
|
6768
|
+
const changed = headerCell.alignment != newAlignment ||
|
|
6769
|
+
headerCell.leftPinOffset != newLeftPinOffset;
|
|
6770
|
+
headerCell.alignment = newAlignment;
|
|
6771
|
+
headerCell.leftPinOffset = newLeftPinOffset;
|
|
6772
|
+
// Only mark for check when changed to prevent infinite cycles
|
|
6773
|
+
if (changed) {
|
|
6774
|
+
queueMicrotask(() => {
|
|
6775
|
+
headerCell.cdr.markForCheck();
|
|
6776
|
+
});
|
|
6777
|
+
}
|
|
6769
6778
|
});
|
|
6770
6779
|
const getCellCoordinates = createCellCoordinateCalculator(dataCells.map(dataCell => {
|
|
6771
6780
|
const element = dataCell.elementRef.nativeElement;
|
|
@@ -6778,13 +6787,25 @@ class SimpleTableComponent {
|
|
|
6778
6787
|
dataCells.forEach((dataCell, cellIndex) => {
|
|
6779
6788
|
const bounds = getCellCoordinates(cellIndex);
|
|
6780
6789
|
const headerCell = headerCells.get(bounds.start.col);
|
|
6790
|
+
let changed = false;
|
|
6781
6791
|
if (headerCell) {
|
|
6792
|
+
changed =
|
|
6793
|
+
dataCell.alignment != headerCell.alignment ||
|
|
6794
|
+
dataCell.pinned != headerCell.pinned ||
|
|
6795
|
+
dataCell.leftPinOffset != headerCell.leftPinOffset;
|
|
6782
6796
|
dataCell.alignment = headerCell.alignment;
|
|
6783
6797
|
dataCell.pinned = headerCell.pinned;
|
|
6784
6798
|
dataCell.leftPinOffset = headerCell.leftPinOffset;
|
|
6785
6799
|
}
|
|
6786
|
-
|
|
6787
|
-
dataCell.
|
|
6800
|
+
const newIsLastRow = bounds.end.row === maxRow;
|
|
6801
|
+
changed = changed || dataCell.isLastRow != newIsLastRow;
|
|
6802
|
+
dataCell.isLastRow = newIsLastRow;
|
|
6803
|
+
// Only mark for check when changed to prevent infinite cycles
|
|
6804
|
+
if (changed) {
|
|
6805
|
+
queueMicrotask(() => {
|
|
6806
|
+
dataCell.cdr.markForCheck();
|
|
6807
|
+
});
|
|
6808
|
+
}
|
|
6788
6809
|
});
|
|
6789
6810
|
}
|
|
6790
6811
|
}
|