From b89064a02c7a47db6d8bc7df7ca4873baaf91516 Mon Sep 17 00:00:00 2001 From: MIchael Dudley <54119397+dudley-ibm@users.noreply.github.com> Date: Tue, 5 Jan 2021 16:52:01 -0500 Subject: [PATCH 01/10] feat(pictograms): add Cloud PAK pictograms to cloud category (#7439) * add 8 new cloud pak pictograms to cloud category * chore(pictograms): update snapshots * fix(pictograms): remove cloud pak for automation asset Co-authored-by: TJ Egan Co-authored-by: Josh Black --- .../__snapshots__/PublicAPI-test.js.snap | 7 ++++ .../__snapshots__/PublicAPI-test.js.snap | 7 ++++ packages/pictograms/categories.yml | 9 ++++- packages/pictograms/pictograms.yml | 32 +++++++++++++++-- .../pictograms/src/svg/cloud-pak--family.svg | 15 ++++++++ .../src/svg/cloud-pak--for-applications.svg | 13 +++++++ .../src/svg/cloud-pak--for-data.svg | 36 +++++++++++++++++++ .../src/svg/cloud-pak--for-integration.svg | 28 +++++++++++++++ .../cloud-pak--for-multicloud-management.svg | 33 +++++++++++++++++ .../src/svg/cloud-pak--for-security.svg | 13 +++++++ .../pictograms/src/svg/cloud-pak--system.svg | 17 +++++++++ 11 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 packages/pictograms/src/svg/cloud-pak--family.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--for-applications.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--for-data.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--for-integration.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--for-multicloud-management.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--for-security.svg create mode 100644 packages/pictograms/src/svg/cloud-pak--system.svg diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap index fce5a7aeb1fe..a301e7f3b01a 100644 --- a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap +++ b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap @@ -112,6 +112,13 @@ Array [ "CloudGuidelines", "CloudManagedServices", "CloudOracle", + "CloudPakFamily", + "CloudPakForApplications", + "CloudPakForData", + "CloudPakForIntegration", + "CloudPakForMulticloudManagement", + "CloudPakForSecurity", + "CloudPakSystem", "CloudPartners", "CloudPlanning", "CloudSap", diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap index 94176e5092eb..830caea0aba4 100644 --- a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap +++ b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap @@ -112,6 +112,13 @@ Array [ "CloudGuidelines", "CloudManagedServices", "CloudOracle", + "CloudPakFamily", + "CloudPakForApplications", + "CloudPakForData", + "CloudPakForIntegration", + "CloudPakForMulticloudManagement", + "CloudPakForSecurity", + "CloudPakSystem", "CloudPartners", "CloudPlanning", "CloudSap", diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml index e58c8fa62468..c5f8568dfdcc 100644 --- a/packages/pictograms/categories.yml +++ b/packages/pictograms/categories.yml @@ -139,8 +139,15 @@ categories: - cloud--strategy - cloud--tutorials - cloud--vmware - - condition--builder + - cloud-pak--family + - cloud-pak--for-applications + - cloud-pak--for-data + - cloud-pak--for-integration + - cloud-pak--for-multicloud-management + - cloud-pak--for-security + - cloud-pak--system - cognos--analytics + - condition--builder - construct - devops - digital diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml index a9c206b4167e..dfaa1c005188 100644 --- a/packages/pictograms/pictograms.yml +++ b/packages/pictograms/pictograms.yml @@ -963,6 +963,34 @@ - cloud vmware - cloud - vmware +- name: cloud-pak--family + friendly_name: Cloud Pak Family + aliases: + - Cloud Pak Family +- name: cloud-pak--for-applications + friendly_name: Cloud Pak for Applications + aliases: + - Cloud Pak for Applications +- name: cloud-pak--for-data + friendly_name: Cloud Pak for Data + aliases: + - Cloud Pak for Data +- name: cloud-pak--for-integration + friendly_name: Cloud Pak for Integration + aliases: + - Cloud Pak for Integration +- name: cloud-pak--for-multicloud-management + friendly_name: Cloud Pak for Multicloud Management + aliases: + - Cloud Pak for Multicloud Management +- name: cloud-pak--for-security + friendly_name: Cloud Pak for Security + aliases: + - Cloud Pak for Security +- name: cloud-pak--system + friendly_name: Cloud Pak System + aliases: + - Cloud Pak System - name: cloudy friendly_name: Cloudy aliases: @@ -1067,7 +1095,7 @@ - watson - name: condition--builder friendly_name: Condition builder - aliases: + aliases: - condition builder - if - condition @@ -3375,7 +3403,7 @@ - cities - name: random--samples friendly_name: Random samples - aliases: + aliases: - random samples - random - dice diff --git a/packages/pictograms/src/svg/cloud-pak--family.svg b/packages/pictograms/src/svg/cloud-pak--family.svg new file mode 100644 index 000000000000..8557be976ac4 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--family.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--for-applications.svg b/packages/pictograms/src/svg/cloud-pak--for-applications.svg new file mode 100644 index 000000000000..b6b9047f0521 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--for-applications.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--for-data.svg b/packages/pictograms/src/svg/cloud-pak--for-data.svg new file mode 100644 index 000000000000..9d0f5d80c8a7 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--for-data.svg @@ -0,0 +1,36 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--for-integration.svg b/packages/pictograms/src/svg/cloud-pak--for-integration.svg new file mode 100644 index 000000000000..8b5ae8cbef42 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--for-integration.svg @@ -0,0 +1,28 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--for-multicloud-management.svg b/packages/pictograms/src/svg/cloud-pak--for-multicloud-management.svg new file mode 100644 index 000000000000..e06be904bcc3 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--for-multicloud-management.svg @@ -0,0 +1,33 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--for-security.svg b/packages/pictograms/src/svg/cloud-pak--for-security.svg new file mode 100644 index 000000000000..4fb23eee98f0 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--for-security.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/packages/pictograms/src/svg/cloud-pak--system.svg b/packages/pictograms/src/svg/cloud-pak--system.svg new file mode 100644 index 000000000000..2918dbaa6428 --- /dev/null +++ b/packages/pictograms/src/svg/cloud-pak--system.svg @@ -0,0 +1,17 @@ + + + + + + From 978fbdd20f82c12c1f239f57f85cd3a866492bac Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Tue, 5 Jan 2021 17:20:33 -0500 Subject: [PATCH 02/10] Revert "fix(dropdown): state disabled background color (#7461)" (#7473) This reverts commit 81aa04f3814631ff8460d6c94bba67ec62ad80a4. Co-authored-by: Josh Black Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/components/docs/sass.md | 3 --- packages/components/src/components/dropdown/_dropdown.scss | 1 - 2 files changed, 4 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 0441a29e5f33..3e085f1b6f59 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -10623,7 +10623,6 @@ $disabled-01: if( - [accordion [mixin]](#accordion-mixin) - [content-switcher [mixin]](#content-switcher-mixin) - [date-picker [mixin]](#date-picker-mixin) - - [dropdown [mixin]](#dropdown-mixin) - [listbox [mixin]](#listbox-mixin) - [number-input [mixin]](#number-input-mixin) - [search [mixin]](#search-mixin) @@ -20554,7 +20553,6 @@ Dropdown styles } .#{$prefix}--dropdown--disabled { - background-color: $disabled-01; border-bottom-color: transparent; &:hover { @@ -20705,7 +20703,6 @@ Dropdown styles - [selected-ui [variable]](#selected-ui-variable) - [text-02 [variable]](#text-02-variable) - [decorative-01 [variable]](#decorative-01-variable) - - [disabled-01 [variable]](#disabled-01-variable) - [disabled-02 [variable]](#disabled-02-variable) - [carbon--spacing-07 [variable]](#carbon--spacing-07-variable) - [carbon--spacing-04 [variable]](#carbon--spacing-04-variable) diff --git a/packages/components/src/components/dropdown/_dropdown.scss b/packages/components/src/components/dropdown/_dropdown.scss index d7d8c8822d4a..1c1e44383f7f 100644 --- a/packages/components/src/components/dropdown/_dropdown.scss +++ b/packages/components/src/components/dropdown/_dropdown.scss @@ -348,7 +348,6 @@ } .#{$prefix}--dropdown--disabled { - background-color: $disabled-01; border-bottom-color: transparent; &:hover { From 2c3b11b16585b38df871dfd28d53835541666f2b Mon Sep 17 00:00:00 2001 From: DAK <40970507+dakahn@users.noreply.github.com> Date: Tue, 5 Jan 2021 16:44:30 -0600 Subject: [PATCH 03/10] fix(Datepicker): add aria role to Flatpickr dialog (#7465) Co-authored-by: Josh Black Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../src/components/DatePicker/DatePicker.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js index 55a05476f28f..a2721ae000dc 100644 --- a/packages/react/src/components/DatePicker/DatePicker.js +++ b/packages/react/src/components/DatePicker/DatePicker.js @@ -329,6 +329,7 @@ export default class DatePicker extends Component { onValueUpdate: onHook, }); this.addKeyboardEvents(this.cal); + this.addRoleAttributeToDialog(); } } } @@ -386,6 +387,22 @@ export default class DatePicker extends Component { } }; + /** + * Flatpickr's calendar dialog is not rendered in a landmark causing an + * error with IBM Equal Access Accessibility Checker so we add an aria + * role to the container div. + */ + addRoleAttributeToDialog = () => { + if (this.inputField) { + this.cal.calendarContainer.setAttribute('role', 'region'); + // IBM EAAC requires an aria-label on a role='region' + this.cal.calendarContainer.setAttribute( + 'aria-label', + 'calendar-container' + ); + } + }; + addKeyboardEvents = (cal) => { if (this.inputField) { this.inputField.addEventListener('keydown', (e) => { From 77fd9a7a9332836775b9c2aa5bcba2b614379cfa Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Tue, 5 Jan 2021 18:08:45 -0500 Subject: [PATCH 04/10] fix(ui-shell): remove menubar role (#7462) Co-authored-by: Alessandra Davila Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/react/src/components/UIShell/HeaderNavigation.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/react/src/components/UIShell/HeaderNavigation.js b/packages/react/src/components/UIShell/HeaderNavigation.js index 06bac76953d0..62a479f58e1d 100644 --- a/packages/react/src/components/UIShell/HeaderNavigation.js +++ b/packages/react/src/components/UIShell/HeaderNavigation.js @@ -66,10 +66,7 @@ export default class HeaderNavigation extends React.Component { return ( From 01cafb6d8fd53a9d58800c6c8c3aa2039515dc03 Mon Sep 17 00:00:00 2001 From: DAK <40970507+dakahn@users.noreply.github.com> Date: Tue, 5 Jan 2021 17:30:25 -0600 Subject: [PATCH 05/10] test(Button): add accessibility unit tests and docs (#7413) * test(Button): add accessibility unit tests and docs * test(Button): add automated tests * Update packages/react/src/components/Button/button-avt.md Co-authored-by: emyarod * test(Button): update snaps * test(Button): make assertions explicit, fix wrong query Co-authored-by: emyarod Co-authored-by: Andrea N. Cardona Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../src/components/Button/Button-test.js | 56 +++++++++++++++++++ .../react/src/components/Button/button-avt.md | 28 ++++++++++ 2 files changed, 84 insertions(+) create mode 100644 packages/react/src/components/Button/button-avt.md diff --git a/packages/react/src/components/Button/Button-test.js b/packages/react/src/components/Button/Button-test.js index c5e385d3f016..b08383e64980 100644 --- a/packages/react/src/components/Button/Button-test.js +++ b/packages/react/src/components/Button/Button-test.js @@ -12,6 +12,9 @@ import Link from '../Link'; import ButtonSkeleton from '../Button/Button.Skeleton'; import { shallow, mount } from 'enzyme'; import { settings } from 'carbon-components'; +import { cleanup, render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import '@testing-library/jest-dom'; const { prefix } = settings; @@ -392,3 +395,56 @@ describe('Small ButtonSkeleton', () => { }); }); }); + +describe('Small ButtonSkeleton', () => { + describe('Renders as expected', () => { + const wrapper = shallow(); + + it('has the expected classes for small', () => { + expect(wrapper.hasClass(`${prefix}--btn--sm`)).toEqual(true); + expect(wrapper.hasClass(`${prefix}--skeleton`)).toEqual(true); + }); + }); +}); + +describe('Button accessibility', () => { + afterEach(cleanup); + + it('should have no Axe violations', async () => { + render(); + + await expect(screen.getByRole('button')).toHaveNoAxeViolations(); + }); + + it('should have no Accessibility Checker violations', async () => { + render( +
+ +
+ ); + + await expect(screen.getByRole('button')).toHaveNoACViolations('Button'); + }); + + it('is keyboard accessible', () => { + render(); + userEvent.tab(); + expect(screen.getByText('Button Label')).toHaveFocus(); + }); + + it('should have an accessible label', () => { + render(); + expect(() => screen.getByText('Button Label')).not.toThrow(); + }); + + it('should have the role of button', () => { + render(); + expect(() => screen.getByRole('button')).not.toThrow(); + }); + + it('is not keyboard accessible when disabled', () => { + render(); + userEvent.tab(); + expect(document.body).toHaveFocus(); + }); +}); diff --git a/packages/react/src/components/Button/button-avt.md b/packages/react/src/components/Button/button-avt.md new file mode 100644 index 000000000000..8cbe8c37b526 --- /dev/null +++ b/packages/react/src/components/Button/button-avt.md @@ -0,0 +1,28 @@ +Button Component Accessibility Verification Testing + +Developers or designers wanting to manually verify the accessibility of the +component can carry out the following steps: + +## Contrast + +- [ ] the Button text has a contrast of 4.5:1 minimum against the background + color +- [ ] the Button background has a contrast of 4.5:1 minimum against the page + background + +## Screen reader + +Each screen reader should be tested when paired with its preferred browser. + +### VoiceOver on Safari + +1. {tab} "Button, button, main. You are currently on a button. To click this + button press ctrl-option-space" + +### JAWS on Edge/Chrome + +1. {tab} "Main fram, Button, button. To activate press SPACEBAR" + +### NVDA on Firefox (optional, but recommended) + +1. {tab} "main frame, main landmark. Button button" From 39740729b3d073078f778e0fd9f38a091d78c4ed Mon Sep 17 00:00:00 2001 From: Josh Black Date: Wed, 6 Jan 2021 13:39:45 -0600 Subject: [PATCH 06/10] fix(pictograms-react): update telemetry to 0.0.0-alpha.6 (#7508) --- ...m-0.0.0-alpha.6-6f4f97f004-4d31a35b55.zip} | Bin 13949 -> 14005 bytes packages/pictograms-react/package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) rename .yarn/cache/{@carbon-telemetry-npm-0.0.0-alpha.5-62872c49ad-a72b74d37e.zip => @carbon-telemetry-npm-0.0.0-alpha.6-6f4f97f004-4d31a35b55.zip} (67%) diff --git a/.yarn/cache/@carbon-telemetry-npm-0.0.0-alpha.5-62872c49ad-a72b74d37e.zip b/.yarn/cache/@carbon-telemetry-npm-0.0.0-alpha.6-6f4f97f004-4d31a35b55.zip similarity index 67% rename from .yarn/cache/@carbon-telemetry-npm-0.0.0-alpha.5-62872c49ad-a72b74d37e.zip rename to .yarn/cache/@carbon-telemetry-npm-0.0.0-alpha.6-6f4f97f004-4d31a35b55.zip index 237ab61ef54ef83697832ad01d9e1ed6a59a2add..7ce3bc2f73530934915ed3a72e8057fb261e9468 100644 GIT binary patch delta 2948 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 diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json index 9691737d9f1a..199e3b77c4f6 100644 --- a/packages/pictograms-react/package.json +++ b/packages/pictograms-react/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@carbon/icon-helpers": "^10.11.0-rc.0", - "@carbon/telemetry": "^0.0.0-alpha.5", + "@carbon/telemetry": "0.0.0-alpha.6", "prop-types": "^15.7.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index fd8e74a286b4..9a9a8a56ab55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2848,7 +2848,7 @@ __metadata: "@carbon/icon-build-helpers": ^0.13.0-rc.0 "@carbon/icon-helpers": ^10.11.0-rc.0 "@carbon/pictograms": ^11.1.0-rc.0 - "@carbon/telemetry": ^0.0.0-alpha.5 + "@carbon/telemetry": 0.0.0-alpha.6 prop-types: ^15.7.2 peerDependencies: react: ">=16" @@ -2890,9 +2890,9 @@ __metadata: languageName: unknown linkType: soft -"@carbon/telemetry@npm:^0.0.0-alpha.5": - version: 0.0.0-alpha.5 - resolution: "@carbon/telemetry@npm:0.0.0-alpha.5" +"@carbon/telemetry@npm:0.0.0-alpha.6": + version: 0.0.0-alpha.6 + resolution: "@carbon/telemetry@npm:0.0.0-alpha.6" dependencies: "@babel/parser": ^7.12.5 "@babel/traverse": ^7.12.5 @@ -2906,7 +2906,7 @@ __metadata: yargs: ^16.1.1 bin: carbon-telemetry: bin/carbon-telemetry.js - checksum: a72b74d37efff08c087fa861ea77d99061e53d387658852d0dbf95cae86b97f3ce237244bb404d7793a22f92557ac3ceb41086406d281b76edd95034fa668824 + checksum: 4d31a35b55b080cf703cab1df2c6bcbf97cd619dd43f1181280b7645e7f60a7f143c8fb128b1e406bd7daf1a0ca13d345b2ab9011273bbbbf3ecab5e74328b90 languageName: node linkType: hard From 93f8e13474dbb9d8ccd952dead9475910a949792 Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Wed, 6 Jan 2021 14:39:43 -0600 Subject: [PATCH 07/10] chore(release): v10.26.0-rc.1 (#7510) * chore(release): v10.26.0-rc.1 * chore(release): v10.26.0-rc.1 - update yarn --- packages/components/package.json | 2 +- packages/pictograms-react/package.json | 4 ++-- packages/pictograms/package.json | 2 +- packages/react/package.json | 4 ++-- yarn.lock | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 6d5e2d392819..73f91a0948a4 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.26.0-rc.0", + "version": "10.26.0-rc.1", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json index 199e3b77c4f6..a3d72e3c8a73 100644 --- a/packages/pictograms-react/package.json +++ b/packages/pictograms-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms-react", "description": "React components for pictograms in digital and software products using the Carbon Design System", - "version": "11.1.0-rc.0", + "version": "11.1.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -43,7 +43,7 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^0.13.0-rc.0", - "@carbon/pictograms": "^11.1.0-rc.0" + "@carbon/pictograms": "^11.1.0-rc.1" }, "sideEffects": false } diff --git a/packages/pictograms/package.json b/packages/pictograms/package.json index d6375c8f882c..a191dbbb9bf4 100644 --- a/packages/pictograms/package.json +++ b/packages/pictograms/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms", "description": "Pictograms for digital and software products using the Carbon Design System", - "version": "11.1.0-rc.0", + "version": "11.1.0-rc.1", "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 c8eac2b5a33a..d9c70dd913b5 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.26.0-rc.0", + "version": "7.26.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -83,7 +83,7 @@ "babel-plugin-react-docgen": "^4.0.0", "babel-plugin-transform-inline-environment-variables": "^0.4.0", "browserslist-config-carbon": "^10.6.0", - "carbon-components": "^10.26.0-rc.0", + "carbon-components": "^10.26.0-rc.1", "carbon-icons": "^7.0.5", "chalk": "^2.3.0", "cli-table": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index 9a9a8a56ab55..110c7b34afb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2847,7 +2847,7 @@ __metadata: dependencies: "@carbon/icon-build-helpers": ^0.13.0-rc.0 "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/pictograms": ^11.1.0-rc.0 + "@carbon/pictograms": ^11.1.0-rc.1 "@carbon/telemetry": 0.0.0-alpha.6 prop-types: ^15.7.2 peerDependencies: @@ -2855,7 +2855,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/pictograms@^11.1.0-rc.0, @carbon/pictograms@workspace:packages/pictograms": +"@carbon/pictograms@^11.1.0-rc.1, @carbon/pictograms@workspace:packages/pictograms": version: 0.0.0-use.local resolution: "@carbon/pictograms@workspace:packages/pictograms" dependencies: @@ -10214,7 +10214,7 @@ __metadata: babel-plugin-react-docgen: ^4.0.0 babel-plugin-transform-inline-environment-variables: ^0.4.0 browserslist-config-carbon: ^10.6.0 - carbon-components: ^10.26.0-rc.0 + carbon-components: ^10.26.0-rc.1 carbon-icons: ^7.0.5 chalk: ^2.3.0 classnames: 2.2.6 @@ -10273,7 +10273,7 @@ __metadata: languageName: unknown linkType: soft -"carbon-components@^10.26.0-rc.0, carbon-components@workspace:packages/components": +"carbon-components@^10.26.0-rc.1, carbon-components@workspace:packages/components": version: 0.0.0-use.local resolution: "carbon-components@workspace:packages/components" dependencies: From d41f538ce43d6acb8174e262532c5e4c23faf6a6 Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Thu, 7 Jan 2021 15:31:25 -0600 Subject: [PATCH 08/10] chore(release): v10.26.0 (#7517) * chore(release): v10.26.0 * chore(release): v10.26.0 - remove changelog files * chore(release): v10.26.0 - remove storybook changelog * chore(release): v10.26.0 - updated yarn --- config/storybook-preset-carbon/package.json | 2 +- packages/bundler/package.json | 2 +- packages/cli/package.json | 2 +- packages/colors/package.json | 4 +- packages/components/package.json | 10 +- packages/elements/package.json | 18 +-- packages/grid/package.json | 6 +- packages/icon-build-helpers/package.json | 4 +- packages/icon-helpers/package.json | 4 +- packages/icons-handlebars/package.json | 6 +- packages/icons-react/package.json | 8 +- packages/icons-vue/package.json | 6 +- packages/icons/package.json | 4 +- packages/layout/package.json | 4 +- packages/motion/package.json | 4 +- packages/pictograms-react/package.json | 8 +- packages/pictograms/package.json | 4 +- packages/react/package.json | 8 +- packages/sketch/package.json | 12 +- packages/themes/package.json | 8 +- packages/type/package.json | 6 +- yarn.lock | 120 ++++++++++---------- 22 files changed, 125 insertions(+), 125 deletions(-) diff --git a/config/storybook-preset-carbon/package.json b/config/storybook-preset-carbon/package.json index 3d36e50e5217..607afea15c4e 100644 --- a/config/storybook-preset-carbon/package.json +++ b/config/storybook-preset-carbon/package.json @@ -1,7 +1,7 @@ { "name": "storybook-preset-carbon", "private": true, - "version": "0.1.0-rc.0", + "version": "0.1.0", "license": "Apache-2.0", "main": "index.js", "repository": { diff --git a/packages/bundler/package.json b/packages/bundler/package.json index 4fc6554d8916..c20fa98b1c28 100644 --- a/packages/bundler/package.json +++ b/packages/bundler/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/bundler", "description": "Bundler used for libraries in the Carbon Design System", - "version": "10.11.0-rc.0", + "version": "10.11.0", "license": "Apache-2.0", "bin": "./bin/bundler.js", "repository": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 98f836172c4c..f76771dfc296 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/cli", "description": "Task automation for working with the Carbon Design System", - "version": "10.17.0-rc.0", + "version": "10.17.0", "license": "Apache-2.0", "bin": { "carbon-cli": "./bin/carbon-cli.js" diff --git a/packages/colors/package.json b/packages/colors/package.json index 4b929cd213f2..ea1f11f1cd04 100644 --- a/packages/colors/package.json +++ b/packages/colors/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/colors", "description": "Colors for digital and software products using the Carbon Design System", - "version": "10.18.0-rc.0", + "version": "10.18.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -35,7 +35,7 @@ "clean": "rimraf css es lib umd scss" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "@carbon/cli-reporter": "^10.4.0", "@carbon/scss-generator": "^10.11.0", "@carbon/test-utils": "^10.13.0", diff --git a/packages/components/package.json b/packages/components/package.json index 73f91a0948a4..165aa541b826 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.26.0-rc.1", + "version": "10.26.0", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", @@ -83,10 +83,10 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", - "@carbon/bundler": "^10.11.0-rc.0", - "@carbon/elements": "^10.25.0-rc.0", - "@carbon/icons-handlebars": "^10.23.0-rc.0", - "@carbon/icons-react": "^10.23.0-rc.0", + "@carbon/bundler": "^10.11.0", + "@carbon/elements": "^10.25.0", + "@carbon/icons-handlebars": "^10.23.0", + "@carbon/icons-react": "^10.23.0", "@carbon/test-utils": "^10.13.0", "@frctl/fractal": "^1.1.0", "adaro": "1.0.4", diff --git a/packages/elements/package.json b/packages/elements/package.json index 3cdc25f12031..813ed580e268 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.25.0-rc.0", + "version": "10.25.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -35,17 +35,17 @@ "clean": "rimraf es lib umd && node tasks/clean.js" }, "dependencies": { - "@carbon/colors": "^10.18.0-rc.0", - "@carbon/grid": "^10.18.0-rc.0", - "@carbon/icons": "^10.23.0-rc.0", + "@carbon/colors": "^10.18.0", + "@carbon/grid": "^10.18.0", + "@carbon/icons": "^10.23.0", "@carbon/import-once": "^10.4.0", - "@carbon/layout": "^10.16.0-rc.0", - "@carbon/motion": "^10.11.0-rc.0", - "@carbon/themes": "^10.25.0-rc.0", - "@carbon/type": "^10.19.0-rc.0" + "@carbon/layout": "^10.16.0", + "@carbon/motion": "^10.11.0", + "@carbon/themes": "^10.25.0", + "@carbon/type": "^10.19.0" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "fs-extra": "^8.1.0", "klaw-sync": "^6.0.0", "replace-in-file": "^3.4.2", diff --git a/packages/grid/package.json b/packages/grid/package.json index 366033bd637a..388a7f17a9a3 100644 --- a/packages/grid/package.json +++ b/packages/grid/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/grid", "description": "Grid for digital and software products using the Carbon Design System", - "version": "10.18.0-rc.0", + "version": "10.18.0", "license": "Apache-2.0", "repository": { "type": "git", @@ -32,10 +32,10 @@ }, "dependencies": { "@carbon/import-once": "^10.4.0", - "@carbon/layout": "^10.16.0-rc.0" + "@carbon/layout": "^10.16.0" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "rimraf": "^3.0.0" }, "eyeglass": { diff --git a/packages/icon-build-helpers/package.json b/packages/icon-build-helpers/package.json index c530e4ef807b..2f408ba6b52e 100644 --- a/packages/icon-build-helpers/package.json +++ b/packages/icon-build-helpers/package.json @@ -2,7 +2,7 @@ "name": "@carbon/icon-build-helpers", "private": true, "description": "Build helpers for the Carbon Design System icon library", - "version": "0.13.0-rc.0", + "version": "0.13.0", "license": "Apache-2.0", "main": "src/index.js", "repository": { @@ -25,7 +25,7 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@carbon/cli-reporter": "^10.4.0", - "@carbon/icon-helpers": "^10.11.0-rc.0", + "@carbon/icon-helpers": "^10.11.0", "browserslist-config-carbon": "^10.6.0", "change-case": "^4.1.1", "core-js": "^3.6.5", diff --git a/packages/icon-helpers/package.json b/packages/icon-helpers/package.json index 3e96828c1c28..50de734f64a3 100644 --- a/packages/icon-helpers/package.json +++ b/packages/icon-helpers/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icon-helpers", "description": "Helpers used alongside icons for digital and software products using the Carbon Design System", - "version": "10.11.0-rc.0", + "version": "10.11.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ "clean": "rimraf es lib umd" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "rimraf": "^3.0.0" }, "sideEffects": false diff --git a/packages/icons-handlebars/package.json b/packages/icons-handlebars/package.json index 719b6b44aa11..c8640f6d15c2 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.23.0-rc.0", + "version": "10.23.0", "license": "Apache-2.0", "main": "index.js", "repository": { @@ -26,8 +26,8 @@ "handlebars": "^4.0.12" }, "dependencies": { - "@carbon/icon-helpers": "^10.11.0-rc.0", - "@carbon/icons": "^10.23.0-rc.0" + "@carbon/icon-helpers": "^10.11.0", + "@carbon/icons": "^10.23.0" }, "devDependencies": { "handlebars": "^4.0.12" diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index 49bd8c672f54..485b3b3fa4ef 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.23.0-rc.0", + "version": "10.23.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -36,12 +36,12 @@ "react": ">=16" }, "dependencies": { - "@carbon/icon-helpers": "^10.11.0-rc.0", + "@carbon/icon-helpers": "^10.11.0", "prop-types": "^15.7.2" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.13.0-rc.0", - "@carbon/icons": "^10.23.0-rc.0" + "@carbon/icon-build-helpers": "^0.13.0", + "@carbon/icons": "^10.23.0" }, "sideEffects": false } diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index 0a443e78cb6b..ee127f600d62 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.23.0-rc.0", + "version": "10.23.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -28,11 +28,11 @@ "clean": "rimraf es lib" }, "dependencies": { - "@carbon/icon-helpers": "^10.11.0-rc.0" + "@carbon/icon-helpers": "^10.11.0" }, "devDependencies": { "@carbon/cli-reporter": "^10.4.0", - "@carbon/icons": "^10.23.0-rc.0", + "@carbon/icons": "^10.23.0", "fs-extra": "^8.1.0", "prettier": "^2.1.0", "rimraf": "^3.0.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index 4e30b5e851e2..417bb3a7cdcb 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.23.0-rc.0", + "version": "10.23.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -38,7 +38,7 @@ "prepublishOnly": "yarn build" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.13.0-rc.0" + "@carbon/icon-build-helpers": "^0.13.0" }, "gitHead": "bb04f2f061de0bda6e457a07a67cf624db375808" } diff --git a/packages/layout/package.json b/packages/layout/package.json index 6a1fad1e8ea0..865ef93669ef 100644 --- a/packages/layout/package.json +++ b/packages/layout/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/layout", "description": "Layout helpers for digital and software products using the Carbon Design System", - "version": "10.16.0-rc.0", + "version": "10.16.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -29,7 +29,7 @@ "clean": "rimraf es lib umd scss/generated" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "@carbon/cli-reporter": "^10.4.0", "@carbon/scss-generator": "^10.11.0", "@carbon/test-utils": "^10.13.0", diff --git a/packages/motion/package.json b/packages/motion/package.json index ddb09a063c90..0e935aed994b 100644 --- a/packages/motion/package.json +++ b/packages/motion/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/motion", "description": "Motion helpers for digital and software products using the Carbon Design System", - "version": "10.11.0-rc.0", + "version": "10.11.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -29,7 +29,7 @@ "clean": "rimraf es lib umd" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "rimraf": "^3.0.0" }, "eyeglass": { diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json index a3d72e3c8a73..d693f5bc9c42 100644 --- a/packages/pictograms-react/package.json +++ b/packages/pictograms-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms-react", "description": "React components for pictograms in digital and software products using the Carbon Design System", - "version": "11.1.0-rc.1", + "version": "11.1.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -37,13 +37,13 @@ "react": ">=16" }, "dependencies": { - "@carbon/icon-helpers": "^10.11.0-rc.0", + "@carbon/icon-helpers": "^10.11.0", "@carbon/telemetry": "0.0.0-alpha.6", "prop-types": "^15.7.2" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.13.0-rc.0", - "@carbon/pictograms": "^11.1.0-rc.1" + "@carbon/icon-build-helpers": "^0.13.0", + "@carbon/pictograms": "^11.1.0" }, "sideEffects": false } diff --git a/packages/pictograms/package.json b/packages/pictograms/package.json index a191dbbb9bf4..ff7e3c4090e4 100644 --- a/packages/pictograms/package.json +++ b/packages/pictograms/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms", "description": "Pictograms for digital and software products using the Carbon Design System", - "version": "11.1.0-rc.1", + "version": "11.1.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -31,7 +31,7 @@ "prepublishOnly": "yarn build" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.13.0-rc.0", + "@carbon/icon-build-helpers": "^0.13.0", "rimraf": "^3.0.0" } } diff --git a/packages/react/package.json b/packages/react/package.json index d9c70dd913b5..f59a4bb864a9 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.26.0-rc.1", + "version": "7.26.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -43,7 +43,7 @@ "react-dom": "^16.8.6 || ^17.0.1" }, "dependencies": { - "@carbon/icons-react": "^10.23.0-rc.0", + "@carbon/icons-react": "^10.23.0", "classnames": "2.2.6", "downshift": "5.2.1", "flatpickr": "4.6.1", @@ -83,7 +83,7 @@ "babel-plugin-react-docgen": "^4.0.0", "babel-plugin-transform-inline-environment-variables": "^0.4.0", "browserslist-config-carbon": "^10.6.0", - "carbon-components": "^10.26.0-rc.1", + "carbon-components": "^10.26.0", "carbon-icons": "^7.0.5", "chalk": "^2.3.0", "cli-table": "^0.3.0", @@ -116,7 +116,7 @@ "rollup-plugin-terser": "^4.0.0", "rtlcss": "^2.4.0", "sass-loader": "^8.0.2", - "storybook-preset-carbon": "^0.1.0-rc.0", + "storybook-preset-carbon": "^0.1.0", "string-replace-loader": "^2.1.0", "terser-webpack-plugin": "^2.3.2", "webpack": "^4.41.5", diff --git a/packages/sketch/package.json b/packages/sketch/package.json index 99d6b778140c..d9c597c34745 100644 --- a/packages/sketch/package.json +++ b/packages/sketch/package.json @@ -2,7 +2,7 @@ "name": "@carbon/sketch", "private": true, "description": "Tooling for generating a sketch plugin to bring code to design", - "version": "10.24.0-rc.0", + "version": "10.24.0", "license": "Apache-2.0", "repository": { "type": "git", @@ -29,11 +29,11 @@ }, "dependencies": { "@babel/polyfill": "^7.8.7", - "@carbon/colors": "^10.18.0-rc.0", - "@carbon/icon-helpers": "^10.11.0-rc.0", - "@carbon/icons": "^10.23.0-rc.0", - "@carbon/themes": "^10.25.0-rc.0", - "@carbon/type": "^10.19.0-rc.0", + "@carbon/colors": "^10.18.0", + "@carbon/icon-helpers": "^10.11.0", + "@carbon/icons": "^10.23.0", + "@carbon/themes": "^10.25.0", + "@carbon/type": "^10.19.0", "@skpm/builder": "^0.7.0", "color-string": "^1.5.3", "skpm": "^1.2.0" diff --git a/packages/themes/package.json b/packages/themes/package.json index 28121a9eddec..a7e3210ffa2e 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/themes", "description": "Themes for applying color in the Carbon Design System", - "version": "10.25.0-rc.0", + "version": "10.25.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -28,9 +28,9 @@ "build": "yarn clean && bundler bundle src/index.js --name CarbonThemes && node tasks/build.js && bundler check \"scss/*.scss\" && bundler sassdoc \"scss/**/*.scss\"" }, "dependencies": { - "@carbon/colors": "^10.18.0-rc.0", - "@carbon/layout": "^10.16.0-rc.0", - "@carbon/type": "^10.19.0-rc.0", + "@carbon/colors": "^10.18.0", + "@carbon/layout": "^10.16.0", + "@carbon/type": "^10.19.0", "color": "^3.1.2" }, "devDependencies": { diff --git a/packages/type/package.json b/packages/type/package.json index 8fb415b9f56d..11126cf5f36b 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/type", "description": "Typography for digital and software products using the Carbon Design System", - "version": "10.19.0-rc.0", + "version": "10.19.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -37,10 +37,10 @@ }, "dependencies": { "@carbon/import-once": "^10.4.0", - "@carbon/layout": "^10.16.0-rc.0" + "@carbon/layout": "^10.16.0" }, "devDependencies": { - "@carbon/bundler": "^10.11.0-rc.0", + "@carbon/bundler": "^10.11.0", "@carbon/test-utils": "^10.13.0", "change-case": "^4.1.1", "rimraf": "^3.0.0" diff --git a/yarn.lock b/yarn.lock index 110c7b34afb0..cc6bbbaec71a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2568,7 +2568,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/bundler@^10.11.0-rc.0, @carbon/bundler@workspace:packages/bundler": +"@carbon/bundler@^10.11.0, @carbon/bundler@workspace:packages/bundler": version: 0.0.0-use.local resolution: "@carbon/bundler@workspace:packages/bundler" dependencies: @@ -2648,11 +2648,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/colors@^10.18.0-rc.0, @carbon/colors@workspace:packages/colors": +"@carbon/colors@^10.18.0, @carbon/colors@workspace:packages/colors": version: 0.0.0-use.local resolution: "@carbon/colors@workspace:packages/colors" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 "@carbon/cli-reporter": ^10.4.0 "@carbon/scss-generator": ^10.11.0 "@carbon/test-utils": ^10.13.0 @@ -2664,19 +2664,19 @@ __metadata: languageName: unknown linkType: soft -"@carbon/elements@^10.25.0-rc.0, @carbon/elements@workspace:packages/elements": +"@carbon/elements@^10.25.0, @carbon/elements@workspace:packages/elements": version: 0.0.0-use.local resolution: "@carbon/elements@workspace:packages/elements" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 - "@carbon/colors": ^10.18.0-rc.0 - "@carbon/grid": ^10.18.0-rc.0 - "@carbon/icons": ^10.23.0-rc.0 + "@carbon/bundler": ^10.11.0 + "@carbon/colors": ^10.18.0 + "@carbon/grid": ^10.18.0 + "@carbon/icons": ^10.23.0 "@carbon/import-once": ^10.4.0 - "@carbon/layout": ^10.16.0-rc.0 - "@carbon/motion": ^10.11.0-rc.0 - "@carbon/themes": ^10.25.0-rc.0 - "@carbon/type": ^10.19.0-rc.0 + "@carbon/layout": ^10.16.0 + "@carbon/motion": ^10.11.0 + "@carbon/themes": ^10.25.0 + "@carbon/type": ^10.19.0 fs-extra: ^8.1.0 klaw-sync: ^6.0.0 replace-in-file: ^3.4.2 @@ -2699,25 +2699,25 @@ __metadata: languageName: unknown linkType: soft -"@carbon/grid@^10.18.0-rc.0, @carbon/grid@workspace:packages/grid": +"@carbon/grid@^10.18.0, @carbon/grid@workspace:packages/grid": version: 0.0.0-use.local resolution: "@carbon/grid@workspace:packages/grid" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 "@carbon/import-once": ^10.4.0 - "@carbon/layout": ^10.16.0-rc.0 + "@carbon/layout": ^10.16.0 rimraf: ^3.0.0 languageName: unknown linkType: soft -"@carbon/icon-build-helpers@^0.13.0-rc.0, @carbon/icon-build-helpers@workspace:packages/icon-build-helpers": +"@carbon/icon-build-helpers@^0.13.0, @carbon/icon-build-helpers@workspace:packages/icon-build-helpers": version: 0.0.0-use.local resolution: "@carbon/icon-build-helpers@workspace:packages/icon-build-helpers" dependencies: "@babel/preset-env": ^7.10.0 "@babel/preset-react": ^7.10.0 "@carbon/cli-reporter": ^10.4.0 - "@carbon/icon-helpers": ^10.11.0-rc.0 + "@carbon/icon-helpers": ^10.11.0 browserslist-config-carbon: ^10.6.0 change-case: ^4.1.1 core-js: ^3.6.5 @@ -2739,11 +2739,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/icon-helpers@^10.11.0-rc.0, @carbon/icon-helpers@workspace:packages/icon-helpers": +"@carbon/icon-helpers@^10.11.0, @carbon/icon-helpers@workspace:packages/icon-helpers": version: 0.0.0-use.local resolution: "@carbon/icon-helpers@workspace:packages/icon-helpers" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 rimraf: ^3.0.0 languageName: unknown linkType: soft @@ -2755,25 +2755,25 @@ __metadata: languageName: node linkType: hard -"@carbon/icons-handlebars@^10.23.0-rc.0, @carbon/icons-handlebars@workspace:packages/icons-handlebars": +"@carbon/icons-handlebars@^10.23.0, @carbon/icons-handlebars@workspace:packages/icons-handlebars": version: 0.0.0-use.local resolution: "@carbon/icons-handlebars@workspace:packages/icons-handlebars" dependencies: - "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/icons": ^10.23.0-rc.0 + "@carbon/icon-helpers": ^10.11.0 + "@carbon/icons": ^10.23.0 handlebars: ^4.0.12 peerDependencies: handlebars: ^4.0.12 languageName: unknown linkType: soft -"@carbon/icons-react@^10.23.0-rc.0, @carbon/icons-react@workspace:packages/icons-react": +"@carbon/icons-react@^10.23.0, @carbon/icons-react@workspace:packages/icons-react": version: 0.0.0-use.local resolution: "@carbon/icons-react@workspace:packages/icons-react" dependencies: - "@carbon/icon-build-helpers": ^0.13.0-rc.0 - "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/icons": ^10.23.0-rc.0 + "@carbon/icon-build-helpers": ^0.13.0 + "@carbon/icon-helpers": ^10.11.0 + "@carbon/icons": ^10.23.0 prop-types: ^15.7.2 peerDependencies: react: ">=16" @@ -2795,8 +2795,8 @@ __metadata: resolution: "@carbon/icons-vue@workspace:packages/icons-vue" dependencies: "@carbon/cli-reporter": ^10.4.0 - "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/icons": ^10.23.0-rc.0 + "@carbon/icon-helpers": ^10.11.0 + "@carbon/icons": ^10.23.0 fs-extra: ^8.1.0 prettier: ^2.1.0 rimraf: ^3.0.0 @@ -2805,11 +2805,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/icons@^10.23.0-rc.0, @carbon/icons@workspace:packages/icons": +"@carbon/icons@^10.23.0, @carbon/icons@workspace:packages/icons": version: 0.0.0-use.local resolution: "@carbon/icons@workspace:packages/icons" dependencies: - "@carbon/icon-build-helpers": ^0.13.0-rc.0 + "@carbon/icon-build-helpers": ^0.13.0 languageName: unknown linkType: soft @@ -2819,11 +2819,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/layout@^10.16.0-rc.0, @carbon/layout@workspace:packages/layout": +"@carbon/layout@^10.16.0, @carbon/layout@workspace:packages/layout": version: 0.0.0-use.local resolution: "@carbon/layout@workspace:packages/layout" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 "@carbon/cli-reporter": ^10.4.0 "@carbon/scss-generator": ^10.11.0 "@carbon/test-utils": ^10.13.0 @@ -2832,11 +2832,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/motion@^10.11.0-rc.0, @carbon/motion@workspace:packages/motion": +"@carbon/motion@^10.11.0, @carbon/motion@workspace:packages/motion": version: 0.0.0-use.local resolution: "@carbon/motion@workspace:packages/motion" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 rimraf: ^3.0.0 languageName: unknown linkType: soft @@ -2845,9 +2845,9 @@ __metadata: version: 0.0.0-use.local resolution: "@carbon/pictograms-react@workspace:packages/pictograms-react" dependencies: - "@carbon/icon-build-helpers": ^0.13.0-rc.0 - "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/pictograms": ^11.1.0-rc.1 + "@carbon/icon-build-helpers": ^0.13.0 + "@carbon/icon-helpers": ^10.11.0 + "@carbon/pictograms": ^11.1.0 "@carbon/telemetry": 0.0.0-alpha.6 prop-types: ^15.7.2 peerDependencies: @@ -2855,11 +2855,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/pictograms@^11.1.0-rc.1, @carbon/pictograms@workspace:packages/pictograms": +"@carbon/pictograms@^11.1.0, @carbon/pictograms@workspace:packages/pictograms": version: 0.0.0-use.local resolution: "@carbon/pictograms@workspace:packages/pictograms" dependencies: - "@carbon/icon-build-helpers": ^0.13.0-rc.0 + "@carbon/icon-build-helpers": ^0.13.0 rimraf: ^3.0.0 languageName: unknown linkType: soft @@ -2877,11 +2877,11 @@ __metadata: resolution: "@carbon/sketch@workspace:packages/sketch" dependencies: "@babel/polyfill": ^7.8.7 - "@carbon/colors": ^10.18.0-rc.0 - "@carbon/icon-helpers": ^10.11.0-rc.0 - "@carbon/icons": ^10.23.0-rc.0 - "@carbon/themes": ^10.25.0-rc.0 - "@carbon/type": ^10.19.0-rc.0 + "@carbon/colors": ^10.18.0 + "@carbon/icon-helpers": ^10.11.0 + "@carbon/icons": ^10.23.0 + "@carbon/themes": ^10.25.0 + "@carbon/type": ^10.19.0 "@skpm/builder": ^0.7.0 color-string: ^1.5.3 cross-env: ^5.2.0 @@ -2925,16 +2925,16 @@ __metadata: languageName: unknown linkType: soft -"@carbon/themes@^10.25.0-rc.0, @carbon/themes@workspace:packages/themes": +"@carbon/themes@^10.25.0, @carbon/themes@workspace:packages/themes": version: 0.0.0-use.local resolution: "@carbon/themes@workspace:packages/themes" dependencies: "@carbon/cli-reporter": ^10.4.0 - "@carbon/colors": ^10.18.0-rc.0 - "@carbon/layout": ^10.16.0-rc.0 + "@carbon/colors": ^10.18.0 + "@carbon/layout": ^10.16.0 "@carbon/scss-generator": ^10.11.0 "@carbon/test-utils": ^10.13.0 - "@carbon/type": ^10.19.0-rc.0 + "@carbon/type": ^10.19.0 change-case: ^4.1.1 color: ^3.1.2 core-js: ^3.6.5 @@ -2945,13 +2945,13 @@ __metadata: languageName: unknown linkType: soft -"@carbon/type@^10.19.0-rc.0, @carbon/type@workspace:packages/type": +"@carbon/type@^10.19.0, @carbon/type@workspace:packages/type": version: 0.0.0-use.local resolution: "@carbon/type@workspace:packages/type" dependencies: - "@carbon/bundler": ^10.11.0-rc.0 + "@carbon/bundler": ^10.11.0 "@carbon/import-once": ^10.4.0 - "@carbon/layout": ^10.16.0-rc.0 + "@carbon/layout": ^10.16.0 "@carbon/test-utils": ^10.13.0 change-case: ^4.1.1 rimraf: ^3.0.0 @@ -10200,7 +10200,7 @@ __metadata: "@babel/plugin-transform-object-assign": ^7.7.4 "@babel/preset-env": ^7.10.0 "@babel/preset-react": ^7.10.0 - "@carbon/icons-react": ^10.23.0-rc.0 + "@carbon/icons-react": ^10.23.0 "@carbon/test-utils": ^10.13.0 "@percy/storybook": ^3.3.1 "@storybook/addon-storysource": ^5.3.19 @@ -10214,7 +10214,7 @@ __metadata: babel-plugin-react-docgen: ^4.0.0 babel-plugin-transform-inline-environment-variables: ^0.4.0 browserslist-config-carbon: ^10.6.0 - carbon-components: ^10.26.0-rc.1 + carbon-components: ^10.26.0 carbon-icons: ^7.0.5 chalk: ^2.3.0 classnames: 2.2.6 @@ -10257,7 +10257,7 @@ __metadata: rollup-plugin-terser: ^4.0.0 rtlcss: ^2.4.0 sass-loader: ^8.0.2 - storybook-preset-carbon: ^0.1.0-rc.0 + storybook-preset-carbon: ^0.1.0 string-replace-loader: ^2.1.0 terser-webpack-plugin: ^2.3.2 use-resize-observer: ^6.0.0 @@ -10273,7 +10273,7 @@ __metadata: languageName: unknown linkType: soft -"carbon-components@^10.26.0-rc.1, carbon-components@workspace:packages/components": +"carbon-components@^10.26.0, carbon-components@workspace:packages/components": version: 0.0.0-use.local resolution: "carbon-components@workspace:packages/components" dependencies: @@ -10285,10 +10285,10 @@ __metadata: "@babel/preset-env": ^7.10.0 "@babel/preset-react": ^7.10.0 "@babel/runtime": ^7.10.0 - "@carbon/bundler": ^10.11.0-rc.0 - "@carbon/elements": ^10.25.0-rc.0 - "@carbon/icons-handlebars": ^10.23.0-rc.0 - "@carbon/icons-react": ^10.23.0-rc.0 + "@carbon/bundler": ^10.11.0 + "@carbon/elements": ^10.25.0 + "@carbon/icons-handlebars": ^10.23.0 + "@carbon/icons-react": ^10.23.0 "@carbon/test-utils": ^10.13.0 "@frctl/fractal": ^1.1.0 adaro: 1.0.4 @@ -31790,7 +31790,7 @@ resolve@1.1.x: languageName: node linkType: hard -"storybook-preset-carbon@^0.1.0-rc.0, storybook-preset-carbon@workspace:config/storybook-preset-carbon": +"storybook-preset-carbon@^0.1.0, storybook-preset-carbon@workspace:config/storybook-preset-carbon": version: 0.0.0-use.local resolution: "storybook-preset-carbon@workspace:config/storybook-preset-carbon" dependencies: From d962f10d0dceb80e3bf47b06624e0a68d9df3ab7 Mon Sep 17 00:00:00 2001 From: emyarod Date: Mon, 11 Jan 2021 11:12:09 -0800 Subject: [PATCH 09/10] fix(data-table): increase interactive area of expand button (#7392) * refactor: consolidate expandable button rules * refactor: remove duplicate style rules * fix(data-table): place header label indentation on container div * fix(data-table): restore custom checkbox padding rules * fix(data-table): increase interactive area of expand button * fix(data-table): affix row height --- .../data-table/_data-table-core.scss | 37 ++++++++++++------ .../data-table/_data-table-expandable.scss | 39 +++++++++++++------ 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/packages/components/src/components/data-table/_data-table-core.scss b/packages/components/src/components/data-table/_data-table-core.scss index bb76e0b8c4d0..5576b83e44a3 100644 --- a/packages/components/src/components/data-table/_data-table-core.scss +++ b/packages/components/src/components/data-table/_data-table-core.scss @@ -98,12 +98,9 @@ vertical-align: middle; } - .#{$prefix}--data-table td { + .#{$prefix}--data-table th { padding-right: $spacing-05; padding-left: $spacing-05; - } - - .#{$prefix}--data-table th { color: $text-01; background-color: $ui-03; } @@ -115,8 +112,6 @@ } .#{$prefix}--data-table .#{$prefix}--table-header-label { - padding-right: $spacing-05; - padding-left: $spacing-05; text-align: left; } @@ -283,22 +278,40 @@ .#{$prefix}--data-table thead th.#{$prefix}--table-expand, .#{$prefix}--data-table tbody td.#{$prefix}--table-expand { min-width: 0; - // spacing between checkbox / chevron and next cell should be 16px / 1rem - // adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here - padding-right: 0; - padding-left: $spacing-05; } .#{$prefix}--data-table thead th.#{$prefix}--table-column-checkbox, .#{$prefix}--data-table tbody td.#{$prefix}--table-column-checkbox { // 16px padding left + 20px checkbox width - width: rem(36px); + width: rem(16px); + // spacing between checkbox / chevron and next cell should be 16px / 1rem + // adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here + padding-right: $spacing-05; + padding-left: $spacing-05; } .#{$prefix}--data-table thead th.#{$prefix}--table-expand, .#{$prefix}--data-table tbody td.#{$prefix}--table-expand { - // 16px padding left + 16px checkbox width + width: rem(48px); + height: rem(48px); + } + + .#{$prefix}--data-table--compact thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--compact tbody td.#{$prefix}--table-expand { + width: rem(24px); + height: rem(24px); + } + + .#{$prefix}--data-table--short thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--short tbody td.#{$prefix}--table-expand { width: rem(32px); + height: rem(32px); + } + + .#{$prefix}--data-table--tall thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--tall tbody td.#{$prefix}--table-expand { + width: rem(64px); + height: rem(64px); } .#{$prefix}--data-table--tall .#{$prefix}--table-column-checkbox { diff --git a/packages/components/src/components/data-table/_data-table-expandable.scss b/packages/components/src/components/data-table/_data-table-expandable.scss index 468ac7ce3cdb..872d3cef0d64 100644 --- a/packages/components/src/components/data-table/_data-table-expandable.scss +++ b/packages/components/src/components/data-table/_data-table-expandable.scss @@ -161,20 +161,26 @@ // Expand icon column //---------------------------------------------------------------------------- .#{$prefix}--data-table td.#{$prefix}--table-expand { - width: 2.5rem; - min-width: 2.5rem; border-bottom: 1px solid $ui-03; } - .#{$prefix}--data-table td.#{$prefix}--table-expand, - th.#{$prefix}--table-expand { - padding: 0 $spacing-05; + .#{$prefix}--data-table th.#{$prefix}--table-expand + th, + .#{$prefix}--data-table td.#{$prefix}--table-expand + td { + padding-left: 0; } - .#{$prefix}--data-table--tall td.#{$prefix}--table-expand, - .#{$prefix}--data-table--tall th.#{$prefix}--table-expand { - padding-top: rem(16px); - padding-bottom: rem(16px); + .#{$prefix}--data-table + th.#{$prefix}--table-expand + + .#{$prefix}--table-column-checkbox, + .#{$prefix}--data-table + td.#{$prefix}--table-expand + + .#{$prefix}--table-column-checkbox { + padding-right: 0; + } + + .#{$prefix}--data-table td.#{$prefix}--table-expand, + .#{$prefix}--data-table th.#{$prefix}--table-expand { + padding: 0; } .#{$prefix}--data-table @@ -191,17 +197,21 @@ .#{$prefix}--table-expand__button { @include button-reset('false'); - height: rem(16px); + display: inline-flex; + align-items: center; + justify-content: center; + width: 100%; + // Account for the border in `.bx--table-expand` + height: calc(100% + 1px); vertical-align: inherit; } .#{$prefix}--table-expand__button:focus { outline: none; + box-shadow: inset 0 0 0 2px $focus; } .#{$prefix}--table-expand__button:focus .#{$prefix}--table-expand__svg { - box-shadow: inset 0 0 0 2px $focus; - // Windows, Firefox HCM Fix @media screen and (-ms-high-contrast: active), screen and (prefers-contrast) { @@ -222,6 +232,11 @@ } } + .#{$prefix}--data-table--tall .#{$prefix}--table-expand__button { + padding-top: rem(16px); + padding-bottom: rem(24px); + } + // fix expanded parent separating border length tr.#{$prefix}--parent-row.#{$prefix}--expandable-row td.#{$prefix}--table-expand From eee0a9611f8ef3851fe5ae6bca43b7df2472baaa Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Mon, 11 Jan 2021 19:37:27 +0000 Subject: [PATCH 10/10] chore(project): sync generated files --- packages/components/docs/sass.md | 76 ++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 24 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 3e085f1b6f59..812ba78708b2 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -18735,12 +18735,9 @@ Data table core styles vertical-align: middle; } - .#{$prefix}--data-table td { + .#{$prefix}--data-table th { padding-right: $spacing-05; padding-left: $spacing-05; - } - - .#{$prefix}--data-table th { color: $text-01; background-color: $ui-03; } @@ -18752,8 +18749,6 @@ Data table core styles } .#{$prefix}--data-table .#{$prefix}--table-header-label { - padding-right: $spacing-05; - padding-left: $spacing-05; text-align: left; } @@ -18920,22 +18915,40 @@ Data table core styles .#{$prefix}--data-table thead th.#{$prefix}--table-expand, .#{$prefix}--data-table tbody td.#{$prefix}--table-expand { min-width: 0; - // spacing between checkbox / chevron and next cell should be 16px / 1rem - // adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here - padding-right: 0; - padding-left: $spacing-05; } .#{$prefix}--data-table thead th.#{$prefix}--table-column-checkbox, .#{$prefix}--data-table tbody td.#{$prefix}--table-column-checkbox { // 16px padding left + 20px checkbox width - width: rem(36px); + width: rem(16px); + // spacing between checkbox / chevron and next cell should be 16px / 1rem + // adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here + padding-right: $spacing-05; + padding-left: $spacing-05; } .#{$prefix}--data-table thead th.#{$prefix}--table-expand, .#{$prefix}--data-table tbody td.#{$prefix}--table-expand { - // 16px padding left + 16px checkbox width + width: rem(48px); + height: rem(48px); + } + + .#{$prefix}--data-table--compact thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--compact tbody td.#{$prefix}--table-expand { + width: rem(24px); + height: rem(24px); + } + + .#{$prefix}--data-table--short thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--short tbody td.#{$prefix}--table-expand { width: rem(32px); + height: rem(32px); + } + + .#{$prefix}--data-table--tall thead th.#{$prefix}--table-expand, + .#{$prefix}--data-table--tall tbody td.#{$prefix}--table-expand { + width: rem(64px); + height: rem(64px); } .#{$prefix}--data-table--tall .#{$prefix}--table-column-checkbox { @@ -19546,20 +19559,26 @@ Data table expandable styles // Expand icon column //---------------------------------------------------------------------------- .#{$prefix}--data-table td.#{$prefix}--table-expand { - width: 2.5rem; - min-width: 2.5rem; border-bottom: 1px solid $ui-03; } - .#{$prefix}--data-table td.#{$prefix}--table-expand, - th.#{$prefix}--table-expand { - padding: 0 $spacing-05; + .#{$prefix}--data-table th.#{$prefix}--table-expand + th, + .#{$prefix}--data-table td.#{$prefix}--table-expand + td { + padding-left: 0; } - .#{$prefix}--data-table--tall td.#{$prefix}--table-expand, - .#{$prefix}--data-table--tall th.#{$prefix}--table-expand { - padding-top: rem(16px); - padding-bottom: rem(16px); + .#{$prefix}--data-table + th.#{$prefix}--table-expand + + .#{$prefix}--table-column-checkbox, + .#{$prefix}--data-table + td.#{$prefix}--table-expand + + .#{$prefix}--table-column-checkbox { + padding-right: 0; + } + + .#{$prefix}--data-table td.#{$prefix}--table-expand, + .#{$prefix}--data-table th.#{$prefix}--table-expand { + padding: 0; } .#{$prefix}--data-table @@ -19576,17 +19595,21 @@ Data table expandable styles .#{$prefix}--table-expand__button { @include button-reset('false'); - height: rem(16px); + display: inline-flex; + align-items: center; + justify-content: center; + width: 100%; + // Account for the border in `.bx--table-expand` + height: calc(100% + 1px); vertical-align: inherit; } .#{$prefix}--table-expand__button:focus { outline: none; + box-shadow: inset 0 0 0 2px $focus; } .#{$prefix}--table-expand__button:focus .#{$prefix}--table-expand__svg { - box-shadow: inset 0 0 0 2px $focus; - // Windows, Firefox HCM Fix @media screen and (-ms-high-contrast: active), screen and (prefers-contrast) { @@ -19607,6 +19630,11 @@ Data table expandable styles } } + .#{$prefix}--data-table--tall .#{$prefix}--table-expand__button { + padding-top: rem(16px); + padding-bottom: rem(24px); + } + // fix expanded parent separating border length tr.#{$prefix}--parent-row.#{$prefix}--expandable-row td.#{$prefix}--table-expand