Merge branch 'master' into dashboard-editor

carbon-design-system · Oct 19, 2020 · c8e48c0 · c8e48c0
2 parents 11957b7 + 628ca76
commit c8e48c0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/src/components/Table/TableHead/TableHead.jsx b/src/components/Table/TableHead/TableHead.jsx
@@ -381,7 +381,7 @@ const TableHead = ({
               ? matchingColumnMeta.align
               : 'start';
           const hasOverflow = Array.isArray(
-            matchingColumnMeta.overflowMenuItems
+            matchingColumnMeta?.overflowMenuItems
           );
 
           // Increases the minimum width of the Header when the overflow button is present

diff --git a/src/components/TableCard/TableCard.test.jsx b/src/components/TableCard/TableCard.test.jsx
@@ -586,4 +586,43 @@ describe('TableCard', () => {
     expect(screen.queryAllByText(/^Medium$/g)).toHaveLength(1);
     expect(screen.queryAllByText(/^Lowest$/g)).toHaveLength(5);
   });
+  it('can be resized without crashing', () => {
+    const { rerender } = render(
+      <TableCard
+        id="table-list"
+        title="Testing resize"
+        content={{
+          columns: tableColumns,
+        }}
+        values={tableData}
+        size={CARD_SIZES.LARGE}
+      />
+    );
+
+    rerender(
+      <TableCard
+        id="table-list"
+        title="Testing resize"
+        content={{
+          columns: tableColumns,
+        }}
+        values={tableData}
+        size={CARD_SIZES.LARGEWIDE}
+      />
+    );
+
+    rerender(
+      <TableCard
+        id="table-list"
+        title="Testing resize"
+        content={{
+          columns: tableColumns,
+        }}
+        values={tableData}
+        size={CARD_SIZES.LARGE}
+      />
+    );
+
+    expect(screen.getByText('Testing resize')).toBeInTheDocument();
+  });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -15391,9 +15391,9 @@ npm-run-path@^4.0.0:
     path-key "^3.0.0"
 
 npm-user-validate@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
-  integrity sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
+  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
 npm-which@^3.0.1:
   version "3.0.1"