Merge 1aab35a into c07d566

carbon-design-system · Sep 26, 2022 · 26daf82 · 26daf82
2 parents c07d566 + 1aab35a
commit 26daf82
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 18 deletions.
diff --git a/packages/react/src/components/Table/TablePropTypes.js b/packages/react/src/components/Table/TablePropTypes.js
@@ -49,15 +49,15 @@ export const RowActionsStatePropTypes = PropTypes.arrayOf(
 
 export const EmptyStatePropTypes = PropTypes.oneOfType([
   PropTypes.shape({
-    message: PropTypes.node.isRequired,
-    messageBody: PropTypes.node,
+    message: PropTypes.string.isRequired,
+    messageBody: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
     /* Show a different message if no content is in the table matching the filters */
-    messageWithFilters: PropTypes.node,
-    messageWithFiltersBody: PropTypes.node,
+    messageWithFilters: PropTypes.string,
+    messageWithFiltersBody: PropTypes.string,
     /* If a label is not provided, no action button will be rendered */
-    buttonLabel: PropTypes.node,
+    buttonLabel: PropTypes.string,
     /* Show a different button label if no content is in the table matching the filters */
-    buttonLabelWithFilters: PropTypes.node,
+    buttonLabelWithFilters: PropTypes.string,
   }),
   /* If a React element is provided, it will be rendered in place of the default */
   PropTypes.element,

diff --git a/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap b/packages/react/src/utils/__tests__/__snapshots__/publicAPI.test.js.snap
@@ -494,23 +494,33 @@ Map {
               "args": Array [
                 Object {
                   "buttonLabel": Object {
-                    "type": "node",
+                    "type": "string",
                   },
                   "buttonLabelWithFilters": Object {
-                    "type": "node",
+                    "type": "string",
                   },
                   "message": Object {
                     "isRequired": true,
-                    "type": "node",
+                    "type": "string",
                   },
                   "messageBody": Object {
-                    "type": "node",
+                    "args": Array [
+                      Array [
+                        Object {
+                          "type": "node",
+                        },
+                        Object {
+                          "type": "string",
+                        },
+                      ],
+                    ],
+                    "type": "oneOfType",
                   },
                   "messageWithFilters": Object {
-                    "type": "node",
+                    "type": "string",
                   },
                   "messageWithFiltersBody": Object {
-                    "type": "node",
+                    "type": "string",
                   },
                 },
               ],
@@ -1759,23 +1769,33 @@ Map {
                           "args": Array [
                             Object {
                               "buttonLabel": Object {
-                                "type": "node",
+                                "type": "string",
                               },
                               "buttonLabelWithFilters": Object {
-                                "type": "node",
+                                "type": "string",
                               },
                               "message": Object {
                                 "isRequired": true,
-                                "type": "node",
+                                "type": "string",
                               },
                               "messageBody": Object {
-                                "type": "node",
+                                "args": Array [
+                                  Array [
+                                    Object {
+                                      "type": "node",
+                                    },
+                                    Object {
+                                      "type": "string",
+                                    },
+                                  ],
+                                ],
+                                "type": "oneOfType",
                               },
                               "messageWithFilters": Object {
-                                "type": "node",
+                                "type": "string",
                               },
                               "messageWithFiltersBody": Object {
-                                "type": "node",
+                                "type": "string",
                               },
                             },
                           ],