Skip to content

Commit

Permalink
Merge branch 'main' into search-functional-component
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Dec 7, 2021
2 parents b43bede + ab061bd commit 52a023e
Show file tree
Hide file tree
Showing 38 changed files with 1,939 additions and 2,185 deletions.
10 changes: 5 additions & 5 deletions packages/carbon-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react",
"description": "React components for the Carbon Design System",
"version": "0.10.0",
"version": "0.11.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -44,10 +44,10 @@
"dependencies": {
"@carbon/feature-flags": "^0.6.0",
"@carbon/icons-react": "^10.44.0",
"@carbon/styles": "^0.10.0",
"@carbon/styles": "^0.11.0-rc.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"carbon-components": "^10.49.0",
"carbon-components-react": "^7.49.0",
"carbon-components": "^10.50.0-rc.0",
"carbon-components-react": "^7.50.0-rc.0",
"carbon-icons": "^7.0.7"
},
"devDependencies": {
Expand All @@ -58,7 +58,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.14.5",
"@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.14.5",
"@carbon/themes": "^10.47.0",
"@carbon/themes": "^10.48.0-rc.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-node-resolve": "^11.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -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.49.0",
"version": "10.50.0-rc.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -81,7 +81,7 @@
"@babel/preset-react": "^7.14.5",
"@babel/runtime": "^7.14.6",
"@carbon/cli": "^10.31.0",
"@carbon/elements": "^10.48.0",
"@carbon/elements": "^10.49.0-rc.0",
"@carbon/icons-handlebars": "^10.44.0",
"@carbon/icons-react": "^10.44.0",
"@carbon/test-utils": "^10.20.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.48.0",
"version": "10.49.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -41,8 +41,8 @@
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.34.0",
"@carbon/motion": "^10.26.0",
"@carbon/themes": "^10.47.0",
"@carbon/type": "^10.38.0"
"@carbon/themes": "^10.48.0-rc.0",
"@carbon/type": "^10.39.0-rc.0"
},
"devDependencies": {
"@carbon/cli": "^10.31.0",
Expand Down
108 changes: 33 additions & 75 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2645,6 +2645,9 @@ Map {
"onChange": Object {
"type": "func",
},
"renderSelectedItem": Object {
"type": "func",
},
"selectedItem": Object {
"args": Array [
Array [
Expand Down Expand Up @@ -3105,7 +3108,6 @@ Map {
"selectionFeedback": "top-after-reopen",
"sortItems": [Function],
},
"displayName": "MultiSelect.Filterable",
"propTypes": Object {
"ariaLabel": Object {
"type": "string",
Expand Down Expand Up @@ -4071,7 +4073,6 @@ Map {
"selectionFeedback": "top-after-reopen",
"sortItems": [Function],
},
"displayName": "MultiSelect.Filterable",
"propTypes": Object {
"ariaLabel": Object {
"type": "string",
Expand Down Expand Up @@ -5941,51 +5942,6 @@ Map {
},
},
},
"unstable_ContainedTab" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
"className": Object {
"type": "string",
},
"disabled": Object {
"type": "bool",
},
"handleTabClick": Object {
"type": "func",
},
"handleTabKeyDown": Object {
"type": "func",
},
"id": Object {
"type": "string",
},
"index": Object {
"type": "number",
},
"label": Object {
"type": "node",
},
"onClick": Object {
"type": "func",
},
"onKeyDown": Object {
"type": "func",
},
"renderButton": Object {
"type": "func",
},
"renderContent": Object {
"type": "func",
},
"selected": Object {
"type": "bool",
},
"tabIndex": Object {
"type": "number",
},
},
"render": [Function],
},
"TabContent" => Object {
"defaultProps": Object {
"selected": false,
Expand Down Expand Up @@ -6084,7 +6040,7 @@ Map {
},
},
},
"unstable_ContainedTabs" => Object {
"unstable_TabPanel" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
"children": Object {
Expand All @@ -6093,32 +6049,19 @@ Map {
"className": Object {
"type": "string",
},
"hidden": Object {
"type": "bool",
},
"leftOverflowButtonProps": Object {
"type": "object",
},
"light": [Function],
"onClick": Object {
"type": "func",
},
"onKeyDown": Object {
"type": "func",
},
"onSelectionChange": Object {
"type": "func",
},
"rightOverflowButtonProps": Object {
"type": "object",
},
"scrollIntoView": Object {
"type": "bool",
},
"selected": Object {
"type": "number",
},
"render": [Function],
},
"unstable_TabPanels" => Object {
"propTypes": Object {
"children": Object {
"type": "node",
},
"selectionMode": Object {
},
},
"unstable_TabList" => Object {
"propTypes": Object {
"activation": Object {
"args": Array [
Array [
"automatic",
Expand All @@ -6127,11 +6070,26 @@ Map {
],
"type": "oneOf",
},
"tabContentClassName": Object {
"aria-label": Object {
"isRequired": true,
"type": "string",
},
"children": Object {
"type": "node",
},
"className": Object {
"type": "string",
},
"contained": Object {
"type": "bool",
},
"light": Object {
"type": "bool",
},
"scrollIntoView": Object {
"type": "bool",
},
},
"render": [Function],
},
"Tag" => Object {
"propTypes": Object {
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -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.49.0",
"version": "7.50.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -102,7 +102,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.49.0",
"carbon-components": "^10.50.0-rc.0",
"carbon-icons": "^7.0.5",
"chalk": "^4.1.1",
"cli-table": "^0.3.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ Array [
"TooltipDefinition",
"TooltipIcon",
"UnorderedList",
"unstable_ContainedTab",
"unstable_ContainedTabs",
"unstable_FeatureFlags",
"unstable_HStack",
"unstable_Heading",
Expand All @@ -219,6 +217,9 @@ Array [
"unstable_ProgressBar",
"unstable_Section",
"unstable_Stack",
"unstable_TabList",
"unstable_TabPanel",
"unstable_TabPanels",
"unstable_Theme",
"unstable_Tooltip",
"unstable_TreeNode",
Expand Down
Loading

0 comments on commit 52a023e

Please sign in to comment.