Merge branch 'move-toolGroups' into 'master'

Move tool groups

See merge request !519

editors/demo/src/Editoria/config/config.js

@@ -3,49 +3,30 @@ import { debounce } from 'lodash';
 
 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   ImageService,
-  ImageToolGroupService,
   LinkService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   DisplayBlockLevelService,
-  DisplayToolGroupService,
   TextBlockLevelService,
-  TextToolGroupService,
   NoteService,
-  NoteToolGroupService,
   TrackChangeService,
   CommentsService,
   CodeBlockService,
-  CodeBlockToolGroupService,
   DisplayTextToolGroupService,
   MathService,
   FindAndReplaceService,
   EditingSuggestingService,
-  TrackingAndEditingToolGroupService,
   FullScreenService,
-  FullScreenToolGroupService,
   SpecialCharactersService,
-  SpecialCharactersToolGroupService,
   HighlightService,
-  TextHighlightToolGroupServices,
-  EditorInfoToolGroupServices,
   BottomInfoService,
   TransformService,
-  TransformToolGroupService,
-  TrackOptionsToolGroupService,
-  TrackCommentOptionsToolGroupService,
-  CustomTagInlineToolGroupService,
-  CustomTagBlockToolGroupService,
   CustomTagService,
   disallowPasteImagesPlugin,
-  // YjsService,
   BlockDropDownToolGroupService,
-  // TitleToolGroupService,
   AskAiContentService,
+  // YjsService,
 } from 'wax-prosemirror-services';
 
 import { TablesService, tableEditing, columnResizing } from 'wax-table-service';
