@quadrats/common 0.4.4 → 0.5.3

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.
@@ -37,7 +37,7 @@ export declare type ImageHostingResolvers<Hosting extends string> = Record<Hosti
 export declare type ImageSizeSteps = ReadonlyArray<number>;
 export declare type ImageGetAboveImageFigureOptions = GetAboveByTypesOptions;
 export declare type ImageGetAboveImageCaptionOptions = GetAboveByTypesOptions;
-export interface Image<Hosting extends string> extends Withable {
+export interface Image<Hosting extends string, T extends Editor = Editor> extends Withable {
     /**
      * An object which keys are `figure`, `image`, 'caption` and values are the corresponding element types.
      */
@@ -51,15 +51,15 @@ export interface Image<Hosting extends string> extends Withable {
      */
     sizeSteps?: ImageSizeSteps;
     isImageUrl(url: string): boolean;
-    getAboveImageFigure(editor: Editor, options?: ImageGetAboveImageFigureOptions): NodeEntry<ImageFigureElement> | undefined;
-    getAboveImageCaption(editor: Editor, options?: ImageGetAboveImageCaptionOptions): NodeEntry<ImageCaptionElement> | undefined;
-    isSelectionInImage(editor: Editor): boolean;
-    isSelectionInImageCaption(editor: Editor): boolean;
-    isCollapsedOnImage(editor: Editor): boolean;
+    getAboveImageFigure(editor: T, options?: ImageGetAboveImageFigureOptions): NodeEntry<ImageFigureElement> | undefined;
+    getAboveImageCaption(editor: T, options?: ImageGetAboveImageCaptionOptions): NodeEntry<ImageCaptionElement> | undefined;
+    isSelectionInImage(editor: T): boolean;
+    isSelectionInImageCaption(editor: T): boolean;
+    isCollapsedOnImage(editor: T): boolean;
     createImageElement(src: string, hosting?: Hosting): ImageFigureElement;
-    insertImage(editor: Editor, src: string, options?: {
+    insertImage(editor: T, src: string, options?: {
         hosting?: Hosting;
         at?: Location;
     }): void;
-    resizeImage(editor: Editor, entry: NodeEntry<Element>, width: number): void;
+    resizeImage(editor: T, 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,11 +1,11 @@
-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 {
+export interface InputBlock<T extends Editor = Editor> extends Withable {
     type: string;
-    start(editor: Editor, config: InputWidgetConfig): void;
-    remove(editor: Editor, entry: NodeEntry<InputBlockElement>, foucs: VoidFunction): void;
+    start(editor: T, config: InputWidgetConfig): void;
+    remove(editor: T, entry: NodeEntry<InputBlockElement>, foucs: VoidFunction): void;
     confirm(element: InputBlockElement, value: string, remove: VoidFunction): void;
 }

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<import("slate").BaseEditor>;

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

@@ -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));
             };
@@ -133,7 +136,7 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
                      * Remove empty content.
                      */
                     if (Text.isTextList(node.children)) {
-                        if (node.children.every((textNode) => !textNode.text)) {
+                        if (node.children.every(textNode => !textNode.text)) {
                             Transforms.unwrapNodes(editor, { at: path });
                             return;
                         }

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));
             };
@@ -138,7 +141,7 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
                      * Remove empty content.
                      */
                     if (core.Text.isTextList(node.children)) {
-                        if (node.children.every((textNode) => !textNode.text)) {
+                        if (node.children.every(textNode => !textNode.text)) {
                             core.Transforms.unwrapNodes(editor, { at: path });
                             return;
                         }

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 {
@@ -10,18 +10,18 @@ export declare type LinkWrapLinkOptions = Omit<TransformsWrapNodesOptions, 'spli
 export interface LinkUpsertLinkOptions {
     at?: Range;
 }
-export interface Link extends WithElementType, Withable {
+export interface Link<T extends Editor = Editor> extends WithElementType, Withable {
     isUrl(value: string): boolean;
     /**
      * To get the first previous text which is url and its range.
      */
-    getFirstPrevTextAsUrlAndRange(editor: Editor, at: Location): {
+    getFirstPrevTextAsUrlAndRange(editor: T, at: Location): {
         url: string;
         at: Range;
     } | undefined;
-    isSelectionInLink(editor: Editor): boolean;
-    insertLink(editor: Editor, url: string, options?: LinkInsertLinkOptions): void;
-    unwrapLink(editor: Editor, options?: LinkUnwrapLinkOptions): void;
-    wrapLink(editor: Editor, url: string, options?: LinkWrapLinkOptions): void;
-    upsertLink(editor: Editor, url: string, options?: LinkUpsertLinkOptions): void;
+    isSelectionInLink(editor: T): boolean;
+    insertLink(editor: T, url: string, options?: LinkInsertLinkOptions): void;
+    unwrapLink(editor: T, options?: LinkUnwrapLinkOptions): void;
+    wrapLink(editor: T, url: string, options?: LinkWrapLinkOptions): void;
+    upsertLink(editor: T, url: string, options?: LinkUpsertLinkOptions): void;
 }

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,41 +1,41 @@
-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;
 }
-export interface List extends Withable {
+export interface List<T extends Editor = Editor> 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;
-    isSelectionInList(editor: Editor, listTypeKey: ListRootTypeKey): boolean;
+    isListElement(node: Node): node is QuadratsElement;
+    isListItemElement(node: Node): node is QuadratsElement;
+    isSelectionInList(editor: T, listTypeKey: ListRootTypeKey): boolean;
     /**
      * If expanded, get the list wrapping the location.
      */
-    getAboveListAndItem(editor: Editor, options?: ListGetAboveListEntriesOptions): ListAboveListAndItem | undefined;
-    unwrapList(editor: Editor): void;
-    toggleList(editor: Editor, listTypeKey: ListRootTypeKey, defaultType?: string): void;
+    getAboveListAndItem(editor: T, options?: ListGetAboveListEntriesOptions): ListAboveListAndItem | undefined;
+    unwrapList(editor: T): void;
+    toggleList(editor: T, listTypeKey: ListRootTypeKey, defaultType?: string): void;
     /**
      * Increase the depth of the first item in the location if increasable.
      */
-    increaseListItemDepth(editor: Editor, entries: ListAboveListAndItem): void;
+    increaseListItemDepth(editor: T, entries: ListAboveListAndItem): void;
     /**
      * Decrease the depth of the first item in the location if decreasable.
      */
-    decreaseListItemDepth(editor: Editor, entries: ListAboveListAndItem): void;
+    decreaseListItemDepth(editor: T, entries: ListAboveListAndItem): void;
     /**
      * Unwrap the list if at root, or decrease the depth of list item.
      */
-    decreaseListItemDepthOrUnwrapIfNeed(editor: Editor, entries: ListAboveListAndItem): void;
+    decreaseListItemDepthOrUnwrapIfNeed(editor: T, entries: ListAboveListAndItem): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadrats/common",
-  "version": "0.4.4",
+  "version": "0.5.3",
   "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,8 +1,8 @@
-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 {
+export interface ReadMore<T extends Editor = Editor> extends WithElementType, Withable {
     createReadMoreElement(): ReadMoreElement;
-    insertReadMore(editor: Editor): void;
+    insertReadMore(editor: T): void;
 }

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<import("slate").BaseEditor>;

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 {