@quadrats/common 1.1.4 → 1.1.5

package/card/createCard.js

@@ -1,4 +1,4 @@
-import { Element, Node, Transforms, Editor, createParagraphElement } from '@quadrats/core';
+import { Element, Node, Transforms, Editor, Path, createParagraphElement } from '@quadrats/core';
 import { CARD_TYPES, CARD_PLACEHOLDER_TYPE } from './constants.js';
 
 function createCard(options) {
@@ -43,7 +43,25 @@ function createCard(options) {
         return Object.assign(Object.assign({ type: types.card, confirmModal }, cardValues), { children: [cardImageElement, cardContentsElement] });
     };
     const insertCard = ({ editor, cardValues }) => {
-        Transforms.insertNodes(editor, [createCardElement(cardValues), createParagraphElement()]);
+        const [currentBlockEntry] = Editor.nodes(editor, {
+            match: (n) => Element.isElement(n) && Editor.isBlock(editor, n),
+        });
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            // 在目前 block 後面插入
+            const insertPath = Path.next(currentPath);
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [createCardElement(cardValues), createParagraphElement()], {
+                    at: insertPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [createCardElement(cardValues), createParagraphElement()]);
+            });
+        }
     };
     const updateCardElement = ({ editor, cardValues, path }) => {
         var _a;

package/card/index.cjs.js

@@ -54,7 +54,25 @@ function createCard(options) {
         return Object.assign(Object.assign({ type: types.card, confirmModal }, cardValues), { children: [cardImageElement, cardContentsElement] });
     };
     const insertCard = ({ editor, cardValues }) => {
-        core.Transforms.insertNodes(editor, [createCardElement(cardValues), core.createParagraphElement()]);
+        const [currentBlockEntry] = core.Editor.nodes(editor, {
+            match: (n) => core.Element.isElement(n) && core.Editor.isBlock(editor, n),
+        });
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            // 在目前 block 後面插入
+            const insertPath = core.Path.next(currentPath);
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [createCardElement(cardValues), core.createParagraphElement()], {
+                    at: insertPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [createCardElement(cardValues), core.createParagraphElement()]);
+            });
+        }
     };
     const updateCardElement = ({ editor, cardValues, path }) => {
         var _a;

package/carousel/createCarousel.js

@@ -1,5 +1,5 @@
 import { __awaiter } from './_virtual/_tslib.js';
-import { Element, Node, Transforms, Editor, createParagraphElement } from '@quadrats/core';
+import { Element, Node, Transforms, Editor, Path, createParagraphElement } from '@quadrats/core';
 import { CAROUSEL_TYPES, CAROUSEL_PLACEHOLDER_TYPE } from './constants.js';
 import { getFilesFromInput } from './getFilesFromInput.js';
 
@@ -48,7 +48,25 @@ function createCarousel(options) {
         };
     };
     const insertCarousel = ({ editor, items }) => {
-        Transforms.insertNodes(editor, [createCarouselElement({ items }), createParagraphElement()]);
+        const [currentBlockEntry] = Editor.nodes(editor, {
+            match: (n) => Element.isElement(n) && Editor.isBlock(editor, n),
+        });
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            // 在目前 block 後面插入
+            const insertPath = Path.next(currentPath);
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [createCarouselElement({ items }), createParagraphElement()], {
+                    at: insertPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [createCarouselElement({ items }), createParagraphElement()]);
+            });
+        }
     };
     const updateCarouselElement = ({ editor, items, path }) => {
         Transforms.setNodes(editor, { items }, { at: path });

package/carousel/index.cjs.js

@@ -118,7 +118,25 @@ function createCarousel(options) {
         };
     };
     const insertCarousel = ({ editor, items }) => {
-        core.Transforms.insertNodes(editor, [createCarouselElement({ items }), core.createParagraphElement()]);
+        const [currentBlockEntry] = core.Editor.nodes(editor, {
+            match: (n) => core.Element.isElement(n) && core.Editor.isBlock(editor, n),
+        });
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            // 在目前 block 後面插入
+            const insertPath = core.Path.next(currentPath);
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [createCarouselElement({ items }), core.createParagraphElement()], {
+                    at: insertPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [createCarouselElement({ items }), core.createParagraphElement()]);
+            });
+        }
     };
     const updateCarouselElement = ({ editor, items, path }) => {
         core.Transforms.setNodes(editor, { items }, { at: path });

package/carousel/typings.d.ts

@@ -50,7 +50,7 @@ export interface Carousel<T extends Editor = Editor> extends Withable {
     maxLength: number;
     limitSize: number;
     confirmModal: boolean;
-    selectFiles(editor: T): Promise<File[] | undefined>;
+    selectFiles(): Promise<File[] | undefined>;
     getBody: FileUploaderGetBody;
     getHeaders?: FileUploaderGetHeaders;
     getUrl: FileUploaderGetUrl;

package/embed/createEmbed.js

@@ -1,4 +1,4 @@
-import { PARAGRAPH_TYPE, Element, Transforms, normalizeVoidElementChildren, Editor, isAboveBlockEmpty } from '@quadrats/core';
+import { PARAGRAPH_TYPE, Element, Transforms, normalizeVoidElementChildren, Editor, Path, isAboveBlockEmpty } from '@quadrats/core';
 import { EMBED_TYPE, EMBED_PLACEHOLDER_TYPE } from './constants.js';
 import { serializeEmbedCode } from './serializeEmbedCode.js';
 
@@ -9,17 +9,42 @@ function createEmbed(options) {
         const result = serializeEmbedCode(embedCode, strategies, provider);
         if (result) {
             const [provider, data] = result;
-            const embedElement = Object.assign(Object.assign({}, data), { type, provider, children: [{ text: '' }] });
+            const embedElement = Object.assign(Object.assign({}, data), { type,
+                provider, children: [{ text: '' }] });
+            const [currentBlockEntry] = Editor.nodes(editor, {
+                match: (n) => Element.isElement(n) && Editor.isBlock(editor, n),
+            });
+            if (currentBlockEntry) {
+                const [, currentPath] = currentBlockEntry;
+                // 在目前 block 後面插入
+                const insertPath = Path.next(currentPath);
+                Editor.withoutNormalizing(editor, () => {
+                    Transforms.insertNodes(editor, [
+                        embedElement,
+                        typeof defaultNode === 'string'
+                            ? { type: defaultNode, children: [{ text: '' }] }
+                            : defaultNode,
+                    ], {
+                        at: insertPath,
+                    });
+                });
+            }
+            else {
+                // 沒找到 block（例如空編輯器）
+                Editor.withoutNormalizing(editor, () => {
+                    Transforms.insertNodes(editor, [
+                        embedElement,
+                        typeof defaultNode === 'string'
+                            ? { type: defaultNode, children: [{ text: '' }] }
+                            : defaultNode,
+                    ]);
+                });
+            }
             if (isAboveBlockEmpty(editor)) {
                 Transforms.removeNodes(editor, {
                     at: (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor,
                 });
             }
-            Transforms.insertNodes(editor, [
-                embedElement,
-                typeof defaultNode === 'string'
-                    ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
-            ]);
             Transforms.move(editor);
         }
     };
@@ -34,9 +59,17 @@ function createEmbed(options) {
         });
     };
     const removeEmbedPlaceholder = (editor) => {
-        Transforms.removeNodes(editor, {
-            match: node => Element.isElement(node) && node.type === EMBED_PLACEHOLDER_TYPE,
-        });
+        const matches = Array.from(Editor.nodes(editor, {
+            at: [],
+            match: (node) => Element.isElement(node) && node.type === EMBED_PLACEHOLDER_TYPE,
+        }));
+        if (matches.length) {
+            matches
+                .map(([, path]) => path)
+                .forEach((path) => {
+                Transforms.removeNodes(editor, { at: path });
+            });
+        }
     };
     return {
         type,
@@ -46,12 +79,13 @@ function createEmbed(options) {
         removeEmbedPlaceholder,
         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;
+                        ? strategies[node.provider]
+                        : undefined;
                     if (!strategy || !strategy.isElementDataValid(node)) {
                         Transforms.removeNodes(editor, { at: path });
                         return;

package/embed/index.cjs.js

@@ -28,17 +28,42 @@ function createEmbed(options) {
         const result = serializeEmbedCode(embedCode, strategies, provider);
         if (result) {
             const [provider, data] = result;
-            const embedElement = Object.assign(Object.assign({}, data), { type, provider, children: [{ text: '' }] });
+            const embedElement = Object.assign(Object.assign({}, data), { type,
+                provider, children: [{ text: '' }] });
+            const [currentBlockEntry] = core.Editor.nodes(editor, {
+                match: (n) => core.Element.isElement(n) && core.Editor.isBlock(editor, n),
+            });
+            if (currentBlockEntry) {
+                const [, currentPath] = currentBlockEntry;
+                // 在目前 block 後面插入
+                const insertPath = core.Path.next(currentPath);
+                core.Editor.withoutNormalizing(editor, () => {
+                    core.Transforms.insertNodes(editor, [
+                        embedElement,
+                        typeof defaultNode === 'string'
+                            ? { type: defaultNode, children: [{ text: '' }] }
+                            : defaultNode,
+                    ], {
+                        at: insertPath,
+                    });
+                });
+            }
+            else {
+                // 沒找到 block（例如空編輯器）
+                core.Editor.withoutNormalizing(editor, () => {
+                    core.Transforms.insertNodes(editor, [
+                        embedElement,
+                        typeof defaultNode === 'string'
+                            ? { type: defaultNode, children: [{ text: '' }] }
+                            : defaultNode,
+                    ]);
+                });
+            }
             if (core.isAboveBlockEmpty(editor)) {
                 core.Transforms.removeNodes(editor, {
                     at: (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor,
                 });
             }
-            core.Transforms.insertNodes(editor, [
-                embedElement,
-                typeof defaultNode === 'string'
-                    ? { type: defaultNode, children: [{ text: '' }] } : defaultNode,
-            ]);
             core.Transforms.move(editor);
         }
     };
@@ -53,9 +78,17 @@ function createEmbed(options) {
         });
     };
     const removeEmbedPlaceholder = (editor) => {
-        core.Transforms.removeNodes(editor, {
-            match: node => core.Element.isElement(node) && node.type === EMBED_PLACEHOLDER_TYPE,
-        });
+        const matches = Array.from(core.Editor.nodes(editor, {
+            at: [],
+            match: (node) => core.Element.isElement(node) && node.type === EMBED_PLACEHOLDER_TYPE,
+        }));
+        if (matches.length) {
+            matches
+                .map(([, path]) => path)
+                .forEach((path) => {
+                core.Transforms.removeNodes(editor, { at: path });
+            });
+        }
     };
     return {
         type,
@@ -65,12 +98,13 @@ function createEmbed(options) {
         removeEmbedPlaceholder,
         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;
+                        ? strategies[node.provider]
+                        : undefined;
                     if (!strategy || !strategy.isElementDataValid(node)) {
                         core.Transforms.removeNodes(editor, { at: path });
                         return;

package/file-uploader/createFileUploader.d.ts

@@ -1,8 +1,8 @@
-import { Editor } from '@quadrats/core';
+import { Editor, NodeEntry, Node } from '@quadrats/core';
 import { FileUploader, FileUploaderElement } from './typings';
 export interface CreateFileUploaderOptions {
     type?: string;
 }
 export declare const createFileUploaderElementByType: (type: string) => FileUploader<Editor>['createFileUploaderElement'];
-export declare function insertFileUploaderElement(editor: Editor, fileUploaderElement: FileUploaderElement | undefined): void;
+export declare function insertFileUploaderElement(editor: Editor, fileUploaderElement: FileUploaderElement | undefined, currentBlockEntry?: NodeEntry<Node> | undefined): void;
 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 { Editor, isAboveBlockEmpty, Transforms, createParagraphElement, Element, HistoryEditor } from '@quadrats/core';
+import { Editor, Transforms, createParagraphElement, isAboveBlockEmpty, Element, HistoryEditor } from '@quadrats/core';
 import { FILE_UPLOADER_TYPE, FILE_UPLOADER_PLACEHOLDER_TYPE } from './constants.js';
 import { getFilesFromInput } from './getFilesFromInput.js';
 import { TABLE_CELL_TYPE } from '@quadrats/common/table';
@@ -54,8 +54,7 @@ const createFileUploaderElementByType = (type) => (editor, file, options) => __a
     }
     return fileUploaderElement;
 });
-function insertFileUploaderElement(editor, fileUploaderElement) {
-    var _a, _b;
+function insertFileUploaderElement(editor, fileUploaderElement, currentBlockEntry) {
     if (fileUploaderElement) {
         // 驗證當前 selection 是否仍然有效
         if (!editor.selection) {
@@ -73,25 +72,47 @@ function insertFileUploaderElement(editor, fileUploaderElement) {
             console.warn('Cannot insert file uploader element: invalid selection path', error);
             return;
         }
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], {
+                    at: currentPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()]);
+            });
+        }
         // Clear empty node
         if (isAboveBlockEmpty(editor)) {
             Transforms.removeNodes(editor, {
                 at: editor.selection.anchor,
             });
         }
-        Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], {
-            at: ((_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor.path.length) ? [((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.anchor.path[0]) + 1] : undefined,
-        });
-        Transforms.move(editor);
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            Transforms.select(editor, Editor.start(editor, currentPath));
+        }
     }
 }
 function createFileUploader(options = {}) {
     const { type = FILE_UPLOADER_TYPE } = options;
     const createFileUploaderElement = createFileUploaderElementByType(type);
     const removeUploaderPlaceholder = (editor) => {
-        Transforms.removeNodes(editor, {
+        const matches = Array.from(Editor.nodes(editor, {
+            at: [],
             match: (node) => Element.isElement(node) && node.type === FILE_UPLOADER_PLACEHOLDER_TYPE,
-        });
+        }));
+        if (matches.length) {
+            matches
+                .map(([, path]) => path)
+                .forEach((path) => {
+                Transforms.removeNodes(editor, { at: path });
+            });
+        }
     };
     const upload = (editor, options) => __awaiter(this, void 0, void 0, function* () {
         // 檢查是否在不允許的元件之中，如果是則不執行上傳
@@ -109,6 +130,9 @@ function createFileUploader(options = {}) {
             }
         }
         const { accept, multiple } = options;
+        const [currentBlockEntry] = Editor.nodes(editor, {
+            match: (n) => Element.isElement(n) && Editor.isBlock(editor, n),
+        });
         const files = yield getFilesFromInput({ accept, multiple });
         if (!files) {
             removeUploaderPlaceholder(editor);
@@ -118,7 +142,7 @@ function createFileUploader(options = {}) {
         files.reduce((prev, file) => __awaiter(this, void 0, void 0, function* () {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
-                insertFileUploaderElement(editor, fileUploaderElement);
+                insertFileUploaderElement(editor, fileUploaderElement, currentBlockEntry);
             });
         }), Promise.resolve());
     });

