ActiveCommentPlugin to CommentPlugin

wax-prosemirror-components/src/components/comments/CommentBox.js

@@ -40,8 +40,8 @@ export default ({ comment, view, top, dataBox }) => {
     ),
     [animate, setAnimate] = useState(false),
     { attrs: { id } } = comment,
-    activeCommentPlugin = app.PmPlugins.get("activeComment"),
-    activeComment = activeCommentPlugin.getState(activeView.state).comment;
+    commentPlugin = app.PmPlugins.get("commentPlugin"),
+    activeComment = commentPlugin.getState(activeView.state).comment;
 
   let active = false;
   if (activeComment && id === activeComment.attrs.id) active = true;

wax-prosemirror-components/src/components/rightArea/RightArea.js

@@ -15,7 +15,7 @@ import { each, uniqBy, sortBy } from "lodash";
 
 export default ({ area }) => {
   const { view: { main }, app, activeView } = useContext(WaxContext);
-  const activeCommentPlugin = app.PmPlugins.get("activeComment");
+  const commentPlugin = app.PmPlugins.get("commentPlugin");
   const [marksNodes, setMarksNodes] = useState([]);
   const [position, setPosition] = useState();
 
@@ -32,8 +32,7 @@ export default ({ area }) => {
       const id =
         markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id;
 
-      const activeComment = activeCommentPlugin.getState(activeView.state)
-        .comment;
+      const activeComment = commentPlugin.getState(activeView.state).comment;
 
       let isActive = false;
       if (activeComment && id === activeComment.attrs.id) isActive = true;

wax-prosemirror-components/src/components/trackChanges/TrackChangeBox.js

@@ -39,12 +39,8 @@ export default ({ trackChange, view, top, dataBox }) => {
   } else {
     action = `User demo changed paragraph to heading 1`;
   }
-  // const { attrs: { id } } = comment;
 
-  // const activeCommentPlugin = app.PmPlugins.get("activeComment");
-  // const activeComment = activeCommentPlugin.getState(activeView.state).comment;
   let active = false;
-  // if (activeComment && id === activeComment.attrs.id) active = true;
   useEffect(() => {
     setAnimate(true);
   }, []);

wax-prosemirror-plugins/index.js

@@ -2,5 +2,5 @@ export {
   default as TrackChangePlugin
 } from "./src/trackChanges/TrackChangePlugin";
 
-export { default as ActiveComment } from "./src/comments/ActiveComment";
+export { default as CommentPlugin } from "./src/comments/CommentPlugin";
 export { default as WaxSelectionPlugin } from "./src/WaxSelectionPlugin";

wax-prosemirror-plugins/src/comments/ActiveComment.js → wax-prosemirror-plugins/src/comments/CommentPlugin.js

@@ -3,7 +3,7 @@ import { Plugin, PluginKey } from "prosemirror-state";
 import { Decoration, DecorationSet } from "prosemirror-view";
 import { DocumentHelpers } from "wax-prosemirror-utilities";
 
-const activeComment = new PluginKey("activeComment");
+const commentPlugin = new PluginKey("commentPlugin");
 
 const getComment = state => {
   const commentMark = state.schema.marks["comment"];
@@ -52,7 +52,7 @@ const getComment = state => {
 
 export default props => {
   return new Plugin({
-    key: activeComment,
+    key: commentPlugin,
     state: {
       init: (_, state) => {
         return { comment: getComment(state) };
@@ -75,7 +75,7 @@ export default props => {
     },
     props: {
       decorations: state => {
-        const commentPluginState = state && activeComment.getState(state);
+        const commentPluginState = state && commentPlugin.getState(state);
         return commentPluginState.createDecoration;
       }
     }

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

 import Service from "../Service";
 import { commentMark } from "wax-prosemirror-schema";
 import { RightArea, CommentBubbleComponent } from "wax-prosemirror-components";
-import { ActiveComment } from "wax-prosemirror-plugins";
+import { CommentPlugin } from "wax-prosemirror-plugins";
 
-const PLUGIN_KEY = "activeComment";
+const PLUGIN_KEY = "commentPlugin";
 
 export default class CommentsService extends Service {
   name = "CommentsService";
 
   boot() {
-    this.app.PmPlugins.add(PLUGIN_KEY, ActiveComment(PLUGIN_KEY));
+    this.app.PmPlugins.add(PLUGIN_KEY, CommentPlugin(PLUGIN_KEY));
     const createOverlay = this.container.get("CreateOverlay");
     const layout = this.container.get("Layout");
     createOverlay(