diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js index c66d58b655bff54eec89c85ea4eec9bead1b80da..03ba626ccd16188a8255a6c11dfb24c59a8ae2df 100644 --- a/editors/editoria/src/config/config.js +++ b/editors/editoria/src/config/config.js @@ -1,9 +1,10 @@ import { emDash, ellipsis } from 'prosemirror-inputrules'; import { columnResizing, tableEditing } from 'prosemirror-tables'; import { + InlineAnnotationsService, AnnotationToolGroupService, ImageService, - InlineAnnotationsService, + ImageToolGroupService, LinkService, ListsService, ListToolGroupService, @@ -13,7 +14,6 @@ import { BaseToolGroupService, DisplayBlockLevelService, DisplayToolGroupService, - ImageToolGroupService, TextBlockLevelService, TextToolGroupService, NoteService, @@ -37,10 +37,8 @@ import { BottomInfoService, TransformService, TransformToolGroupService, - TrackOptionsService, TrackOptionsToolGroupService, TrackCommentOptionsToolGroupService, - CustomTagInlineService, CustomTagInlineToolGroupService, CustomTagBlockToolGroupService, CustomTagService, @@ -139,8 +137,6 @@ export default { ], }, - // Always load first CommentsService and LinkService, - //as it matters on how PM treats nodes and marks services: [ new DisplayBlockLevelService(), new DisplayToolGroupService(), diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js index bb65ad62fb6775c8f3ca83cff57cbb1040c9c75c..6b14b78a91fd6cc8258052519fb1a6fac6e0978d 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js @@ -1,8 +1,7 @@ import React from 'react'; -// eslint-disable-next-line import/no-named-as-default,import/no-named-as-default-member -import Tools from '../../lib/Tools'; import { v4 as uuidv4 } from 'uuid'; import { CustomTagInlineComponent } from 'wax-prosemirror-components'; +import Tools from '../../lib/Tools'; class CustomTagInLineTool extends Tools { title = 'Custom Tag Inline'; @@ -11,7 +10,11 @@ class CustomTagInLineTool extends Tools { renderTool(view) { return ( - <CustomTagInlineComponent item={this.toJSON()} key={uuidv4()} view={view} /> + <CustomTagInlineComponent + item={this.toJSON()} + key={uuidv4()} + view={view} + /> ); } } diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagService.js b/wax-prosemirror-services/src/CustomTagService/CustomTagService.js index 4f0f7bd298ab2367d78078776161840f3e0a9d0e..3728cce66c5e39b47788b081904d139933276ab8 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagService.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagService.js @@ -5,4 +5,4 @@ class CustomTagService extends Service { dependencies = CustomService; } -export default CustomTagService; \ No newline at end of file +export default CustomTagService; diff --git a/wax-prosemirror-services/src/CustomTagService/index.js b/wax-prosemirror-services/src/CustomTagService/index.js index 3f2a55179d50faad63730caf2476024bc50eeb36..9be43edbd63afd8bb3494470420268f18637074d 100644 --- a/wax-prosemirror-services/src/CustomTagService/index.js +++ b/wax-prosemirror-services/src/CustomTagService/index.js @@ -1,8 +1,4 @@ -import CustomTagBlockService from "./CustomTagBlockService/CustomTagBlockService"; -import CustomTagInlineService from "./CustomTagInlineService/CustomTagInlineService"; +import CustomTagBlockService from './CustomTagBlockService/CustomTagBlockService'; +import CustomTagInlineService from './CustomTagInlineService/CustomTagInlineService'; - -export default [ - new CustomTagBlockService(), - new CustomTagInlineService() -]; \ No newline at end of file +export default [new CustomTagBlockService(), new CustomTagInlineService()];