shortcut tool

wax-prosemirror-components/index.js

@@ -3,11 +3,10 @@ export { default as UndoRedoButton } from './src/components/UndoRedoButton';
 export { default as MenuButton } from './src/ui/buttons/MenuButton';
 export { default as icons } from './src/icons/icons';
 export { default as Icon } from './src/helpers/Icon';
-export { default as TitleButton } from './src/components/TitleButton';
 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';
-export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool';
-export { default as EditorShortCutsTool } from './src/components/EditorInfo/EditorShortCutsTool';

wax-prosemirror-services/src/BottomInfoService/ShortCutsInfoService/ShortCutsInfoTool.js

 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { EditorShortCutsTool } from 'wax-prosemirror-components';
 import { Tools } from 'wax-prosemirror-core';
+import EditorShortCutsTool from './components/EditorShortCutsTool';
 
 @injectable()
 class ShortCutsInfoTool extends Tools {
@@ -14,7 +14,7 @@ class ShortCutsInfoTool extends Tools {
   }
 
   get enable() {
-    return state => {
+    return () => {
       return true;
     };
   }

wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js → wax-prosemirror-services/src/BottomInfoService/ShortCutsInfoService/components/EditorShortCutsTool.js

@@ -2,7 +2,7 @@ import React, { useMemo, useState, useRef } from 'react';
 import styled from 'styled-components';
 import { grid } from '@pubsweet/ui-toolkit';
 import { v4 as uuidv4 } from 'uuid';
-import MenuButton from '../../ui/buttons/MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
 import { useOnClickOutside } from 'wax-prosemirror-core';
 
 const Wrapper = styled.div`

wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js

 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { TitleButton } from 'wax-prosemirror-components';
 import { Commands, DocumentHelpers, Tools } from 'wax-prosemirror-core';
+import TitleButton from './components/TitleButton';
 import checkLevelFromConfig from '../HeadingService/checkLevelFromConfig';
 
 @injectable()

wax-prosemirror-components/src/components/TitleButton.js → wax-prosemirror-services/src/DisplayBlockLevel/TitleService/components/TitleButton.js

 /* eslint react/prop-types: 0 */
 import React, { useContext, useMemo, useEffect } from 'react';
 import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core';
-import MenuButton from '../ui/buttons/MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
 
 const TitleButton = ({ view = {}, item }) => {
   const { active, icon, label, run, select, title } = item;