diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js index 546430148465ae618dc579979978f830f0351445..124f1de51b8d2b061f4f697af228e9950369c543 100644 --- a/wax-prosemirror-components/index.js +++ b/wax-prosemirror-components/index.js @@ -6,7 +6,5 @@ export { default as Icon } from './src/helpers/Icon'; export { default as ToolGroupComponent } from './src/components/ToolGroupComponent'; export { default as ToolGroups } from './src/components/ToolGroups'; -export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool'; - export { default as Tabs } from './src/ui/tabs/Tabs'; export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools'; diff --git a/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/CounterInfoTool.js b/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/CounterInfoTool.js index 3e412198993f3996ed821a558bdccbab2f6d3ef4..d091d542589c975b1e16c690e4fd870ef760644c 100644 --- a/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/CounterInfoTool.js +++ b/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/CounterInfoTool.js @@ -1,13 +1,12 @@ import React from 'react'; import { isEmpty } from 'lodash'; import { injectable } from 'inversify'; -import { EditorInfoTool } from 'wax-prosemirror-components'; import { Tools } from 'wax-prosemirror-core'; +import EditorInfoTool from './components/EditorInfoTool'; @injectable() class CounterInfoTool extends Tools { title = 'Counter Info'; - icon = 'highlight'; name = 'CounterInfo'; get run() { @@ -15,7 +14,7 @@ class CounterInfoTool extends Tools { } get enable() { - return state => { + return () => { return true; }; } @@ -24,7 +23,7 @@ class CounterInfoTool extends Tools { if (isEmpty(view)) return null; // eslint-disable-next-line no-underscore-dangle return this._isDisplayed ? ( - <EditorInfoTool key="CounterInfo" item={this.toJSON()} view={view} /> + <EditorInfoTool item={this.toJSON()} key="CounterInfo" view={view} /> ) : null; } } diff --git a/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js b/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/components/EditorInfoTool.js similarity index 99% rename from wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js rename to wax-prosemirror-services/src/BottomInfoService/CounterInfoService/components/EditorInfoTool.js index d78734e93f2444d72baf4d7b0ef6d09f5198c710..3b9001c0276452a57735f340b4d2952496d539d5 100644 --- a/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js +++ b/wax-prosemirror-services/src/BottomInfoService/CounterInfoService/components/EditorInfoTool.js @@ -14,7 +14,7 @@ import { DocumentHelpers, useOnClickOutside, } from 'wax-prosemirror-core'; -import MenuButton from '../../../ui/buttons/MenuButton'; +import { MenuButton } from 'wax-prosemirror-components'; const Wrapper = styled.div` font-size: 0;