@quadrats/common 0.7.1 → 0.7.3

package/file-uploader/_virtual/_tslib.js

@@ -12,7 +12,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -23,6 +23,11 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 export { __awaiter };

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 { HistoryEditor, Transforms, isAboveBlockEmpty, createParagraphElement } from '@quadrats/core';
 import { FILE_UPLOADER_TYPE } from './constants.js';
 import { getFilesFromInput } from './getFilesFromInput.js';
 
@@ -64,8 +64,17 @@ function createFileUploader(options = {}) {
         files.reduce((prev, file) => __awaiter(this, void 0, void 0, function* () {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
+                var _a, _b, _c;
                 if (fileUploaderElement) {
-                    Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], options);
+                    // Clear empty node
+                    if (isAboveBlockEmpty(editor)) {
+                        Transforms.removeNodes(editor, {
+                            at: (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor,
+                        });
+                    }
+                    Transforms.insertNodes(editor, [fileUploaderElement, createParagraphElement()], {
+                        at: ((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.anchor.path.length) ? [((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.path[0]) + 1] : undefined,
+                    });
                     Transforms.move(editor);
                 }
             });

package/file-uploader/index.cjs.js

@@ -45,7 +45,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -56,7 +56,12 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 function createFileUploader(options = {}) {
     const { type = FILE_UPLOADER_TYPE } = options;
@@ -118,8 +123,17 @@ function createFileUploader(options = {}) {
         files.reduce((prev, file) => __awaiter(this, void 0, void 0, function* () {
             yield prev;
             return createFileUploaderElement(editor, file, options).then((fileUploaderElement) => {
+                var _a, _b, _c;
                 if (fileUploaderElement) {
-                    core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], options);
+                    // Clear empty node
+                    if (core.isAboveBlockEmpty(editor)) {
+                        core.Transforms.removeNodes(editor, {
+                            at: (_a = editor.selection) === null || _a === void 0 ? void 0 : _a.anchor,
+                        });
+                    }
+                    core.Transforms.insertNodes(editor, [fileUploaderElement, core.createParagraphElement()], {
+                        at: ((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.anchor.path.length) ? [((_c = editor.selection) === null || _c === void 0 ? void 0 : _c.anchor.path[0]) + 1] : undefined,
+                    });
                     core.Transforms.move(editor);
                 }
             });

package/image/createImage.js

@@ -19,17 +19,6 @@ function createImage(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 previousNodeIsCaption = (editor) => {
-        const previous = Editor.previous(editor);
-        if (!previous)
-            return false;
-        const [, previousLocation] = previous;
-        const previousWrapper = Editor.parent(editor, previousLocation);
-        if (!previousWrapper)
-            return false;
-        const [previousWrapperNode] = previousWrapper;
-        return previousWrapperNode.type === types.caption;
-    };
     const createImageElement = (src, hosting) => {
         const imageElement = {
             type: types.image,
@@ -111,27 +100,6 @@ function createImage(options = {}) {
                     if ((captionPath && Editor[isEdgeMethodName](editor, selection.focus, captionPath))) {
                         return;
                     }
-                    // Remove image element when backwards from external
-                    if (!captionPath && previousNodeIsCaption(editor)) {
-                        const previous = Editor.previous(editor);
-                        if (!previous)
-                            return false;
-                        const [, previousLocation] = previous;
-                        const previousWrapper = Editor.parent(editor, previousLocation);
-                        if (!previousWrapper)
-                            return false;
-                        const [previousWrapperNode, wrapperLocation] = previousWrapper;
-                        if (previousWrapperNode.type === types.caption) {
-                            const imageContainer = Editor.parent(editor, wrapperLocation);
-                            if (imageContainer) {
-                                const [imageElement, imageLocation] = imageContainer;
-                                if (imageElement.type === types.figure) {
-                                    Transforms.removeNodes(editor, { at: imageLocation });
-                                }
-                            }
-                        }
-                        return;
-                    }
                 }
                 origin();
             };

package/image/index.cjs.js

@@ -45,17 +45,6 @@ function createImage(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 previousNodeIsCaption = (editor) => {
-        const previous = core.Editor.previous(editor);
-        if (!previous)
-            return false;
-        const [, previousLocation] = previous;
-        const previousWrapper = core.Editor.parent(editor, previousLocation);
-        if (!previousWrapper)
-            return false;
-        const [previousWrapperNode] = previousWrapper;
-        return previousWrapperNode.type === types.caption;
-    };
     const createImageElement = (src, hosting) => {
         const imageElement = {
             type: types.image,
@@ -137,27 +126,6 @@ function createImage(options = {}) {
                     if ((captionPath && core.Editor[isEdgeMethodName](editor, selection.focus, captionPath))) {
                         return;
                     }
-                    // Remove image element when backwards from external
-                    if (!captionPath && previousNodeIsCaption(editor)) {
-                        const previous = core.Editor.previous(editor);
-                        if (!previous)
-                            return false;
-                        const [, previousLocation] = previous;
-                        const previousWrapper = core.Editor.parent(editor, previousLocation);
-                        if (!previousWrapper)
-                            return false;
-                        const [previousWrapperNode, wrapperLocation] = previousWrapper;
-                        if (previousWrapperNode.type === types.caption) {
-                            const imageContainer = core.Editor.parent(editor, wrapperLocation);
-                            if (imageContainer) {
-                                const [imageElement, imageLocation] = imageContainer;
-                                if (imageElement.type === types.figure) {
-                                    core.Transforms.removeNodes(editor, { at: imageLocation });
-                                }
-                            }
-                        }
-                        return;
-                    }
                 }
                 origin();
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quadrats/common",
-  "version": "0.7.1",
+  "version": "0.7.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.7.0",
+    "@quadrats/core": "^0.7.2",
     "@quadrats/locales": "^0.7.0",
-    "@quadrats/utils": "^0.7.1"
+    "@quadrats/utils": "^0.7.2"
   }
 }