From 442d506ab22e85f6d2c5c58dba68b931eefd3ef2 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Thu, 6 Jan 2022 09:46:33 +0200 Subject: [PATCH] temp --- wax-prosemirror-core/src/WaxView.js | 8 ++++++-- wax-prosemirror-services/src/ImageService/Image.js | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js index c0cb922a3..ab6e2d0af 100644 --- a/wax-prosemirror-core/src/WaxView.js +++ b/wax-prosemirror-core/src/WaxView.js @@ -9,6 +9,7 @@ import React, { forwardRef, useImperativeHandle, } from 'react'; +import { isEmpty } from 'lodash'; import applyDevTools from 'prosemirror-dev-tools'; import { EditorState } from 'prosemirror-state'; import { EditorView } from 'prosemirror-view'; @@ -127,8 +128,11 @@ const WaxView = forwardRef((props, ref) => { the central point of each transaction */ context.setTransaction(transaction); - - if (!transaction.getMeta('outsideView')) { + console.log(isEmpty(transaction.getMeta('imagePlaceHolder$'))); + if ( + !transaction.getMeta('outsideView') || + isEmpty(transaction.getMeta('imagePlaceHolder$')) + ) { context.updateView( { main: view, diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js index 501a6aa0c..2364d816d 100644 --- a/wax-prosemirror-services/src/ImageService/Image.js +++ b/wax-prosemirror-services/src/ImageService/Image.js @@ -1,5 +1,7 @@ /* eslint-disable no-underscore-dangle */ -import React from 'react'; +import React, { useContext, useRef, useEffect } from 'react'; +import { WaxContext } from 'wax-prosemirror-core'; + import { v4 as uuidv4 } from 'uuid'; import { isEmpty } from 'lodash'; import { injectable } from 'inversify'; @@ -37,6 +39,8 @@ class Image extends Tools { renderTool(view) { if (isEmpty(view)) return null; + const context = useContext(WaxContext); + console.log(context.activeViewId); const upload = fileUpload( view, this.config.get('fileUpload'), -- GitLab