From de3a33c451120583151b451d9411344fb731de2e Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Wed, 1 Mar 2023 07:55:44 +0200 Subject: [PATCH] fixes --- .../TablesService/components/TableDropDown.js | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js index a849dbd80..e41518292 100644 --- a/wax-prosemirror-services/src/TablesService/components/TableDropDown.js +++ b/wax-prosemirror-services/src/TablesService/components/TableDropDown.js @@ -33,6 +33,7 @@ const DropDownButton = styled.button` `; const DropDownMenu = styled.div` + visibility: ${props => (props.isOpen ? 'visible' : 'hidden')}; background: #fff; display: flex; flex-direction: column; @@ -88,9 +89,12 @@ const TableDropDown = ({ item }) => { if (isDisabled) setIsOpen(false); }, [isDisabled]); - const openCloseMenu = e => { - // e.preventDefault(); + const openCloseMenu = () => { if (!isDisabled) setIsOpen(!isOpen); + if (isOpen) + setTimeout(() => { + activeView.focus(); + }); }; const onKeyDown = (e, index) => { @@ -142,26 +146,20 @@ const TableDropDown = ({ item }) => { > <span>Table Options</span> <StyledIcon name="expand" /> </DropDownButton> - <DropDownMenu - role="menu" - style={{ visibility: isOpen ? 'visible' : 'hidden' }} - > + <DropDownMenu isOpen={isOpen} role="menu"> {dropDownOptions.map((option, index) => { itemRefs.current[index] = itemRefs.current[index] || createRef(); return ( <span key={option.value} - onClick={e => { + onClick={() => { item.run( activeView.state, activeView.dispatch, tablesFn[option.value], ); - setTimeout(() => { - activeView.focus(); - }); - openCloseMenu(e); + openCloseMenu(); }} onKeyDown={e => onKeyDown(e, index)} ref={itemRefs.current[index]} -- GitLab