diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json index d09c734edce7..c502eb66561f 100644 --- a/config/jest-config-carbon/package.json +++ b/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.10.0-rc.0", + "version": "0.10.0", "license": "Apache-2.0", "main": "index.js", "repository": { diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json index c9a2c13f3c9e..d44c56ce5c86 100644 --- a/packages/carbon-react/package.json +++ b/packages/carbon-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/react", "description": "React components for the Carbon Design System", - "version": "0.9.0-rc.0", + "version": "0.9.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -43,11 +43,11 @@ }, "dependencies": { "@carbon/feature-flags": "^0.6.0", - "@carbon/icons-react": "^10.43.0-rc.0", - "@carbon/styles": "^0.9.0-rc.0", + "@carbon/icons-react": "^10.43.0", + "@carbon/styles": "^0.9.0", "@carbon/telemetry": "0.0.0-alpha.6", - "carbon-components": "^10.48.0-rc.0", - "carbon-components-react": "^7.48.0-rc.0", + "carbon-components": "^10.48.0", + "carbon-components-react": "^7.48.0", "carbon-icons": "^7.0.7" }, "devDependencies": { @@ -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-rc.0", + "@carbon/themes": "^10.47.0", "@rollup/plugin-babel": "^5.3.0", "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", @@ -91,6 +91,8 @@ "webpack": "^4.41.5" }, "sideEffects": [ + "es/index.js", + "lib/index.js", "es/feature-flags.js", "lib/feature-flags.js", "es/prefix.js", diff --git a/packages/carbon-react/scss/components/stack/_index.scss b/packages/carbon-react/scss/components/stack/_index.scss new file mode 100644 index 000000000000..fb8a6cf6a378 --- /dev/null +++ b/packages/carbon-react/scss/components/stack/_index.scss @@ -0,0 +1,9 @@ +// Code generated by @carbon/react. DO NOT EDIT. +// +// Copyright IBM Corp. 2018, 2018 +// +// This source code is licensed under the Apache-2.0 license found in the +// LICENSE file in the root directory of this source tree. +// + +@forward '@carbon/styles/scss/components/stack'; diff --git a/packages/carbon-react/tasks/build-styles.js b/packages/carbon-react/tasks/build-styles.js index 97715e8e7e6c..21c0c3dbca5c 100644 --- a/packages/carbon-react/tasks/build-styles.js +++ b/packages/carbon-react/tasks/build-styles.js @@ -367,6 +367,16 @@ async function build() { }, ], }, + { + type: 'directory', + filepath: 'stack', + files: [ + { + type: 'file', + filepath: '_index.scss', + }, + ], + }, { type: 'directory', filepath: 'structured-list', diff --git a/packages/components/package.json b/packages/components/package.json index de9ee7bff26d..5127c7011449 100644 --- a/packages/components/package.json +++ b/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.48.0-rc.0", + "version": "10.48.0", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", @@ -81,9 +81,9 @@ "@babel/preset-react": "^7.14.5", "@babel/runtime": "^7.14.6", "@carbon/cli": "^10.31.0", - "@carbon/elements": "^10.47.0-rc.0", - "@carbon/icons-handlebars": "^10.43.0-rc.0", - "@carbon/icons-react": "^10.43.0-rc.0", + "@carbon/elements": "^10.47.0", + "@carbon/icons-handlebars": "^10.43.0", + "@carbon/icons-react": "^10.43.0", "@carbon/test-utils": "^10.20.0", "@frctl/fractal": "^1.1.0", "@rollup/plugin-babel": "^5.3.0", diff --git a/packages/elements/package.json b/packages/elements/package.json index d1efabaeba8d..2ea06f63ca13 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/elements", "description": "A collection of design elements in code for the IBM Design Language", - "version": "10.47.0-rc.0", + "version": "10.47.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -37,11 +37,11 @@ "dependencies": { "@carbon/colors": "^10.34.0", "@carbon/grid": "^10.39.0", - "@carbon/icons": "^10.43.0-rc.0", + "@carbon/icons": "^10.43.0", "@carbon/import-once": "^10.6.0", "@carbon/layout": "^10.34.0", "@carbon/motion": "^10.26.0", - "@carbon/themes": "^10.47.0-rc.0", + "@carbon/themes": "^10.47.0", "@carbon/type": "^10.38.0" }, "devDependencies": { diff --git a/packages/icons-handlebars/package.json b/packages/icons-handlebars/package.json index cc0d378f449a..fb79aa672fd5 100644 --- a/packages/icons-handlebars/package.json +++ b/packages/icons-handlebars/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-handlebars", "description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System", - "version": "10.43.0-rc.0", + "version": "10.43.0", "license": "Apache-2.0", "main": "index.js", "repository": { @@ -27,7 +27,7 @@ }, "dependencies": { "@carbon/icon-helpers": "^10.25.0", - "@carbon/icons": "^10.43.0-rc.0" + "@carbon/icons": "^10.43.0" }, "devDependencies": { "handlebars": "^4.0.12" diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index 77e54ed28c6c..43f0824ce62c 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-react", "description": "React components for icons in digital and software products using the Carbon Design System", - "version": "10.43.0-rc.0", + "version": "10.43.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -44,7 +44,7 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^0.30.0", - "@carbon/icons": "^10.43.0-rc.0", + "@carbon/icons": "^10.43.0", "rimraf": "^3.0.2" }, "sideEffects": false diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index 05f9edbdd2f7..8f6cde300309 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-vue", "description": "Vue components for icons in digital and software products using the Carbon Design System", - "version": "10.43.0-rc.0", + "version": "10.43.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -32,7 +32,7 @@ }, "devDependencies": { "@carbon/cli-reporter": "^10.5.0", - "@carbon/icons": "^10.43.0-rc.0", + "@carbon/icons": "^10.43.0", "fs-extra": "^8.1.0", "prettier": "^2.2.1", "rimraf": "^3.0.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index 21ef1902e201..aa496825b40b 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons", "description": "Icons for digital and software products using the Carbon Design System", - "version": "10.43.0-rc.0", + "version": "10.43.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react/package.json b/packages/react/package.json index 1bd7a0726ce9..a2ba61014041 100644 --- a/packages/react/package.json +++ b/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.48.0-rc.0", + "version": "7.48.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -48,7 +48,7 @@ "dependencies": { "@babel/runtime": "^7.14.6", "@carbon/feature-flags": "^0.6.0", - "@carbon/icons-react": "^10.43.0-rc.0", + "@carbon/icons-react": "^10.43.0", "@carbon/layout": "^10.34.0", "@carbon/telemetry": "0.0.0-alpha.6", "classnames": "2.3.1", @@ -103,7 +103,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.48.0-rc.0", + "carbon-components": "^10.48.0", "carbon-icons": "^7.0.5", "chalk": "^4.1.1", "cli-table": "^0.3.0", diff --git a/packages/react/src/components/ComposedModal/index.js b/packages/react/src/components/ComposedModal/index.js index c8a5f7b8d15a..ab0019e7c102 100644 --- a/packages/react/src/components/ComposedModal/index.js +++ b/packages/react/src/components/ComposedModal/index.js @@ -7,22 +7,26 @@ import * as FeatureFlags from '@carbon/feature-flags'; import { ModalHeader as ModalHeaderNext } from './next/ModalHeader'; +import { ModalFooter as ModalFooterNext } from './next/ModalFooter'; import { default as ComposedModalNext } from './next/ComposedModal'; import { default as ComposedModalClassic, ModalHeader as ModalHeaderClassic, ModalBody, - ModalFooter, + ModalFooter as ModalFooterClassic, } from './ComposedModal'; export const ModalHeader = FeatureFlags.enabled('enable-v11-release') ? ModalHeaderNext : ModalHeaderClassic; +export const ModalFooter = FeatureFlags.enabled('enable-v11-release') + ? ModalFooterNext + : ModalFooterClassic; + export const ComposedModal = FeatureFlags.enabled('enable-v11-release') ? ComposedModalNext : ComposedModalClassic; -export { ModalBody, ModalFooter }; - +export { ModalBody }; export default from './ComposedModal'; diff --git a/packages/react/src/components/ComposedModal/next/ComposedModal.js b/packages/react/src/components/ComposedModal/next/ComposedModal.js index 7f1c77230bf5..c8a2c9eec095 100644 --- a/packages/react/src/components/ComposedModal/next/ComposedModal.js +++ b/packages/react/src/components/ComposedModal/next/ComposedModal.js @@ -3,19 +3,83 @@ import PropTypes from 'prop-types'; import { ModalHeader } from './ModalHeader'; import { ModalFooter } from '../ComposedModal'; -import classNames from 'classnames'; +import cx from 'classnames'; import toggleClass from '../../../tools/toggleClass'; +import requiredIfGivenPropIsTruthy from '../../../prop-types/requiredIfGivenPropIsTruthy'; import wrapFocus from '../../../internal/wrapFocus'; import { usePrefix } from '../../../internal/usePrefix'; +export function ModalBody({ + className: customClassName, + children, + hasForm, + hasScrollingContent, + ...rest +}) { + const prefix = usePrefix(); + const contentClass = cx({ + [`${prefix}--modal-content`]: true, + [`${prefix}--modal-content--with-form`]: hasForm, + [`${prefix}--modal-scroll-content`]: hasScrollingContent, + [customClassName]: customClassName, + }); + const hasScrollingContentProps = hasScrollingContent + ? { + tabIndex: 0, + role: 'region', + } + : {}; + return ( + <> +
Test
+Test
++ Custom domains direct requests for your apps in this Cloud Foundry + organization to a URL that you own. A custom domain can be a shared + domain, a shared subdomain, or a shared domain and host. +
++ Custom domains direct requests for your apps in this Cloud Foundry + organization to a URL that you own. A custom domain can be a shared + domain, a shared subdomain, or a shared domain and host. +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
++ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id + accumsan augue. Phasellus consequat augue vitae tellus tincidunt + posuere. Curabitur justo urna, consectetur vel elit iaculis, + ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie + tellus. Quisque consectetur non risus eu rutrum.{' '} +
+ > + )} ++ Custom domains direct requests for your apps in this Cloud Foundry + organization to a URL that you own. A custom domain can be a shared + domain, a shared subdomain, or a shared domain and host. +
+