@@ -179,7 +160,7 @@ export default {
   ],
   ImageService: { showAlt: true },
   CommentsService: {
-    showTitle: true
+    showTitle: true,
   },
   CustomTagService: {
     tags: [
@@ -201,15 +182,12 @@ export default {
   },
 
   services: [
-    // new TitleToolGroupService(),
     // new YjsService(),
     new BlockDropDownToolGroupService(),
     new AskAiContentService(),
     new CustomTagService(),
     new DisplayBlockLevelService(),
-    new DisplayToolGroupService(),
     new TextBlockLevelService(),
-    new TextToolGroupService(),
     new ListsService(),
     new LinkService(),
     new InlineAnnotationsService(),
@@ -218,32 +196,16 @@ export default {
     new ImageService(),
     new TablesService(),
     new BaseService(),
-    new BaseToolGroupService(),
     new NoteService(),
-    new ImageToolGroupService(),
-    new AnnotationToolGroupService(),
-    new NoteToolGroupService(),
-    new ListToolGroupService(),
     new CodeBlockService(),
-    new CodeBlockToolGroupService(),
     new EditingSuggestingService(),
     new DisplayTextToolGroupService(),
     new MathService(),
     new FindAndReplaceService(),
-    new TrackingAndEditingToolGroupService(),
     new FullScreenService(),
-    new FullScreenToolGroupService(),
     new SpecialCharactersService(),
-    new SpecialCharactersToolGroupService(),
     new HighlightService(),
-    new TextHighlightToolGroupServices(),
-    new EditorInfoToolGroupServices(),
     new BottomInfoService(),
     new TransformService(),
-    new TransformToolGroupService(),
-    new TrackOptionsToolGroupService(),
-    new TrackCommentOptionsToolGroupService(),
-    new CustomTagInlineToolGroupService(),
-    new CustomTagBlockToolGroupService(),
   ],
 };

editors/demo/src/Editoria/config/configMobile.js

 import { emDash, ellipsis } from 'prosemirror-inputrules';
 import {
-  AnnotationToolGroupService,
   ImageService,
   InlineAnnotationsService,
   LinkService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   DisplayBlockLevelService,
-  DisplayToolGroupService,
-  ImageToolGroupService,
   TextBlockLevelService,
-  TextToolGroupService,
   NoteService,
-  NoteToolGroupService,
   EditingSuggestingService,
   TrackChangeService,
   CommentsService,
   CodeBlockService,
-  CodeBlockToolGroupService,
   DisplayTextToolGroupService,
   BlockDropDownToolGroupService,
   HighlightService,
-  TextHighlightToolGroupServices,
-  EditorInfoToolGroupServices,
   BottomInfoService,
   TransformService,
-  TransformToolGroupService,
-  CustomTagInlineToolGroupService,
-  CustomTagBlockToolGroupService,
   CustomTagService,
 } from 'wax-prosemirror-services';
 
@@ -92,9 +79,7 @@ export default {
   //as it matters on how PM treats nodes and marks
   services: [
     new DisplayBlockLevelService(),
-    new DisplayToolGroupService(),
     new TextBlockLevelService(),
-    new TextToolGroupService(),
     new ListsService(),
     new LinkService(),
     new InlineAnnotationsService(),
@@ -103,25 +88,14 @@ export default {
     new ImageService(),
     new TablesService(),
     new BaseService(),
-    new BaseToolGroupService(),
     new NoteService(),
-    new ImageToolGroupService(),
-    new AnnotationToolGroupService(),
-    new NoteToolGroupService(),
-    new ListToolGroupService(),
     new CodeBlockService(),
-    new CodeBlockToolGroupService(),
     new EditingSuggestingService(),
     new DisplayTextToolGroupService(),
     new BlockDropDownToolGroupService(),
     new HighlightService(),
-    new TextHighlightToolGroupServices(),
-    new EditorInfoToolGroupServices(),
     new BottomInfoService(),
     new TransformService(),
-    new TransformToolGroupService(),
     new CustomTagService(),
-    new CustomTagInlineToolGroupService(),
-    new CustomTagBlockToolGroupService(),
   ],
 };

editors/demo/src/HHMI/HHMI.js

@@ -195,7 +195,7 @@ const Hhmi = () => {
         // targetFormat="JSON"
         readonly={readOnly}
         layout={HhmiLayout}
-        onChange={source => console.log(source)}
+        // onChange={source => console.log(source)}
       />
     </>
   );

editors/demo/src/HHMI/config/config.js

 import { emDash, ellipsis } from 'prosemirror-inputrules';
 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   ImageService,
-  ImageToolGroupService,
   LinkService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   DisplayTextToolGroupService,
   MathService,
   FullScreenService,
-  FullScreenToolGroupService,
 } from 'wax-prosemirror-services';
 
 import { QuestionsService } from 'wax-questions-service';
@@ -68,13 +63,8 @@ export default {
     new ImageService(),
     new TablesService(),
     new BaseService(),
-    new BaseToolGroupService(),
-    new ImageToolGroupService(),
-    new AnnotationToolGroupService(),
-    new ListToolGroupService(),
     new DisplayTextToolGroupService(),
     new MathService(),
     new FullScreenService(),
-    new FullScreenToolGroupService(),
   ],
 };

editors/demo/src/NCBI/config/configEnter.js

 import { DefaultSchema } from 'wax-prosemirror-core';
 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   LinkService,
   EnterService,
 } from 'wax-prosemirror-services';
@@ -48,12 +45,9 @@ const configEnter = getContent => ({
   services: [
     new EnterService(),
     new InlineAnnotationsService(),
-    new AnnotationToolGroupService(),
     new LinkService(),
-    new ListToolGroupService(),
     new BaseService(),
     new ListsService(),
-    new BaseToolGroupService(),
   ],
 });
 

editors/demo/src/NCBI/config/configMini.js

 import { DefaultSchema } from 'wax-prosemirror-core';
 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   LinkService,
 } from 'wax-prosemirror-services';
 
@@ -32,12 +29,9 @@ const config = {
 
   services: [
     new InlineAnnotationsService(),
-    new AnnotationToolGroupService(),
     new LinkService(),
-    new ListToolGroupService(),
     new BaseService(),
     new ListsService(),
-    new BaseToolGroupService(),
   ],
 };
 

editors/demo/src/NCBI/config/configTitle.js

 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   BaseService,
-  BaseToolGroupService,
   LinkService,
 } from 'wax-prosemirror-services';
 
