bullet list

wax-prosemirror-schema/index.js

@@ -29,3 +29,4 @@ export { default as extractProseNode } from "./src/nodes/extractProseNode";
 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";

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

@@ -355,35 +355,6 @@ const nodes = {
       return [`h${node.attrs.level}`, attrs, 0];
     }
   },
-  // ordered_list: {
-  //   group: "block",
-  //   content: "list_item+",
-  //   attrs: {
-  //     order: { default: 1 },
-  //     track: { default: [] }
-  //   },
-  //   parseDOM: [
-  //     {
-  //       tag: "ol",
-  //       getAttrs(dom) {
-  //         return {
-  //           order: dom.hasAttribute("start") ? +dom.getAttribute("start") : 1,
-  //           track: parseTracks(dom.dataset.track)
-  //         };
-  //       }
-  //     }
-  //   ],
-  //   toDOM(node) {
-  //     const attrs = {};
-  //     if (node.attrs.order !== 1) {
-  //       attrs.start = node.attrs.order;
-  //     }
-  //     if (node.attrs.track.length) {
-  //       attrs["data-track"] = JSON.stringify(node.attrs.track);
-  //     }
-  //     return ["ol", attrs, 0];
-  //   }
-  // },
   bullet_list: {
     group: "block",
     content: "list_item+",

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

+const bulletlist = {
+  group: "block",
+  content: "list_item+",
+  attrs: {
+    track: { default: [] }
+  },
+  parseDOM: [
+    {
+      tag: "ul",
+      getAttrs(hook, next) {
+        Object.assign(hook, {
+          track: parseTracks(hook.dom.dataset.track)
+        });
+        next();
+      }
+    }
+  ],
+  toDOM(hook, next) {
+    const attrs = {};
+    if (hook.node.attrs.track.length) {
+      attrs["data-track"] = JSON.stringify(hook.node.attrs.track);
+    }
+    hook.value = ["ul", attrs, 0];
+    next;
+  }
+};
+
+export default bulletlist;

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

@@ -17,6 +17,7 @@ export default class Annotation extends ToolGroup {
     @inject("Blockquote") blockquote,
     @inject("Image") image,
     @inject("OrderedList") orderedlist,
+    @inject("BulletList") bulletlist,
     @inject("Table") table,
     @inject("TableDropDownOptions") tableDropDownOptions
   ) {
@@ -35,7 +36,8 @@ export default class Annotation extends ToolGroup {
       tableDropDownOptions,
       image,
       table,
-      orderedlist
+      orderedlist,
+      bulletlist
     ];
   }
 

wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js

@@ -11,19 +11,19 @@ export default class BulletList extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      wrapInList(state.config.schema.nodes.bullet_list)(state, dispatch);
+      wrapInList(state.config.schema.nodes.bulletlist)(state, dispatch);
     };
   }
 
-  get enable() {
-    return state => {
-      return wrapInList(state.config.schema.nodes.bullet_list)(state);
-    };
-  }
+  // get enable() {
+  //   return state => {
+  //     return wrapInList(state.config.schema.nodes.bulletlist)(state);
+  //   };
+  // }
 
   get active() {
     return state => {
-      return blockActive(state.config.schema.nodes.bullet_list)(state);
+      return blockActive(state.config.schema.nodes.bulletlist)(state);
     };
   }
 }

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

+import { bulletListNode } from "wax-prosemirror-schema";
 import Service from "wax-prosemirror-core/src/services/Service";
 import BulletList from "./BulletList";
 
@@ -6,6 +7,11 @@ class BulletListService extends Service {
 
   register() {
     this.container.bind("BulletList").to(BulletList);
+
+    this.container
+      .bind("schema")
+      .toConstantValue({ bulletlist: bulletListNode })
+      .whenTargetNamed("node");
   }
 }
 

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

 import { orderedListNode } from "wax-prosemirror-schema";
 import Service from "wax-prosemirror-core/src/services/Service";
 import OrderedList from "./OrderedList";
-console.log(orderedListNode);
+
 class OrderedListService extends Service {
   boot() {}