@quadrats/common 0.5.10 → 0.6.4

package/blockquote/createBlockquote.js

@@ -1,38 +1,35 @@
-import { isNodesTypeIn, toggleNodesType, Editor, Transforms, createParagraphElement, Element, normalizeOnlyInlineOrTextInChildren } from '@quadrats/core';
+import { isNodesTypeIn, unwrapNodesByTypes, wrapNodesWithUnhangRange } from '@quadrats/core';
 import { BLOCKQUOTE_TYPE } from './constants.js';
 
 function createBlockquote({ type = BLOCKQUOTE_TYPE } = {}) {
+    const unwrapBlockquote = (editor) => {
+        unwrapNodesByTypes(editor, [type]);
+    };
+    const wrapBlockquote = (editor) => {
+        const element = {
+            type,
+            children: [],
+        };
+        wrapNodesWithUnhangRange(editor, element, { split: true });
+    };
+    const isSelectionInBlockquote = editor => (isNodesTypeIn(editor, [type], { mode: 'highest' }));
     return {
         type,
-        isSelectionInBlockquote: editor => isNodesTypeIn(editor, [type]),
+        unwrapBlockquote,
+        wrapBlockquote,
+        isSelectionInBlockquote,
         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);
+            const actived = isSelectionInBlockquote(editor);
+            if (editor.selection) {
+                if (actived) {
+                    unwrapBlockquote(editor);
+                }
+                else {
+                    wrapBlockquote(editor);
                 }
             }
         },
         with(editor) {
-            const { normalizeNode } = editor;
-            editor.normalizeNode = (entry) => {
-                const [node] = entry;
-                if (Element.isElement(node) && node.type === type) {
-                    if (normalizeOnlyInlineOrTextInChildren(editor, entry)) {
-                        return;
-                    }
-                }
-                normalizeNode(entry);
-            };
             return editor;
         },
     };

package/blockquote/index.cjs.js

@@ -7,37 +7,34 @@ var core = require('@quadrats/core');
 const BLOCKQUOTE_TYPE = 'blockquote';
 
 function createBlockquote({ type = BLOCKQUOTE_TYPE } = {}) {
+    const unwrapBlockquote = (editor) => {
+        core.unwrapNodesByTypes(editor, [type]);
+    };
+    const wrapBlockquote = (editor) => {
+        const element = {
+            type,
+            children: [],
+        };
+        core.wrapNodesWithUnhangRange(editor, element, { split: true });
+    };
+    const isSelectionInBlockquote = editor => (core.isNodesTypeIn(editor, [type], { mode: 'highest' }));
     return {
         type,
-        isSelectionInBlockquote: editor => core.isNodesTypeIn(editor, [type]),
+        unwrapBlockquote,
+        wrapBlockquote,
+        isSelectionInBlockquote,
         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);
+            const actived = isSelectionInBlockquote(editor);
+            if (editor.selection) {
+                if (actived) {
+                    unwrapBlockquote(editor);
+                }
+                else {
+                    wrapBlockquote(editor);
                 }
             }
         },
         with(editor) {
-            const { normalizeNode } = editor;
-            editor.normalizeNode = (entry) => {
-                const [node] = entry;
-                if (core.Element.isElement(node) && node.type === type) {
-                    if (core.normalizeOnlyInlineOrTextInChildren(editor, entry)) {
-                        return;
-                    }
-                }
-                normalizeNode(entry);
-            };
             return editor;
         },
     };

package/blockquote/typings.d.ts

@@ -2,6 +2,8 @@ import { Editor, QuadratsElement, Withable, WithElementType } from '@quadrats/co
 export interface BlockquoteElement extends QuadratsElement, WithElementType {
 }
 export interface Blockquote<T extends Editor = Editor> extends WithElementType, Withable {
+    unwrapBlockquote(editor: T): void;
+    wrapBlockquote(editor: T): void;
     isSelectionInBlockquote(editor: T): boolean;
     toggleBlockquote(editor: T): void;
 }

