Merge remote-tracking branch 'origin/master' into customisable-checkb…

…oxes
Addepar · Jul 23, 2024 · e6c9d97 · e6c9d97
2 parents 5990836 + 90e2197
commit e6c9d97
Show file tree

Hide file tree

Showing 8 changed files with 727 additions and 618 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-table",
-  "version": "6.0.0-1",
+  "version": "6.0.0-2",
   "description": "An addon to support large data set and a number of features around table.",
   "keywords": [
     "ember-addon"

diff --git a/types/components/ember-tbody/component.d.ts b/types/components/ember-tbody/component.d.ts
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { EmberTableColumn, EmberTableRow } from 'ember-table';
+import { EmberTableColumn, EmberTableRow, TableRowMeta } from 'ember-table';
 import EmberTrComponent from 'ember-table/components/ember-tr/component';
 
 type SelectionMode =
@@ -104,7 +104,7 @@ export interface EmberTbodyArgs<RowType extends EmberTableRow> {
   /**
    * When `true`, this option causes selecting all of a node's children to also select the node itself.
    */
-  selectingChildrenSelectsParents?: boolean;
+  selectingChildrenSelectsParent?: boolean;
 
   /**
    * The currently selected rows.
@@ -135,7 +135,7 @@ export interface EmberTbodySignature<
     default: [
       {
         row: typeof EmberTrComponent<RowType, ColumnType>;
-        rowMeta: unknown;
+        rowMeta: TableRowMeta;
         rowValue: RowType;
       }
     ];

diff --git a/types/components/ember-td/component.d.ts b/types/components/ember-td/component.d.ts
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { EmberTableColumn,  EmberTableRow } from 'ember-table';
+import { EmberTableColumn,  EmberTableRow, TableRowMeta } from 'ember-table';
 
 export interface EmberTdSignature<RowType, ColumnType> {
   Element: HTMLTableCellElement;
@@ -21,7 +21,7 @@ export interface EmberTdSignature<RowType, ColumnType> {
       rowValue: RowType,
       cellMeta: unknown,
       columnMeta: unknown,
-      rowMeta: unknown,
+      rowMeta: TableRowMeta,
     ];
     select?: [
       rowMeta: unknown,

diff --git a/types/components/ember-tfoot/component.d.ts b/types/components/ember-tfoot/component.d.ts
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { EmberTableColumn,  EmberTableRow } from 'ember-table';
+import { EmberTableColumn,  EmberTableRow, TableRowMeta } from 'ember-table';
 import EmberTrComponent from 'ember-table/components/ember-tr/component';
 
 export interface EmberTfootSignature<
@@ -14,7 +14,7 @@ export interface EmberTfootSignature<
     default: [
       {
         row: typeof EmberTrComponent<RowType, ColumnType>;
-        rowMeta: unknown;
+        rowMeta: TableRowMeta;
         rowValue: RowType;
       }
     ];

diff --git a/types/components/ember-thead/component.d.ts b/types/components/ember-thead/component.d.ts
@@ -118,7 +118,7 @@ export interface EmberTheadArgs<RowType, ColumnType> {
   /**
    * Sets a constraint on the table's size, such that it must be greater than, less than, or equal to the size of the containing element.
    */
-  widthConstraint?: 'none' | 'eq-container' | 'gte-container' | 'lte-container';
+  widthConstraint?: 'none' | 'eq-container' | 'eq-container-slack' | 'gte-container' | 'gte-container-slack' | 'lte-container';
 }
 
 export interface EmberTheadSignature<

diff --git a/types/components/ember-tr/component.d.ts b/types/components/ember-tr/component.d.ts
@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { EmberTableColumn, EmberTableRow } from 'ember-table';
+import { EmberTableColumn, EmberTableRow, TableRowMeta } from 'ember-table';
 import EmberTdComponent from 'ember-table/components/ember-td/component';
 
 export interface EmberTrSignature<
@@ -27,7 +27,7 @@ export interface EmberTrSignature<
         cellValue: RowType[keyof RowType];
         columnMeta: unknown;
         columnValue: ColumnType;
-        rowMeta: unknown;
+        rowMeta: TableRowMeta;
         rowValue: RowType;
       }
     ];

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -18,3 +18,15 @@ export interface EmberTableSort {
   isAscending: boolean;
   valuePath: string;
 }
+
+export interface TableRowMeta {
+  isCollapsed: boolean;
+  isSelected: boolean;
+  isGroupSelected: boolean;
+  canCollapse: boolean;
+  depth: number;
+  first: unknown | null;
+  last: unknown | null;
+  next: unknown | null;
+  prev: unknown | null;
+}