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.

Sign up for GitHub

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

Jump to bottom

Change inline edit for a11y, eslint updates #1332

Merged
merged 4 commits into from
May 1, 2018
Merged

Change inline edit for a11y, eslint updates #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b54bb7
Change inline edit to be able to Tab from inline edit to 'x' button. …
donnieberg Apr 20, 2018
15b2329
Merge branch 'a11y-inlineEdit-fix' of https://github.com/donnieberg/d…
interactivellama Apr 26, 2018
477bbeb
Merge branch 'master' of github.com:salesforce/design-system-react in…
interactivellama Apr 27, 2018
4c67a47
Keep eslint config versions locked
interactivellama Apr 27, 2018
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
16 changes: 13 additions & 3 deletions components/forms/input/inline.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const defaultProps = {
class InlineEdit extends React.Component {
constructor (props) {
super(props);

this.state = {
isEditing: false,
value: null,
Expand All @@ -115,6 +116,13 @@ class InlineEdit extends React.Component {
}
}

handleCloseBtnClick = () => {
this.endEditMode();
setTimeout(() => {
this.editButtonRef.focus();
}, 100);
};

endEditMode = (option) => {
if (this.willSave) {
clearTimeout(this.willSave);
Expand Down Expand Up @@ -212,15 +220,18 @@ class InlineEdit extends React.Component {
category="utility"
name="close"
position="right"
onClick={this.endEditMode}
tabIndex="-1"
onBlur={this.handleBlur}
onClick={this.handleCloseBtnClick}
/>
) : null
}
disabled={disabled}
inlineEditTrigger={
<Button
assistiveText={assistiveText}
buttonRef={(component) => {
if (component) this.editButtonRef = component;
}}
className="slds-m-left_x-small"
disabled={disabled}
iconName="edit"
Expand All @@ -229,7 +240,6 @@ class InlineEdit extends React.Component {
variant="icon"
/>
}
onBlur={this.handleBlur}
onChange={this.handleChange}
onClick={!this.state.isEditing ? this.triggerEditMode : null}
onKeyDown={this.handleKeyDown}
Expand Down
Loading