package/file-uploader/createFileUploader.js

@@ -1,6 +1,6 @@
 import { __awaiter } from './_virtual/_tslib.js';
 import { readFileAsDataURL } from '@quadrats/utils';
-import { Transforms, createParagraphElement } from '@quadrats/core';
+import { Transforms, createParagraphElement, HistoryEditor } from '@quadrats/core';
 import { FILE_UPLOADER_TYPE } from './constants.js';
 import { getFilesFromInput } from './getFilesFromInput.js';
 
@@ -25,8 +25,10 @@ function createFileUploader(options = {}) {
                     if (xhr.status < 400) {
                         const path = getPath();
                         if (path) {
-                            Transforms.removeNodes(editor, { at: path });
-                            Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
+                            HistoryEditor.withoutSaving(editor, () => {
+                                Transforms.removeNodes(editor, { at: path });
+                                Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
+                            });
                         }
                     }
                     else {

package/file-uploader/index.cjs.js

@@ -79,8 +79,10 @@ function createFileUploader(options = {}) {
                     if (xhr.status < 400) {
                         const path = getPath();
                         if (path) {
-                            core.Transforms.removeNodes(editor, { at: path });
-                            core.Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
+                            core.HistoryEditor.withoutSaving(editor, () => {
+                                core.Transforms.removeNodes(editor, { at: path });
+                                core.Transforms.insertNodes(editor, createElementByResponse(xhr.response), { at: path });
+                            });
                         }
                     }
                     else {

package/footnote/createFootnote.js

@@ -5,13 +5,13 @@ import { FOOTNOTE_TYPE } from './constants.js';
 function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     const isSelectionInFootnote = editor => isNodesTypeIn(editor, [type]);
     const getFootnoteText = (editor) => {
-        var _a, _b, _c;
+        var _a, _b;
         const at = editor.selection;
         if (!at) {
             return '';
         }
         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;
+        return firstNode === null || firstNode === void 0 ? void 0 : firstNode.footnote;
     };
     const updateFootnoteIndex = (editor, options = { startAt: 1 }) => {
         var _a;

package/footnote/index.cjs.js

@@ -10,13 +10,13 @@ const FOOTNOTE_TYPE = 'footnote';
 function createFootnote({ type = FOOTNOTE_TYPE, } = {}) {
     const isSelectionInFootnote = editor => core.isNodesTypeIn(editor, [type]);
     const getFootnoteText = (editor) => {
-        var _a, _b, _c;
+        var _a, _b;
         const at = editor.selection;
         if (!at) {
             return '';
         }
         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;
+        return firstNode === null || firstNode === void 0 ? void 0 : firstNode.footnote;
     };
     const updateFootnoteIndex = (editor, options = { startAt: 1 }) => {
         var _a;

package/link/createLink.js

@@ -68,6 +68,7 @@ function createLink({ type = LINK_TYPE, isUrl: isUrl$1 = isUrl, prevUrlToLinkAft
                     }
                     else {
                         insertLink(editor, url, { at });
+                        Transforms.move(editor, { distance: url.length });
                     }
                     return;
                 }

package/link/index.cjs.js

@@ -73,6 +73,7 @@ function createLink({ type = LINK_TYPE, isUrl = utils.isUrl, prevUrlToLinkAfterS
                     }
                     else {
                         insertLink(editor, url, { at });
+                        core.Transforms.move(editor, { distance: url.length });
                     }
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadrats/common",
-  "version": "0.5.10",
+  "version": "0.6.4",
   "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.5.9",
-    "@quadrats/locales": "^0.5.0",
-    "@quadrats/utils": "^0.5.0"
+    "@quadrats/core": "^0.6.4",
+    "@quadrats/locales": "^0.6.0",
+    "@quadrats/utils": "^0.6.0"
   }
 }