From f8bbc6d72f225d1c64777c65e06a094165573518 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 19 Nov 2022 18:04:52 +0200
Subject: [PATCH] custom tags
---
wax-prosemirror-components/index.js | 4 ----
wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js | 2 +-
.../customtag => ui/tabs}/CustomTagBlockComponent.js | 2 +-
.../CustomTagInlineService/CustomTagInlineService.js | 2 +-
.../CustomTagInlineService/CustomTagInlineTool.js | 2 +-
.../components}/CustomTagInlineComponent.js | 5 ++---
.../components/CustomTagInlineOverlayComponent.js | 6 +++---
7 files changed, 9 insertions(+), 14 deletions(-)
rename wax-prosemirror-components/src/{components/customtag => ui/tabs}/CustomTagBlockComponent.js (98%)
rename {wax-prosemirror-components/src/components/customtag => wax-prosemirror-services/src/CustomTagService/components}/CustomTagInlineComponent.js (95%)
rename wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js => wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js (97%)
diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index bdcac1b0f..a34e71fe9 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -11,7 +11,3 @@ export { default as Tabs } from './src/ui/tabs/Tabs';
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 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-components/src/ui/tabs/BlockElementGroup.js b/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js
index f5a4ca81c..732742cf4 100644
--- a/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js
+++ b/wax-prosemirror-components/src/ui/tabs/BlockElementGroup.js
@@ -2,7 +2,7 @@
import React, { useState } from 'react';
import { th } from '@pubsweet/ui-toolkit';
import styled from 'styled-components';
-import CustomTagBlockComponent from '../../components/customtag/CustomTagBlockComponent';
+import CustomTagBlockComponent from './CustomTagBlockComponent';
import OENToolGroup from './OENToolGroup';
import BlockElement from './BlockElement';
import Icon from '../../helpers/Icon';
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js b/wax-prosemirror-components/src/ui/tabs/CustomTagBlockComponent.js
similarity index 98%
rename from wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js
rename to wax-prosemirror-components/src/ui/tabs/CustomTagBlockComponent.js
index 2e1ddd8e9..e83e150b7 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js
+++ b/wax-prosemirror-components/src/ui/tabs/CustomTagBlockComponent.js
@@ -2,7 +2,7 @@ import React, { useContext, useMemo, useRef, useState, useEffect } from 'react';
import styled, { css } from 'styled-components';
import { WaxContext } from 'wax-prosemirror-core';
import { v4 as uuidv4 } from 'uuid';
-import MenuButton from '../../ui/buttons/MenuButton';
+import MenuButton from '../buttons/MenuButton';
const activeStyles = css`
pointer-events: none;
diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
index a7da291b3..69c102282 100644
--- a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
+++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
@@ -1,5 +1,5 @@
import { Service } from 'wax-prosemirror-core';
-import { CustomTagInlineOverlayComponent } from 'wax-prosemirror-components';
+import CustomTagInlineOverlayComponent from '../components/CustomTagInlineOverlayComponent';
import customtagInlineMark from './schema/customtagInlineMark';
import CustomTagInlineTool from './CustomTagInlineTool';
diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js
index d2fa2eff5..521a91c5e 100644
--- a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js
+++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js
@@ -1,7 +1,7 @@
import React from 'react';
import { v4 as uuidv4 } from 'uuid';
-import { CustomTagInlineComponent } from 'wax-prosemirror-components';
import { Tools } from 'wax-prosemirror-core';
+import CustomTagInlineComponent from '../components/CustomTagInlineComponent';
class CustomTagInLineTool extends Tools {
title = 'Custom Tag Inline';
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagInlineComponent.js b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineComponent.js
similarity index 95%
rename from wax-prosemirror-components/src/components/customtag/CustomTagInlineComponent.js
rename to wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineComponent.js
index e85a8ee4b..ddbfb3ff7 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagInlineComponent.js
+++ b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineComponent.js
@@ -1,8 +1,7 @@
import React, { useMemo, useState, useContext } from 'react';
-import { WaxContext } from 'wax-prosemirror-core';
import styled from 'styled-components';
-
-import MenuButton from '../../ui/buttons/MenuButton';
+import { WaxContext } from 'wax-prosemirror-core';
+import { MenuButton } from 'wax-prosemirror-components';
const StyledButton = styled(MenuButton)`
svg {
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
similarity index 97%
rename from wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
rename to wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
index 61ff08bc3..da3549006 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
+++ b/wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineOverlayComponent.js
@@ -10,7 +10,7 @@ import styled from 'styled-components';
import { grid, th } from '@pubsweet/ui-toolkit';
import { WaxContext } from 'wax-prosemirror-core';
import { v4 as uuidv4 } from 'uuid';
-import Icon from '../../helpers/Icon';
+import { Icon } from 'wax-prosemirror-components';
const IconRemove = styled(Icon)`
cursor: pointer;
@@ -80,7 +80,7 @@ const Item = styled.div`
const initialArr = [];
-const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
+const CustomTagInlineOverlayComponent = ({ mark }) => {
const ref = useRef(null);
const [inputValue, setInputValue] = useState('');
@@ -111,7 +111,7 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
const [allTags, setAllTags] = useState(configTags);
let image = false;
- state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+ state.doc.nodesBetween($from.pos, $to.pos, node => {
if (node.type.name === 'image') {
image = true;
}
--
GitLab