diff --git a/.yarn/offline-mirror/@carbon-colors-10.7.2.tgz b/.yarn/offline-mirror/@carbon-colors-10.8.0.tgz similarity index 67% rename from .yarn/offline-mirror/@carbon-colors-10.7.2.tgz rename to .yarn/offline-mirror/@carbon-colors-10.8.0.tgz index a1221dc58..2c58fe8e1 100644 Binary files a/.yarn/offline-mirror/@carbon-colors-10.7.2.tgz and b/.yarn/offline-mirror/@carbon-colors-10.8.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-colors-10.8.1.tgz b/.yarn/offline-mirror/@carbon-colors-10.8.1.tgz new file mode 100644 index 000000000..7a8ab2f2f Binary files /dev/null and b/.yarn/offline-mirror/@carbon-colors-10.8.1.tgz differ diff --git a/.yarn/offline-mirror/@carbon-grid-10.8.2.tgz b/.yarn/offline-mirror/@carbon-grid-10.8.2.tgz deleted file mode 100644 index a32eb97c3..000000000 Binary files a/.yarn/offline-mirror/@carbon-grid-10.8.2.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-grid-10.9.0.tgz b/.yarn/offline-mirror/@carbon-grid-10.9.0.tgz new file mode 100644 index 000000000..113a6f024 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-grid-10.9.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-icon-helpers-10.5.2.tgz b/.yarn/offline-mirror/@carbon-icon-helpers-10.5.2.tgz deleted file mode 100644 index 68f885281..000000000 Binary files a/.yarn/offline-mirror/@carbon-icon-helpers-10.5.2.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-icon-helpers-10.6.0.tgz b/.yarn/offline-mirror/@carbon-icon-helpers-10.6.0.tgz new file mode 100644 index 000000000..2c77aa04b Binary files /dev/null and b/.yarn/offline-mirror/@carbon-icon-helpers-10.6.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-icons-react-10.8.2.tgz b/.yarn/offline-mirror/@carbon-icons-react-10.8.2.tgz deleted file mode 100644 index 3091913f1..000000000 Binary files a/.yarn/offline-mirror/@carbon-icons-react-10.8.2.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-icons-react-10.9.0.tgz b/.yarn/offline-mirror/@carbon-icons-react-10.9.0.tgz new file mode 100644 index 000000000..0034fdf56 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-icons-react-10.9.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-icons-react-10.9.2.tgz b/.yarn/offline-mirror/@carbon-icons-react-10.9.2.tgz new file mode 100644 index 000000000..2811ac68c Binary files /dev/null and b/.yarn/offline-mirror/@carbon-icons-react-10.9.2.tgz differ diff --git a/.yarn/offline-mirror/@carbon-layout-10.7.3.tgz b/.yarn/offline-mirror/@carbon-layout-10.7.3.tgz deleted file mode 100644 index 9c530cf23..000000000 Binary files a/.yarn/offline-mirror/@carbon-layout-10.7.3.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-layout-10.8.0.tgz b/.yarn/offline-mirror/@carbon-layout-10.8.0.tgz new file mode 100644 index 000000000..5ead54dbb Binary files /dev/null and b/.yarn/offline-mirror/@carbon-layout-10.8.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-layout-10.8.2.tgz b/.yarn/offline-mirror/@carbon-layout-10.8.2.tgz new file mode 100644 index 000000000..06d63c859 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-layout-10.8.2.tgz differ diff --git a/.yarn/offline-mirror/@carbon-motion-10.5.2.tgz b/.yarn/offline-mirror/@carbon-motion-10.5.2.tgz deleted file mode 100644 index fcba7fedd..000000000 Binary files a/.yarn/offline-mirror/@carbon-motion-10.5.2.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-motion-10.6.0.tgz b/.yarn/offline-mirror/@carbon-motion-10.6.0.tgz new file mode 100644 index 000000000..8d1732412 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-motion-10.6.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-themes-10.10.0.tgz b/.yarn/offline-mirror/@carbon-themes-10.10.0.tgz new file mode 100644 index 000000000..a7cc71042 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-themes-10.10.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-themes-10.9.3.tgz b/.yarn/offline-mirror/@carbon-themes-10.9.3.tgz deleted file mode 100644 index 39d11b825..000000000 Binary files a/.yarn/offline-mirror/@carbon-themes-10.9.3.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-type-10.8.3.tgz b/.yarn/offline-mirror/@carbon-type-10.8.3.tgz deleted file mode 100644 index 1799c0c7f..000000000 Binary files a/.yarn/offline-mirror/@carbon-type-10.8.3.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-type-10.9.0.tgz b/.yarn/offline-mirror/@carbon-type-10.9.0.tgz new file mode 100644 index 000000000..ceacc3b88 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-type-10.9.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-type-10.9.2.tgz b/.yarn/offline-mirror/@carbon-type-10.9.2.tgz new file mode 100644 index 000000000..e7ccffcb8 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-type-10.9.2.tgz differ diff --git a/.yarn/offline-mirror/carbon-components-10.10.0.tgz b/.yarn/offline-mirror/carbon-components-10.10.0.tgz new file mode 100644 index 000000000..89d81a27b Binary files /dev/null and b/.yarn/offline-mirror/carbon-components-10.10.0.tgz differ diff --git a/.yarn/offline-mirror/carbon-components-10.9.3.tgz b/.yarn/offline-mirror/carbon-components-10.9.3.tgz deleted file mode 100644 index 4e4efb97f..000000000 Binary files a/.yarn/offline-mirror/carbon-components-10.9.3.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/carbon-components-react-7.10.0.tgz b/.yarn/offline-mirror/carbon-components-react-7.10.0.tgz new file mode 100644 index 000000000..3de6ed816 Binary files /dev/null and b/.yarn/offline-mirror/carbon-components-react-7.10.0.tgz differ diff --git a/.yarn/offline-mirror/carbon-components-react-7.9.3.tgz b/.yarn/offline-mirror/carbon-components-react-7.9.3.tgz deleted file mode 100644 index 594a8e495..000000000 Binary files a/.yarn/offline-mirror/carbon-components-react-7.9.3.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/color-3.1.2.tgz b/.yarn/offline-mirror/color-3.1.2.tgz new file mode 100644 index 000000000..0d5b7ba04 Binary files /dev/null and b/.yarn/offline-mirror/color-3.1.2.tgz differ diff --git a/.yarn/offline-mirror/color-string-1.5.3.tgz b/.yarn/offline-mirror/color-string-1.5.3.tgz new file mode 100644 index 000000000..57a8d72e9 Binary files /dev/null and b/.yarn/offline-mirror/color-string-1.5.3.tgz differ diff --git a/.yarn/offline-mirror/cssmin-0.4.3.tgz b/.yarn/offline-mirror/cssmin-0.4.3.tgz new file mode 100644 index 000000000..ce0623cf2 Binary files /dev/null and b/.yarn/offline-mirror/cssmin-0.4.3.tgz differ diff --git a/.yarn/offline-mirror/is-arrayish-0.3.2.tgz b/.yarn/offline-mirror/is-arrayish-0.3.2.tgz new file mode 100644 index 000000000..85ae31053 Binary files /dev/null and b/.yarn/offline-mirror/is-arrayish-0.3.2.tgz differ diff --git a/.yarn/offline-mirror/lodash.findlast-4.6.0.tgz b/.yarn/offline-mirror/lodash.findlast-4.6.0.tgz new file mode 100644 index 000000000..8d01a4a89 Binary files /dev/null and b/.yarn/offline-mirror/lodash.findlast-4.6.0.tgz differ diff --git a/.yarn/offline-mirror/node-sass-4.13.1.tgz b/.yarn/offline-mirror/node-sass-4.13.1.tgz new file mode 100644 index 000000000..1c6ebb22e Binary files /dev/null and b/.yarn/offline-mirror/node-sass-4.13.1.tgz differ diff --git a/.yarn/offline-mirror/scss-to-json-2.0.0.tgz b/.yarn/offline-mirror/scss-to-json-2.0.0.tgz new file mode 100644 index 000000000..e33229ce4 Binary files /dev/null and b/.yarn/offline-mirror/scss-to-json-2.0.0.tgz differ diff --git a/.yarn/offline-mirror/simple-swizzle-0.2.2.tgz b/.yarn/offline-mirror/simple-swizzle-0.2.2.tgz new file mode 100644 index 000000000..bac642226 Binary files /dev/null and b/.yarn/offline-mirror/simple-swizzle-0.2.2.tgz differ diff --git a/docs/themes/themes.md b/docs/themes/themes.md index 5643f23a0..a4cab60e0 100644 --- a/docs/themes/themes.md +++ b/docs/themes/themes.md @@ -17,6 +17,7 @@ | `text-03` | `cool-gray-40` | `gray-60` | | `text-04` | `white-0` | `white-0` | | `text-05` | `cool-gray-60` | `gray-50` | +| `text-error` | `red-60` | `red-40` | | `icon-01` | `cool-gray-100` | `gray-10` | | `icon-02` | `cool-gray-70` | `gray-30` | | `icon-03` | `white-0` | `white-0` | @@ -50,7 +51,7 @@ | `selected-ui` | `cool-gray-20` | `gray-80` | | `inverse-hover-ui` | `#464c51` | `#e5e5e5` | | `hover-selected-ui` | `#c4c9d1` | `#4c4c4c` | -| `hover-danger` | `#ba1b23` | `#ba1b23` | +| `hover-danger` | `#b81921` | `#b81921` | | `active-danger` | `red-80` | `red-80` | | `hover-row` | `#e0e4ea` | `#353535` | | `visited-link` | `purple-60` | `purple-40` | diff --git a/package.json b/package.json index 3adc9e8ec..b52cfa351 100644 --- a/package.json +++ b/package.json @@ -44,16 +44,16 @@ }, "dependencies": { "@babel/runtime": "^7.4.3", - "@carbon/colors": "10.7.2", - "@carbon/grid": "10.8.2", - "@carbon/icons-react": "10.8.2", + "@carbon/colors": "10.8.0", + "@carbon/grid": "10.9.0", + "@carbon/icons-react": "10.9.0", "@carbon/import-once": "10.3.0", - "@carbon/layout": "10.7.3", - "@carbon/motion": "10.5.2", - "@carbon/themes": "10.9.3", - "@carbon/type": "10.8.3", - "carbon-components": "10.9.3", - "carbon-components-react": "7.9.3", + "@carbon/layout": "10.8.0", + "@carbon/motion": "10.6.0", + "@carbon/themes": "10.10.0", + "@carbon/type": "10.9.0", + "carbon-components": "10.10.0", + "carbon-components-react": "7.10.0", "classnames": "^2.2.5", "downshift": "^1.31.14", "export-to-csv": "^0.2.1", diff --git a/src/components/DataTable/DataTablePagination/__tests__/__snapshots__/DataTablePagination.spec.js.snap b/src/components/DataTable/DataTablePagination/__tests__/__snapshots__/DataTablePagination.spec.js.snap index 231e52b58..eb112748b 100644 --- a/src/components/DataTable/DataTablePagination/__tests__/__snapshots__/DataTablePagination.spec.js.snap +++ b/src/components/DataTable/DataTablePagination/__tests__/__snapshots__/DataTablePagination.spec.js.snap @@ -469,7 +469,7 @@ exports[`DataTablePagination Rendering renders the HTML of the node's subtree 1` xmlns="http://www.w3.org/2000/svg" > @@ -489,7 +489,7 @@ exports[`DataTablePagination Rendering renders the HTML of the node's subtree 1` xmlns="http://www.w3.org/2000/svg" > diff --git a/src/components/ExternalLink/__tests__/ExternalLink.spec.js b/src/components/ExternalLink/__tests__/ExternalLink.spec.js index b0e7e333e..0b516e0c8 100644 --- a/src/components/ExternalLink/__tests__/ExternalLink.spec.js +++ b/src/components/ExternalLink/__tests__/ExternalLink.spec.js @@ -6,7 +6,7 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { ExternalLink } from '../../../..'; +import { ExternalLink } from '../../..'; describe('ExternalLink', () => { test('should have no Axe or DAP violations', async () => { diff --git a/src/components/FilterPanel/FilterPanelSearch/__tests__/FilterSearch.spec.js b/src/components/FilterPanel/FilterPanelSearch/__tests__/FilterSearch.spec.js index 950f52322..3a922157f 100644 --- a/src/components/FilterPanel/FilterPanelSearch/__tests__/FilterSearch.spec.js +++ b/src/components/FilterPanel/FilterPanelSearch/__tests__/FilterSearch.spec.js @@ -29,24 +29,30 @@ describe('FilterPanelSearch', () => { }); test('renders results content when keyboard focus is added', () => { - const { getByTestId, getByLabelText } = render( - + const { getByTestId, getByPlaceholderText } = render( +
); - getByLabelText('search label').focus(); + getByPlaceholderText('search placeholder').focus(); expect(getByTestId('result-content')).toBeVisible(); }); test('does not render results content when keyboard focus is removed', async () => { - const { queryByTestId, getByLabelText } = render( - + const { queryByTestId, getByPlaceholderText } = render( +
); - const searchInput = getByLabelText('search label'); + const searchInput = getByPlaceholderText('search placeholder'); searchInput.focus(); searchInput.blur(); @@ -57,15 +63,18 @@ describe('FilterPanelSearch', () => { test('does not remove results content when keyboard focus transfers to results', () => { jest.useFakeTimers(); - const { getByTestId, getByLabelText, container } = render( - + const { getByTestId, getByPlaceholderText, container } = render( +
); - const searchInput = getByLabelText('search label'); + const searchInput = getByPlaceholderText('search placeholder'); searchInput.focus(); container.querySelector('#checkbox').focus(); @@ -78,10 +87,14 @@ describe('FilterPanelSearch', () => { test('invokes onChange when the user types a value into the search', () => { const onChangeMock = jest.fn(); - const { getByLabelText } = render( - + const { getByPlaceholderText } = render( + ); - userEvent.type(getByLabelText(/search label/i), 'search term'); + userEvent.type(getByPlaceholderText(/search placeholder/i), 'search term'); expect(onChangeMock).toHaveBeenCalledTimes('search term'.length); }); }); diff --git a/src/components/Icon/__tests__/__snapshots__/Icon.spec.js.snap b/src/components/Icon/__tests__/__snapshots__/Icon.spec.js.snap index f014a6f28..5387dcbb7 100644 --- a/src/components/Icon/__tests__/__snapshots__/Icon.spec.js.snap +++ b/src/components/Icon/__tests__/__snapshots__/Icon.spec.js.snap @@ -36,12 +36,12 @@ exports[`Icon Rendering renders the HTML of the node's subtree 1`] = ` height="16" preserveAspectRatio="xMidYMid meet" style="will-change:transform" - viewBox="0 0 16 16" + viewBox="0 0 32 32" width="16" xmlns="http://www.w3.org/2000/svg" > `; diff --git a/src/components/ProgressIndicator/ProgressIndicator.stories.js b/src/components/ProgressIndicator/ProgressIndicator.stories.js index 2aa66154f..ffb4f1c07 100644 --- a/src/components/ProgressIndicator/ProgressIndicator.stories.js +++ b/src/components/ProgressIndicator/ProgressIndicator.stories.js @@ -5,7 +5,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import { number } from '@storybook/addon-knobs'; +import { boolean, number, text } from '@storybook/addon-knobs'; import { action } from '@storybook/addon-actions'; import { settings } from 'carbon-components'; @@ -26,10 +26,11 @@ storiesOf(components('ProgressIndicator'), module) 'Default', () => ( @@ -84,10 +85,10 @@ storiesOf(components('ProgressIndicator'), module) { info: { text: ` - For React usage, ProgressIndicator holds the currentIndex state to indicate which ProgressStep is the current step. The ProgressIndicator component should always be used with ProgressStep components as its children. Changing currentIndex prop will automatically set the ProgressStep components props (complete, incomplete, current). - For general usage, Progress Indicators display steps in a process. It should indicate when steps have been complete, the active step, - and the steps to come. - `, + For React usage, ProgressIndicator holds the currentIndex state to indicate which ProgressStep is the current step. The ProgressIndicator component should always be used with ProgressStep components as its children. Changing currentIndex prop will automatically set the ProgressStep components props (complete, incomplete, current). + For general usage, Progress Indicators display steps in a process. It should indicate when steps have been complete, the active step, + and the steps to come. + `, }, } ) @@ -131,15 +132,15 @@ storiesOf(components('ProgressIndicator'), module) { info: { text: ` - If you register an onChange handler, the Progress Indicator will become interactive. Your parent component should update the currentIndex prop within the onChange handler. - `, + If you register an onChange handler, the Progress Indicator will become interactive. Your parent component should update the currentIndex prop within the onChange handler. + `, }, } ) .add('skeleton', () => , { info: { text: ` - Placeholder skeleton state to use when content is loading. - `, + Placeholder skeleton state to use when content is loading. + `, }, }); diff --git a/src/components/StepIndicator/__tests__/__snapshots__/StepIndicator.spec.js.snap b/src/components/StepIndicator/__tests__/__snapshots__/StepIndicator.spec.js.snap index 645c029c5..f1e38c117 100644 --- a/src/components/StepIndicator/__tests__/__snapshots__/StepIndicator.spec.js.snap +++ b/src/components/StepIndicator/__tests__/__snapshots__/StepIndicator.spec.js.snap @@ -33,18 +33,31 @@ exports[`StepIndicator render renders if \`currentIndex\` is null 1`] = `
  • -
    - + + Incomplete + +

    -

    +
    • `; @@ -66,26 +79,30 @@ exports[`StepIndicator render renders the HTML of the node's subtree 1`] = `
  • -
    + + Complete +