Merge branch 'fix/link_not_work_in_firefox' into develop

src/components/MenuCommands/Link/AddLinkCommandButton.vue

@@ -31,13 +31,24 @@ export default class AddLinkCommandButton extends Mixins(i18nMixin) {
   @Inject() readonly editorStateOptions!: EditorStateOptions;
 
   openApplyLinkControl (): void {
+    const { editor } = this.editorContext;
+    const { state, view } = editor;
+    const { tr } = state; // current trascation, need to restore when confirmed
+
     MessageBox.prompt('', this.t('editor.extensions.Link.add.control.title'), {
       confirmButtonText: this.t('editor.extensions.Link.add.control.confirm'),
       cancelButtonText: this.t('editor.extensions.Link.add.control.cancel'),
       inputPlaceholder: this.t('editor.extensions.Link.add.control.placeholder'),
       roundButton: true,
     // @ts-ignore
     }).then(({ value: href }) => {
+      // https://github.com/Leecason/element-tiptap/issues/119
+      // in Firefox 77, when message-box confirm button clicked, editor will lose focus
+      // and re-focus on closeDialog's next tick, https://github.com/ElemeFE/element/blob/dev/src/utils/aria-dialog.js#L66
+      // but re-focus will lose the previous selection, so add link will not work
+      // here need to restore the previous trascation
+      view.dispatch(tr);
+
       this.editorContext.commands.link({ href });
     }).catch(() => {
 

src/components/MenuCommands/Link/EditLinkCommandButton.vue

@@ -32,6 +32,10 @@ export default class EditLinkCommandButton extends Mixins(i18nMixin) {
   readonly initUrl!: string;
 
   openEditLinkControl (): void {
+    const { editor } = this.editorContext;
+    const { state, view } = editor;
+    const { tr } = state; // current trascation, need to restore when confirmed
+
     MessageBox.prompt('', this.t('editor.extensions.Link.edit.control.title'), {
       confirmButtonText: this.t('editor.extensions.Link.edit.control.confirm'),
       cancelButtonText: this.t('editor.extensions.Link.edit.control.cancel'),
@@ -40,6 +44,13 @@ export default class EditLinkCommandButton extends Mixins(i18nMixin) {
       roundButton: true,
     // @ts-ignore
     }).then(({ value: href }) => {
+      // https://github.com/Leecason/element-tiptap/issues/119
+      // in Firefox 77, when message-box confirm button clicked, editor will lose focus
+      // and re-focus on closeDialog's next tick, https://github.com/ElemeFE/element/blob/dev/src/utils/aria-dialog.js#L66
+      // but re-focus will lose the previous selection, so add link will not work
+      // here need to restore the previous trascation
+      view.dispatch(tr);
+
       this.editorContext.commands.link({ href });
     }).catch(() => {
 

src/components/MenuCommands/Link/UnlinkCommandButton.vue

@@ -1,6 +1,6 @@
 <template>
   <command-button
-    :command="editorContext.commands.unlink"
+    :command="() => editorContext.commands.link({ href: '' })"
     :tooltip="t('editor.extensions.Link.unlink.tooltip')"
     icon="unlink"
   />

src/extensions/link.ts

@@ -1,29 +1,12 @@
-import { MarkType } from 'prosemirror-model';
 import { Plugin, TextSelection } from 'prosemirror-state';
 import { Link as TiptapLink } from 'tiptap-extensions';
 // @ts-ignore
-import { updateMark, removeMark, CommandFunction } from 'tiptap-commands';
-// @ts-ignore
 import { getMarkRange } from 'tiptap-utils';
 import { MenuData } from 'tiptap';
 import { MenuBtnView } from '@/../types';
 import AddLinkCommandButton from '@/components/MenuCommands/Link/AddLinkCommandButton.vue';
 
 export default class Link extends TiptapLink implements MenuBtnView {
-  commands ({ type }: { type: MarkType }) {
-    return {
-      link: (attrs: { href: string }) => {
-        if (attrs.href) {
-          return updateMark(type, attrs);
-        }
-
-        return removeMark(type);
-      },
-
-      unlink: (): CommandFunction => removeMark(type),
-    };
-  }
-
   get plugins () {
     return [
       new Plugin({