From 204ae57ff0edec3e37467b295c6f399703976742 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Mon, 14 Mar 2022 11:23:07 +0200 Subject: [PATCH] fix config --- wax-prosemirror-components/src/components/TitleButton.js | 5 +++-- .../editingSuggesting/EditingSuggestingDropDown.js | 4 +++- wax-prosemirror-core/src/Wax.js | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/wax-prosemirror-components/src/components/TitleButton.js b/wax-prosemirror-components/src/components/TitleButton.js index f3c14f7e0..546255f9f 100644 --- a/wax-prosemirror-components/src/components/TitleButton.js +++ b/wax-prosemirror-components/src/components/TitleButton.js @@ -34,9 +34,10 @@ const TitleButton = ({ view = {}, item }) => { useEffect(() => { if (titleNode[0]) { - serviceConfig.updateTitle(titleNode[0].node.textContent); + if (serviceConfig) + serviceConfig.updateTitle(titleNode[0].node.textContent); } else { - serviceConfig.updateTitle(''); + if (serviceConfig) serviceConfig.updateTitle(''); } }, [chapterTitle]); diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js index f939fcee8..7eb5fc877 100644 --- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js +++ b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js @@ -81,7 +81,9 @@ const dropDownOptions = [ const EditingSuggesting = ({ view: { dispatch, state }, item }) => { const { app, activeView, pmViews } = useContext(WaxContext); - const enableService = app.config.get('config.EnableTrackChangeService'); + const enableService = app.config.get('config.EnableTrackChangeService') + ? app.config.get('config.EnableTrackChangeService') + : { toggle: false }; const isDisabled = enableService.toggle; const isEditable = pmViews.main.props.editable(editable => { diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js index b94cde27f..a06ea9def 100644 --- a/wax-prosemirror-core/src/Wax.js +++ b/wax-prosemirror-core/src/Wax.js @@ -62,8 +62,6 @@ const Wax = forwardRef((props, ref) => { helpers.revertNotesSchema(schema); }; - const TrackChange = application.config.get('config.EnableTrackChangeService'); - const Layout = application.container.get('Layout'); if (layout) Layout.setLayout(layout); const WaxRender = Layout.layoutComponent; @@ -82,7 +80,10 @@ const Wax = forwardRef((props, ref) => { ref={ref} serializer={serializer} targetFormat={targetFormat} - TrackChange={TrackChange} + TrackChange={ + application.config.get('config.EnableTrackChangeService') || + undefined + } user={user} value={value} > -- GitLab