From 0d718be80f8bd99827ef041d01f806c4e9a0e883 Mon Sep 17 00:00:00 2001 From: Laura Silva <91160746+silvalaura@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:06:45 -0400 Subject: [PATCH] Release v4.1.1 (#1112) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-bot Co-authored-by: Jerrod Heiser --- .changeset/docs-typos.md | 5 ++ .changeset/fix-inputBase.md | 5 ++ .changeset/maxLength-warnings.md | 5 ++ .changeset/pre.json | 19 +++++ .changeset/tabprops.md | 5 ++ .github/workflows/preview.yml | 4 +- .github/workflows/publish-latest.yml | 2 +- .github/workflows/publish-next-patch.yml | 82 +++++++++++++++++++ .github/workflows/publish-next.yml | 2 +- .github/workflows/publish-patch.yml | 2 +- packages/charts/CHANGELOG.md | 7 ++ packages/charts/package.json | 6 +- packages/dropzone/CHANGELOG.md | 7 ++ packages/dropzone/package.json | 6 +- packages/react-magma-dom/CHANGELOG.md | 3 + packages/react-magma-dom/package.json | 2 +- .../src/components/Input/Input.test.js | 20 +++++ .../src/components/Input/index.tsx | 4 +- .../InputBase/InputBase.stories.tsx | 11 +++ .../src/components/InputBase/index.tsx | 13 ++- .../src/components/Tabs/Tab.tsx | 5 -- .../src/components/Textarea/index.tsx | 4 +- packages/schema-renderer/CHANGELOG.md | 7 ++ packages/schema-renderer/package.json | 6 +- patterns/header/CHANGELOG.md | 7 ++ patterns/header/package.json | 6 +- website/react-magma-docs/CHANGELOG.md | 31 +++++++ website/react-magma-docs/package.json | 12 +-- .../src/pages/api-intro/changelog.mdx | 3 + .../src/pages/design/alert.mdx | 4 +- .../src/pages/design/checkboxes.mdx | 8 +- .../src/pages/design/combobox.mdx | 2 +- .../src/pages/design/indeterminate.mdx | 2 +- .../src/pages/design/input.mdx | 2 +- .../src/pages/design/password-input.mdx | 2 +- .../react-magma-docs/src/pages/design/tag.mdx | 2 +- .../src/pages/design/toast.mdx | 2 +- .../src/pages/design/toggle.mdx | 2 +- 38 files changed, 270 insertions(+), 47 deletions(-) create mode 100644 .changeset/docs-typos.md create mode 100644 .changeset/fix-inputBase.md create mode 100644 .changeset/maxLength-warnings.md create mode 100644 .changeset/pre.json create mode 100644 .changeset/tabprops.md create mode 100644 .github/workflows/publish-next-patch.yml diff --git a/.changeset/docs-typos.md b/.changeset/docs-typos.md new file mode 100644 index 000000000..4c0e5544d --- /dev/null +++ b/.changeset/docs-typos.md @@ -0,0 +1,5 @@ +--- +'react-magma-docs': patch +--- + +Update typos \ No newline at end of file diff --git a/.changeset/fix-inputBase.md b/.changeset/fix-inputBase.md new file mode 100644 index 000000000..768e317df --- /dev/null +++ b/.changeset/fix-inputBase.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Input Base): Fixed case where default value of `0` did not render the default value in the input field. diff --git a/.changeset/maxLength-warnings.md b/.changeset/maxLength-warnings.md new file mode 100644 index 000000000..e7eeb009c --- /dev/null +++ b/.changeset/maxLength-warnings.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Input/Textarea): Fix `maxLength` console warning regarding passing a boolean attribute \ No newline at end of file diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..e430102c6 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,19 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "@react-magma/charts": "4.0.1", + "@react-magma/dropzone": "4.0.0", + "react-magma-dom": "4.1.0", + "@react-magma/schema-renderer": "4.0.0", + "@cengage-patterns/header": "6.0.0", + "react-magma-docs": "5.0.2", + "react-magma-landing": "1.1.2" + }, + "changesets": [ + "docs-typos", + "fix-inputBase", + "maxLength-warnings", + "tabprops" + ] +} diff --git a/.changeset/tabprops.md b/.changeset/tabprops.md new file mode 100644 index 000000000..08b5c7c8b --- /dev/null +++ b/.changeset/tabprops.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +docs(tabs): Update TabProps to remove `isActive`-- this component does not use it. use `activeIndex` on the `TabsContainer` to indicate the active tab. \ No newline at end of file diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 426f771f6..69fe58fcb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,10 +1,10 @@ -name: preview +name: Preview (within a pull request) on: pull_request: branches: - dev - main - - v3 + - 'dev-patch' - 'patch-*' types: [opened, edited, synchronize, reopened] jobs: diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml index 3313a7b91..99c78d29b 100644 --- a/.github/workflows/publish-latest.yml +++ b/.github/workflows/publish-latest.yml @@ -1,4 +1,4 @@ -name: Publish Latest +name: Publish Latest (main) on: push: branches: diff --git a/.github/workflows/publish-next-patch.yml b/.github/workflows/publish-next-patch.yml new file mode 100644 index 000000000..45adcd901 --- /dev/null +++ b/.github/workflows/publish-next-patch.yml @@ -0,0 +1,82 @@ +name: Publish Next Patch (dev-patch) +on: + push: + branches: + - dev-patch +jobs: + build: + runs-on: macos-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup + uses: actions/setup-node@v2 + with: + node-version: '14' + check-latest: true + - name: Check Node version + run: node -v + - name: Update NPM version + run: npm install -g "npm@^7.6.3" + - name: Install + run: npm ci + - name: Test + run: npm test + - name: Coverage + uses: codecov/codecov-action@v1 + - name: Configure NPM + run: | + git config --global user.name 'github-bot' + git config --global user.email 'github-bot@users.noreply.github.com' + echo //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} > .npmrc + - name: Check if Prerelease + id: check_files + uses: andstor/file-existence-action@v1 + with: + files: ".changeset/pre.json" + - name: Enter Prerelease Mode + if: steps.check_files.outputs.files_exists == 'false' + run: | + npm run version:prerelease + git add .changeset/pre.json + - name: Publish + run: | + npm run version:pkgs + git commit -am "chore: enter prerelease mode" + npm run release + git push --follow-tags + - name: Get Alias + id: info + run: | + echo "::set-output name=alias::$(npm run --silent getAlias)" + echo "::set-output name=version::$(npm run --silent getVersion)" + - name: Build Docs + run: npm run build:docs + - name: Build Storybook + run: npm run build:storybook + - name: Deploy Docs to Netlify + uses: nwtgck/actions-netlify@v1.1 + with: + publish-dir: './website/react-magma-docs/public' + github-token: ${{ secrets.GITHUB_TOKEN }} + deploy-message: 'Deploy from GitHub Actions' + enable-pull-request-comment: true + enable-commit-comment: true + overwrites-pull-request-comment: true + alias: next-patch + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} + - name: Deploy Dev Storybook to Netlify + uses: nwtgck/actions-netlify@v1.1 + with: + publish-dir: './storybook-static' + production-branch: patch-3.x.x + github-token: ${{ secrets.GITHUB_TOKEN }} + enable-pull-request-comment: true + enable-commit-comment: true + overwrites-pull-request-comment: false + alias: storybook-preview-dev-patch + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} diff --git a/.github/workflows/publish-next.yml b/.github/workflows/publish-next.yml index 3c1a018ca..339d8921d 100644 --- a/.github/workflows/publish-next.yml +++ b/.github/workflows/publish-next.yml @@ -1,4 +1,4 @@ -name: Publish Next +name: Publish Next (dev) on: push: branches: diff --git a/.github/workflows/publish-patch.yml b/.github/workflows/publish-patch.yml index 1a670f81d..dec656732 100644 --- a/.github/workflows/publish-patch.yml +++ b/.github/workflows/publish-patch.yml @@ -1,4 +1,4 @@ -name: Publish Patch +name: Publish Patch (patch-*) on: push: branches: diff --git a/packages/charts/CHANGELOG.md b/packages/charts/CHANGELOG.md index 84a72a3ff..5df8f4b68 100644 --- a/packages/charts/CHANGELOG.md +++ b/packages/charts/CHANGELOG.md @@ -1,5 +1,12 @@ # @react-magma/charts +## 4.0.2-next.0 + +### Patch Changes + +- Updated dependencies [871820e8d] + - react-magma-dom@4.1.1-next.0 + ## 4.0.1 ### Patch Changes diff --git a/packages/charts/package.json b/packages/charts/package.json index c8638ff31..57b7d91a6 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -1,6 +1,6 @@ { "name": "@react-magma/charts", - "version": "4.0.1", + "version": "4.0.2-next.0", "publishConfig": { "access": "public" }, @@ -30,7 +30,7 @@ "@emotion/styled": "^10.0.27", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0-next.2", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0" }, "dependencies": { @@ -41,7 +41,7 @@ "@emotion/styled": "^10.0.27", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0" } } diff --git a/packages/dropzone/CHANGELOG.md b/packages/dropzone/CHANGELOG.md index e845a5cb4..9be1fbe54 100644 --- a/packages/dropzone/CHANGELOG.md +++ b/packages/dropzone/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 4.0.1-next.0 + +### Patch Changes + +- Updated dependencies [871820e8d] + - react-magma-dom@4.1.1-next.0 + ## 4.0.0 ## 4.0.0-next.1 diff --git a/packages/dropzone/package.json b/packages/dropzone/package.json index 0b5acb162..cf81b2850 100644 --- a/packages/dropzone/package.json +++ b/packages/dropzone/package.json @@ -1,6 +1,6 @@ { "name": "@react-magma/dropzone", - "version": "4.0.0", + "version": "4.0.1-next.0", "publishConfig": { "access": "public" }, @@ -30,7 +30,7 @@ "@emotion/styled": "^10.0.27", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0-next.2", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0" }, "dependencies": { @@ -42,7 +42,7 @@ "@emotion/styled": "^10.0.27", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0" } } diff --git a/packages/react-magma-dom/CHANGELOG.md b/packages/react-magma-dom/CHANGELOG.md index 7f3e45362..7095d19b1 100644 --- a/packages/react-magma-dom/CHANGELOG.md +++ b/packages/react-magma-dom/CHANGELOG.md @@ -1,3 +1,5 @@ + + ## 4.1.0 ### Minor Changes @@ -16,6 +18,7 @@ Please note that in the meantime, `maxLength` is still supported but will need to be changed to `maxCount` as future releases will remove `maxLength` and `hasCharacterCounter`. +- caee2a755: fix(CharCounter): Update calculation for character length on rerender. - d0c69155a: fix(inputbase): Update icon/button position for inputs with two icons. - 6f53d1891: fix(Modal): Added support for closing individual nested modals with escape key. - 395aea21c: fix(Pagination): Spacing, Tooltip inverse state, and VoiceOver support fixes. diff --git a/packages/react-magma-dom/package.json b/packages/react-magma-dom/package.json index b1373f950..56a8e2218 100644 --- a/packages/react-magma-dom/package.json +++ b/packages/react-magma-dom/package.json @@ -1,6 +1,6 @@ { "name": "react-magma-dom", - "version": "4.1.0", + "version": "4.1.1-next.2", "description": "", "main": "dist/index.js", "module": "dist/esm/index.js", diff --git a/packages/react-magma-dom/src/components/Input/Input.test.js b/packages/react-magma-dom/src/components/Input/Input.test.js index 09ba2f793..7e949ba5f 100644 --- a/packages/react-magma-dom/src/components/Input/Input.test.js +++ b/packages/react-magma-dom/src/components/Input/Input.test.js @@ -244,6 +244,26 @@ describe('Input', () => { expect(getByLabelText(iconAriaLabel)).toBeDisabled(); }); + it('should initially render with value of `defaultValue` if no `value` provided', () => { + const labelText = 'test label'; + const defaultValue = 'defaultValue'; + const { getByLabelText } = render( + + ); + + expect(getByLabelText(labelText)).toHaveAttribute('value', defaultValue); + }); + + it('should render with value "0" when `defaultValue` is 0', () => { + const labelText = 'test label'; + const defaultValue = 0; + const { getByLabelText } = render( + + ); + + expect(getByLabelText(labelText)).toHaveAttribute('value', '0'); + }); + it('should render an input with a value passed through', () => { const labelText = 'test label'; const value = 'Test Value'; diff --git a/packages/react-magma-dom/src/components/Input/index.tsx b/packages/react-magma-dom/src/components/Input/index.tsx index 08de74c08..456e75e43 100644 --- a/packages/react-magma-dom/src/components/Input/index.tsx +++ b/packages/react-magma-dom/src/components/Input/index.tsx @@ -45,6 +45,8 @@ export const Input = React.forwardRef( const maxCharacters = typeof maxCount === 'number' ? maxCount : maxLength; + const maxLengthNum = !hasCharacterCounter && maxLength ? maxLength : undefined; + const isInverse = useIsInverse(props.isInverse); const [characterLength, setCharacterLength] = useState( @@ -103,7 +105,7 @@ export const Input = React.forwardRef( inputSize={inputSize} inputLength={characterLength} isInverse={isInverse} - maxLength={!hasCharacterCounter && maxLength} + maxLength={maxLengthNum} onChange={handleChange} onClear={handleClear} ref={ref} diff --git a/packages/react-magma-dom/src/components/InputBase/InputBase.stories.tsx b/packages/react-magma-dom/src/components/InputBase/InputBase.stories.tsx index d4346237e..3642d8ecf 100644 --- a/packages/react-magma-dom/src/components/InputBase/InputBase.stories.tsx +++ b/packages/react-magma-dom/src/components/InputBase/InputBase.stories.tsx @@ -46,6 +46,11 @@ export const Default = args => { labelText="Input" isClearable /> + { isClearable isInverse /> + ( const [value, setValue] = React.useState< string | ReadonlyArray | number - >(props.defaultValue || props.value || ''); + >( + props.defaultValue !== undefined && + props.defaultValue !== null + ? props.defaultValue + : props.value || '' + ); + + const maxLengthNum = !hasCharacterCounter && maxLength ? maxLength : undefined; React.useEffect(() => { if (props.value !== undefined && props.value !== null) { @@ -623,7 +630,7 @@ export const InputBase = React.forwardRef( isPredictive={isPredictive} hasError={hasError} ref={ref} - maxLength={!hasCharacterCounter && maxLength} + maxLength={maxLengthNum} onChange={handleChange} style={inputStyle} theme={theme} @@ -652,7 +659,7 @@ export const InputBase = React.forwardRef( )} - {isClearable && value && ( + {isClearable && value !== '' && ( | React.ReactElement[]; - /** - * If true, the component will display with the active/selected state - * @default false - */ - isActive?: boolean; isInverse?: boolean; /** * @internal diff --git a/packages/react-magma-dom/src/components/Textarea/index.tsx b/packages/react-magma-dom/src/components/Textarea/index.tsx index 8867bd330..dfc9bdd96 100644 --- a/packages/react-magma-dom/src/components/Textarea/index.tsx +++ b/packages/react-magma-dom/src/components/Textarea/index.tsx @@ -77,6 +77,8 @@ export const Textarea = React.forwardRef( const descriptionId = errorMessage || helperMessage ? `${id}__desc` : null; const maxCharacters = typeof maxCount === 'number' ? maxCount : maxLength; + const maxLengthNum = !hasCharacterCounter && maxLength ? maxLength : undefined; + const [value, setValue] = React.useState< string | ReadonlyArray | number >(props.defaultValue || props.value || ''); @@ -130,7 +132,7 @@ export const Textarea = React.forwardRef( (hasCharacterCounter && characterLength > maxCharacters) } id={id} - maxLength={!hasCharacterCounter && maxLength} + maxLength={maxLengthNum} isInverse={isInverse} onChange={handleChange} ref={ref} diff --git a/packages/schema-renderer/CHANGELOG.md b/packages/schema-renderer/CHANGELOG.md index ab11c5f9c..7083757fa 100644 --- a/packages/schema-renderer/CHANGELOG.md +++ b/packages/schema-renderer/CHANGELOG.md @@ -1,5 +1,12 @@ # @react-magma/schema-renderer +## 4.0.1-next.0 + +### Patch Changes + +- Updated dependencies [871820e8d] + - react-magma-dom@4.1.1-next.0 + ## 4.0.0 ## 4.0.0-next.1 diff --git a/packages/schema-renderer/package.json b/packages/schema-renderer/package.json index 4e072db47..5180747ab 100644 --- a/packages/schema-renderer/package.json +++ b/packages/schema-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@react-magma/schema-renderer", - "version": "4.0.0", + "version": "4.0.1-next.0", "publishConfig": { "access": "public" }, @@ -27,7 +27,7 @@ "downshift": "^5.4.5", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0-next.2", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0", "uuid": "^8.3.0" }, @@ -41,7 +41,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "react-dropzone": "11.3.2", - "react-magma-dom": "^4.1.0", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0", "tsdx": "^0.14.1", "uuid": "^8.3.0" diff --git a/patterns/header/CHANGELOG.md b/patterns/header/CHANGELOG.md index a16d01c6d..01b93c353 100644 --- a/patterns/header/CHANGELOG.md +++ b/patterns/header/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 6.0.1-next.0 + +### Patch Changes + +- Updated dependencies [871820e8d] + - react-magma-dom@4.1.1-next.0 + ## 6.0.0 ## 6.0.0-next.1 diff --git a/patterns/header/package.json b/patterns/header/package.json index ffc1d68af..b8a28bc53 100644 --- a/patterns/header/package.json +++ b/patterns/header/package.json @@ -2,7 +2,7 @@ "publishConfig": { "access": "public" }, - "version": "6.0.0", + "version": "6.0.1-next.0", "license": "MIT", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -26,7 +26,7 @@ "downshift": "^5.4.5", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0-next.2", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0", "uuid": "^8.3.0" }, @@ -38,7 +38,7 @@ "downshift": "^5.4.5", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-magma-dom": "^4.1.0", + "react-magma-dom": "^4.1.1-next.0", "react-magma-icons": "^3.0.0", "uuid": "^8.3.0" }, diff --git a/website/react-magma-docs/CHANGELOG.md b/website/react-magma-docs/CHANGELOG.md index 7981718ff..9f3a1e389 100644 --- a/website/react-magma-docs/CHANGELOG.md +++ b/website/react-magma-docs/CHANGELOG.md @@ -1,5 +1,36 @@ # Change Log +## 5.0.3-next.3 + +### Patch Changes + +- c7f957b3f: Update typos + +## 5.0.3-next.2 + +### Patch Changes + +- Updated dependencies [f21d2ac2e] + - react-magma-dom@4.1.1-next.2 + +## 5.0.3-next.1 + +### Patch Changes + +- Updated dependencies [df2934692] + - react-magma-dom@4.1.1-next.1 + +## 5.0.3-next.0 + +### Patch Changes + +- Updated dependencies [871820e8d] + - react-magma-dom@4.1.1-next.0 + - @react-magma/charts@4.0.2-next.0 + - @react-magma/dropzone@4.0.1-next.0 + - @react-magma/schema-renderer@4.0.1-next.0 + - @cengage-patterns/header@6.0.1-next.0 + ## 5.0.2 ### Patch Changes diff --git a/website/react-magma-docs/package.json b/website/react-magma-docs/package.json index cbbc2b1e9..b5bafe53b 100644 --- a/website/react-magma-docs/package.json +++ b/website/react-magma-docs/package.json @@ -1,7 +1,7 @@ { "name": "react-magma-docs", "description": "React Magma docs", - "version": "5.0.2", + "version": "5.0.3-next.3", "private": true, "repository": { "type": "git", @@ -11,15 +11,15 @@ "homepage": "https://react-magma.cengage.com", "dependencies": { "@babel/plugin-transform-react-jsx": "7.10.4", - "@cengage-patterns/header": "6.0.0", + "@cengage-patterns/header": "6.0.1-next.0", "@data-driven-forms/react-form-renderer": "^3.6.0", "@emotion/core": "^10.1.1", "@emotion/styled": "^10.0.27", "@mdx-js/mdx": "^1.5.5", "@mdx-js/react": "^1.5.5", - "@react-magma/charts": "^4.0.1", - "@react-magma/dropzone": "4.0.0", - "@react-magma/schema-renderer": "^4.0.0", + "@react-magma/charts": "^4.0.2-next.0", + "@react-magma/dropzone": "4.0.1-next.0", + "@react-magma/schema-renderer": "^4.0.1-next.0", "buble": "0.19.4", "buffer": "^6.0.3", "core-js": "^3.1.4", @@ -49,7 +49,7 @@ "react-focus-lock": "^2.9.2", "react-helmet": "5.2.0", "react-live": "^2.2.1", - "react-magma-dom": "4.1.0", + "react-magma-dom": "4.1.1-next.2", "react-magma-icons": "^3.0.0", "react-spring": "6.1.9", "semver": "^7.3.4", diff --git a/website/react-magma-docs/src/pages/api-intro/changelog.mdx b/website/react-magma-docs/src/pages/api-intro/changelog.mdx index f11c08c66..a44e9d6f3 100644 --- a/website/react-magma-docs/src/pages/api-intro/changelog.mdx +++ b/website/react-magma-docs/src/pages/api-intro/changelog.mdx @@ -5,6 +5,8 @@ order: 4 + + ## 4.1.0 ### Minor Changes @@ -23,6 +25,7 @@ order: 4 Please note that in the meantime, `maxLength` is still supported but will need to be changed to `maxCount` as future releases will remove `maxLength` and `hasCharacterCounter`. +- caee2a755: fix(CharCounter): Update calculation for character length on rerender. - d0c69155a: fix(inputbase): Update icon/button position for inputs with two icons. - 6f53d1891: fix(Modal): Added support for closing individual nested modals with escape key. - 395aea21c: fix(Pagination): Spacing, Tooltip inverse state, and VoiceOver support fixes. diff --git a/website/react-magma-docs/src/pages/design/alert.mdx b/website/react-magma-docs/src/pages/design/alert.mdx index a468e6e8b..6f5731278 100644 --- a/website/react-magma-docs/src/pages/design/alert.mdx +++ b/website/react-magma-docs/src/pages/design/alert.mdx @@ -80,7 +80,7 @@ Indicates that a system process completed successfully. ### Warning -Indicates that something isn't quite right, but there wasn't an error. +Indicates that something is not quite right, but there wasn't an error. Umm, something's not quite right here. @@ -106,7 +106,7 @@ Inline alerts are embedded within the content of a page. They can provide the us -If an inline alert is being used to communicate some general information to the user, then you can choose to allow them to dismiss the alert to get it out of their way. However, error messages are typically not dismissable by the user and persist until the issue is fixed either by the user or the system. +If an inline alert is being used to communicate some general information to the user, then you can choose to allow them to dismiss the alert to get it out of their way. However, error messages are typically not dismissible by the user and persist until the issue is fixed either by the user or the system.
diff --git a/website/react-magma-docs/src/pages/design/checkboxes.mdx b/website/react-magma-docs/src/pages/design/checkboxes.mdx index 22550233e..5af1b975a 100644 --- a/website/react-magma-docs/src/pages/design/checkboxes.mdx +++ b/website/react-magma-docs/src/pages/design/checkboxes.mdx @@ -10,10 +10,10 @@ import { LeadParagraph } from '../../components/LeadParagraph'; - A checkbox is an input control that allows a user to select one or more options from a number of choices. + A checkbox is an input control that allows a user to select one or more + options from a number of choices. - ## Usage Use checkboxes to: @@ -91,7 +91,7 @@ The default color used for checked checkboxes is primary-500 from the Magma pale

Incorrect

- Don't use multiple colors in the same UI. Pick one and stick with + Do not use multiple colors in the same UI. Pick one and stick with it.

@@ -106,7 +106,7 @@ The default color used for checked checkboxes is primary-500 from the Magma pale

Incorrect

- If you're going to change the color, don't use a neutral color. This + If you are going to change the color, don't use a neutral color. This could be confused with a checkbox that is checked and disabled.

diff --git a/website/react-magma-docs/src/pages/design/combobox.mdx b/website/react-magma-docs/src/pages/design/combobox.mdx index 46f363081..ac0ee3145 100644 --- a/website/react-magma-docs/src/pages/design/combobox.mdx +++ b/website/react-magma-docs/src/pages/design/combobox.mdx @@ -15,7 +15,7 @@ import { LeadParagraph } from '../../components/LeadParagraph'; ## Usage -The list is designed to help the user arrive at a value, but the value does not necessarily have to come from that list. Don't think of it like a Select, but more of a text input with some suggestions. +The list is designed to help the user arrive at a value, but the value does not necessarily have to come from that list. Do not think of it like a Select, but more of a text input with some suggestions. ![](../../images/inputs/combobox-example.png) diff --git a/website/react-magma-docs/src/pages/design/indeterminate.mdx b/website/react-magma-docs/src/pages/design/indeterminate.mdx index a68b17b5d..7d685b6ae 100644 --- a/website/react-magma-docs/src/pages/design/indeterminate.mdx +++ b/website/react-magma-docs/src/pages/design/indeterminate.mdx @@ -15,7 +15,7 @@ import { LeadParagraph } from '../../components/LeadParagraph'; ## Usage -Use the indeterminate state when the checkbox contains a sublist of selections, some of which are selected, and some unselected. +Use the indeterminate state when the checkbox contains a sub list of selections, some of which are selected, and some unselected. View the documentation for checkboxes for more details. diff --git a/website/react-magma-docs/src/pages/design/input.mdx b/website/react-magma-docs/src/pages/design/input.mdx index 530034331..4b3ff09e8 100644 --- a/website/react-magma-docs/src/pages/design/input.mdx +++ b/website/react-magma-docs/src/pages/design/input.mdx @@ -71,7 +71,7 @@ View component API for text areas. ### Password -Use this input when you want keep the user's password masked for security. +Use this input when you want to keep the user's password masked for security. View the password input documentation for more detail. diff --git a/website/react-magma-docs/src/pages/design/password-input.mdx b/website/react-magma-docs/src/pages/design/password-input.mdx index f95b7c33e..f54222747 100644 --- a/website/react-magma-docs/src/pages/design/password-input.mdx +++ b/website/react-magma-docs/src/pages/design/password-input.mdx @@ -10,7 +10,7 @@ import { Link } from 'gatsby'; - Use the password input when you want keep the user's password masked for security. + Use the password input when you want to keep the user's password masked for security.
diff --git a/website/react-magma-docs/src/pages/design/tag.mdx b/website/react-magma-docs/src/pages/design/tag.mdx index 18f89c23e..c8bba9742 100644 --- a/website/react-magma-docs/src/pages/design/tag.mdx +++ b/website/react-magma-docs/src/pages/design/tag.mdx @@ -96,7 +96,7 @@ A leading icon may be added to the tag. This can help clarify the meaning of a t --- -## Dismissable Tags +## Dismissible Tags Tags can include a close button on the right side. Using this close button completely removes it from the UI. This can be especially useful for something like search filters. In this scenario, a tag could be used when applying a filter to a list of search results, and then dismissing the tag removes the filter. diff --git a/website/react-magma-docs/src/pages/design/toast.mdx b/website/react-magma-docs/src/pages/design/toast.mdx index ad00f0f04..1a72d558b 100644 --- a/website/react-magma-docs/src/pages/design/toast.mdx +++ b/website/react-magma-docs/src/pages/design/toast.mdx @@ -83,7 +83,7 @@ Avoid displaying errors or warnings with toasts, but if you have to, then these

Correct

Toasts displaying error messages or warnings should only be manually - dismissable. + dismissible.

diff --git a/website/react-magma-docs/src/pages/design/toggle.mdx b/website/react-magma-docs/src/pages/design/toggle.mdx index 0e9e91c54..804803e5c 100644 --- a/website/react-magma-docs/src/pages/design/toggle.mdx +++ b/website/react-magma-docs/src/pages/design/toggle.mdx @@ -13,7 +13,7 @@ import { LeadParagraph } from '../../components/LeadParagraph'; ## Usage -Toggle switches are a great way to adjust settings when you're simply turning something on and off. The option that the switch controls, as well as the state it's in, should be made clear from the corresponding inline label. +Toggle switches are a great way to adjust settings when you are simply turning something on and off. The option that the switch controls, as well as the state it is in, should be made clear from the corresponding inline label.