From 0f0c9ff74f0113a66a605d44bf6138c6906ca0a2 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 19 Nov 2022 17:57:14 +0200
Subject: [PATCH] editing/suggesting
---
wax-prosemirror-components/index.js | 1 -
.../src/EditingSuggestingService/EditingSuggesting.js | 8 +++++---
.../components}/EditingSuggestingDropDown.js | 4 +++-
3 files changed, 8 insertions(+), 5 deletions(-)
rename {wax-prosemirror-components/src/components/editingSuggesting => wax-prosemirror-services/src/EditingSuggestingService/components}/EditingSuggestingDropDown.js (94%)
diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index c17751b53..bdcac1b0f 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -12,7 +12,6 @@ export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool';
export { default as EditorShortCutsTool } from './src/components/EditorInfo/EditorShortCutsTool';
-export { default as EditingSuggestingDropDown } from './src/components/editingSuggesting/EditingSuggestingDropDown';
export { default as CustomTagInlineComponent } from './src/components/customtag/CustomTagInlineComponent';
export { default as CustomTagInlineOverlayComponent } from './src/components/customtag/CustomTagInlineOverlayCompoment';
export { default as CustomTagBlockComponent } from './src/components/customtag/CustomTagBlockComponent';
diff --git a/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js b/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
index b3d943429..57892b7ba 100644
--- a/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
+++ b/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
@@ -1,9 +1,10 @@
+/* eslint-disable no-unused-vars */
import React from 'react';
import { injectable } from 'inversify';
import { isEmpty } from 'lodash';
import { v4 as uuidv4 } from 'uuid';
-import { EditingSuggestingDropDown } from 'wax-prosemirror-components';
import { Tools } from 'wax-prosemirror-core';
+import EditingSuggestingDropDown from './components/EditingSuggestingDropDown';
@injectable()
export default class EditingSuggesting extends Tools {
@@ -25,12 +26,13 @@ export default class EditingSuggesting extends Tools {
renderTool(view) {
if (isEmpty(view)) return null;
+ // eslint-disable-next-line no-underscore-dangle
return this._isDisplayed ? (
<EditingSuggestingDropDown
+ enabled={this.config.enabled}
+ item={this.toJSON()}
key={uuidv4()}
view={view}
- item={this.toJSON()}
- enabled={this.config.enabled}
/>
) : null;
}
diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
similarity index 94%
rename from wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
rename to wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
index b525220df..4a467e748 100644
--- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
+++ b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
@@ -3,7 +3,7 @@ import React, { useMemo, useContext } from 'react';
import styled from 'styled-components';
import { WaxContext, ReactDropDownStyles } from 'wax-prosemirror-core';
import Dropdown from 'react-dropdown';
-import Icon from '../../helpers/Icon';
+import { Icon } from 'wax-prosemirror-components';
const Wrapper = styled.span`
${ReactDropDownStyles};
@@ -78,6 +78,7 @@ const dropDownOptions = [
{ label: <Suggesting />, value: 'suggesting' },
];
+// eslint-disable-next-line no-unused-vars
const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
const { app, activeView, pmViews } = useContext(WaxContext);
const enableService = app.config.get('config.EnableTrackChangeService')
@@ -110,6 +111,7 @@ const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
() => (
<Wrapper>
<DropdownStyled
+ // eslint-disable-next-line no-unused-vars
onChange={option => {
return enableDisableTrackChanges();
}}
--
GitLab