From 85eb7150a73e8c7409fb1e01d08a82d671699642 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 20 Oct 2020 20:29:20 +0300
Subject: [PATCH] force note rerender if last removed
---
editors/editoria/src/layout/EditoriaLayout.js | 9 +++++++-
.../src/NoteService/NoteComponent.js | 22 +++++++++----------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index dcc88856a..01a1f64e5 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -165,6 +165,10 @@ const NotesArea = ComponentPlugin('notesArea');
const RightArea = ComponentPlugin('rightArea');
const WaxOverlays = ComponentPlugin('waxOverlays');
+const HiddenArea = styled.span`
+ display: none;
+`;
+
const EditoriaLayout = ({ editor }) => {
const {
view: { main },
@@ -204,7 +208,7 @@ const EditoriaLayout = ({ editor }) => {
{showNotes && (
<NotesAreaContainer>
<NotesContainer id="notes-container">
- <NotesArea />
+ <NotesArea view={main} />
</NotesContainer>
<CommentsContainerNotes>
<RightArea area="notes" />
@@ -216,6 +220,9 @@ const EditoriaLayout = ({ editor }) => {
</Main>
<WaxOverlays />
+ <HiddenArea>
+ <NotesArea view={main} />
+ </HiddenArea>
</Wrapper>
</ThemeProvider>
);
diff --git a/wax-prosemirror-services/src/NoteService/NoteComponent.js b/wax-prosemirror-services/src/NoteService/NoteComponent.js
index e1edb6abd..b48136662 100644
--- a/wax-prosemirror-services/src/NoteService/NoteComponent.js
+++ b/wax-prosemirror-services/src/NoteService/NoteComponent.js
@@ -1,3 +1,4 @@
+/* eslint react/prop-types: 0 */
import React, { useContext, useState, useMemo } from 'react';
import useDeepCompareEffect from 'use-deep-compare-effect';
import { differenceBy } from 'lodash';
@@ -5,23 +6,20 @@ import { WaxContext } from 'wax-prosemirror-core';
import { DocumentHelpers } from 'wax-prosemirror-utilities';
import NoteEditor from './NoteEditor';
-export default () => {
+export default ({ view: view }) => {
+ if (typeof view === 'undefined') return null;
const context = useContext(WaxContext);
- const {
- view,
- view: { main },
- } = context;
const {
state: { tr },
- } = main;
+ } = view;
const [notes, setNotes] = useState([]);
const cleanUpNoteViews = () => {
if (view) {
const currentNotes = DocumentHelpers.findChildrenByType(
- main.state.doc,
- main.state.schema.nodes.footnote,
+ view.state.doc,
+ view.state.schema.nodes.footnote,
true,
);
if (notes.length > currentNotes.length) {
@@ -31,7 +29,7 @@ export default () => {
});
tr.setMeta('notesChanged', true);
- main.dispatch(tr);
+ view.dispatch(tr);
// const newView = Object.keys(view).reduce((object, key) => {
// if (key !== difference[0].node.attrs.id) {
@@ -44,12 +42,12 @@ export default () => {
};
useDeepCompareEffect(() => {
- setNotes(updateNotes(main));
+ setNotes(updateNotes(view));
cleanUpNoteViews();
- }, [updateNotes(main)]);
+ }, [updateNotes(view)]);
const noteComponent = useMemo(
- () => <NoteEditor notes={notes} view={main} />,
+ () => <NoteEditor notes={notes} view={view} />,
[notes],
);
return <>{noteComponent}</>;
--
GitLab