From 2fe5b419d59e606407fb69ed623a1c30876811c0 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Mon, 22 Mar 2021 14:43:09 +0200 Subject: [PATCH] remove-view --- .../src/components/HeadingsDropDown.js | 2 +- .../src/components/TableDropDown.js | 8 ++++++-- wax-prosemirror-services/src/MenuService/Menu.js | 6 ++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/wax-prosemirror-components/src/components/HeadingsDropDown.js b/wax-prosemirror-components/src/components/HeadingsDropDown.js index 18d1a5712..79bdab12b 100644 --- a/wax-prosemirror-components/src/components/HeadingsDropDown.js +++ b/wax-prosemirror-components/src/components/HeadingsDropDown.js @@ -20,12 +20,12 @@ const dropDownOptions = [ const HeadingsDropDown = ({ dispatch, state, item }) => ( <DropdownStyled - options={dropDownOptions} onChange={option => { Commands.setBlockType(state.config.schema.nodes.heading, { level: option.value, })(state, dispatch); }} + options={dropDownOptions} placeholder="Choose heading" select={item.select && item.select(state)} /> diff --git a/wax-prosemirror-components/src/components/TableDropDown.js b/wax-prosemirror-components/src/components/TableDropDown.js index 4712ce351..5fa779bc5 100644 --- a/wax-prosemirror-components/src/components/TableDropDown.js +++ b/wax-prosemirror-components/src/components/TableDropDown.js @@ -52,7 +52,7 @@ const dropDownOptions = [ { label: 'Toggle header cells', value: 'toggleHeaderCell' }, ]; -const TableDropDown = ({ view: { dispatch, state }, item }) => { +const TableDropDown = ({ item }) => { const { activeView } = useContext(WaxContext); const [selectedOption, setSelectedOption] = useState(''); @@ -61,7 +61,11 @@ const TableDropDown = ({ view: { dispatch, state }, item }) => { () => ( <DropdownStyled onChange={option => { - item.run(activeView.state, dispatch, tablesFn[option.value]); + item.run( + activeView.state, + activeView.dispatch, + tablesFn[option.value], + ); setSelectedOption(option.value); setTimeout(() => { diff --git a/wax-prosemirror-services/src/MenuService/Menu.js b/wax-prosemirror-services/src/MenuService/Menu.js index 13bde1557..aa4d67a40 100644 --- a/wax-prosemirror-services/src/MenuService/Menu.js +++ b/wax-prosemirror-services/src/MenuService/Menu.js @@ -35,11 +35,9 @@ class Menu { render() { return () => { - const { - view: { main }, - activeView, - } = useContext(WaxContext); + const { activeView } = useContext(WaxContext); const Bar = useMemo(() => ( + // eslint-disable-next-line react/no-this-in-sfc <MenuWrapper items={this.toolGroups} view={activeView || {}} /> )); return <>{Bar}</>; -- GitLab