diff --git a/.changeset/dropdownContent-falseChild.md b/.changeset/dropdownContent-falseChild.md new file mode 100644 index 000000000..c5452931b --- /dev/null +++ b/.changeset/dropdownContent-falseChild.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(DropdownContent): Handle `false` as child \ No newline at end of file diff --git a/.changeset/feat-dropdownExpandableMenu.md b/.changeset/feat-dropdownExpandableMenu.md new file mode 100644 index 000000000..bb700208b --- /dev/null +++ b/.changeset/feat-dropdownExpandableMenu.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': minor +--- + +feat(DropdownExpandableMenu): A new menu item display for the Dropdown component which enables expandable lists by one level diff --git a/.changeset/feat-optionalPerPageSelect.md b/.changeset/feat-optionalPerPageSelect.md new file mode 100644 index 000000000..2a7a56062 --- /dev/null +++ b/.changeset/feat-optionalPerPageSelect.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': minor +--- + +feat(TablePagination): TablePagination component will hide rows per page select when no onRowsPerPageChange argument passed \ No newline at end of file diff --git a/.changeset/fix-dropdownDocsStorybook.md b/.changeset/fix-dropdownDocsStorybook.md new file mode 100644 index 000000000..d4d35c223 --- /dev/null +++ b/.changeset/fix-dropdownDocsStorybook.md @@ -0,0 +1,5 @@ +--- +'react-magma-docs': patch +--- + +fix(Dropdown): Removing Dropdown password examples from docs and Storybook in lieu of future fix to UI bug pertaining to the show / hide button. diff --git a/.changeset/fix-labelsColors.md b/.changeset/fix-labelsColors.md new file mode 100644 index 000000000..bf597d948 --- /dev/null +++ b/.changeset/fix-labelsColors.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(StyledLabel/TabPanel): Update various labels and TabPanel content to be neutral700 (instead of neutral500) \ No newline at end of file diff --git a/.changeset/fix-modalEscape.md b/.changeset/fix-modalEscape.md new file mode 100644 index 000000000..f7e8d2002 --- /dev/null +++ b/.changeset/fix-modalEscape.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Select/Combobox/Dropdown/DatePicker): Added support for closing components that have menus with the escape key inside of modals while retaining an open modal state. diff --git a/.changeset/fix-passInputLarge.md b/.changeset/fix-passInputLarge.md new file mode 100644 index 000000000..11ffc7020 --- /dev/null +++ b/.changeset/fix-passInputLarge.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(PasswordInput): Update placement of Show/Hide button on Large input size diff --git a/.changeset/fix-radioGroup.md b/.changeset/fix-radioGroup.md new file mode 100644 index 000000000..5a8f60461 --- /dev/null +++ b/.changeset/fix-radioGroup.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(RadioGroup): Radio Group label is now a span to improve a11y \ No newline at end of file diff --git a/.changeset/fix-subPageTabs.md b/.changeset/fix-subPageTabs.md new file mode 100644 index 000000000..a6ce9afad --- /dev/null +++ b/.changeset/fix-subPageTabs.md @@ -0,0 +1,5 @@ +--- +'react-magma-docs': patch +--- + +fix(SubPageTabs): Fixed automatic browser scrolling from bottom of page, and fixed window.history manipulation \ No newline at end of file diff --git a/.changeset/inputHeight.md b/.changeset/inputHeight.md new file mode 100644 index 000000000..9102ff748 --- /dev/null +++ b/.changeset/inputHeight.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Input): Update Input height to match button sizes: 40px (instead of 42px) and 56px (instead of 58px) \ No newline at end of file diff --git a/.changeset/nativeSelectHeight.md b/.changeset/nativeSelectHeight.md new file mode 100644 index 000000000..c53082cc8 --- /dev/null +++ b/.changeset/nativeSelectHeight.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(NativeSelect): Update NativeSelect height to match button sizes: 40px (instead of 42px) \ No newline at end of file diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..e2614e492 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,31 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "@react-magma/charts": "4.0.2", + "@react-magma/dropzone": "4.0.1", + "react-magma-dom": "4.1.1", + "@react-magma/schema-renderer": "4.0.1", + "@cengage-patterns/header": "6.0.1", + "react-magma-docs": "5.0.3", + "react-magma-landing": "1.1.2" + }, + "changesets": [ + "dropdown-menuItemRole", + "dropdownContent-falseChild", + "feat-dropdownExpandableMenu", + "feat-optionalPerPageSelect", + "fix-datePickerEscape", + "fix-dropdownDocsStorybook", + "fix-expandableDropdown", + "fix-expandableDropdownDisabled", + "fix-labelsColors", + "fix-modalEscape", + "fix-passInputLarge", + "fix-radioGroup", + "inputHeight", + "nativeSelectHeight", + "sortArrows", + "update-modalPadding" + ] +} diff --git a/.changeset/sortArrows.md b/.changeset/sortArrows.md new file mode 100644 index 000000000..85644d2c0 --- /dev/null +++ b/.changeset/sortArrows.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Table/DataGrid): Update Ascending (point up) and Descending (point down) arrows to match other design systems \ No newline at end of file diff --git a/.changeset/update-modalPadding.md b/.changeset/update-modalPadding.md new file mode 100644 index 000000000..c6494ddc8 --- /dev/null +++ b/.changeset/update-modalPadding.md @@ -0,0 +1,5 @@ +--- +'react-magma-dom': patch +--- + +fix(Modal): Update padding so it's equal on all sides (16px small viewport or 24px for large) diff --git a/packages/charts/CHANGELOG.md b/packages/charts/CHANGELOG.md index 675cbfc54..620f5ca4f 100644 --- a/packages/charts/CHANGELOG.md +++ b/packages/charts/CHANGELOG.md @@ -1,8 +1,13 @@ # @react-magma/charts -## 4.0.2 +## 5.0.0-next.0 + +### Patch Changes -## 4.0.2-next.0 +- Updated dependencies [9a09b8b55] + - react-magma-dom@4.2.0-next.0 + +## 4.0.2 ### Patch Changes @@ -15,22 +20,14 @@ - 1238e8d: Fix handleKeyboardInstructionsButtonKeydown type error -## 4.0.1-next.0 - -### Patch Changes - -- a81b0728b: Fix handleKeyboardInstructionsButtonKeydown type error - ## 4.0.0 -## 4.0.0-next.1 - ### Patch Changes - Updated dependencies [3d00dcc7e] - react-magma-dom@4.1.0-next.2 -## 3.0.1-next.0 +## 3.0.1 ### Patch Changes @@ -43,79 +40,26 @@ - c01c53838: chore: Update to React v17.0.2 -## 3.0.0-next.0 - -### Major Changes - -- c01c53838: chore: Update to React v17.0.2 - -### Patch Changes - -- Updated dependencies [adba671f3] -- Updated dependencies [c01c53838] - - react-magma-dom@4.0.0-next.0 - ## 2.0.1 ### Patch Changes - 7b4549726: Update react-magma-icons version to 2.3.6 -## 2.0.1-next.1 - -### Patch Changes - -- 7b4549726: Update react-magma-icons version to 2.3.6 - -## 2.0.1-next.0 - -### Patch Changes - -- Updated dependencies [f5189569b] - - react-magma-dom@3.2.1-next.0 - ## 2.0.0 ### Patch Changes - 95fc5ae7: chore(npm/node): Update versions -## 2.0.0-next.1 - -### Patch Changes - -- 95fc5ae72: chore(npm/node): Update versions - -## 2.0.0-next.0 - -### Patch Changes - -- Updated dependencies [47015f38] - - react-magma-dom@3.2.0-next.0 - ## 1.0.2 ### Patch Changes - 0de78513: build(deps): Bump react-magma-icons to 2.3.4 -## 1.0.2-next.1 - -### Patch Changes - -- 0de78513c: build(deps): Bump react-magma-icons to 2.3.4 - -## 1.0.2-next.0 - -### Patch Changes - -- Updated dependencies [17ee57afe] - - react-magma-dom@3.1.2-next.0 - ## 1.0.1 -## 1.0.1-next.0 - ### Patch Changes - Updated dependencies [fc8a20bf] @@ -123,15 +67,7 @@ ## 1.0.0 -## 1.0.0-next.0 - ### Patch Changes - Updated dependencies [366b25af] - react-magma-dom@3.0.0-next.0 - -## 0.0.4 - -## 0.0.3 - -## 0.0.2 diff --git a/packages/charts/package.json b/packages/charts/package.json index d0718b3da..54612310f 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -1,6 +1,6 @@ { "name": "@react-magma/charts", - "version": "4.0.2", + "version": "5.0.0-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.1-next.0", + "react-magma-dom": "^4.2.0-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.1", + "react-magma-dom": "^4.2.0-next.0", "react-magma-icons": "^3.0.0" } } diff --git a/packages/dropzone/CHANGELOG.md b/packages/dropzone/CHANGELOG.md index 666b2dfc6..d599f48e8 100644 --- a/packages/dropzone/CHANGELOG.md +++ b/packages/dropzone/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 5.0.0-next.0 + +### Patch Changes + +- Updated dependencies [9a09b8b55] + - react-magma-dom@4.2.0-next.0 + ## 4.0.1 ## 4.0.1-next.0 diff --git a/packages/dropzone/package.json b/packages/dropzone/package.json index 55b66bd4b..a11ab805e 100644 --- a/packages/dropzone/package.json +++ b/packages/dropzone/package.json @@ -1,6 +1,6 @@ { "name": "@react-magma/dropzone", - "version": "4.0.1", + "version": "5.0.0-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.1-next.0", + "react-magma-dom": "^4.2.0-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.1", + "react-magma-dom": "^4.2.0-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 245508521..5fbe5398c 100644 --- a/packages/react-magma-dom/CHANGELOG.md +++ b/packages/react-magma-dom/CHANGELOG.md @@ -1,10 +1,11 @@ + ## 4.1.1 ### Patch Changes -- 0d718be80: fix(Input Base): Fixed case where default value of `0` did not render the default value in the input field. +- 0d718be80: fix(Input Base): Fixed case where default value of `0` did not render the default value in the input field - 0d718be80: fix(Input/Textarea): Fix `maxLength` console warning regarding passing a boolean attribute -- 0d718be80: docs(tabs): Update TabProps to remove `isActive`-- this component does not use it. use `activeIndex` on the `TabsContainer` to indicate the active tab. +- 0d718be80: docs(tabs): Update TabProps to remove `isActive`-- this component does not use it. Use `activeIndex` on the `TabsContainer` to indicate the active tab ## 4.1.0 @@ -44,7 +45,9 @@ - f311f81e9: feat(toggleButton): New Toggle Button component. - ccacca490: (TablePagination, DataGrid) switch dropdown component in table pagination to native select - Deprecations: `dropdownDropDirection` prop is now deprecated +### Deprecations + +- `dropdownDropDirection` prop is now deprecated ### Patch Changes @@ -77,7 +80,7 @@ - 47015f38: feat(characterCounter): New Character Counter component. - 15bdd2d0: fix(characterCounter): Added dynamic aria-live states for screen readers based on the amount of text in the input. - 9daf9331: feat(combobox): `hasPersistentMenu` prop allows for the items list to stay visible after each selection on Multi Comboboxes - fix(combobox): Placeholder on Multi Comboboxes now disappears when at least one item is selected +- fix(combobox): Placeholder on Multi Comboboxes now disappears when at least one item is selected - eb9ed1f3: feat(input): Added left label position capability for Combobox, DatePicker, Input, NativeSelect, PasswordInput, Textarea, and TimePicker. An additional prop of labelWidth has also been implemented for use in a column of Inputs for styling purposes. - 1893be73: feat(button): Subtle button @@ -85,8 +88,8 @@ - 34c2957a: fix(combobox): Combobox items have a default `type="button"` to prevent issues when used inside a form. - 85853eae: fix(MultiCombobox): Support for `isClearable` button for multi comboboxes. `isClearable` button supports `isInverse` for single and multi comboboxes. - feat(combobox): Add `isTypeahead` prop to allow `selectedItems` items that are not in `items`. - feat(combobod): Add `isLoading` prop to `ItemsList` to show a loading state +- feat(combobox): Add `isTypeahead` prop to allow `selectedItems` items that are not in `items`. +- feat(combobod): Add `isLoading` prop to `ItemsList` to show a loading state - 1110043a: fix(table): Add keyboard only focus to tables without a focusable element. - 2fe13d60: docs(table): Storybook example with adjustable number of rows - 95fc5ae7: chore(npm/node): Update versions @@ -125,14 +128,6 @@ ## 3.1.0 -### Minor Changes - -- 04e0a5a8: Release 3.1.0 - -## 3.0.0 - -**NOTE: 3.0.0 was an accidental release. Please use 3.1.x and above** - ### Major Changes - 732f5c908: fix(button): Remove margin from buttons @@ -189,6 +184,10 @@ - 3a27353aa: bug: Dropdowns/Selects are hidden when used inside other components. - 3a27353aa: fix(textarea): Textarea can now be cleared +## 3.0.0 + +**NOTE: 3.0.0 was an accidental release. Please use 3.1.x and above** + ## 2.5.11 ### Patch Changes @@ -201,14 +200,6 @@ ### Patch Changes -- fdc6b27f: fix: adding in reference for list props within the index -- fdc6b27f: fix(accordion.stories.tsx): fix Accordion expand collapse all story & change background to transparent -- fdc6b27f: build(publish-next-yml): Add Deploy Dev Storybook to Netlify step to publish-next. - -## 2.5.10 - -### Patch Changes - - e4c69ca5: fix(alert): add right padding of 12px - 39b2fc49: fix(modal.tsx): Remove title attribute from modals - cbadaccb: feat: List component @@ -233,7 +224,7 @@ ### Patch Changes -This was an accidental release. Please skip this version and upgrade to to 2.5.10. +This was an accidental release. Please skip this version and upgrade to 2.5.10. ## 2.5.8 @@ -250,10 +241,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - 4da10cb8: fix(Tabs): call onChange function when tab panel is changed by keyboard navigation - 1bbd5017: feat(tooltip): add an `open` prop for persistent tooltips - a23e8307: Fix: Added portal back into modal -- c9907a67: feat: Inputs update - - Removed top margin from helper and error messages related to inputs. - +- c9907a67: feat: Inputs update: Removed top margin from helper and error messages related to inputs. - fb4741bd: fix(dropdown): changed link color in dropdown to be dark gray instead of blue - 6cbb9cf2: feat(dropdown): add onOpen property to be called when dropdown opens - edbdda88: Release 2.5.7 @@ -298,12 +286,11 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 ### Patch Changes -- 4980c87a: - disable the clear and action buttons when the input is disabled +- 4980c87a: disable the clear and action buttons when the input is disabled - ebdacccc: refactor(Dropdown): renamed handleMenuBlur to handleDropdownBlur -- 8ee194d4: - extend TypographyProps for HeadingProps - - use Generic for TypographyProps -- aea1e089: - fix(datepicker): keep close button below the helper information - - fix(datepicker): return focus to the previous element after closing helper information +- 8ee194d4: extend TypographyProps for HeadingProps. Use Generic for TypographyProps +- aea1e089: fix(datepicker): keep close button below the helper information +- fix(datepicker): return focus to the previous element after closing helper information - 21c2ac2e: fix(time-picker): prevent time from switching to am when hour changes - 12380623: fix(input): add onClear function to be called when the input is cleared by clicking the clear button @@ -319,18 +306,14 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - 3260fafb: Call onClose function when clicking outside of the dropdown menu - e12e00cf: fix(textarea): default width to 100% - 12d6d789: fix StyledButton: move creation of wrappers outside of StyledButton render function -- 93ecc6c8: Feature/grid - - CSS-Grid component for Magma. Grid styles can be applied as props to quickly and easily create a layout. - +- 93ecc6c8: Feature/grid: CSS-Grid component for Magma. Grid styles can be applied as props to quickly and easily create a layout. - c5cec3f6: Add useFocusLock hook to fix focus jumping around inside of a modal that has components re-rendered. ## 2.5.0 ### Minor Changes -- 8e3559c3: Refactor pagination component to use the new `usePagination` hook. - Create new `Datagrid` component as well as a new `useDataPagination` hook to handle datagrid data. +- 8e3559c3: Refactor pagination component to use the new `usePagination` hook. Create new `Datagrid` component as well as a new `useDataPagination` hook to handle datagrid data. ### Patch Changes @@ -342,19 +325,11 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 ### Minor Changes -- f0a1882f: fix/controlled-toggle - - Update `Toggle` to have controlled and uncontrolled variants akin to `Checkbox` - -- 88e2daee: Feature/datagrid +- f0a1882f: fix/controlled-toggle: Update `Toggle` to have controlled and uncontrolled variants akin to `Checkbox` - Creating a `Datagrid` component with the options to have selectable rows and pagination. +- 88e2daee: Feature/datagrid: Creating a `Datagrid` component with the options to have selectable rows and pagination. As a part of pagination for the `Datagrid` component there is now a `useDataPagination` hook that creates a `pagination` object with the data needed to build any of our pagination components. - As a part of pagination for the `Datagrid` component there is now a `useDataPagination` hook that creates a `pagination` object with the data needed to build any of our pagination components. - -- b7f7e431: feature/transitions: Add `Transition` component. - - A reusable Transition components that allows teams to use the same standard transitions everywhere. +- b7f7e431: feature/transitions: Add `Transition` component. A reusable Transition components that allows teams to use the same standard transitions everywhere. ``` @@ -363,9 +338,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 ``` - c49cda0e: Add new transition component -- 1ceb9951: Feature/accordion - - Adding a new accordion component +- 1ceb9951: Feature/accordion: Adding a new accordion component ### Patch Changes @@ -380,7 +353,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - d0a7687d: fix(input): fix issue with inline inputs rendering too wide (such as search box) -### 2.3.9 (2021-03-24) +### 2.3.9 - chore: update to node 14, npm 7 - fix(checkbox): switch to icon for unchecked state @@ -391,20 +364,20 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - fix(Button): default to ButtonType.button - fix(icons): update remaining v1 icons -### 2.3.8 (2021-03-01) +### 2.3.8 - fix: update dependencies accross packages - docs(checkbox): improve stories -### 2.3.7 (2021-02-22) +### 2.3.7 - feat(icons): release v2.0.0 -### 2.3.6 (2021-02-18) +### 2.3.6 - Note: Version bump only for package react-magma-dom -### 2.3.5 (2021-02-18) +### 2.3.5 - table: duplicate exports (1583413) - ci(stories): add remaining stories @@ -420,13 +393,13 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - fix(label): add labelPosition enum - feature(table): add pagination -### 2.3.4 (2021-01-25) +### 2.3.4 - ci(storybook): add storybook - chore: update contributing guide - fix(tooltip): improve positioning -### 2.3.3 (2021-01-20) +### 2.3.3 - docs(theme): use magma theme in more places - feat(combobox): add isMulti XOR @@ -436,7 +409,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - fix(hyperlink): extend Anchor - fix(theme): remove jsx pragma -### 2.3.2 (2020-12-30) +### 2.3.2 - ci(actions): new github Actions - ci(actions): deploy to Netlify @@ -449,7 +422,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - fix(combobox): support maxHeight - fix(combobox): support customComponents -### [2.3.1-alpha.0](https://github.com/cengage/react-magma/compare/react-magma-dom@2.3.0...react-magma-dom@2.3.1-alpha.0) (2020-12-11) +### [2.3.1-alpha.0](https://github.com/cengage/react-magma/compare/react-magma-dom@2.3.0...react-magma-dom@2.3.1-alpha.0) ### Bug Fixes @@ -457,7 +430,7 @@ This was an accidental release. Please skip this version and upgrade to to 2.5.1 - **dropdown:** add interfaces with default props, testids ([65d15d7](https://github.com/cengage/react-magma/commit/65d15d70131cf45d40622f41e45bd96284729c10)) - **tab:** handle click parameter names fixed ([70dc881](https://github.com/cengage/react-magma/commit/70dc881078a1823c7031eb973362eef369682dc3)) -## [2.3.0](https://github.com/cengage/react-magma/compare/react-magma-dom@2.3.0...react-magma-dom@2.3.0) (2020-12-08) +## [2.3.0](https://github.com/cengage/react-magma/compare/react-magma-dom@2.3.0...react-magma-dom@2.3.0) ### Features diff --git a/packages/react-magma-dom/package.json b/packages/react-magma-dom/package.json index 3af85dc82..0ae222ec9 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.1", + "version": "4.2.0-next.14", "description": "", "main": "dist/index.js", "module": "dist/esm/index.js", diff --git a/packages/react-magma-dom/src/components/Accordion/AccordionButton.tsx b/packages/react-magma-dom/src/components/Accordion/AccordionButton.tsx index 3d9b353a3..0ac8a7702 100644 --- a/packages/react-magma-dom/src/components/Accordion/AccordionButton.tsx +++ b/packages/react-magma-dom/src/components/Accordion/AccordionButton.tsx @@ -20,6 +20,11 @@ import { transparentize } from 'polished'; export interface AccordionButtonProps extends UseAccordionButtonProps, React.HTMLAttributes { + /** + * For use in components repurposing Accordion with custom keyboard navigation with it's elements. + * @internal + */ + customOnKeyDown?: () => void; /** * @internal */ @@ -90,7 +95,13 @@ export const AccordionButton = React.forwardRef< HTMLButtonElement, AccordionButtonProps >((props, forwardedRef) => { - const { children, testId, isInverse: isInverseProp, ...rest } = props; + const { + children, + testId, + customOnKeyDown, + isInverse: isInverseProp, + ...rest + } = props; const theme = React.useContext(ThemeContext); const isInverse = useIsInverse(isInverseProp); @@ -126,7 +137,7 @@ export const AccordionButton = React.forwardRef< isExpanded={isExpanded} isInverse={isInverse} onClick={handleClick} - onKeyDown={handleKeyDown} + onKeyDown={customOnKeyDown ? customOnKeyDown : handleKeyDown} ref={ref} theme={theme} > diff --git a/packages/react-magma-dom/src/components/ButtonGroup/__snapshots__/ButtonGroup.test.js.snap b/packages/react-magma-dom/src/components/ButtonGroup/__snapshots__/ButtonGroup.test.js.snap index ebb409b67..6be520c6a 100644 --- a/packages/react-magma-dom/src/components/ButtonGroup/__snapshots__/ButtonGroup.test.js.snap +++ b/packages/react-magma-dom/src/components/ButtonGroup/__snapshots__/ButtonGroup.test.js.snap @@ -945,7 +945,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] align-items: center; } -.emotion-22 { +.emotion-20 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -963,35 +963,35 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] row-gap: 8px; } -.emotion-22 > button:first-child, -.emotion-22 > div:first-child { +.emotion-20 > button:first-child, +.emotion-20 > div:first-child { margin-left: 0; } -.emotion-22 > button:last-child, -.emotion-22 > div:last-child { +.emotion-20 > button:last-child, +.emotion-20 > div:last-child { margin-right: 0; } -.emotion-22 > div { +.emotion-20 > div { margin: 0 4px; -webkit-flex: none; -ms-flex: none; flex: none; } -.emotion-22 > div button:nth-child(2) { +.emotion-20 > div button:nth-child(2) { width: 40px; } -.emotion-22 > button { +.emotion-20 > button { margin: 0 4px; -webkit-flex: none; -ms-flex: none; flex: none; } -.emotion-12 { +.emotion-11 { display: inline-block; position: relative; } @@ -1101,7 +1101,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] padding-right: 8px; } -.emotion-11 { +.emotion-10 { background: #FFFFFF; border: 1px solid #D4D4D4; border-radius: 8px; @@ -1136,14 +1136,10 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] outline-offset: 0; } -.emotion-11:focus { +.emotion-10:focus { outline: 2px solid #0074B7; } -.emotion-10 { - padding: 4px 0; -} - .emotion-9 { -webkit-align-items: center; -webkit-box-align: center; @@ -1289,7 +1285,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] align-items: center; } -.emotion-22 { +.emotion-20 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -1307,35 +1303,35 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] row-gap: 8px; } -.emotion-22 > button:first-child, -.emotion-22 > div:first-child { +.emotion-20 > button:first-child, +.emotion-20 > div:first-child { margin-left: 0; } -.emotion-22 > button:last-child, -.emotion-22 > div:last-child { +.emotion-20 > button:last-child, +.emotion-20 > div:last-child { margin-right: 0; } -.emotion-22 > div { +.emotion-20 > div { margin: 0 4px; -webkit-flex: none; -ms-flex: none; flex: none; } -.emotion-22 > div button:nth-child(2) { +.emotion-20 > div button:nth-child(2) { width: 40px; } -.emotion-22 > button { +.emotion-20 > button { margin: 0 4px; -webkit-flex: none; -ms-flex: none; flex: none; } -.emotion-12 { +.emotion-11 { display: inline-block; position: relative; } @@ -1445,7 +1441,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] padding-right: 8px; } -.emotion-11 { +.emotion-10 { background: #FFFFFF; border: 1px solid #D4D4D4; border-radius: 8px; @@ -1480,14 +1476,10 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`] outline-offset: 0; } -.emotion-11:focus { +.emotion-10:focus { outline: 2px solid #0074B7; } -.emotion-10 { - padding: 4px 0; -} - .emotion-9 { -webkit-align-items: center; -webkit-box-align: center; @@ -1523,7 +1515,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`]
@@ -1540,7 +1532,7 @@ exports[`ButtonGroup With dropdowns Snapshot: Horizontal & center alignment 1`]