From 2c5885c026f5c5f484460c679ffecc05cde90b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 18 Nov 2020 17:38:16 +0100 Subject: [PATCH] rename removeMark to unsetMark --- packages/core/src/commands/{removeMark.ts => unsetMark.ts} | 2 +- packages/core/src/extensions/commands.ts | 4 ++-- packages/extension-bold/src/index.ts | 2 +- packages/extension-code/src/index.ts | 2 +- packages/extension-highlight/src/index.ts | 2 +- packages/extension-italic/src/index.ts | 2 +- packages/extension-link/src/index.ts | 2 +- packages/extension-strike/src/index.ts | 2 +- packages/extension-text-style/src/index.ts | 2 +- packages/extension-underline/src/index.ts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename packages/core/src/commands/{removeMark.ts => unsetMark.ts} (85%) diff --git a/packages/core/src/commands/removeMark.ts b/packages/core/src/commands/unsetMark.ts similarity index 85% rename from packages/core/src/commands/removeMark.ts rename to packages/core/src/commands/unsetMark.ts index f0d12683..be59305f 100644 --- a/packages/core/src/commands/removeMark.ts +++ b/packages/core/src/commands/unsetMark.ts @@ -6,7 +6,7 @@ import getMarkRange from '../utils/getMarkRange' /** * Remove all marks in the current selection. */ -export const removeMark = (typeOrName: string | MarkType): Command => ({ tr, state, dispatch }) => { +export const unsetMark = (typeOrName: string | MarkType): Command => ({ tr, state, dispatch }) => { const { selection } = tr const type = getMarkType(typeOrName, state.schema) let { from, to } = selection diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts index c381cc7e..92db9dff 100644 --- a/packages/core/src/extensions/commands.ts +++ b/packages/core/src/extensions/commands.ts @@ -11,7 +11,6 @@ import * as insertHTML from '../commands/insertHTML' import * as insertText from '../commands/insertText' import * as lift from '../commands/lift' import * as liftListItem from '../commands/liftListItem' -import * as removeMark from '../commands/removeMark' import * as removeMarks from '../commands/removeMarks' import * as resetNodeAttributes from '../commands/resetNodeAttributes' import * as scrollIntoView from '../commands/scrollIntoView' @@ -27,6 +26,7 @@ import * as toggleBlockType from '../commands/toggleBlockType' import * as toggleList from '../commands/toggleList' import * as toggleMark from '../commands/toggleMark' import * as toggleWrap from '../commands/toggleWrap' +import * as unsetMark from '../commands/unsetMark' import * as updateNodeAttributes from '../commands/updateNodeAttributes' import * as wrapIn from '../commands/wrapIn' import * as wrapInList from '../commands/wrapInList' @@ -46,7 +46,6 @@ export const Commands = Extension.create({ ...insertText, ...lift, ...liftListItem, - ...removeMark, ...removeMarks, ...resetNodeAttributes, ...scrollIntoView, @@ -62,6 +61,7 @@ export const Commands = Extension.create({ ...toggleList, ...toggleMark, ...toggleWrap, + ...unsetMark, ...updateNodeAttributes, ...wrapIn, ...wrapInList, diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts index 88143ce7..07908f2d 100644 --- a/packages/extension-bold/src/index.ts +++ b/packages/extension-bold/src/index.ts @@ -61,7 +61,7 @@ const Bold = Mark.create({ * Unset a bold mark */ unsetBold: (): Command => ({ commands }) => { - return commands.removeMark('bold') + return commands.unsetMark('bold') }, } }, diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts index 182ee32c..7078ad76 100644 --- a/packages/extension-code/src/index.ts +++ b/packages/extension-code/src/index.ts @@ -51,7 +51,7 @@ const Code = Mark.create({ * Unset a code mark */ unsetCode: (): Command => ({ commands }) => { - return commands.removeMark('code') + return commands.unsetMark('code') }, } }, diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts index 0b5e75eb..9ba67670 100644 --- a/packages/extension-highlight/src/index.ts +++ b/packages/extension-highlight/src/index.ts @@ -74,7 +74,7 @@ const Highlight = Mark.create({ * Unset a highlight mark */ unsetHighlight: (): Command => ({ commands }) => { - return commands.removeMark('highlight') + return commands.unsetMark('highlight') }, } }, diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts index c8e33174..43656a1e 100644 --- a/packages/extension-italic/src/index.ts +++ b/packages/extension-italic/src/index.ts @@ -60,7 +60,7 @@ const Italic = Mark.create({ * Unset an italic mark */ unsetItalic: (): Command => ({ commands }) => { - return commands.removeMark('italic') + return commands.unsetMark('italic') }, } }, diff --git a/packages/extension-link/src/index.ts b/packages/extension-link/src/index.ts index 8d464aab..ca62b123 100644 --- a/packages/extension-link/src/index.ts +++ b/packages/extension-link/src/index.ts @@ -62,7 +62,7 @@ const Link = Mark.create({ * Unset a link mark */ unsetLink: (): Command => ({ commands }) => { - return commands.removeMark('link') + return commands.unsetMark('link') }, } }, diff --git a/packages/extension-strike/src/index.ts b/packages/extension-strike/src/index.ts index 583f1a74..f0f6a76b 100644 --- a/packages/extension-strike/src/index.ts +++ b/packages/extension-strike/src/index.ts @@ -60,7 +60,7 @@ const Strike = Mark.create({ * Unset a strike mark */ unsetStrike: (): Command => ({ commands }) => { - return commands.removeMark('strike') + return commands.unsetMark('strike') }, } }, diff --git a/packages/extension-text-style/src/index.ts b/packages/extension-text-style/src/index.ts index 2055941b..d32bb276 100644 --- a/packages/extension-text-style/src/index.ts +++ b/packages/extension-text-style/src/index.ts @@ -37,7 +37,7 @@ const TextStyle = Mark.create({ return true } - return commands.removeMark('textStyle') + return commands.unsetMark('textStyle') }, } }, diff --git a/packages/extension-underline/src/index.ts b/packages/extension-underline/src/index.ts index 763290cf..11ac411c 100644 --- a/packages/extension-underline/src/index.ts +++ b/packages/extension-underline/src/index.ts @@ -46,7 +46,7 @@ const Underline = Mark.create({ * Unset an underline mark */ unsetUnderline: (): Command => ({ commands }) => { - return commands.removeMark('underline') + return commands.unsetMark('underline') }, } },