Skip to content
This repository has been archived by the owner on Mar 4, 2020. It is now read-only.

fix(ButtonGroup): remove 'accessibility' prop and corresponding behavior #605

Merged
merged 4 commits into from
Dec 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### BREAKING CHANGES
- `type` prop is replaced with `color` in `Divider` component @layershifter ([#558](https://github.com/stardust-ui/react/pull/558))
- Remove `createColorVariants` and `setColorLightness` utils @layershifter ([#583](https://github.com/stardust-ui/react/pull/583))
- Remove `accessibility` prop (and corresponding behavior) from `ButtonGroup` @kolaps33 ([#605](https://github.com/stardust-ui/react/pull/605))

### Fixes
- Fix `Provider` is not executing staticStyles with the merged siteVariables @mnajdova ([#559](https://github.com/stardust-ui/react/pull/559))
Expand Down
18 changes: 1 addition & 17 deletions src/components/Button/ButtonGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,11 @@ import {
commonPropTypes,
} from '../../lib'
import Button from './Button'
import { buttonGroupBehavior } from '../../lib/accessibility'
import { Accessibility } from '../../lib/accessibility/types'

export interface ButtonGroupProps
extends UIComponentProps,
ChildrenComponentProps,
ContentComponentProps {
/**
* Accessibility behavior if overridden by the user.
* @default buttonGroupBehavior
*/
accessibility?: Accessibility

/** The buttons contained inside the ButtonGroup. */
buttons?: ShorthandValue[]

Expand All @@ -50,17 +42,9 @@ class ButtonGroup extends UIComponent<Extendable<ButtonGroupProps>, any> {

public static defaultProps = {
as: 'div',
accessibility: buttonGroupBehavior as Accessibility,
kuzhelov marked this conversation as resolved.
Show resolved Hide resolved
}

public renderComponent({
ElementType,
classes,
accessibility,
variables,
styles,
rest,
}): React.ReactNode {
public renderComponent({ ElementType, classes, accessibility, styles, rest }): React.ReactNode {
const { children, content, buttons, circular } = this.props
if (_.isNil(buttons)) {
return (
Expand Down
23 changes: 0 additions & 23 deletions src/lib/accessibility/Behaviors/Button/buttonGroupBehavior.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/lib/accessibility/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export { default as defaultBehavior } from './Behaviors/defaultBehavior'
export { default as buttonBehavior } from './Behaviors/Button/buttonBehavior'
export { default as buttonGroupBehavior } from './Behaviors/Button/buttonGroupBehavior'
export { default as toggleButtonBehavior } from './Behaviors/Button/toggleButtonBehavior'
export { default as imageBehavior } from './Behaviors/Image/imageBehavior'
export { default as menuBehavior } from './Behaviors/Menu/menuBehavior'
Expand Down
2 changes: 0 additions & 2 deletions test/specs/behaviors/behavior-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
basicListBehavior,
basicListItemBehavior,
buttonBehavior,
buttonGroupBehavior,
iconBehavior,
imageBehavior,
inputBehavior,
Expand Down Expand Up @@ -40,7 +39,6 @@ testHelper.addTests(definitions)
testHelper.addBehavior('basicListBehavior', basicListBehavior)
testHelper.addBehavior('basicListItemBehavior', basicListItemBehavior)
testHelper.addBehavior('buttonBehavior', buttonBehavior)
testHelper.addBehavior('buttonGroupBehavior', buttonGroupBehavior)
testHelper.addBehavior('iconBehavior', iconBehavior)
testHelper.addBehavior('inputBehavior', inputBehavior)
testHelper.addBehavior('imageBehavior', imageBehavior)
Expand Down
11 changes: 1 addition & 10 deletions test/specs/components/Button/ButtonGroup-test.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
import { isConformant, handlesAccessibility } from 'test/specs/commonTests'
import { isConformant } from 'test/specs/commonTests'
import ButtonGroup from 'src/components/Button/ButtonGroup'
import implementsCollectionShorthandProp from '../../commonTests/implementsCollectionShorthandProp'
import Button from 'src/components/Button/Button'
import { buttonGroupBehavior } from '../../../../src/lib/accessibility'
import { AccessibilityDefinition } from 'src/lib/accessibility/types'

const buttonGroupImplementsCollectionShorthandProp = implementsCollectionShorthandProp(ButtonGroup)

describe('ButtonGroup', () => {
isConformant(ButtonGroup)
buttonGroupImplementsCollectionShorthandProp('buttons', Button)

describe('accessibility', () => {
handlesAccessibility(ButtonGroup, {
defaultRootRole: 'presentation',
focusZoneDefinition: (buttonGroupBehavior as AccessibilityDefinition).focusZone,
})
})
})