refactoring

packages/core/src/extensions/focusEvents.ts

@@ -11,9 +11,6 @@ export const FocusEvents = Extension.create({
       new Plugin({
         key: new PluginKey('focusEvents'),
         props: {
-          attributes: {
-            tabindex: '0',
-          },
           handleDOMEvents: {
             focus: (view, event) => {
               editor.isFocused = true

packages/core/src/extensions/index.ts

@@ -3,3 +3,4 @@ export { Commands } from './commands'
 export { Editable } from './editable'
 export { FocusEvents } from './focusEvents'
 export { Keymap } from './keymap'
+export { Tabindex } from './tabindex'

packages/core/src/extensions/tabindex.ts

@@ -0,0 +1,19 @@
+import { Plugin, PluginKey } from 'prosemirror-state'
+import { Extension } from '../Extension'
+
+export const Tabindex = Extension.create({
+  name: 'tabindex',
+
+  addProseMirrorPlugins() {
+    return [
+      new Plugin({
+        key: new PluginKey('tabindex'),
+        props: {
+          attributes: {
+            tabindex: '0',
+          },
+        },
+      }),
+    ]
+  },
+})

packages/core/src/helpers/getMarkAttributes.ts

@@ -17,9 +17,9 @@ export default function getMarkAttributes(state: EditorState, typeOrName: string
 
   const mark = marks.find(markItem => markItem.type.name === type.name)
 
-  if (mark) {
+  if (!mark) {
-    return { ...mark.attrs }
-  }
-
     return {}
   }
+
+  return { ...mark.attrs }
+}

packages/core/src/helpers/getNodeAttributes.ts

@@ -15,9 +15,9 @@ export default function getNodeAttributes(state: EditorState, typeOrName: string
     .reverse()
     .find(nodeItem => nodeItem.type.name === type.name)
 
-  if (node) {
+  if (!node) {
-    return { ...node.attrs }
-  }
-
     return {}
   }
+
+  return { ...node.attrs }
+}

packages/core/src/helpers/getRenderedAttributes.ts

@@ -14,7 +14,5 @@ export default function getRenderedAttributes(nodeOrMark: Node | Mark, extension
 
       return item.attribute.renderHTML(nodeOrMark.attrs) || {}
     })
-    .reduce((attributes, attribute) => {
+    .reduce((attributes, attribute) => mergeAttributes(attributes, attribute), {})
-      return mergeAttributes(attributes, attribute)
-    }, {})
 }

packages/core/src/helpers/getSchemaTypeByName.ts

@@ -1,13 +1,5 @@
 import { MarkType, NodeType, Schema } from 'prosemirror-model'
 
 export default function getSchemaTypeByName(name: string, schema: Schema): NodeType | MarkType | null {
-  if (schema.nodes[name]) {
+  return schema.nodes[name] || schema.marks[name] || null
-    return schema.nodes[name]
-  }
-
-  if (schema.marks[name]) {
-    return schema.marks[name]
-  }
-
-  return null
 }

packages/core/src/utilities/mergeAttributes.ts

@@ -9,6 +9,7 @@ export default function mergeAttributes(...objects: Record<string, any>[]): Reco
 
         if (!exists) {
           mergedAttributes[key] = value
+
           return
         }
 

packages/core/src/utilities/removeElement.ts

@@ -1,5 +1,5 @@
 export default function removeElement(element: HTMLElement): void {
-  if (element && element.parentNode) {
+  if (element?.parentNode) {
     element.parentNode.removeChild(element)
   }
 }