Skip to content

Commit

Permalink
Merge branch 'main' into implement-definition-tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
dakahn authored Jan 26, 2022
2 parents 86838da + e11bf01 commit 2e86f04
Show file tree
Hide file tree
Showing 20 changed files with 518 additions and 333 deletions.
1 change: 1 addition & 0 deletions packages/carbon-react/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe('Carbon Components React', () => {
"FileUploaderItem",
"FileUploaderSkeleton",
"Filename",
"FlexGrid",
"FluidForm",
"Form",
"FormGroup",
Expand Down
8 changes: 0 additions & 8 deletions packages/carbon-react/src/components/Grid/index.js

This file was deleted.

8 changes: 3 additions & 5 deletions packages/carbon-react/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ export {
SideNavMenu,
SideNavMenuItem,
SideNavSwitcher,
Grid,
Column,
unstable_FlexGrid as FlexGrid,
// Experimental
unstable_useContextMenu,
unstable_FeatureFlags as FeatureFlags,
Expand Down Expand Up @@ -219,8 +222,3 @@ export {
unstable_useTheme as useTheme,
unstable_VStack as VStack,
} from 'carbon-components-react';
export {
// Grid
Grid,
Column,
} from './components/Grid';
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
32 changes: 32 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
Loading

0 comments on commit 2e86f04

Please sign in to comment.