From 16d26405874d0b9d4ad79324fb0f3941a823eef3 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sat, 4 Mar 2023 18:47:29 +0200 Subject: [PATCH] fix focus on button --- .../src/MatchingService/components/DropDownComponent.js | 4 +++- .../src/TablesService/components/TableDropDown.js | 3 +++ .../QuestionsDropDownToolGroupService/DropDownComponent.js | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js index 188a7ad6b..11095d073 100644 --- a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js +++ b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js @@ -163,10 +163,12 @@ const DropComponent = ({ getPos, node, view }) => { aria-haspopup disabled={isDisabled} onKeyDown={e => { - e.preventDefault(); if (e.keyCode === 40) { itemRefs.current[0].current.focus(); } + if (e.keyCode === 27) { + openCloseMenu(); + } }} onMouseDown={openCloseMenu} type="button" diff --git a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js index 442403cce..1ee58b2ac 100644 --- a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js +++ b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js @@ -141,6 +141,9 @@ const TableDropDown = ({ item }) => { if (e.keyCode === 40) { itemRefs.current[0].current.focus(); } + if (e.keyCode === 27) { + openCloseMenu(); + } }} onMouseDown={openCloseMenu} type="button" diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js index a5487e967..fac5f300b 100644 --- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js +++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js @@ -200,6 +200,9 @@ const DropDownComponent = ({ view, tools }) => { if (e.keyCode === 40) { itemRefs.current[0].current.focus(); } + if (e.keyCode === 27) { + openCloseMenu(); + } }} onMouseDown={openCloseMenu} type="button" -- GitLab