Merge branch 'link-command' into 'master'

fix commands for link (enable, updateHref)

See merge request !89

wax-prosemirror-components/src/components/link/LinkComponent.js

@@ -39,12 +39,19 @@ const LinkComponent = ({ mark, setPosition, position }) => {
     [ref.current, href]
   );
 
-  const addLink = () => {
+  const addLinkHref = () => {
     const href = linkHref;
+    const linkMark = state.schema.marks.link;
+    const { tr } = state;
     dispatch(
-      state.tr
-        .removeMark(mark.from, mark.to, state.schema.marks.link)
-        .addMark(mark.from, mark.to, state.schema.marks.link.create({ href }))
+      tr.addMark(
+        mark.from,
+        mark.to,
+        linkMark.create({
+          ...((mark && mark.attrs) || {}),
+          href
+        })
+      )
     );
     activeView.focus();
   };
@@ -56,11 +63,11 @@ const LinkComponent = ({ mark, setPosition, position }) => {
 
   const handleKeyDown = event => {
     if (event.key === "Enter" || event.which === 13) {
-      addLink();
+      addLinkHref();
     }
   };
 
-  const updateLink = () => {
+  const updateLinkHref = () => {
     const { current: { value } } = linkInput;
     setLinkHref(value);
   };
@@ -103,11 +110,11 @@ const LinkComponent = ({ mark, setPosition, position }) => {
       <input
         type="text"
         ref={linkInput}
-        onChange={updateLink}
+        onChange={updateLinkHref}
         onKeyPress={handleKeyDown}
         value={linkHref}
       />
-      <Button primary onClick={addLink}>
+      <Button primary onClick={addLinkHref}>
         {addButtonText}
       </Button>
       <Button onClick={removeLink}>Remove</Button>

wax-prosemirror-services/src/LinkService/LinkTool.js

@@ -22,10 +22,7 @@ export default class LinkTool extends Tools {
 
   get enable() {
     return state => {
-      const { selection } = state;
-      const onSameNode = isEqual(selection.$from.path, selection.$to.path);
-      if (onSameNode && !selection.empty) return true;
-      return false;
+      return Commands.isOnSameTextBlock(state);
     };
   }
 

wax-prosemirror-utilities/src/commands/Commands.js

@@ -59,6 +59,14 @@ const createLink = (state, dispatch) => {
   );
 };
 
+const isOnSameTextBlock = state => {
+  const { selection: { $from, $to, from, to } } = state;
+  if (from !== to && $from.parent === $to.parent && $from.parent.isTextblock) {
+    return true;
+  }
+  return false;
+};
+
 const createComment = (state, dispatch, group) => {
   const { selection: { $from, $to } } = state;
   dispatch(
@@ -75,10 +83,11 @@ const createComment = (state, dispatch, group) => {
 };
 
 export default {
-  markActive,
   blockActive,
   canInsert,
-  createTable,
+  createComment,
   createLink,
-  createComment
+  createTable,
+  markActive,
+  isOnSameTextBlock
 };