From a40a5ef3bff4e6e02a82d79050d5361790bb1cac Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 15 Nov 2022 08:51:40 +0000 Subject: [PATCH] Chore: Fixes --- .../gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx | 2 +- .../services/plugins/hooks/useViewIsReady.ts | 10 ++++++---- packages/tools/website/updateNews.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx index f01c0aa760..57f6ff723e 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx @@ -220,7 +220,7 @@ function Editor(props: EditorProps, ref: any) { cm.off('refresh', editor_resize); cm.off('update', editor_update); // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied - editorParent.current.removeChild(cm.getWrapperElement()); + if (editorParent.current) editorParent.current.removeChild(cm.getWrapperElement()); setEditor(null); }; // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied diff --git a/packages/app-desktop/services/plugins/hooks/useViewIsReady.ts b/packages/app-desktop/services/plugins/hooks/useViewIsReady.ts index 0278f4cf9b..7abe989ddb 100644 --- a/packages/app-desktop/services/plugins/hooks/useViewIsReady.ts +++ b/packages/app-desktop/services/plugins/hooks/useViewIsReady.ts @@ -41,10 +41,12 @@ export default function useViewIsReady(viewRef: any) { viewRef.current.contentWindow.addEventListener('message', onMessage); return () => { - viewRef.current.removeEventListener('dom-ready', onIFrameReady); - viewRef.current.removeEventListener('load', onIFrameReady); - // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied - viewRef.current.contentWindow.removeEventListener('message', onMessage); + if (viewRef.current) { + viewRef.current.removeEventListener('dom-ready', onIFrameReady); + viewRef.current.removeEventListener('load', onIFrameReady); + // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied + viewRef.current.contentWindow.removeEventListener('message', onMessage); + } }; // eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied }, []); diff --git a/packages/tools/website/updateNews.ts b/packages/tools/website/updateNews.ts index 66b0b4a95c..dd8c87767d 100644 --- a/packages/tools/website/updateNews.ts +++ b/packages/tools/website/updateNews.ts @@ -114,7 +114,7 @@ const execApi = async (method: HttpMethod, path: string, body: Record => {