Merge branch 'main' into 10292-update-tokens

config/eslint-config-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
   "description": "ESLint configuration for Carbon",
-  "version": "2.9.0",
+  "version": "2.10.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

config/jest-config-carbon/package.json

@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "0.11.0",
+  "version": "0.12.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

lerna.json

@@ -6,7 +6,6 @@
   "useWorkspaces": true,
   "ignoreChanges": [
     "actions/**",
-    "codemods/**",
     "**/__fixtures__/**",
     "**/__tests__/**",
     "**/docs/**",

package.json

@@ -9,7 +9,6 @@
   },
   "workspaces": [
     "actions/*",
-    "codemods",
     "config/*",
     "packages/*",
     "www"
@@ -21,7 +20,7 @@
     "doctoc": "doctoc --title '## Table of Contents'",
     "format": "prettier --write '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**'",
     "format:diff": "prettier --list-different '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**' '!packages/components/**'",
-    "lint": "eslint actions config codemods packages www",
+    "lint": "eslint actions config packages www",
     "lint:styles": "stylelint '**/*.{css,scss}' --report-needless-disables --report-invalid-scope-disables",
     "sync": "carbon-cli sync",
     "test": "cross-env BABEL_ENV=test jest",

packages/carbon-react/__tests__/index-test.js

@@ -57,6 +57,7 @@ describe('Carbon Components React', () => {
         "FileUploaderItem",
         "FileUploaderSkeleton",
         "Filename",
+        "FlexGrid",
         "FluidForm",
         "Form",
         "FormGroup",

packages/carbon-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "0.12.0",
+  "version": "0.13.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,10 +44,10 @@
   "dependencies": {
     "@carbon/feature-flags": "^0.7.0",
     "@carbon/icons-react": "^10.45.0",
-    "@carbon/styles": "^0.12.0",
+    "@carbon/styles": "^0.13.0-rc.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
-    "carbon-components": "^10.51.0",
-    "carbon-components-react": "^7.51.0",
+    "carbon-components": "^10.52.0-rc.0",
+    "carbon-components-react": "^7.52.0-rc.0",
     "carbon-icons": "^7.0.7"
   },
   "devDependencies": {

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';

packages/components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carbon-components",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "10.51.0",
+  "version": "10.52.0-rc.0",
   "license": "Apache-2.0",
   "main": "umd/index.js",
   "module": "es/index.js",

packages/components/src/components/checkbox/_checkbox.scss

@@ -42,6 +42,7 @@
   // to match the specs.
   .#{$prefix}--checkbox {
     @include hidden;
+
     //even though its hidden, positioning is for native validation to be aligned to checkbox
     top: 1.25rem;
     left: 0.7rem;
@@ -198,6 +199,13 @@
     // Add extra spacing when label is present
     margin: rem(1px) 0 0 rem(6px);
   }
+
+  //-----------------------------------------------
+  // InlineCheckbox
+  //-----------------------------------------------
+  .#{$prefix}--checkbox--inline {
+    position: relative;
+  }
 }
 
 @include exports('checkbox') {

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;

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],

packages/react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carbon-components-react",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "7.51.0",
+  "version": "7.52.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -107,7 +107,7 @@
     "babel-plugin-react-docgen": "^4.2.1",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "browserslist-config-carbon": "^10.6.1",
-    "carbon-components": "^10.51.0",
+    "carbon-components": "^10.52.0-rc.0",
     "carbon-icons": "^7.0.5",
     "chalk": "^4.1.1",
     "cli-table": "^0.3.0",