custom tags

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';

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';

wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js → 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;

wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js

 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';
 

wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js

 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';

wax-prosemirror-components/src/components/customtag/CustomTagInlineComponent.js → wax-prosemirror-services/src/CustomTagService/components/CustomTagInlineComponent.js

 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 {

wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js → 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;
     }