Merge branch 'master' into stickyHeaderFix

carbon-design-system · Aug 4, 2020 · 3228bc9 · 3228bc9
2 parents 49fa051 + f5d666f
commit 3228bc9
Show file tree

Hide file tree

Showing 8 changed files with 7,182 additions and 7,150 deletions.
diff --git a/packages/pictograms/master/pictogram-master.ai b/packages/pictograms/master/pictogram-master.ai
diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -100,6 +100,7 @@ Map {
     "defaultProps": Object {
       "disabled": false,
       "kind": "primary",
+      "size": "default",
       "tabIndex": 0,
       "type": "button",
     },

diff --git a/packages/react/src/components/Button/Button.js b/packages/react/src/components/Button/Button.js
@@ -205,6 +205,7 @@ Button.defaultProps = {
   type: 'button',
   disabled: false,
   kind: 'primary',
+  size: 'default',
 };
 
 export default Button;
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -2051,6 +2051,7 @@ exports[`DataTable should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -2120,6 +2121,7 @@ exports[`DataTable should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -2189,6 +2191,7 @@ exports[`DataTable should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -2244,6 +2247,7 @@ exports[`DataTable should render 1`] = `
                     disabled={false}
                     kind="primary"
                     onClick={[Function]}
+                    size="default"
                     tabIndex={-1}
                     type="button"
                   >
@@ -3045,6 +3049,7 @@ exports[`DataTable sticky header should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -3114,6 +3119,7 @@ exports[`DataTable sticky header should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -3183,6 +3189,7 @@ exports[`DataTable sticky header should render 1`] = `
                           "render": [Function],
                         }
                       }
+                      size="default"
                       tabIndex={0}
                       type="button"
                     >
@@ -3238,6 +3245,7 @@ exports[`DataTable sticky header should render 1`] = `
                     disabled={false}
                     kind="primary"
                     onClick={[Function]}
+                    size="default"
                     tabIndex={-1}
                     type="button"
                   >

diff --git a/...ages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap b/...ages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap
@@ -22,6 +22,7 @@ exports[`DataTable.TableBatchAction should render 1`] = `
         "render": [Function],
       }
     }
+    size="default"
     tabIndex={0}
     type="button"
   >

diff --git a/...ges/react/src/components/DataTable/__tests__/__snapshots__/TableBatchActions-test.js.snap b/...ges/react/src/components/DataTable/__tests__/__snapshots__/TableBatchActions-test.js.snap
@@ -31,6 +31,7 @@ exports[`DataTable.TableBatchActions should render 1`] = `
           disabled={false}
           kind="primary"
           onClick={[MockFunction]}
+          size="default"
           tabIndex={-1}
           type="button"
         >
@@ -81,6 +82,7 @@ exports[`DataTable.TableBatchActions should render 2`] = `
           disabled={false}
           kind="primary"
           onClick={[MockFunction]}
+          size="default"
           tabIndex={0}
           type="button"
         >

diff --git a/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap b/packages/react/src/components/ModalWrapper/__snapshots__/ModalWrapper-test.js.snap
@@ -28,6 +28,7 @@ exports[`ModalWrapper should render 1`] = `
       iconDescription="Provide icon description if icon is used"
       kind="primary"
       onClick={[Function]}
+      size="default"
       tabIndex={0}
       type="button"
     >
@@ -155,6 +156,7 @@ exports[`ModalWrapper should render 1`] = `
               disabled={false}
               kind="secondary"
               onClick={[Function]}
+              size="default"
               tabIndex={0}
               type="button"
             >
@@ -172,6 +174,7 @@ exports[`ModalWrapper should render 1`] = `
               disabled={false}
               kind="primary"
               onClick={[Function]}
+              size="default"
               tabIndex={0}
               type="button"
             >

diff --git a/packages/react/src/components/Tag/Tag.js b/packages/react/src/components/Tag/Tag.js
@@ -67,6 +67,7 @@ const Tag = ({
         {children !== null && children !== undefined ? children : TYPES[type]}
       </span>
       <button
+        type="button"
         className={`${prefix}--tag__close-icon`}
         onClick={handleClose}
         disabled={disabled}