feat: finish list tools

wax-prosemirror-schema/index.js

@@ -30,3 +30,4 @@ export { default as extractPoetryNode } from "./src/nodes/extractPoetryNode";
 export { default as titleNode } from "./src/nodes/titleNode";
 export { default as orderedListNode } from "./src/nodes/orderedListNode";
 export { default as bulletListNode } from "./src/nodes/bulletListNode";
+export { default as listItemNode } from "./src/nodes/listItemNode";

wax-prosemirror-schema/src/editoria/nodes.js

@@ -325,30 +325,6 @@ const nodes = {
       return [`h${node.attrs.level}`, attrs, 0];
     }
   },
-  list_item: {
-    content: "block+",
-    attrs: {
-      track: { default: [] }
-    },
-    parseDOM: [
-      {
-        tag: "li",
-        getAttrs(dom) {
-          return {
-            track: parseTracks(dom.dataset.track)
-          };
-        }
-      }
-    ],
-    toDOM(node) {
-      const attrs = {};
-      if (node.attrs.track.length) {
-        attrs["data-track"] = JSON.stringify(node.attrs.track);
-      }
-      return ["li", attrs, 0];
-    },
-    defining: true
-  },
   blockquote: {
     content: "block+",
     group: "block",

wax-prosemirror-services/src/AnnotationService/Annotation.js

@@ -18,6 +18,8 @@ export default class Annotation extends ToolGroup {
     @inject("Image") image,
     @inject("OrderedList") orderedlist,
     @inject("BulletList") bulletlist,
+    @inject("JoinUp") joinup,
+    @inject("Lift") lift,
     @inject("Table") table,
     @inject("TableDropDownOptions") tableDropDownOptions
   ) {
@@ -37,7 +39,9 @@ export default class Annotation extends ToolGroup {
       image,
       table,
       orderedlist,
-      bulletlist
+      bulletlist,
+      joinup,
+      lift
     ];
   }
 

wax-prosemirror-services/src/AnnotationService/tools/JoinUp.js

-import { joinUp } from "prosemirror-commands";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
-
-@injectable()
-export default class JoinUp extends Tools {
-  title = "Join with above block";
-  content = icons.join_up;
-
-  get run() {
-    return joinUp;
-  }
-
-  get enable() {
-    return joinUp;
-  }
-
-  select(state) {
-    return joinUp(state);
-  }
-}

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

@@ -2,10 +2,12 @@ import BulletListService from "./BulletListService/BulletListService";
 import OrderedListService from "./OrderedListService/OrderedListService";
 import JoinUpService from "./JoinUpService/JoinUpService";
 import LiftService from "./LiftService/LiftService";
+import ListItemService from "./ListItemService/ListItemService";
 
 export default [
   new BulletListService(),
   new OrderedListService(),
   new JoinUpService(),
-  new LiftService()
+  new LiftService(),
+  new ListItemService()
 ];