ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Hans Pagel
2020-10-08 03:44:18 +02:00
parent 3b01b5b219
commit 19e040df42
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/src/commands/toggleMark.ts
View File

@@ -15,7 +15,11 @@ declare module '../Editor' {
export const toggleMark: ToggleMarkCommand = (typeOrName, attrs) => ({ state, dispatch, commands }) => { export const toggleMark: ToggleMarkCommand = (typeOrName, attrs) => ({ state, dispatch, commands }) => {
const type = getMarkType(typeOrName, state.schema) const type = getMarkType(typeOrName, state.schema)
if (markIsActive(state, type) && !markIsActive(state, type, attrs)) { const hasMarkWithDifferentAttributes = attrs
&& markIsActive(state, type)
&& !markIsActive(state, type, attrs)
if (hasMarkWithDifferentAttributes) {
// @ts-ignore // @ts-ignore
return commands.updateMark(type, attrs) return commands.updateMark(type, attrs)
} }

14
packages/core/src/utils/markHasAttributes.ts
View File

@@ -2,8 +2,14 @@ import { EditorState } from 'prosemirror-state'
import { MarkType } from 'prosemirror-model' import { MarkType } from 'prosemirror-model'
import getMarkAttrs from './getMarkAttrs' import getMarkAttrs from './getMarkAttrs'
export default function markHasAttributes(state: EditorState, type: MarkType, attrs?: Object) { export default function markHasAttributes(state: EditorState, type: MarkType, attrs?: { [key: string]: any }) {
return attrs === undefined || JSON.stringify(attrs) === JSON.stringify( if (attrs === undefined) {
getMarkAttrs(state, type), return true
) }
const originalAttrs: { [key: string]: any } = getMarkAttrs(state, type)
return Object.keys(attrs).filter((key: string) => {
return attrs[key] === originalAttrs[key]
}).length
} }