Skip to content

fix: allow input focus when readonly #5014

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

Merged
chasestarr merged 3 commits into from
Aug 29, 2022
Merged

fix: allow input focus when readonly #5014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5e0d77
fix: allow input focus when readonly
selfdocumentingcode Jul 5, 2022
aa410c2
fix: port readonly focus change to tsx counterparts
selfdocumentingcode Aug 28, 2022
e9e4adb
Merge branch 'master' into master
chasestarr Aug 29, 2022
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
12 changes: 4 additions & 8 deletions src/input/base-input.js.flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,13 @@ class BaseInput<T: HTMLInputElement | HTMLTextAreaElement> extends React.Compone
};

onFocus = (e: SyntheticFocusEvent<T>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: SyntheticFocusEvent<T>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

getInputType() {
Expand Down
12 changes: 4 additions & 8 deletions src/input/base-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,13 @@ class BaseInput<T extends HTMLInputElement | HTMLTextAreaElement> extends React.
};

onFocus = (e: FocusEvent<T>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: FocusEvent<T>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

getInputType() {
Expand Down
14 changes: 5 additions & 9 deletions src/input/input.js.flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,17 @@ class Input extends React.Component<InputPropsT, InternalStateT> {
* customers shouldn't have to manage themselves, such as input's focus state.
*/
state = {
isFocused: (this.props.autoFocus && !this.props.readOnly) || false,
isFocused: this.props.autoFocus || false,
};

onFocus = (e: SyntheticFocusEvent<HTMLInputElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: SyntheticFocusEvent<HTMLInputElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

render() {
Expand Down
14 changes: 5 additions & 9 deletions src/input/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,17 @@ class Input extends React.Component<InputProps, InternalState> {
* customers shouldn't have to manage themselves, such as input's focus state.
*/
state = {
isFocused: (this.props.autoFocus && !this.props.readOnly) || false,
isFocused: this.props.autoFocus || false,
};

onFocus = (e: FocusEvent<HTMLInputElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: FocusEvent<HTMLInputElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

render() {
Expand Down
14 changes: 5 additions & 9 deletions src/textarea/textarea.js.flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,17 @@ class Textarea extends React.Component<TextareaPropsT, { isFocused: boolean }> {
};

state = {
isFocused: (this.props.autoFocus && !this.props.readOnly) || false,
isFocused: this.props.autoFocus || false,
};

onFocus = (e: SyntheticFocusEvent<HTMLTextAreaElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: SyntheticFocusEvent<HTMLTextAreaElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

render() {
Expand Down
14 changes: 5 additions & 9 deletions src/textarea/textarea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,17 @@ class Textarea extends React.Component<
};

state = {
isFocused: (this.props.autoFocus && !this.props.readOnly) || false,
isFocused: this.props.autoFocus || false,
};

onFocus = (e: FocusEvent<HTMLTextAreaElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: true });
this.props.onFocus(e);
}
this.setState({ isFocused: true });
this.props.onFocus(e);
};

onBlur = (e: FocusEvent<HTMLTextAreaElement>) => {
if (!this.props.readOnly) {
this.setState({ isFocused: false });
this.props.onBlur(e);
}
this.setState({ isFocused: false });
this.props.onBlur(e);
};

render() {
Expand Down