@quadrats/common 0.4.0 → 0.5.2

package/blockquote/createBlockquote.js

@@ -1,11 +1,27 @@
-import { isNodesTypeIn, toggleNodesType, Element, normalizeOnlyInlineOrTextInChildren } from '@quadrats/core';
+import { isNodesTypeIn, toggleNodesType, Editor, Transforms, createParagraphElement, Element, normalizeOnlyInlineOrTextInChildren } from '@quadrats/core';
 import { BLOCKQUOTE_TYPE } from './constants.js';
 
 function createBlockquote({ type = BLOCKQUOTE_TYPE } = {}) {
     return {
         type,
-        isSelectionInBlockquote: (editor) => isNodesTypeIn(editor, [type]),
-        toggleBlockquote: (editor) => toggleNodesType(editor, type),
+        isSelectionInBlockquote: editor => isNodesTypeIn(editor, [type]),
+        toggleBlockquote: (editor) => {
+            const actived = isNodesTypeIn(editor, [type]);
+            toggleNodesType(editor, type);
+            if (!actived) {
+                if (editor.selection) {
+                    // Select to line end
+                    const originPoint = Editor.point(editor, editor.selection.focus);
+                    Transforms.move(editor, { unit: 'line', edge: 'end' });
+                    Transforms.collapse(editor, { edge: 'end' });
+                    // Only last block add paragraph automatically
+                    if (!Editor.next(editor)) {
+                        Transforms.insertNodes(editor, [createParagraphElement()]);
+                    }
+                    Transforms.select(editor, originPoint);
+                }
+            }
+        },
         with(editor) {
             const { normalizeNode } = editor;
             editor.normalizeNode = (entry) => {

package/blockquote/index.cjs.js

@@ -9,8 +9,24 @@ const BLOCKQUOTE_TYPE = 'blockquote';
 function createBlockquote({ type = BLOCKQUOTE_TYPE } = {}) {
     return {
         type,
-        isSelectionInBlockquote: (editor) => core.isNodesTypeIn(editor, [type]),
-        toggleBlockquote: (editor) => core.toggleNodesType(editor, type),
+        isSelectionInBlockquote: editor => core.isNodesTypeIn(editor, [type]),
+        toggleBlockquote: (editor) => {
+            const actived = core.isNodesTypeIn(editor, [type]);
+            core.toggleNodesType(editor, type);
+            if (!actived) {
+                if (editor.selection) {
+                    // Select to line end
+                    const originPoint = core.Editor.point(editor, editor.selection.focus);
+                    core.Transforms.move(editor, { unit: 'line', edge: 'end' });
+                    core.Transforms.collapse(editor, { edge: 'end' });
+                    // Only last block add paragraph automatically
+                    if (!core.Editor.next(editor)) {
+                        core.Transforms.insertNodes(editor, [core.createParagraphElement()]);
+                    }
+                    core.Transforms.select(editor, originPoint);
+                }
+            }
+        },
         with(editor) {
             const { normalizeNode } = editor;
             editor.normalizeNode = (entry) => {

package/blockquote/typings.d.ts

@@ -1,5 +1,5 @@
-import { Editor, Element, Withable, WithElementType } from '@quadrats/core';
-export interface BlockquoteElement extends Element, WithElementType {
+import { Editor, QuadratsElement, Withable, WithElementType } from '@quadrats/core';
+export interface BlockquoteElement extends QuadratsElement, WithElementType {
 }
 export interface Blockquote extends WithElementType, Withable {
     isSelectionInBlockquote(editor: Editor): boolean;

package/bold/createBold.d.ts

@@ -1 +1 @@
-export declare const createBold: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createBold: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;

package/bold/createBold.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { BOLD_TYPE } from './constants.js';
 
 const createBold = (variant) => createToggleMarkCreator({
-    type: getVariantType(BOLD_TYPE, variant),
-    parentType: BOLD_TYPE,
+    type: BOLD_TYPE,
+    variant,
 });
 
 export { createBold };

package/bold/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const BOLD_TYPE = 'bold';
 
 const createBold = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(BOLD_TYPE, variant),
-    parentType: BOLD_TYPE,
+    type: BOLD_TYPE,
+    variant,
 });
 
 exports.BOLD_TYPE = BOLD_TYPE;

package/divider/createDivider.js

@@ -14,7 +14,7 @@ function createDivider(options = {}) {
         insertDivider,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 /**

package/divider/index.cjs.js

@@ -19,7 +19,7 @@ function createDivider(options = {}) {
         insertDivider,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 /**

package/divider/typings.d.ts

@@ -1,5 +1,5 @@
-import { Editor, Element, Text, Withable, WithElementType } from '@quadrats/core';
-export interface DividerElement extends Element, WithElementType {
+import { Editor, QuadratsElement, Text, Withable, WithElementType } from '@quadrats/core';
+export interface DividerElement extends QuadratsElement, WithElementType {
     children: [Text];
 }
 export interface Divider extends WithElementType, Withable {

package/embed/createEmbed.js

@@ -11,7 +11,8 @@ function createEmbed(options) {
             const embedElement = Object.assign(Object.assign({}, data), { type, provider, children: [{ text: '' }] });
             Transforms.insertNodes(editor, [
                 embedElement,
-                typeof defaultNode === 'string' ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
+                typeof defaultNode === 'string'
+                    ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
             ]);
             Transforms.move(editor);
         }
@@ -22,11 +23,12 @@ function createEmbed(options) {
         insertEmbed,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (Element.isElement(node) && node.type === type) {
-                    const strategy = node.provider ? strategies[node.provider] : undefined;
+                    const strategy = node.provider
+                        ? strategies[node.provider] : undefined;
                     if (!strategy || !strategy.isElementDataValid(node)) {
                         Transforms.removeNodes(editor, { at: path });
                         return;

package/embed/index.cjs.js

@@ -33,7 +33,8 @@ function createEmbed(options) {
             const embedElement = Object.assign(Object.assign({}, data), { type, provider, children: [{ text: '' }] });
             core.Transforms.insertNodes(editor, [
                 embedElement,
-                typeof defaultNode === 'string' ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
+                typeof defaultNode === 'string'
+                    ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
             ]);
             core.Transforms.move(editor);
         }
@@ -44,11 +45,12 @@ function createEmbed(options) {
         insertEmbed,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (core.Element.isElement(node) && node.type === type) {
-                    const strategy = node.provider ? strategies[node.provider] : undefined;
+                    const strategy = node.provider
+                        ? strategies[node.provider] : undefined;
                     if (!strategy || !strategy.isElementDataValid(node)) {
                         core.Transforms.removeNodes(editor, { at: path });
                         return;

package/embed/typings.d.ts

@@ -1,5 +1,5 @@
-import { Editor, Element, Node, Text, Withable, WithElementType } from '@quadrats/core';
-export interface EmbedElement extends Element, WithElementType {
+import { Editor, QuadratsElement, Node, Text, Withable, WithElementType } from '@quadrats/core';
+export interface EmbedElement extends QuadratsElement, WithElementType {
     /**
      * The embed provider.
      *

package/file-uploader/createFileUploader.js

@@ -1,6 +1,6 @@
 import { __awaiter } from './_virtual/_tslib.js';
 import { readFileAsDataURL } from '@quadrats/utils';
-import { HistoryEditor, Transforms, createParagraphElement } from '@quadrats/core';
+import { Transforms, createParagraphElement } from '@quadrats/core';
 import { FILE_UPLOADER_TYPE } from './constants.js';
 import { getFilesFromInput } from './getFilesFromInput.js';
 
@@ -25,10 +25,8 @@ function createFileUploader(options = {}) {
                     if (xhr.status < 400) {
                         const path = getPath();
                         if (path) {
-                            HistoryEditor.withoutSaving(editor, () => {
-                                Transforms.removeNodes(editor, { at: path });
-                                Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
-                            });
+                            Transforms.removeNodes(editor, { at: path });
+                            Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
                         }
                     }
                     else {
@@ -65,10 +63,8 @@ function createFileUploader(options = {}) {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
                 if (fileUploaderElement) {
-                    HistoryEditor.withoutSaving(editor, () => {
-                        Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], options);
-                        Transforms.move(editor);
-                    });
+                    Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], options);
+                    Transforms.move(editor);
                 }
             });
         }), Promise.resolve());

package/file-uploader/index.cjs.js

@@ -79,10 +79,8 @@ function createFileUploader(options = {}) {
                     if (xhr.status < 400) {
                         const path = getPath();
                         if (path) {
-                            core.HistoryEditor.withoutSaving(editor, () => {
-                                core.Transforms.removeNodes(editor, { at: path });
-                                core.Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
-                            });
+                            core.Transforms.removeNodes(editor, { at: path });
+                            core.Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
                         }
                     }
                     else {
@@ -119,10 +117,8 @@ function createFileUploader(options = {}) {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
                 if (fileUploaderElement) {
-                    core.HistoryEditor.withoutSaving(editor, () => {
-                        core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], options);
-                        core.Transforms.move(editor);
-                    });
+                    core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], options);
+                    core.Transforms.move(editor);
                 }
             });
         }), Promise.resolve());

package/file-uploader/typings.d.ts

@@ -1,20 +1,20 @@
-import { Editor, Element, HistoryEditor, Path, TransformsInsertNodesOptions, Withable } from '@quadrats/core';
+import { Editor, QuadratsElement, Path, TransformsInsertNodesOptions, Withable } from '@quadrats/core';
 import { GetFilesFromInputOptions } from './getFilesFromInput';
 export interface XHRUploadHeaders {
     [name: string]: string;
 }
-export interface FileUploaderElement extends Element {
+export interface FileUploaderElement extends QuadratsElement {
     type: string;
     register: (getPath: () => Path | undefined, onProgress: (percentage: number) => void) => VoidFunction;
 }
 /**
  * For creating temorary element while uploading.
  */
-export declare type FileUploaderCreateElementByDataURL = (dataURL: string) => Element;
+export declare type FileUploaderCreateElementByDataURL = (dataURL: string) => QuadratsElement;
 /**
  * For create element after uploaded.
  */
-export declare type FileUploaderCreateElementByResponse = (response: any) => Element;
+export declare type FileUploaderCreateElementByResponse = (response: any) => QuadratsElement;
 export declare type FileUploaderGetBody = (file: File) => BodyInit;
 export declare type FileUploaderGetHeaders = (file: File) => XHRUploadHeaders | Promise<XHRUploadHeaders>;
 export declare type FileUploaderGetUrl = (file: File) => string;
@@ -32,6 +32,6 @@ export interface FileUploaderCreateFileUploaderElementOptions {
 export declare type FileUploaderUploadOptions = FileUploaderCreateFileUploaderElementOptions & GetFilesFromInputOptions & TransformsInsertNodesOptions;
 export interface FileUploader extends Withable {
     type: string;
-    createFileUploaderElement(editor: Editor & HistoryEditor, file: File, options: FileUploaderCreateFileUploaderElementOptions): Promise<FileUploaderElement | undefined>;
-    upload(editor: Editor & HistoryEditor, options: FileUploaderUploadOptions): Promise<void>;
+    createFileUploaderElement(editor: Editor, file: File, options: FileUploaderCreateFileUploaderElementOptions): Promise<FileUploaderElement | undefined>;
+    upload(editor: Editor, options: FileUploaderUploadOptions): Promise<void>;
 }

package/footnote/createFootnote.js

@@ -3,27 +3,20 @@ import { FOOTNOTE_TYPE } from './constants.js';
 
 /* eslint-disable max-len */
 function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
-    const isSelectionInFootnote = (editor) => isNodesTypeIn(editor, [type]);
-    const getAllFootnotes = (editor) => {
-        const resultNodes = getNodes(editor, {
-            at: [],
-            match: (node) => node.type === FOOTNOTE_TYPE,
-        });
-        return Array.from(resultNodes);
-    };
+    const isSelectionInFootnote = editor => isNodesTypeIn(editor, [type]);
     const getFootnoteText = (editor) => {
         var _a, _b, _c;
         const at = editor.selection;
         if (!at) {
             return '';
         }
-        const nodes = getNodes(editor, { at, match: (node) => node.type === type });
-        return (_c = (_b = (_a = Array.from(nodes)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.footnote;
+        const firstNode = (_b = (_a = Array.from(getNodes(editor, { at, match: node => node.type === type }))) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b[0];
+        return (_c = firstNode) === null || _c === void 0 ? void 0 : _c.footnote;
     };
     const updateFootnoteIndex = (editor, options = { startAt: 1 }) => {
         var _a;
         let footnoteCount = (_a = options === null || options === void 0 ? void 0 : options.startAt) !== null && _a !== void 0 ? _a : 1;
-        for (const [, path] of getNodes(editor, { at: [], match: (node) => node.type === FOOTNOTE_TYPE })) {
+        for (const [, path] of getNodes(editor, { at: [], match: node => node.type === FOOTNOTE_TYPE })) {
             Transforms.setNodes(editor, { index: footnoteCount }, { at: path });
             footnoteCount += 1;
         }
@@ -48,7 +41,7 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
         }
         if (footnoteText !== '') {
             if (isSelectionInFootnote(editor)) {
-                Transforms.setNodes(editor, { footnote: footnoteText }, { at, match: (node) => node.type === type });
+                Transforms.setNodes(editor, { footnote: footnoteText }, { at, match: node => node.type === type });
             }
             else {
                 wrapFootnote(editor, footnoteText, options);
@@ -61,7 +54,6 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     };
     return {
         type,
-        getAllFootnotes,
         getFootnoteText,
         isSelectionInFootnote,
         updateFootnoteIndex,
@@ -70,7 +62,7 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
         upsertFootnoteAndUpdateIndex,
         with(editor) {
             const { isInline } = editor;
-            editor.isInline = (element) => element.type === type || isInline(element);
+            editor.isInline = element => element.type === type || isInline(element);
             return editor;
         },
     };

package/footnote/index.cjs.js

@@ -8,27 +8,20 @@ const FOOTNOTE_TYPE = 'footnote';
 
 /* eslint-disable max-len */
 function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
-    const isSelectionInFootnote = (editor) => core.isNodesTypeIn(editor, [type]);
-    const getAllFootnotes = (editor) => {
-        const resultNodes = core.getNodes(editor, {
-            at: [],
-            match: (node) => node.type === FOOTNOTE_TYPE,
-        });
-        return Array.from(resultNodes);
-    };
+    const isSelectionInFootnote = editor => core.isNodesTypeIn(editor, [type]);
     const getFootnoteText = (editor) => {
         var _a, _b, _c;
         const at = editor.selection;
         if (!at) {
             return '';
         }
-        const nodes = core.getNodes(editor, { at, match: (node) => node.type === type });
-        return (_c = (_b = (_a = Array.from(nodes)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.footnote;
+        const firstNode = (_b = (_a = Array.from(core.getNodes(editor, { at, match: node => node.type === type }))) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b[0];
+        return (_c = firstNode) === null || _c === void 0 ? void 0 : _c.footnote;
     };
     const updateFootnoteIndex = (editor, options = { startAt: 1 }) => {
         var _a;
         let footnoteCount = (_a = options === null || options === void 0 ? void 0 : options.startAt) !== null && _a !== void 0 ? _a : 1;
-        for (const [, path] of core.getNodes(editor, { at: [], match: (node) => node.type === FOOTNOTE_TYPE })) {
+        for (const [, path] of core.getNodes(editor, { at: [], match: node => node.type === FOOTNOTE_TYPE })) {
             core.Transforms.setNodes(editor, { index: footnoteCount }, { at: path });
             footnoteCount += 1;
         }
@@ -53,7 +46,7 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
         }
         if (footnoteText !== '') {
             if (isSelectionInFootnote(editor)) {
-                core.Transforms.setNodes(editor, { footnote: footnoteText }, { at, match: (node) => node.type === type });
+                core.Transforms.setNodes(editor, { footnote: footnoteText }, { at, match: node => node.type === type });
             }
             else {
                 wrapFootnote(editor, footnoteText, options);
@@ -66,7 +59,6 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     };
     return {
         type,
-        getAllFootnotes,
         getFootnoteText,
         isSelectionInFootnote,
         updateFootnoteIndex,
@@ -75,7 +67,7 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
         upsertFootnoteAndUpdateIndex,
         with(editor) {
             const { isInline } = editor;
-            editor.isInline = (element) => element.type === type || isInline(element);
+            editor.isInline = element => element.type === type || isInline(element);
             return editor;
         },
     };

package/footnote/typings.d.ts

@@ -1,5 +1,10 @@
-import { Editor, Range, Element, WithElementType, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable, NodeEntry, Node } from '@quadrats/core';
-export interface FootnoteElement extends Element, WithElementType {
+import { Editor, Range, QuadratsElement, WithElementType, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable } from '@quadrats/core';
+export interface FootnoteData {
+    footnote: string;
+    index: number;
+    wrapperText: string;
+}
+export interface FootnoteElement extends QuadratsElement, WithElementType {
     footnote: string;
     index?: number;
 }
@@ -14,7 +19,6 @@ export interface FootnoteUpsertFootnoteOptions {
     at?: Range;
 }
 export interface Footnote extends WithElementType, Withable {
-    getAllFootnotes(editor: Editor): NodeEntry<Node>[];
     getFootnoteText(editor: Editor): string;
     isSelectionInFootnote(editor: Editor): boolean;
     unwrapFootnote(editor: Editor, options?: FootnoteUnwrapFootnoteOptions): void;

package/heading/createHeading.js

@@ -2,7 +2,7 @@ import { Element, Transforms, PARAGRAPH_TYPE, normalizeOnlyInlineOrTextInChildre
 import { HEADING_TYPE, HEADING_LEVELS } from './constants.js';
 
 function createHeading({ type = HEADING_TYPE, enabledLevels = HEADING_LEVELS, } = {}) {
-    const getHeadingNodes = (editor, level, options = {}) => getNodes(editor, Object.assign(Object.assign({}, options), { match: (node) => node.type === type && node.level === level }));
+    const getHeadingNodes = (editor, level, options = {}) => getNodes(editor, Object.assign(Object.assign({}, options), { match: node => node.type === type && node.level === level }));
     const isSelectionInHeading = (editor, level, options = {}) => {
         const [match] = getHeadingNodes(editor, level, options);
         return !!match;

package/heading/index.cjs.js

@@ -8,7 +8,7 @@ const HEADING_TYPE = 'heading';
 const HEADING_LEVELS = [1, 2, 3, 4, 5, 6];
 
 function createHeading({ type = HEADING_TYPE, enabledLevels = HEADING_LEVELS, } = {}) {
-    const getHeadingNodes = (editor, level, options = {}) => core.getNodes(editor, Object.assign(Object.assign({}, options), { match: (node) => node.type === type && node.level === level }));
+    const getHeadingNodes = (editor, level, options = {}) => core.getNodes(editor, Object.assign(Object.assign({}, options), { match: node => node.type === type && node.level === level }));
     const isSelectionInHeading = (editor, level, options = {}) => {
         const [match] = getHeadingNodes(editor, level, options);
         return !!match;

package/heading/typings.d.ts

@@ -1,6 +1,6 @@
-import { Editor, Element, GetNodesOptions, Node, NodeEntry, Withable, WithElementType } from '@quadrats/core';
+import { Editor, QuadratsElement, GetNodesOptions, Node, NodeEntry, Withable, WithElementType } from '@quadrats/core';
 export declare type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
-export interface HeadingElement extends Element, WithElementType {
+export interface HeadingElement extends QuadratsElement, WithElementType {
     level: HeadingLevel;
 }
 export interface WithEnabledHeadingLevels<L extends HeadingLevel> {

package/highlight/createHighlight.d.ts

@@ -1 +1 @@
-export declare const createHighlight: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createHighlight: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;

package/highlight/createHighlight.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { HIGHLIGHT_TYPE } from './constants.js';
 
 const createHighlight = (variant) => createToggleMarkCreator({
-    type: getVariantType(HIGHLIGHT_TYPE, variant),
-    parentType: HIGHLIGHT_TYPE,
+    type: HIGHLIGHT_TYPE,
+    variant,
 });
 
 export { createHighlight };

package/highlight/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const HIGHLIGHT_TYPE = 'highlight';
 
 const createHighlight = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(HIGHLIGHT_TYPE, variant),
-    parentType: HIGHLIGHT_TYPE,
+    type: HIGHLIGHT_TYPE,
+    variant,
 });
 
 exports.HIGHLIGHT_TYPE = HIGHLIGHT_TYPE;

package/image/createImage.js

@@ -3,7 +3,7 @@ import { getAboveByTypes, Element, isNodesTypeIn, Transforms, normalizeVoidEleme
 import { IMAGE_TYPES } from './constants.js';
 
 function resolveSizeSteps(steps) {
-    let sortedSteps = steps.filter((step) => step > 0 && step < 100).sort();
+    let sortedSteps = steps.filter(step => step > 0 && step < 100).sort();
     if (!sortedSteps.includes(100)) {
         sortedSteps = [...sortedSteps, 100];
     }
@@ -16,9 +16,9 @@ function createImage(options = {}) {
     const getAboveImageFigure = (editor, options) => getAboveByTypes(editor, [types.figure], options);
     const getAboveImageCaption = (editor, options) => getAboveByTypes(editor, [types.caption], options);
     const isNodesInImage = (editor, options) => isNodesTypeIn(editor, [types.image], options);
-    const isSelectionInImage = (editor) => isNodesInImage(editor);
-    const isSelectionInImageCaption = (editor) => isNodesTypeIn(editor, [types.caption]);
-    const isCollapsedOnImage = (editor) => !!editor.selection && Range.isCollapsed(editor.selection) && isSelectionInImage(editor);
+    const isSelectionInImage = editor => isNodesInImage(editor);
+    const isSelectionInImageCaption = editor => isNodesTypeIn(editor, [types.caption]);
+    const isCollapsedOnImage = editor => !!editor.selection && Range.isCollapsed(editor.selection) && isSelectionInImage(editor);
     const createImageElement = (src, hosting) => {
         const imageElement = {
             type: types.image,
@@ -51,7 +51,7 @@ function createImage(options = {}) {
         if (!sizeSteps) {
             return percentage;
         }
-        const lowerIndex = sizeSteps.findIndex((step) => step >= percentage) - 1;
+        const lowerIndex = sizeSteps.findIndex(step => step >= percentage) - 1;
         const upperIndex = lowerIndex + 1;
         if (lowerIndex < 0) {
             return sizeSteps[0];
@@ -119,7 +119,7 @@ function createImage(options = {}) {
                 }
                 insertBreak();
             };
-            editor.isVoid = (element) => element.type === types.image || isVoid(element);
+            editor.isVoid = element => element.type === types.image || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (Element.isElement(node)) {

package/image/index.cjs.js

@@ -31,7 +31,7 @@ function getImageElementCommonProps(element, hostingResolvers) {
 }
 
 function resolveSizeSteps(steps) {
-    let sortedSteps = steps.filter((step) => step > 0 && step < 100).sort();
+    let sortedSteps = steps.filter(step => step > 0 && step < 100).sort();
     if (!sortedSteps.includes(100)) {
         sortedSteps = [...sortedSteps, 100];
     }
@@ -44,9 +44,9 @@ function createImage(options = {}) {
     const getAboveImageFigure = (editor, options) => core.getAboveByTypes(editor, [types.figure], options);
     const getAboveImageCaption = (editor, options) => core.getAboveByTypes(editor, [types.caption], options);
     const isNodesInImage = (editor, options) => core.isNodesTypeIn(editor, [types.image], options);
-    const isSelectionInImage = (editor) => isNodesInImage(editor);
-    const isSelectionInImageCaption = (editor) => core.isNodesTypeIn(editor, [types.caption]);
-    const isCollapsedOnImage = (editor) => !!editor.selection && core.Range.isCollapsed(editor.selection) && isSelectionInImage(editor);
+    const isSelectionInImage = editor => isNodesInImage(editor);
+    const isSelectionInImageCaption = editor => core.isNodesTypeIn(editor, [types.caption]);
+    const isCollapsedOnImage = editor => !!editor.selection && core.Range.isCollapsed(editor.selection) && isSelectionInImage(editor);
     const createImageElement = (src, hosting) => {
         const imageElement = {
             type: types.image,
@@ -79,7 +79,7 @@ function createImage(options = {}) {
         if (!sizeSteps) {
             return percentage;
         }
-        const lowerIndex = sizeSteps.findIndex((step) => step >= percentage) - 1;
+        const lowerIndex = sizeSteps.findIndex(step => step >= percentage) - 1;
         const upperIndex = lowerIndex + 1;
         if (lowerIndex < 0) {
             return sizeSteps[0];
@@ -147,7 +147,7 @@ function createImage(options = {}) {
                 }
                 insertBreak();
             };
-            editor.isVoid = (element) => element.type === types.image || isVoid(element);
+            editor.isVoid = element => element.type === types.image || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (core.Element.isElement(node)) {

package/image/typings.d.ts

@@ -1,12 +1,12 @@
-import { Editor, Element, GetAboveByTypesOptions, Location, NodeEntry, Text, Withable, WithElementType } from '@quadrats/core';
+import { Editor, QuadratsElement, GetAboveByTypesOptions, Location, NodeEntry, Text, Withable, WithElementType } from '@quadrats/core';
 export declare type ImageFigureTypeKey = 'figure';
 export declare type ImageTypeKey = 'image';
 export declare type ImageCaptionTypeKey = 'caption';
 export declare type ImageTypes = Record<ImageFigureTypeKey | ImageTypeKey | ImageCaptionTypeKey, string>;
-export interface ImageFigureElement extends Element, WithElementType {
+export interface ImageFigureElement extends QuadratsElement, WithElementType {
     width?: number;
 }
-export interface ImageElement extends Element, WithElementType {
+export interface ImageElement extends QuadratsElement, WithElementType {
     children: [Text];
     src: string;
     /**
@@ -15,7 +15,7 @@ export interface ImageElement extends Element, WithElementType {
      */
     hosting?: string;
 }
-export interface ImageCaptionElement extends Element, WithElementType {
+export interface ImageCaptionElement extends QuadratsElement, WithElementType {
 }
 /**
  * Indicate how to resolve the `src` and `hosting` of image element.
@@ -61,5 +61,5 @@ export interface Image<Hosting extends string> extends Withable {
         hosting?: Hosting;
         at?: Location;
     }): void;
-    resizeImage(editor: Editor, entry: NodeEntry<Element>, width: number): void;
+    resizeImage(editor: Editor, entry: NodeEntry<QuadratsElement>, width: number): void;
 }

package/input-block/createInputBlock.js

@@ -28,7 +28,13 @@ function createInputBlock(options = {}) {
         confirm,
         with(editor) {
             const { isVoid } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = (element) => {
+                // invalidate unfinished input_block from storage
+                if (element.type === type
+                    && typeof element.getPlaceholder !== 'function')
+                    return false;
+                return element.type === type || isVoid(element);
+            };
             return editor;
         },
     };

package/input-block/index.cjs.js

@@ -33,7 +33,13 @@ function createInputBlock(options = {}) {
         confirm,
         with(editor) {
             const { isVoid } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = (element) => {
+                // invalidate unfinished input_block from storage
+                if (element.type === type
+                    && typeof element.getPlaceholder !== 'function')
+                    return false;
+                return element.type === type || isVoid(element);
+            };
             return editor;
         },
     };

package/input-block/typings.d.ts

@@ -1,6 +1,6 @@
-import { Editor, Element, NodeEntry, Withable } from '@quadrats/core';
+import { Editor, QuadratsElement, NodeEntry, Withable } from '@quadrats/core';
 import { InputWidgetConfig } from '@quadrats/common/input-widget';
-export interface InputBlockElement extends Element, InputWidgetConfig {
+export interface InputBlockElement extends QuadratsElement, InputWidgetConfig {
     type: string;
 }
 export interface InputBlock extends Withable {

package/italic/createItalic.d.ts

@@ -1 +1 @@
-export declare const createItalic: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createItalic: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;

package/italic/createItalic.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { ITALIC_TYPE } from './constants.js';
 
 const createItalic = (variant) => createToggleMarkCreator({
-    type: getVariantType(ITALIC_TYPE, variant),
-    parentType: ITALIC_TYPE,
+    type: ITALIC_TYPE,
+    variant,
 });
 
 export { createItalic };

package/italic/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const ITALIC_TYPE = 'italic';
 
 const createItalic = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(ITALIC_TYPE, variant),
-    parentType: ITALIC_TYPE,
+    type: ITALIC_TYPE,
+    variant,
 });
 
 exports.ITALIC_TYPE = ITALIC_TYPE;

package/link/createLink.js

@@ -1,5 +1,5 @@
 import { isUrl } from '@quadrats/utils';
-import { Range, unwrapNodesByTypes, Editor, Element, Transforms, getRangeBeforeFromAboveBlockStart, getRangeBefore, isNodesTypeIn, wrapNodesWithUnhangRange, Text, getAboveByTypes } from '@quadrats/core';
+import { Range, unwrapNodesByTypes, Editor, Element, Transforms, Text, getRangeBeforeFromAboveBlockStart, getRangeBefore, isNodesTypeIn, wrapNodesWithUnhangRange, getAboveByTypes } from '@quadrats/core';
 import { LINK_TYPE } from './constants.js';
 
 function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAfterSpaceEntered = true, wrappableVoidTypes, } = {}) {
@@ -35,7 +35,7 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
             }
         }
     };
-    const isSelectionInLink = (editor) => isNodesTypeIn(editor, [type]);
+    const isSelectionInLink = editor => isNodesTypeIn(editor, [type]);
     const insertLink = (editor, url, options = {}) => {
         const { text = url } = options;
         const link = {
@@ -66,6 +66,9 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
                         unwrapLink(editor, { at: wrappableVoidPath });
                         wrapLink(editor, url, { at: wrappableVoidPath });
                     }
+                    else {
+                        insertLink(editor, url, { at });
+                    }
                     return;
                 }
             }
@@ -115,7 +118,7 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
                 if (!wrappableVoidTypes) {
                     return true;
                 }
-                return !element.children.some((child) => Editor.isBlock(editor, child)
+                return !element.children.some(child => Editor.isBlock(editor, child)
                     && Editor.isVoid(editor, child)
                     && wrappableVoidTypes.includes(child.type));
             };
@@ -129,6 +132,15 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
                         Transforms.unwrapNodes(editor, { at: path });
                         return;
                     }
+                    /**
+                     * Remove empty content.
+                     */
+                    if (Text.isTextList(node.children)) {
+                        if (node.children.every(textNode => !textNode.text)) {
+                            Transforms.unwrapNodes(editor, { at: path });
+                            return;
+                        }
+                    }
                 }
                 normalizeNode(entry);
             };

package/link/index.cjs.js

@@ -40,7 +40,7 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
             }
         }
     };
-    const isSelectionInLink = (editor) => core.isNodesTypeIn(editor, [type]);
+    const isSelectionInLink = editor => core.isNodesTypeIn(editor, [type]);
     const insertLink = (editor, url, options = {}) => {
         const { text = url } = options;
         const link = {
@@ -71,6 +71,9 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
                         unwrapLink(editor, { at: wrappableVoidPath });
                         wrapLink(editor, url, { at: wrappableVoidPath });
                     }
+                    else {
+                        insertLink(editor, url, { at });
+                    }
                     return;
                 }
             }
@@ -120,7 +123,7 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
                 if (!wrappableVoidTypes) {
                     return true;
                 }
-                return !element.children.some((child) => core.Editor.isBlock(editor, child)
+                return !element.children.some(child => core.Editor.isBlock(editor, child)
                     && core.Editor.isVoid(editor, child)
                     && wrappableVoidTypes.includes(child.type));
             };
@@ -134,6 +137,15 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
                         core.Transforms.unwrapNodes(editor, { at: path });
                         return;
                     }
+                    /**
+                     * Remove empty content.
+                     */
+                    if (core.Text.isTextList(node.children)) {
+                        if (node.children.every(textNode => !textNode.text)) {
+                            core.Transforms.unwrapNodes(editor, { at: path });
+                            return;
+                        }
+                    }
                 }
                 normalizeNode(entry);
             };

package/link/typings.d.ts

@@ -1,5 +1,5 @@
-import { Editor, Location, Range, Element, WithElementType, TransformsInsertNodesOptions, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable } from '@quadrats/core';
-export interface LinkElement extends Element, WithElementType {
+import { Editor, Location, Range, WithElementType, TransformsInsertNodesOptions, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable, QuadratsElement } from '@quadrats/core';
+export interface LinkElement extends QuadratsElement, WithElementType {
     url: string;
 }
 export interface LinkInsertLinkOptions extends TransformsInsertNodesOptions {

package/list/createList.js

@@ -50,19 +50,24 @@ function createList(options = {}) {
         }
     };
     const increaseListItemDepth = (editor, entries) => {
+        var _a, _b, _c, _d, _e;
         const { list: [listNode], listItem: [, listItemPath], } = entries;
         if (!isFirstChild(listItemPath)) {
             const previousEntry = Editor.node(editor, Path.previous(listItemPath));
             if (previousEntry) {
                 const [previousNode, previousPath] = previousEntry;
-                const lastNodeOfPreviousNode = previousNode.children[previousNode.children.length - 1];
+                const lastNodeOfPreviousNode = ((_a = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _a !== void 0 ? _a : [])[((_b = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _b !== void 0 ? _b : []).length - 1];
                 /**
                  * Move list item next to the last node of previous node of list item.
                  */
                 if (isListElement(lastNodeOfPreviousNode)) {
                     Transforms.moveNodes(editor, {
                         at: listItemPath,
-                        to: [...previousPath, previousNode.children.length - 1, lastNodeOfPreviousNode.children.length],
+                        to: [
+                            ...previousPath,
+                            ((_c = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _c !== void 0 ? _c : []).length - 1,
+                            ((_d = lastNodeOfPreviousNode === null || lastNodeOfPreviousNode === void 0 ? void 0 : lastNodeOfPreviousNode.children) !== null && _d !== void 0 ? _d : []).length,
+                        ],
                     });
                     /**
                      * Wrap list item by a new list and move the new list next to the last node of previous node.
@@ -73,13 +78,14 @@ function createList(options = {}) {
                     Transforms.wrapNodes(editor, newSubListElement, { at: listItemPath });
                     Transforms.moveNodes(editor, {
                         at: listItemPath,
-                        to: [...previousPath, previousNode.children.length],
+                        to: [...previousPath, ((_e = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _e !== void 0 ? _e : []).length],
                     });
                 }
             }
         }
     };
     const decreaseListItemDepth = (editor, entries) => {
+        var _a, _b, _c;
         const { list: [listNode, listPath], listItem: [listItemNode, listItemPath], } = entries;
         const [listParentNode, listParentPath] = Editor.parent(editor, listPath);
         /**
@@ -90,7 +96,7 @@ function createList(options = {}) {
         }
         const newListItemPath = Path.next(listParentPath);
         const listItemIndex = listItemPath[listItemPath.length - 1];
-        const nextSiblingListItems = listNode.children.slice(listItemIndex + 1, listNode.children.length);
+        const nextSiblingListItems = ((_a = listNode === null || listNode === void 0 ? void 0 : listNode.children) !== null && _a !== void 0 ? _a : []).slice(listItemIndex + 1, ((_b = listNode === null || listNode === void 0 ? void 0 : listNode.children) !== null && _b !== void 0 ? _b : []).length);
         Transforms.moveNodes(editor, {
             at: listItemPath,
             to: newListItemPath,
@@ -100,7 +106,7 @@ function createList(options = {}) {
          */
         if (nextSiblingListItems.length) {
             const newSubListElement = { type: listNode.type, children: [] };
-            const newSubListPath = [...newListItemPath, listItemNode.children.length];
+            const newSubListPath = [...newListItemPath, ((_c = listItemNode === null || listItemNode === void 0 ? void 0 : listItemNode.children) !== null && _c !== void 0 ? _c : []).length];
             Transforms.insertNodes(editor, newSubListElement, { at: newSubListPath });
             nextSiblingListItems.forEach((_, index) => {
                 Transforms.moveNodes(editor, {

package/list/index.cjs.js

@@ -59,19 +59,24 @@ function createList(options = {}) {
         }
     };
     const increaseListItemDepth = (editor, entries) => {
+        var _a, _b, _c, _d, _e;
         const { list: [listNode], listItem: [, listItemPath], } = entries;
         if (!core.isFirstChild(listItemPath)) {
             const previousEntry = core.Editor.node(editor, core.Path.previous(listItemPath));
             if (previousEntry) {
                 const [previousNode, previousPath] = previousEntry;
-                const lastNodeOfPreviousNode = previousNode.children[previousNode.children.length - 1];
+                const lastNodeOfPreviousNode = ((_a = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _a !== void 0 ? _a : [])[((_b = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _b !== void 0 ? _b : []).length - 1];
                 /**
                  * Move list item next to the last node of previous node of list item.
                  */
                 if (isListElement(lastNodeOfPreviousNode)) {
                     core.Transforms.moveNodes(editor, {
                         at: listItemPath,
-                        to: [...previousPath, previousNode.children.length - 1, lastNodeOfPreviousNode.children.length],
+                        to: [
+                            ...previousPath,
+                            ((_c = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _c !== void 0 ? _c : []).length - 1,
+                            ((_d = lastNodeOfPreviousNode === null || lastNodeOfPreviousNode === void 0 ? void 0 : lastNodeOfPreviousNode.children) !== null && _d !== void 0 ? _d : []).length,
+                        ],
                     });
                     /**
                      * Wrap list item by a new list and move the new list next to the last node of previous node.
@@ -82,13 +87,14 @@ function createList(options = {}) {
                     core.Transforms.wrapNodes(editor, newSubListElement, { at: listItemPath });
                     core.Transforms.moveNodes(editor, {
                         at: listItemPath,
-                        to: [...previousPath, previousNode.children.length],
+                        to: [...previousPath, ((_e = previousNode === null || previousNode === void 0 ? void 0 : previousNode.children) !== null && _e !== void 0 ? _e : []).length],
                     });
                 }
             }
         }
     };
     const decreaseListItemDepth = (editor, entries) => {
+        var _a, _b, _c;
         const { list: [listNode, listPath], listItem: [listItemNode, listItemPath], } = entries;
         const [listParentNode, listParentPath] = core.Editor.parent(editor, listPath);
         /**
@@ -99,7 +105,7 @@ function createList(options = {}) {
         }
         const newListItemPath = core.Path.next(listParentPath);
         const listItemIndex = listItemPath[listItemPath.length - 1];
-        const nextSiblingListItems = listNode.children.slice(listItemIndex + 1, listNode.children.length);
+        const nextSiblingListItems = ((_a = listNode === null || listNode === void 0 ? void 0 : listNode.children) !== null && _a !== void 0 ? _a : []).slice(listItemIndex + 1, ((_b = listNode === null || listNode === void 0 ? void 0 : listNode.children) !== null && _b !== void 0 ? _b : []).length);
         core.Transforms.moveNodes(editor, {
             at: listItemPath,
             to: newListItemPath,
@@ -109,7 +115,7 @@ function createList(options = {}) {
          */
         if (nextSiblingListItems.length) {
             const newSubListElement = { type: listNode.type, children: [] };
-            const newSubListPath = [...newListItemPath, listItemNode.children.length];
+            const newSubListPath = [...newListItemPath, ((_c = listItemNode === null || listItemNode === void 0 ? void 0 : listItemNode.children) !== null && _c !== void 0 ? _c : []).length];
             core.Transforms.insertNodes(editor, newSubListElement, { at: newSubListPath });
             nextSiblingListItems.forEach((_, index) => {
                 core.Transforms.moveNodes(editor, {

package/list/typings.d.ts

@@ -1,13 +1,13 @@
-import { Editor, Element, Location, Node, NodeEntry, Withable, WithElementType } from '@quadrats/core';
+import { Editor, QuadratsElement, Location, Node, NodeEntry, Withable, WithElementType } from '@quadrats/core';
 export declare type ListRootTypeKey = 'ol' | 'ul';
 export declare type ListItemTypeKey = 'li';
 export declare type ListTypeKey = ListRootTypeKey | ListItemTypeKey;
 export declare type ListTypes = Record<ListTypeKey, string>;
-export interface ListElement extends Element, WithElementType {
+export interface ListElement extends QuadratsElement, WithElementType {
 }
 export interface ListAboveListAndItem {
-    list: NodeEntry<Element>;
-    listItem: NodeEntry<Element>;
+    list: NodeEntry<QuadratsElement>;
+    listItem: NodeEntry<QuadratsElement>;
 }
 export interface ListGetAboveListEntriesOptions {
     at?: Location;
@@ -17,8 +17,8 @@ export interface List extends Withable {
      * An object which keys are `ul`, `ol`, `li` and values are the corresponding element types.
      */
     types: ListTypes;
-    isListElement(node: Node): node is Element;
-    isListItemElement(node: Node): node is Element;
+    isListElement(node: Node): node is QuadratsElement;
+    isListItemElement(node: Node): node is QuadratsElement;
     isSelectionInList(editor: Editor, listTypeKey: ListRootTypeKey): boolean;
     /**
      * If expanded, get the list wrapping the location.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadrats/common",
-  "version": "0.4.0",
+  "version": "0.5.2",
   "description": "",
   "author": "Rytass",
   "homepage": "https://github.com/Quadrats/quadrats#readme",
@@ -18,8 +18,8 @@
     "url": "https://github.com/Quadrats/quadrats/issues"
   },
   "dependencies": {
-    "@quadrats/core": "^0.4.0",
-    "@quadrats/locales": "^0.4.0",
-    "@quadrats/utils": "^0.4.0"
+    "@quadrats/core": "^0.5.2",
+    "@quadrats/locales": "^0.5.0",
+    "@quadrats/utils": "^0.5.0"
   }
 }

package/read-more/createReadMore.js

@@ -29,7 +29,7 @@ function createReadMore(options = {}) {
         insertReadMore,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (Element.isElement(node) && node.type === type) {

package/read-more/index.cjs.js

@@ -34,7 +34,7 @@ function createReadMore(options = {}) {
         insertReadMore,
         with(editor) {
             const { isVoid, normalizeNode } = editor;
-            editor.isVoid = (element) => element.type === type || isVoid(element);
+            editor.isVoid = element => element.type === type || isVoid(element);
             editor.normalizeNode = (entry) => {
                 const [node, path] = entry;
                 if (core.Element.isElement(node) && node.type === type) {

package/read-more/typings.d.ts

@@ -1,5 +1,5 @@
-import { Editor, Element, Text, Withable, WithElementType } from '@quadrats/core';
-export interface ReadMoreElement extends Element, WithElementType {
+import { Editor, QuadratsElement, Text, Withable, WithElementType } from '@quadrats/core';
+export interface ReadMoreElement extends QuadratsElement, WithElementType {
     children: [Text];
 }
 export interface ReadMore extends WithElementType, Withable {

package/strikethrough/createStrikethrough.d.ts

@@ -1 +1 @@
-export declare const createStrikethrough: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createStrikethrough: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;

package/strikethrough/createStrikethrough.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { STRIKETHROUGH_TYPE } from './constants.js';
 
 const createStrikethrough = (variant) => createToggleMarkCreator({
-    type: getVariantType(STRIKETHROUGH_TYPE, variant),
-    parentType: STRIKETHROUGH_TYPE,
+    type: STRIKETHROUGH_TYPE,
+    variant,
 });
 
 export { createStrikethrough };

package/strikethrough/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const STRIKETHROUGH_TYPE = 'strikethrough';
 
 const createStrikethrough = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(STRIKETHROUGH_TYPE, variant),
-    parentType: STRIKETHROUGH_TYPE,
+    type: STRIKETHROUGH_TYPE,
+    variant,
 });
 
 exports.STRIKETHROUGH_TYPE = STRIKETHROUGH_TYPE;

package/toggle-mark/createToggleMarkCreator.d.ts

@@ -1,9 +1,9 @@
 import { WithMarkType } from '@quadrats/core';
 import { ToggleMark } from './typings';
 export declare type CreateToggleMarkCreatorOptions = WithMarkType & {
-    parentType?: string;
+    variant?: string;
 };
 export declare type CreateToggleMarkOptions = Partial<CreateToggleMarkCreatorOptions> & {
-    parentType?: string;
+    variant?: string;
 };
-export declare function createToggleMarkCreator(defaults: CreateToggleMarkCreatorOptions): ({ type, parentType }?: CreateToggleMarkOptions) => ToggleMark;
+export declare function createToggleMarkCreator(defaults: CreateToggleMarkCreatorOptions): ({ type, variant }?: CreateToggleMarkOptions) => ToggleMark;

package/toggle-mark/createToggleMarkCreator.js

@@ -1,27 +1,33 @@
-import { getMark, marksGroupBy } from '@quadrats/core';
+import { getMark } from '@quadrats/core';
 
 function createToggleMarkCreator(defaults) {
-    return ({ type = defaults.type, parentType = defaults.parentType } = {}) => {
+    return ({ type = defaults.type, variant = defaults.variant } = {}) => {
         const isToggleMarkActive = (editor) => {
             const mark = getMark(editor, type);
-            return mark === true;
+            if (mark !== true)
+                return false;
+            const nowVariant = getMark(editor, `${type}Variant`) || '';
+            if (variant) {
+                return nowVariant === variant;
+            }
+            return !nowVariant;
         };
         const toggleMark = (editor) => {
             const isActive = isToggleMarkActive(editor);
             if (isActive) {
                 editor.removeMark(type);
+                if (variant) {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
             else {
-                if (parentType) {
-                    marksGroupBy(editor, (_mark) => {
-                        if (_mark.match(parentType)) {
-                            editor.removeMark(_mark);
-                            return true;
-                        }
-                        return false;
-                    });
-                }
                 editor.addMark(type, true);
+                if (variant) {
+                    editor.addMark(`${type}Variant`, variant);
+                }
+                else {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
         };
         return {

package/toggle-mark/index.cjs.js

@@ -5,27 +5,33 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var core = require('@quadrats/core');
 
 function createToggleMarkCreator(defaults) {
-    return ({ type = defaults.type, parentType = defaults.parentType } = {}) => {
+    return ({ type = defaults.type, variant = defaults.variant } = {}) => {
         const isToggleMarkActive = (editor) => {
             const mark = core.getMark(editor, type);
-            return mark === true;
+            if (mark !== true)
+                return false;
+            const nowVariant = core.getMark(editor, `${type}Variant`) || '';
+            if (variant) {
+                return nowVariant === variant;
+            }
+            return !nowVariant;
         };
         const toggleMark = (editor) => {
             const isActive = isToggleMarkActive(editor);
             if (isActive) {
                 editor.removeMark(type);
+                if (variant) {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
             else {
-                if (parentType) {
-                    core.marksGroupBy(editor, (_mark) => {
-                        if (_mark.match(parentType)) {
-                            editor.removeMark(_mark);
-                            return true;
-                        }
-                        return false;
-                    });
-                }
                 editor.addMark(type, true);
+                if (variant) {
+                    editor.addMark(`${type}Variant`, variant);
+                }
+                else {
+                    editor.removeMark(`${type}Variant`);
+                }
             }
         };
         return {

package/underline/createUnderline.d.ts

@@ -1 +1 @@
-export declare const createUnderline: (variant?: string | undefined) => ({ type, parentType }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;
+export declare const createUnderline: (variant?: string | undefined) => ({ type, variant }?: import("@quadrats/common/toggle-mark").CreateToggleMarkOptions | undefined) => import("@quadrats/common/toggle-mark").ToggleMark;

package/underline/createUnderline.js

@@ -1,10 +1,9 @@
 import { createToggleMarkCreator } from '@quadrats/common/toggle-mark';
-import { getVariantType } from '@quadrats/core';
 import { UNDERLINE_TYPE } from './constants.js';
 
 const createUnderline = (variant) => createToggleMarkCreator({
-    type: getVariantType(UNDERLINE_TYPE, variant),
-    parentType: UNDERLINE_TYPE,
+    type: UNDERLINE_TYPE,
+    variant,
 });
 
 export { createUnderline };

package/underline/index.cjs.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var toggleMark = require('@quadrats/common/toggle-mark');
-var core = require('@quadrats/core');
 
 const UNDERLINE_TYPE = 'underline';
 
 const createUnderline = (variant) => toggleMark.createToggleMarkCreator({
-    type: core.getVariantType(UNDERLINE_TYPE, variant),
-    parentType: UNDERLINE_TYPE,
+    type: UNDERLINE_TYPE,
+    variant,
 });
 
 exports.UNDERLINE_TYPE = UNDERLINE_TYPE;