From e3a3d99c515c614fdb73374ff1220bb36c3666ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 18 Nov 2020 17:36:00 +0100 Subject: [PATCH] rename addMark to setMark --- packages/core/src/commands/{addMark.ts => setMark.ts} | 2 +- packages/core/src/commands/toggleMark.ts | 2 +- packages/core/src/extensions/commands.ts | 4 ++-- packages/extension-bold/src/index.ts | 2 +- packages/extension-code/src/index.ts | 4 ++-- packages/extension-font-family/src/index.ts | 4 ++-- packages/extension-highlight/src/index.ts | 2 +- packages/extension-italic/src/index.ts | 4 ++-- packages/extension-link/src/index.ts | 2 +- packages/extension-strike/src/index.ts | 4 ++-- packages/extension-underline/src/index.ts | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) rename packages/core/src/commands/{addMark.ts => setMark.ts} (91%) diff --git a/packages/core/src/commands/addMark.ts b/packages/core/src/commands/setMark.ts similarity index 91% rename from packages/core/src/commands/addMark.ts rename to packages/core/src/commands/setMark.ts index cc093923..705f4863 100644 --- a/packages/core/src/commands/addMark.ts +++ b/packages/core/src/commands/setMark.ts @@ -6,7 +6,7 @@ import getMarkAttributes from '../utils/getMarkAttributes' /** * Add a mark with new attributes. */ -export const addMark = (typeOrName: string | MarkType, attributes?: {}): Command => ({ tr, state, dispatch }) => { +export const setMark = (typeOrName: string | MarkType, attributes?: {}): Command => ({ tr, state, dispatch }) => { const { selection } = tr const { from, to, empty } = selection const type = getMarkType(typeOrName, state.schema) diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts index 0b3571bb..72aab77d 100644 --- a/packages/core/src/commands/toggleMark.ts +++ b/packages/core/src/commands/toggleMark.ts @@ -15,7 +15,7 @@ export const toggleMark = (typeOrName: string | MarkType, attributes?: {}): Comm && !markIsActive(state, type, attributes) if (attributes && hasMarkWithDifferentAttributes) { - return commands.addMark(type, attributes) + return commands.setMark(type, attributes) } return originalToggleMark(type, attributes)(state, dispatch) diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts index 02e96897..c8b6ebc7 100644 --- a/packages/core/src/extensions/commands.ts +++ b/packages/core/src/extensions/commands.ts @@ -1,5 +1,5 @@ import { Extension } from '../Extension' -import * as addMark from '../commands/addMark' +import * as setMark from '../commands/setMark' import * as blur from '../commands/blur' import * as clearContent from '../commands/clearContent' import * as command from '../commands/command' @@ -34,7 +34,7 @@ import * as wrapInList from '../commands/wrapInList' export const Commands = Extension.create({ addCommands() { return { - ...addMark, + ...setMark, ...blur, ...clearContent, ...clearNodes, diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts index 02356358..88143ce7 100644 --- a/packages/extension-bold/src/index.ts +++ b/packages/extension-bold/src/index.ts @@ -49,7 +49,7 @@ const Bold = Mark.create({ * Set a bold mark */ setBold: (): Command => ({ commands }) => { - return commands.addMark('bold') + return commands.setMark('bold') }, /** * Toggle a bold mark diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts index 33b3a547..182ee32c 100644 --- a/packages/extension-code/src/index.ts +++ b/packages/extension-code/src/index.ts @@ -39,7 +39,7 @@ const Code = Mark.create({ * Set a code mark */ setCode: (): Command => ({ commands }) => { - return commands.addMark('code') + return commands.setMark('code') }, /** * Toggle inline code @@ -51,7 +51,7 @@ const Code = Mark.create({ * Unset a code mark */ unsetCode: (): Command => ({ commands }) => { - return commands.addMark('code') + return commands.removeMark('code') }, } }, diff --git a/packages/extension-font-family/src/index.ts b/packages/extension-font-family/src/index.ts index c29cad73..629f45b2 100644 --- a/packages/extension-font-family/src/index.ts +++ b/packages/extension-font-family/src/index.ts @@ -42,7 +42,7 @@ const FontFamily = Extension.create({ */ setFontFamily: (fontFamily: string): Command => ({ chain }) => { return chain() - .addMark('textStyle', { fontFamily }) + .setMark('textStyle', { fontFamily }) .run() }, /** @@ -50,7 +50,7 @@ const FontFamily = Extension.create({ */ unsetFontFamily: (): Command => ({ chain }) => { return chain() - .addMark('textStyle', { fontFamily: null }) + .setMark('textStyle', { fontFamily: null }) .removeEmptyTextStyle() .run() }, diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts index 9a92a029..0b5e75eb 100644 --- a/packages/extension-highlight/src/index.ts +++ b/packages/extension-highlight/src/index.ts @@ -62,7 +62,7 @@ const Highlight = Mark.create({ * Set a highlight mark */ setHighlight: (attributes?: { color: string }): Command => ({ commands }) => { - return commands.addMark('highlight', attributes) + return commands.setMark('highlight', attributes) }, /** * Toggle a highlight mark diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts index a76b78e6..c8e33174 100644 --- a/packages/extension-italic/src/index.ts +++ b/packages/extension-italic/src/index.ts @@ -48,7 +48,7 @@ const Italic = Mark.create({ * Set an italic mark */ setItalic: (): Command => ({ commands }) => { - return commands.addMark('italic') + return commands.setMark('italic') }, /** * Toggle an italic mark @@ -60,7 +60,7 @@ const Italic = Mark.create({ * Unset an italic mark */ unsetItalic: (): Command => ({ commands }) => { - return commands.addMark('italic') + return commands.removeMark('italic') }, } }, diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts index 4325639e..8d464aab 100644 --- a/packages/extension-link/src/index.ts +++ b/packages/extension-link/src/index.ts @@ -50,7 +50,7 @@ const Link = Mark.create({ * Set a link mark */ setLink: (attributes: { href?: string, target?: string } = {}): Command => ({ commands }) => { - return commands.addMark('link', attributes) + return commands.setMark('link', attributes) }, /** * Toggle a link mark diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts index f7ebaf08..583f1a74 100644 --- a/packages/extension-strike/src/index.ts +++ b/packages/extension-strike/src/index.ts @@ -48,7 +48,7 @@ const Strike = Mark.create({ * Set a strike mark */ setStrike: (): Command => ({ commands }) => { - return commands.addMark('strike') + return commands.setMark('strike') }, /** * Toggle a strike mark @@ -60,7 +60,7 @@ const Strike = Mark.create({ * Unset a strike mark */ unsetStrike: (): Command => ({ commands }) => { - return commands.addMark('strike') + return commands.removeMark('strike') }, } }, diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts index adcff4e1..763290cf 100644 --- a/packages/extension-underline/src/index.ts +++ b/packages/extension-underline/src/index.ts @@ -34,7 +34,7 @@ const Underline = Mark.create({ * Set an underline mark */ setUnderline: (): Command => ({ commands }) => { - return commands.addMark('underline') + return commands.setMark('underline') }, /** * Toggle an underline mark @@ -46,7 +46,7 @@ const Underline = Mark.create({ * Unset an underline mark */ unsetUnderline: (): Command => ({ commands }) => { - return commands.addMark('underline') + return commands.removeMark('underline') }, } },