@@ -58,10 +56,8 @@ const configTitle = {
 
   services: [
     new InlineAnnotationsService(),
-    new AnnotationToolGroupService(),
     new LinkService(),
     new BaseService(),
-    new BaseToolGroupService(),
   ],
 };
 

editors/demo/src/OEN/config/config.js

@@ -3,48 +3,27 @@ import { debounce } from 'lodash';
 
 import {
   InlineAnnotationsService,
-  AnnotationToolGroupService,
   ImageService,
-  ImageToolGroupService,
   LinkService,
   ListsService,
-  ListToolGroupService,
   BaseService,
-  BaseToolGroupService,
   DisplayBlockLevelService,
-  DisplayToolGroupService,
   TextBlockLevelService,
-  TextToolGroupService,
   NoteService,
-  NoteToolGroupService,
   TrackChangeService,
   CommentsService,
   CodeBlockService,
-  CodeBlockToolGroupService,
   // DisplayTextToolGroupService,
   MathService,
   FindAndReplaceService,
   EditingSuggestingService,
-  TrackingAndEditingToolGroupService,
   FullScreenService,
-  FullScreenToolGroupService,
   SpecialCharactersService,
-  SpecialCharactersToolGroupService,
   HighlightService,
-  TextHighlightToolGroupServices,
-  EditorInfoToolGroupServices,
   BottomInfoService,
   TransformService,
-  TransformToolGroupService,
-  TrackOptionsToolGroupService,
-  TrackCommentOptionsToolGroupService,
-  CustomTagInlineToolGroupService,
-  CustomTagBlockToolGroupService,
   CustomTagService,
   OENContainersService,
-  OENLeftToolGroupService,
-  OENContainersToolGroupService,
-  OENAsideToolGroupService,
 } from 'wax-prosemirror-services';
 import { TablesService, tableEditing, columnResizing } from 'wax-table-service';
 
@@ -203,14 +182,10 @@ export default {
   },
 
   services: [
-    new OENContainersToolGroupService(),
     new OENContainersService(),
-    new OENLeftToolGroupService(),
     new CustomTagService(),
     new DisplayBlockLevelService(),
-    new DisplayToolGroupService(),
     new TextBlockLevelService(),
-    new TextToolGroupService(),
     new ListsService(),
     new LinkService(),
     new InlineAnnotationsService(),
@@ -219,32 +194,16 @@ export default {
     new ImageService(),
     new TablesService(),
     new BaseService(),
-    new BaseToolGroupService(),
     new NoteService(),
-    new ImageToolGroupService(),
-    new AnnotationToolGroupService(),
-    new NoteToolGroupService(),
-    new ListToolGroupService(),
     new CodeBlockService(),
-    new CodeBlockToolGroupService(),
     new EditingSuggestingService(),
     // new DisplayTextToolGroupService(),
     new MathService(),
     new FindAndReplaceService(),
-    new TrackingAndEditingToolGroupService(),
     new FullScreenService(),
-    new FullScreenToolGroupService(),
     new SpecialCharactersService(),
-    new SpecialCharactersToolGroupService(),
     new HighlightService(),
-    new TextHighlightToolGroupServices(),
-    new EditorInfoToolGroupServices(),
     new BottomInfoService(),
     new TransformService(),
-    new TransformToolGroupService(),
-    new TrackOptionsToolGroupService(),
-    new TrackCommentOptionsToolGroupService(),
-    new CustomTagInlineToolGroupService(),
-    new CustomTagBlockToolGroupService(),
   ],
 };

wax-prosemirror-core/index.js

@@ -18,7 +18,6 @@ export { default as EditoriaSchema } from './src/utilities/schema/EditoriaSchema
 export { default as Middleware } from './src/utilities/lib/Middleware';
 export { default as ToolGroup } from './src/utilities/lib/ToolGroup';
 export { default as Tools } from './src/utilities/lib/Tools';
-export { default as Translation } from './src/helpers/Translation';
 
 /* Base Services */
 export { default as LayoutService } from './src/config/defaultServices/LayoutService/LayoutService';
