@quadrats/common 0.4.4 → 0.5.3

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,7 +1,7 @@
-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;
-    toggleBlockquote(editor: Editor): void;
+export interface Blockquote<T extends Editor = Editor> extends WithElementType, Withable {
+    isSelectionInBlockquote(editor: T): boolean;
+    toggleBlockquote(editor: T): void;
 }

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

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,8 +1,8 @@
-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 {
+export interface Divider<T extends Editor = Editor> extends WithElementType, Withable {
     createDividerElement(): DividerElement;
-    insertDivider(editor: Editor): void;
+    insertDivider(editor: T): void;
 }

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.
      *
@@ -20,7 +20,7 @@ export interface EmbedStrategy<EmbedData extends Record<string, unknown>, Render
     readonly isElementDataValid: (data: Record<keyof EmbedData, unknown>) => boolean;
 }
 export declare type EmbedStrategies<Provider extends string> = Record<Provider, EmbedStrategy<any, any>>;
-export interface Embed<P extends string> extends WithElementType, Withable {
+export interface Embed<P extends string, T extends Editor = Editor> extends WithElementType, Withable {
     strategies: EmbedStrategies<P>;
-    insertEmbed(editor: Editor, providers: P[], embedCode: string, defaultNode?: Node | string): void;
+    insertEmbed(editor: T, providers: P[], embedCode: string, defaultNode?: Node | string): void;
 }

package/file-uploader/createFileUploader.d.ts

@@ -1,5 +1,6 @@
+import { Editor } from '@quadrats/core';
 import { FileUploader } from './typings';
 export interface CreateFileUploaderOptions {
     type?: string;
 }
-export declare function createFileUploader(options?: CreateFileUploaderOptions): FileUploader;
+export declare function createFileUploader(options?: CreateFileUploaderOptions): FileUploader<Editor>;

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());
@@ -78,8 +74,6 @@ function createFileUploader(options = {}) {
         createFileUploaderElement,
         upload,
         with(editor) {
-            // const { isVoid } = editor;
-            // editor.isVoid = element => element.type === type || isVoid(element);
             return editor;
         },
     };

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());
@@ -132,8 +128,6 @@ function createFileUploader(options = {}) {
         createFileUploaderElement,
         upload,
         with(editor) {
-            // const { isVoid } = editor;
-            // editor.isVoid = element => element.type === type || isVoid(element);
             return editor;
         },
     };

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;
@@ -30,8 +30,8 @@ export interface FileUploaderCreateFileUploaderElementOptions {
     getUrl: FileUploaderGetUrl;
 }
 export declare type FileUploaderUploadOptions = FileUploaderCreateFileUploaderElementOptions & GetFilesFromInputOptions & TransformsInsertNodesOptions;
-export interface FileUploader extends Withable {
+export interface FileUploader<T extends Editor = Editor> 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: T, file: File, options: FileUploaderCreateFileUploaderElementOptions): Promise<FileUploaderElement | undefined>;
+    upload(editor: T, 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;
 }
@@ -13,12 +18,11 @@ export interface FootnoteWrapFootnoteOptions extends Omit<TransformsWrapNodesOpt
 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;
-    updateFootnoteIndex(editor: Editor, options?: FootnoteUpdateFootnoteIndexOptions): void;
-    upsertFootnoteAndUpdateIndex(editor: Editor, footnote: string, options?: FootnoteUpsertFootnoteOptions): void;
-    wrapFootnote(editor: Editor, footnote: string, options?: FootnoteWrapFootnoteOptions): void;
+export interface Footnote<T extends Editor = Editor> extends WithElementType, Withable {
+    getFootnoteText(editor: T): string;
+    isSelectionInFootnote(editor: T): boolean;
+    unwrapFootnote(editor: T, options?: FootnoteUnwrapFootnoteOptions): void;
+    updateFootnoteIndex(editor: T, options?: FootnoteUpdateFootnoteIndexOptions): void;
+    upsertFootnoteAndUpdateIndex(editor: T, footnote: string, options?: FootnoteUpsertFootnoteOptions): void;
+    wrapFootnote(editor: T, footnote: string, options?: FootnoteWrapFootnoteOptions): 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> {
@@ -9,8 +9,8 @@ export interface WithEnabledHeadingLevels<L extends HeadingLevel> {
      */
     enabledLevels: ReadonlyArray<L>;
 }
-export interface Heading<L extends HeadingLevel> extends WithElementType, Withable, WithEnabledHeadingLevels<L> {
-    getHeadingNodes(editor: Editor, level: L, options?: GetNodesOptions): Generator<NodeEntry<Node>>;
-    isSelectionInHeading(editor: Editor, level: L, options?: GetNodesOptions): boolean;
-    toggleHeadingNodes(editor: Editor, level: L, defaultType?: string): void;
+export interface Heading<L extends HeadingLevel, T extends Editor = Editor> extends WithElementType, Withable, WithEnabledHeadingLevels<L> {
+    getHeadingNodes(editor: T, level: L, options?: GetNodesOptions): Generator<NodeEntry<Node>>;
+    isSelectionInHeading(editor: T, level: L, options?: GetNodesOptions): boolean;
+    toggleHeadingNodes(editor: T, level: L, defaultType?: string): void;
 }

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

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)) {