Merge pull request #2861 from mi6/cherry-pick-data-table-contribution

Cherry-pick-data-table-contribution
mi6 · Dec 4, 2024 · f5f47c8 · f5f47c8
2 parents faf340c + a85e4d6
commit f5f47c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/canary-docs/docs.json b/packages/canary-docs/docs.json
@@ -544,7 +544,7 @@
               "type": "IcDataTableDataType[]"
             }
           ],
-          "optional": false,
+          "optional": true,
           "required": false
         },
         {

diff --git a/packages/canary-web-components/src/components.d.ts b/packages/canary-web-components/src/components.d.ts
@@ -82,7 +82,7 @@ export namespace Components {
         /**
           * The row content for the table.
          */
-        "data": IcDataTableDataType[];
+        "data"?: IcDataTableDataType[];
         /**
           * Set the density of the table including font and padding.
          */

diff --git a/packages/canary-web-components/src/components/ic-data-table/ic-data-table.tsx b/packages/canary-web-components/src/components/ic-data-table/ic-data-table.tsx
@@ -157,7 +157,7 @@ export class DataTable {
   /**
    * The row content for the table.
    */
-  @Prop() data: IcDataTableDataType[];
+  @Prop() data?: IcDataTableDataType[];
 
   /**
    * Set the density of the table including font and padding.
@@ -1917,7 +1917,7 @@ export class DataTable {
                 <slot name="pagination-bar" />
               ) : (
                 <ic-pagination-bar
-                  totalItems={data.length}
+                  totalItems={data?.length ?? 0}
                   type={paginationBarOptions.type}
                   rangeLabelType={paginationBarOptions.rangeLabelType}
                   showItemsPerPageControl={