@quadrats/common 0.4.4 → 0.4.5

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/footnote/createFootnote.js

@@ -4,21 +4,14 @@ 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 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;
@@ -61,7 +54,6 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     };
     return {
         type,
-        getAllFootnotes,
         getFootnoteText,
         isSelectionInFootnote,
         updateFootnoteIndex,

package/footnote/index.cjs.js

@@ -9,21 +9,14 @@ 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 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;
@@ -66,7 +59,6 @@ function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     };
     return {
         type,
-        getAllFootnotes,
         getFootnoteText,
         isSelectionInFootnote,
         updateFootnoteIndex,

package/footnote/typings.d.ts

@@ -1,4 +1,9 @@
-import { Editor, Range, Element, WithElementType, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable, NodeEntry, Node } from '@quadrats/core';
+import { Editor, Range, Element, WithElementType, UnwrapNodeByTypesOptions, TransformsWrapNodesOptions, Withable } from '@quadrats/core';
+export interface FootnoteData {
+    footnote: string;
+    index: number;
+    wrapperText: string;
+}
 export interface FootnoteElement extends Element, 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/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/input-block/createInputBlock.js

@@ -28,7 +28,12 @@ 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,12 @@ 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/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

@@ -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;
                 }
             }

package/link/index.cjs.js

@@ -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;
                 }
             }

package/package.json

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

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;