From 99c23dbb3a175283bf22b23e806b4c645766fc5b Mon Sep 17 00:00:00 2001 From: Giannis kopanas <jkopanas@gmail.com> Date: Thu, 15 Apr 2021 16:03:42 +0300 Subject: [PATCH] fix(core): pass node view getPos --- wax-prosemirror-core/src/PortalContext.js | 10 +++++++++- wax-prosemirror-core/src/WaxView.js | 2 -- .../src/PortalService/components/PortalComponent.js | 5 ++++- .../src/PortalService/portalPlugin.js | 3 +-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/wax-prosemirror-core/src/PortalContext.js b/wax-prosemirror-core/src/PortalContext.js index 23e5ca9a1..78e364e18 100644 --- a/wax-prosemirror-core/src/PortalContext.js +++ b/wax-prosemirror-core/src/PortalContext.js @@ -11,11 +11,19 @@ export default props => { const [portal, setPortal] = useState({ element: {}, component: {}, - createPortal: (element, component) => { + node: {}, + view: {}, + getPos: () => {}, + decorations: [], + createPortal: (element, component, node, view, getPos, decorations) => { setPortal({ ...portal, element, component, + node, + view, + getPos, + decorations, }); }, }); diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js index 7f6e5b04f..96f64b890 100644 --- a/wax-prosemirror-core/src/WaxView.js +++ b/wax-prosemirror-core/src/WaxView.js @@ -62,8 +62,6 @@ export default props => { plugins: context.app.getPlugins(), }); - console.log(options); - // debugger; view = new EditorView( { mount: node }, { diff --git a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js index 3cb912db1..09a863ac5 100644 --- a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js +++ b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js @@ -5,10 +5,13 @@ import { v4 as uuidv4 } from 'uuid'; import { isEmpty } from 'lodash'; export default () => { - const { element, component } = useContext(PortalContext); + const { element, component, node, view, getPos, decorations } = useContext( + PortalContext, + ); const [portals, setPortals] = useState([]); + console.log(node, view, getPos(), decorations); useEffect(() => { if (!isEmpty(element)) { portals.push({ dom: element, component, active: true }); diff --git a/wax-prosemirror-services/src/PortalService/portalPlugin.js b/wax-prosemirror-services/src/PortalService/portalPlugin.js index 29e649994..c4482c7af 100644 --- a/wax-prosemirror-services/src/PortalService/portalPlugin.js +++ b/wax-prosemirror-services/src/PortalService/portalPlugin.js @@ -8,8 +8,7 @@ class ReactNodeView { this.dom.id = 'portalId'; this.dom.classList.add('portal'); - console.log('dddd'); - createPortal(this.dom, Component); + createPortal(this.dom, Component, node, view, getPos, decorations); } update(node) { -- GitLab