package/file-uploader/index.cjs.js

@@ -117,8 +117,7 @@ const createFileUploaderElementByType = (type) => (editor, file, options) => __a
     }
     return fileUploaderElement;
 });
-function insertFileUploaderElement(editor, fileUploaderElement) {
-    var _a, _b;
+function insertFileUploaderElement(editor, fileUploaderElement, currentBlockEntry) {
     if (fileUploaderElement) {
         // 驗證當前 selection 是否仍然有效
         if (!editor.selection) {
@@ -136,25 +135,47 @@ function insertFileUploaderElement(editor, fileUploaderElement) {
             console.warn('Cannot insert file uploader element: invalid selection path', error);
             return;
         }
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], {
+                    at: currentPath,
+                });
+            });
+        }
+        else {
+            // 沒找到 block（例如空編輯器）
+            core.Editor.withoutNormalizing(editor, () => {
+                core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()]);
+            });
+        }
         // Clear empty node
         if (core.isAboveBlockEmpty(editor)) {
             core.Transforms.removeNodes(editor, {
                 at: editor.selection.anchor,
             });
         }
-        core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], {
-            at: ((_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor.path.length) ? [((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.anchor.path[0]) + 1] : undefined,
-        });
-        core.Transforms.move(editor);
+        if (currentBlockEntry) {
+            const [, currentPath] = currentBlockEntry;
+            core.Transforms.select(editor, core.Editor.start(editor, currentPath));
+        }
     }
 }
 function createFileUploader(options = {}) {
     const { type = FILE_UPLOADER_TYPE } = options;
     const createFileUploaderElement = createFileUploaderElementByType(type);
     const removeUploaderPlaceholder = (editor) => {
-        core.Transforms.removeNodes(editor, {
+        const matches = Array.from(core.Editor.nodes(editor, {
+            at: [],
             match: (node) => core.Element.isElement(node) && node.type === FILE_UPLOADER_PLACEHOLDER_TYPE,
-        });
+        }));
+        if (matches.length) {
+            matches
+                .map(([, path]) => path)
+                .forEach((path) => {
+                core.Transforms.removeNodes(editor, { at: path });
+            });
+        }
     };
     const upload = (editor, options) => __awaiter(this, void 0, void 0, function* () {
         // 檢查是否在不允許的元件之中，如果是則不執行上傳
@@ -172,6 +193,9 @@ function createFileUploader(options = {}) {
             }
         }
         const { accept, multiple } = options;
+        const [currentBlockEntry] = core.Editor.nodes(editor, {
+            match: (n) => core.Element.isElement(n) && core.Editor.isBlock(editor, n),
+        });
         const files = yield getFilesFromInput({ accept, multiple });
         if (!files) {
             removeUploaderPlaceholder(editor);
@@ -181,7 +205,7 @@ function createFileUploader(options = {}) {
         files.reduce((prev, file) => __awaiter(this, void 0, void 0, function* () {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
-                insertFileUploaderElement(editor, fileUploaderElement);
+                insertFileUploaderElement(editor, fileUploaderElement, currentBlockEntry);
             });
         }), Promise.resolve());
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadrats/common",
-  "version": "1.1.4",
+  "version": "1.1.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": "^1.1.0",
+    "@quadrats/core": "^1.1.5",
     "@quadrats/locales": "^1.0.0",
     "@quadrats/utils": "^1.0.0"
   }