@@ -52,3 +51,8 @@ export { default as Button } from './src/components/Button';
 /* Plugins */
 
 export { default as FakeCursorPlugin } from './src/config/plugins/FakeCursorPlugin';
+
+// export * from 'prosemirror-state';
+// export * from 'prosemirror-view';
+// export * from 'prosemirror-model';
+// export * from 'prosemirror-transform';

wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCuts.js

@@ -59,13 +59,13 @@ const backSpaceShortCut = (state, dispatch, view) => {
 };
 
 const pressEnter = (state, dispatch) => {
+  const { $from, to, from } = state.selection;
+
   // Images
-  if (state.selection.$head.parent.type.name === 'figcaption') {
+  if (state.doc.resolve(from).parent.type.name === 'figcaption') {
     return true;
   }
   if (state.selection.node && state.selection.node.type.name === 'image') {
-    const { $from, to } = state.selection;
-
     const same = $from.sharedDepth(to);
 
     const pos = $from.before(same);
@@ -88,8 +88,8 @@ const pressEnter = (state, dispatch) => {
 
     if (
       title.length === 1 &&
-      state.selection.from > title[0].pos + 1 &&
-      state.selection.from < title[0].pos + title[0].node.nodeSize - 1
+      from > title[0].pos + 1 &&
+      from < title[0].pos + title[0].node.nodeSize - 1
     ) {
       return true;
     }

wax-prosemirror-core/src/helpers/Translation.js

-/* eslint-disable react/prop-types */
-import React from 'react';
-import { isEmpty } from 'lodash';
-import { useTranslation } from 'react-i18next';
-
-const Translation = ({ label, defaultTr }) => {
-  console.log('asdads', defaultTr);
-  const { t, i18n } = useTranslation();
-  return <>{!isEmpty(i18n) && i18n.exists(label) ? t(label) : defaultTr}</>;
-};
-
-export default Translation;

wax-prosemirror-services/index.js

@@ -19,7 +19,6 @@ export { default as SpecialCharactersService } from './src/SpecialCharactersServ
 export { default as HighlightService } from './src/HighlightService/HightlightService';
 export { default as CounterInfoService } from './src/BottomInfoService/CounterInfoService/CounterInfoService';
 export { default as ShortCutsInfoService } from './src/BottomInfoService/ShortCutsInfoService/ShortCutsInfoService';
-
 export { default as BottomInfoService } from './src/BottomInfoService/BottomInfoService';
 export { default as TransformService } from './src/TransformService/TransformService';
 export { default as EditingSuggestingService } from './src/EditingSuggestingService/EditingSuggestingService';
@@ -32,32 +31,12 @@ export { default as OENContainersService } from './src/OENContainersService/OENC
 export { default as YjsService } from './src/YjsService/YjsService';
 export { default as ExternalAPIContentService } from './src/ExternalAPIContentService/ExternalAPIContentService';
 export { default as AskAiContentService } from './src/AiService/AskAiContentService';
+
 /*
 ToolGroups
 */
-export { default as BaseToolGroupService } from './src/WaxToolGroups/BaseToolGroupService/BaseToolGroupService';
-export { default as AnnotationToolGroupService } from './src/WaxToolGroups/AnnotationToolGroupService/AnnotationToolGroupService';
-export { default as ListToolGroupService } from './src/WaxToolGroups/ListToolGroupService/ListToolGroupService';
-export { default as ImageToolGroupService } from './src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService';
-export { default as DisplayToolGroupService } from './src/WaxToolGroups/DisplayToolGroupService/DisplayToolGroupService';
-export { default as TextToolGroupService } from './src/WaxToolGroups/TextToolGroupService/TextToolGroupService';
-export { default as NoteToolGroupService } from './src/WaxToolGroups/NoteToolGroupService/NoteToolGroupService';
-export { default as CodeBlockToolGroupService } from './src/WaxToolGroups/CodeBlockToolGroupService/CodeBlockToolGroupService';
 export { default as DisplayTextToolGroupService } from './src/WaxToolGroups/DisplayTextToolGroupService/DisplayTextToolGroupService';
 export { default as BlockDropDownToolGroupService } from './src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownToolGroupService';
-export { default as TrackingAndEditingToolGroupService } from './src/WaxToolGroups/TrackingAndEditingToolGroupService/TrackingAndEditingToolGroupService';
-export { default as FullScreenToolGroupService } from './src/WaxToolGroups/FullScreenToolGroupService/FullScreenToolGroupService';
-export { default as SpecialCharactersToolGroupService } from './src/WaxToolGroups/SpecialCharactersToolGroupService/SpecialCharactersToolGroupService';
-export { default as TextHighlightToolGroupServices } from './src/WaxToolGroups/TextHighlightToolGroupService/TextHighlightToolGroupService';
-export { default as EditorInfoToolGroupServices } from './src/WaxToolGroups/BottomToolGroupService/InfoToolGroupService/EditorInfoToolGroupService';
-export { default as TransformToolGroupService } from './src/WaxToolGroups/TransformToolGroupService/TransformToolGroupService';
-export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/TrackOptionsToolGroupService/TrackOptionsToolGroupService';
-export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
-export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService';
-export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService';
-export { default as OENContainersToolGroupService } from './src/WaxToolGroups/OENContainersToolGroupService/OENContainersToolGroupService';
-export { default as OENLeftToolGroupService } from './src/WaxToolGroups/OENLeftToolGroupService/OENLeftToolGroupService';
-export { default as TitleToolGroupService } from './src/WaxToolGroups/TitleToolGroupService/TitleToolGroupService';
 /* Plugins */
 
 export { default as disallowPasteImagesPlugin } from './src/ImageService/plugins/disallowPasteImagesPlugin';

wax-prosemirror-services/src/BaseService/index.js

 import UndoService from './UndoService/UndoService';
 import RedoService from './RedoService/RedoService';
 import SaveService from './SaveService/SaveService';
+import BaseToolGroupService from './BaseToolGroupService/BaseToolGroupService';
 
-export default [new UndoService(), new RedoService(), new SaveService()];
+export default [
+  new UndoService(),
+  new RedoService(),
+  new SaveService(),
+  new BaseToolGroupService(),
+];

wax-prosemirror-services/src/WaxToolGroups/BottomToolGroupService/InfoToolGroupService/EditorInfoToolGroupService.js → wax-prosemirror-services/src/BottomInfoService/InfoToolGroupService/EditorInfoToolGroupService.js

 import { Service } from 'wax-prosemirror-core';
 import InfoToolGroup from './InfoTool';
 
-class EditorInfoToolGroupServices extends Service {
-  name = 'EditorInfoToolGroupServices';
+class EditorInfoToolGroupService extends Service {
+  name = 'EditorInfoToolGroupService';
   register() {
     this.container.bind('InfoToolGroup').to(InfoToolGroup);
   }
 }
-export default EditorInfoToolGroupServices;
+export default EditorInfoToolGroupService;

wax-prosemirror-services/src/BottomInfoService/index.js

 import CounterInfoService from './CounterInfoService/CounterInfoService';
 import ShortCutsInfoService from './ShortCutsInfoService/ShortCutsInfoService';
+import EditorInfoToolGroupService from './InfoToolGroupService/EditorInfoToolGroupService';
 
-export default [new CounterInfoService(), new ShortCutsInfoService()];
+export default [
+  new CounterInfoService(),
+  new ShortCutsInfoService(),
+  new EditorInfoToolGroupService(),
+];

wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js

@@ -2,6 +2,7 @@ import { Service } from 'wax-prosemirror-core';
 import codeBlockNode from './schema/codeBlockNode';
 import highlightPlugin from './plugins/highlightPlugin';
 import CodeBlockTool from './CodeBlockTool';
+import CodeBlockToolGroupService from './CodeBlockToolGroupService/CodeBlockToolGroupService';
 import './highlightStyles.css';
 
 export default class CodeBlockService extends Service {
@@ -17,4 +18,6 @@ export default class CodeBlockService extends Service {
       code_block: codeBlockNode,
     });
   }
+
+  dependencies = [new CodeBlockToolGroupService()];
 }