Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Checkbox|Input): fix handling of aria-attributes #1752

Merged
merged 3 commits into from
Jun 15, 2017
Merged

Conversation

layershifter
Copy link
Member

Fixes #1750.

'aria-readonly', 'aria-relevant', 'aria-required', 'aria-selected', 'aria-setsize', 'aria-sort', 'aria-valuemax',
'aria-valuemin', 'aria-valuenow', 'aria-valuetext', 'role',
]

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@levithomason I'm not sure that we should pass all aria attributes to input in these elements, possible you'll want to perform a cleanup in the list.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about we update the existing partitionHTMLInputProps loop to check for aria- prefixed props instead? If /^aria-.*$/.test(prop) then it is automatically an inputProp and not a rest prop.

@codecov-io
Copy link

codecov-io commented Jun 9, 2017

Codecov Report

Merging #1752 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1752      +/-   ##
==========================================
+ Coverage   99.75%   99.75%   +<.01%     
==========================================
  Files         142      142              
  Lines        2466     2467       +1     
==========================================
+ Hits         2460     2461       +1     
  Misses          6        6
Impacted Files Coverage Δ
src/modules/Search/Search.js 100% <100%> (ø) ⬆️
src/modules/Checkbox/Checkbox.js 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 91c3301...7045f15. Read the comment docs.

Copy link
Member Author

@layershifter layershifter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@levithomason I've performed there changes changes that you've requested, looks cleaner 👍

const {
htmlProps = htmlInputProps,
includeAria = true,
} = options
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've applied there our options pattern, so we can control htmlProps and ariaProps separately.

const inputProps = {}
const rest = {}

_.forEach(props, (val, prop) => {
const target = _.includes(htmlProps, prop) ? inputProps : rest
const possibleAria = includeAria && (/^aria-.*$/.test(prop) || prop === 'role')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

role prop belongs to aria attributes, too.

@levithomason
Copy link
Member

Looks great 👍

aabustamante added a commit to aabustamante/Semantic-UI-React that referenced this pull request Jun 15, 2017
* docs(Button): remove redundant prop in Vertical Group example (Semantic-Org#1699)

* feat(typescript): Export generics types (Semantic-Org#1698)

* docs(Dropdown): fix world icon in search example (Semantic-Org#1695)

* Fix MenuExampleText

* add world icon to Dropdown example

* rename 'languageOptions' to 'languages'

* rename  languages   to languageOptions and separate line into two

* separate line of code in two

* separate props in different lines

* remove trailing spaces

* docs(Introduction): fix declarative example (Semantic-Org#1704)

* feat(Item): add unstackable prop to ItemGroup (Semantic-Org#1706)

* feat(Item): add unstackable prop to ItemGroup

* docs(Item): add example for unstackable

* chore(package): commit package-lock.json

* 0.68.4

* docs(changelog): update changelog [ci skip]

* docs(Icon): fix selector for input (Semantic-Org#1714)

* chore(package): update require-dir to version 0.3.2 (Semantic-Org#1721)

https://greenkeeper.io/

* docs(ItemExampleFloated): your description (Semantic-Org#1719)

Fixes error in docs. "AS" is not being recognized.

* chore(package): update react-ace to version 5.0.1 (Semantic-Org#1712)

https://greenkeeper.io/

* fix(Dropdown): add addition item key (Semantic-Org#1727)

* fix(factories): handle falsy `key` values (Semantic-Org#1729)

* fix(Dropdown): fix key handling

* fix(Dropdown): fix key handling

* fix(factories): handle falsy keys

* chore(package): update package-lock.json

* chore(package): update chai-enzyme to 0.7.1 (Semantic-Org#1731)

* feat(typings): expose FormComponent in typings (Semantic-Org#1680)

* Exposed form component in typings to support custom controls in packages.

* Update index.d.ts

* Update index.d.ts

* chore(package): update package-lock.json

* 0.68.5

* docs(changelog): update changelog [ci skip]

* fix(Input): add missing minLength prop (Semantic-Org#1734)

* docs(TableExampleSortable): pass in null when that column shouldn't be sorted (Semantic-Org#1737)

* feat(TextArea): add minHeight property, docs example (Semantic-Org#1679)

* add minHeight property, example to docs

* add rows prop/adjust minHeight prop usage

* mixed(TextArea): update docs, tests, props and typings

* fix(Textarea): move back minHeight prop to style

* fix(htmlInputProps): fix handle on falsy values (Semantic-Org#1746)

* fix(Search): Allow default action if there is no selected result (Semantic-Org#1742)

* docs(images): add missing images, update urls (Semantic-Org#1763)

* fix(Accordion): typings inverted to boolean (Semantic-Org#1758)

Tiny fix for typings, inverted type incorrectly set to string.

* feat(Icon): add ability use the loading prop without an icon (Semantic-Org#1768)

* feat(Button): add focus method (Semantic-Org#1764)

* fix(Dropdown): change active item on keyboard up/down (Semantic-Org#1735)

* fix(Dropdown): change active item on keyboard up/down

* fix(Dropdown): change active item on keyboard up/down

* refactor(Dropdown): simplify move constant

* refactor(Dropdown): remove hidden select (Semantic-Org#1730)

breaking(Dropdown): remove hidden select

* fix(Checkbox|Input): fix handling of aria-attributes (Semantic-Org#1752)

* fix(Checkbox|Input): fix handling of aria-attributes

* feat(htmlInputProps): update handling of aria
@levithomason
Copy link
Member

Released in [email protected]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants