From 6e4592690a15ead04e80b7398ebbaac3b97d9e7e Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Wed, 14 Jul 2021 21:23:54 +0300 Subject: [PATCH] fix dropdown on more tools --- editors/demo/src/Editors.js | 2 +- .../src/components/ToolGroupComponent.js | 2 +- wax-prosemirror-components/src/components/ToolGroups.js | 2 +- wax-prosemirror-components/src/ui/buttons/Dropdown.js | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js index fa52e3550..977ed5cc4 100644 --- a/editors/demo/src/Editors.js +++ b/editors/demo/src/Editors.js @@ -54,7 +54,7 @@ const Editors = () => { case 'ncbi': break; default: - return <Editoria />; + return <HHMI />; } }; diff --git a/wax-prosemirror-components/src/components/ToolGroupComponent.js b/wax-prosemirror-components/src/components/ToolGroupComponent.js index 361f3a494..48d71f905 100644 --- a/wax-prosemirror-components/src/components/ToolGroupComponent.js +++ b/wax-prosemirror-components/src/components/ToolGroupComponent.js @@ -36,8 +36,8 @@ const ToolGroupComponent = ({ view, tools, name }) => { {toolsShown} {rest.length > 0 && ( <Dropdown - iconName="more" dropComponent={<DropWrapper>{rest}</DropWrapper>} + iconName="more" title="Show more tools" /> )} diff --git a/wax-prosemirror-components/src/components/ToolGroups.js b/wax-prosemirror-components/src/components/ToolGroups.js index 374fb6f15..0c60229d3 100644 --- a/wax-prosemirror-components/src/components/ToolGroups.js +++ b/wax-prosemirror-components/src/components/ToolGroups.js @@ -12,8 +12,8 @@ const ToolGroups = ({ toolGroups, view }) => { return ( <ToolGroupComponent key={uuidv4()} - view={view} tools={toolGroup._tools} + view={view} // title={this.title} // name={name} /> diff --git a/wax-prosemirror-components/src/ui/buttons/Dropdown.js b/wax-prosemirror-components/src/ui/buttons/Dropdown.js index 4dd6147fa..3085205fc 100644 --- a/wax-prosemirror-components/src/ui/buttons/Dropdown.js +++ b/wax-prosemirror-components/src/ui/buttons/Dropdown.js @@ -34,7 +34,10 @@ const Dropdown = props => { disabled={disabled} iconName={iconName} label={label} - onMouseDown={() => setIsOpen(!isOpen)} + onMouseDown={event => { + event.preventDefault(); + setIsOpen(!isOpen); + }} title={title} /> -- GitLab