From 5ac99c9d1d2ad7ad3944ffe2e4bc07c2dc834804 Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Tue, 26 Jul 2022 12:49:40 +0200 Subject: [PATCH] fix: Fix select behaviour --- client/src/components/BoardKanban/ListAdd.jsx | 4 ++-- client/src/components/Boards/AddPopup.jsx | 2 +- client/src/components/Card/NameEdit.jsx | 2 +- client/src/components/CardModal/Actions/CommentEdit.jsx | 2 +- .../CardModal/AttachmentAddZone/TextFileAddModal.jsx | 2 +- client/src/components/CardModal/DescriptionEdit.jsx | 2 +- client/src/components/CardModal/Tasks/Add.jsx | 4 ++-- client/src/components/CardModal/Tasks/NameEdit.jsx | 2 +- client/src/components/List/CardAdd.jsx | 4 ++-- client/src/components/Login/Login.jsx | 2 +- client/src/components/ProjectAddModal/ProjectAddModal.jsx | 2 +- client/src/components/UserAddPopup/UserAddPopup.jsx | 2 +- client/src/components/UserEmailEditStep/UserEmailEditStep.jsx | 2 +- .../components/UserPasswordEditStep/UserPasswordEditStep.jsx | 2 +- .../components/UserUsernameEditStep/UserUsernameEditStep.jsx | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/client/src/components/BoardKanban/ListAdd.jsx b/client/src/components/BoardKanban/ListAdd.jsx index 59226976..01805afe 100755 --- a/client/src/components/BoardKanban/ListAdd.jsx +++ b/client/src/components/BoardKanban/ListAdd.jsx @@ -48,11 +48,11 @@ const ListAdd = React.memo(({ onCreate, onClose }) => { }, [onCreate, data, setData, selectNameField]); useEffect(() => { - nameField.current.select(); + nameField.current.focus(); }, []); useDidUpdate(() => { - nameField.current.select(); + nameField.current.focus(); }, [selectNameFieldState]); return ( diff --git a/client/src/components/Boards/AddPopup.jsx b/client/src/components/Boards/AddPopup.jsx index 0fa0f8c1..ff378ac5 100755 --- a/client/src/components/Boards/AddPopup.jsx +++ b/client/src/components/Boards/AddPopup.jsx @@ -35,7 +35,7 @@ const AddStep = React.memo(({ onCreate, onClose }) => { }, [onCreate, onClose, data]); useEffect(() => { - nameField.current.select(); + nameField.current.focus(); }, []); return ( diff --git a/client/src/components/Card/NameEdit.jsx b/client/src/components/Card/NameEdit.jsx index 7bf77f2c..82446174 100644 --- a/client/src/components/Card/NameEdit.jsx +++ b/client/src/components/Card/NameEdit.jsx @@ -79,7 +79,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) => useEffect(() => { if (isOpened) { - field.current.ref.current.select(); + field.current.ref.current.focus(); } }, [isOpened]); diff --git a/client/src/components/CardModal/Actions/CommentEdit.jsx b/client/src/components/CardModal/Actions/CommentEdit.jsx index 9c3ba8e3..7a679a79 100755 --- a/client/src/components/CardModal/Actions/CommentEdit.jsx +++ b/client/src/components/CardModal/Actions/CommentEdit.jsx @@ -76,7 +76,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref) useEffect(() => { if (isOpened) { - textField.current.ref.current.select(); + textField.current.ref.current.focus(); } }, [isOpened]); diff --git a/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx b/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx index 9423d0b5..524196d8 100644 --- a/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx +++ b/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx @@ -37,7 +37,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => { }, [content, onCreate, onClose, data]); useEffect(() => { - nameField.current.select(); + nameField.current.focus(); }, []); return ( diff --git a/client/src/components/CardModal/DescriptionEdit.jsx b/client/src/components/CardModal/DescriptionEdit.jsx index c0794281..1eb24952 100755 --- a/client/src/components/CardModal/DescriptionEdit.jsx +++ b/client/src/components/CardModal/DescriptionEdit.jsx @@ -66,7 +66,7 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate }, useEffect(() => { if (isOpened) { - field.current.ref.current.select(); + field.current.ref.current.focus(); } }, [isOpened]); diff --git a/client/src/components/CardModal/Tasks/Add.jsx b/client/src/components/CardModal/Tasks/Add.jsx index 1e57677d..34259221 100755 --- a/client/src/components/CardModal/Tasks/Add.jsx +++ b/client/src/components/CardModal/Tasks/Add.jsx @@ -81,12 +81,12 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => { useEffect(() => { if (isOpened) { - nameField.current.ref.current.select(); + nameField.current.ref.current.focus(); } }, [isOpened]); useDidUpdate(() => { - nameField.current.ref.current.select(); + nameField.current.ref.current.focus(); }, [selectNameFieldState]); if (!isOpened) { diff --git a/client/src/components/CardModal/Tasks/NameEdit.jsx b/client/src/components/CardModal/Tasks/NameEdit.jsx index 247baf26..d4f4bc51 100755 --- a/client/src/components/CardModal/Tasks/NameEdit.jsx +++ b/client/src/components/CardModal/Tasks/NameEdit.jsx @@ -71,7 +71,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) => useEffect(() => { if (isOpened) { - field.current.ref.current.select(); + field.current.ref.current.focus(); } }, [isOpened]); diff --git a/client/src/components/List/CardAdd.jsx b/client/src/components/List/CardAdd.jsx index 4b3f81e0..ec35dde9 100755 --- a/client/src/components/List/CardAdd.jsx +++ b/client/src/components/List/CardAdd.jsx @@ -65,12 +65,12 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => { useEffect(() => { if (isOpened) { - nameField.current.ref.current.select(); + nameField.current.ref.current.focus(); } }, [isOpened]); useDidUpdate(() => { - nameField.current.ref.current.select(); + nameField.current.ref.current.focus(); }, [selectNameFieldState]); return ( diff --git a/client/src/components/Login/Login.jsx b/client/src/components/Login/Login.jsx index b3684b52..a7e67a16 100755 --- a/client/src/components/Login/Login.jsx +++ b/client/src/components/Login/Login.jsx @@ -83,7 +83,7 @@ const Login = React.memo( }, [onAuthenticate, data]); useEffect(() => { - emailOrUsernameField.current.select(); + emailOrUsernameField.current.focus(); }, []); useEffect(() => { diff --git a/client/src/components/ProjectAddModal/ProjectAddModal.jsx b/client/src/components/ProjectAddModal/ProjectAddModal.jsx index ba29f9ec..1418080f 100755 --- a/client/src/components/ProjectAddModal/ProjectAddModal.jsx +++ b/client/src/components/ProjectAddModal/ProjectAddModal.jsx @@ -33,7 +33,7 @@ const ProjectAddModal = React.memo(({ defaultData, isSubmitting, onCreate, onClo }, [onCreate, data]); useEffect(() => { - nameField.current.select(); + nameField.current.focus(); }, []); return ( diff --git a/client/src/components/UserAddPopup/UserAddPopup.jsx b/client/src/components/UserAddPopup/UserAddPopup.jsx index f7970fa8..07079702 100755 --- a/client/src/components/UserAddPopup/UserAddPopup.jsx +++ b/client/src/components/UserAddPopup/UserAddPopup.jsx @@ -88,7 +88,7 @@ const UserAddStep = React.memo( }, [onCreate, data]); useEffect(() => { - emailField.current.select(); + emailField.current.focus(); }, []); useEffect(() => { diff --git a/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx b/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx index 953528fa..80b0d09d 100644 --- a/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx +++ b/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx @@ -87,7 +87,7 @@ const UserEmailEditStep = React.memo( }, [email, usePasswordConfirmation, onUpdate, onClose, data]); useEffect(() => { - emailField.current.select(); + emailField.current.focus(); }, []); useEffect(() => { diff --git a/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx b/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx index f1730c05..c8be8f65 100644 --- a/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx +++ b/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx @@ -70,7 +70,7 @@ const UserPasswordEditStep = React.memo( }, [usePasswordConfirmation, onUpdate, data]); useEffect(() => { - passwordField.current.select(); + passwordField.current.focus(); }, []); useEffect(() => { diff --git a/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx b/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx index d13e017c..35c44583 100644 --- a/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx +++ b/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx @@ -87,7 +87,7 @@ const UserUsernameEditStep = React.memo( }, [username, usePasswordConfirmation, onUpdate, onClose, data]); useEffect(() => { - usernameField.current.select(); + usernameField.current.focus(); }, []); useEffect(() => {