Merge branch 'main' into implement-definition-tooltip

carbon-design-system · Jan 26, 2022 · 2e86f04 · 2e86f04
2 parents 86838da + e11bf01
commit 2e86f04
Show file tree

Hide file tree

Showing 20 changed files with 518 additions and 333 deletions.
diff --git a/packages/carbon-react/__tests__/index-test.js b/packages/carbon-react/__tests__/index-test.js
@@ -57,6 +57,7 @@ describe('Carbon Components React', () => {
         "FileUploaderItem",
         "FileUploaderSkeleton",
         "Filename",
+        "FlexGrid",
         "FluidForm",
         "Form",
         "FormGroup",

diff --git a/packages/carbon-react/src/components/Grid/index.js b/packages/carbon-react/src/components/Grid/index.js
diff --git a/packages/carbon-react/src/index.js b/packages/carbon-react/src/index.js
@@ -184,6 +184,9 @@ export {
   SideNavMenu,
   SideNavMenuItem,
   SideNavSwitcher,
+  Grid,
+  Column,
+  unstable_FlexGrid as FlexGrid,
   // Experimental
   unstable_useContextMenu,
   unstable_FeatureFlags as FeatureFlags,
@@ -219,8 +222,3 @@ export {
   unstable_useTheme as useTheme,
   unstable_VStack as VStack,
 } from 'carbon-components-react';
-export {
-  // Grid
-  Grid,
-  Column,
-} from './components/Grid';
diff --git a/packages/components/src/components/data-table/_data-table-action.scss b/packages/components/src/components/data-table/_data-table-action.scss
@@ -74,11 +74,15 @@
 
   .#{$prefix}--toolbar-search-container-expandable .#{$prefix}--search-input {
     height: 100%;
-    padding: 0;
     cursor: pointer;
     opacity: 0;
   }
 
+  .#{$prefix}--toolbar-search-container-expandable:not(.#{$prefix}--toolbar-search-container-active)
+    .#{$prefix}--search-input {
+    padding: 0;
+  }
+
   .#{$prefix}--toolbar-search-container-expandable
     .#{$prefix}--search-magnifier-icon {
     left: 0;

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -7889,6 +7889,38 @@ Map {
       },
     },
   },
+  "unstable_FlexGrid" => Object {
+    "propTypes": Object {
+      "as": Object {
+        "args": Array [
+          Array [
+            Object {
+              "type": "string",
+            },
+            Object {
+              "type": "elementType",
+            },
+          ],
+        ],
+        "type": "oneOfType",
+      },
+      "children": Object {
+        "type": "node",
+      },
+      "className": Object {
+        "type": "string",
+      },
+      "condensed": Object {
+        "type": "bool",
+      },
+      "fullWidth": Object {
+        "type": "bool",
+      },
+      "narrow": Object {
+        "type": "bool",
+      },
+    },
+  },
   "unstable_HStack" => Object {
     "$$typeof": Symbol(react.forward_ref),
     "render": [Function],