@quadrats/common 0.6.1 → 0.6.5

package/file-uploader/createFileUploader.js

@@ -7,7 +7,7 @@ import { getFilesFromInput } from './getFilesFromInput.js';
 function createFileUploader(options = {}) {
     const { type = FILE_UPLOADER_TYPE } = options;
     const createFileUploaderElement = (editor, file, options) => __awaiter(this, void 0, void 0, function* () {
-        const { createElement, getBody, getHeaders, getUrl, } = options;
+        const { createElement, getBody, getHeaders, getUrl, uploader, } = options;
         const [mime] = file.type.split('/');
         const createByMime = createElement[mime];
         if (!createByMime) {
@@ -15,7 +15,7 @@ function createFileUploader(options = {}) {
         }
         const { dataURL: createElementByDataURL, response: createElementByResponse } = createByMime;
         const headers = yield (getHeaders === null || getHeaders === void 0 ? void 0 : getHeaders(file));
-        const xhr = new XMLHttpRequest();
+        const xhr = uploader || new XMLHttpRequest();
         const dataURL = yield readFileAsDataURL(file);
         let sent = false;
         const fileUploaderElement = {

package/file-uploader/index.cjs.js

@@ -61,7 +61,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
 function createFileUploader(options = {}) {
     const { type = FILE_UPLOADER_TYPE } = options;
     const createFileUploaderElement = (editor, file, options) => __awaiter(this, void 0, void 0, function* () {
-        const { createElement, getBody, getHeaders, getUrl, } = options;
+        const { createElement, getBody, getHeaders, getUrl, uploader, } = options;
         const [mime] = file.type.split('/');
         const createByMime = createElement[mime];
         if (!createByMime) {
@@ -69,7 +69,7 @@ function createFileUploader(options = {}) {
         }
         const { dataURL: createElementByDataURL, response: createElementByResponse } = createByMime;
         const headers = yield (getHeaders === null || getHeaders === void 0 ? void 0 : getHeaders(file));
-        const xhr = new XMLHttpRequest();
+        const xhr = uploader || new XMLHttpRequest();
         const dataURL = yield utils.readFileAsDataURL(file);
         let sent = false;
         const fileUploaderElement = {

package/file-uploader/typings.d.ts

@@ -18,6 +18,22 @@ export declare type FileUploaderCreateElementByResponse = (response: any) => Qua
 export declare type FileUploaderGetBody = (file: File) => BodyInit;
 export declare type FileUploaderGetHeaders = (file: File) => XHRUploadHeaders | Promise<XHRUploadHeaders>;
 export declare type FileUploaderGetUrl = (file: File) => string;
+interface FileUploaderUploadImplementOnProgressArgs {
+    loaded: number;
+    total: number;
+}
+interface FileUploaderUploadImplement {
+    onprogress: ((options: FileUploaderUploadImplementOnProgressArgs) => void) | null;
+}
+interface FileUploaderImplement {
+    onload: (() => void) | null;
+    open: (method: string, url: string | URL) => void;
+    setRequestHeader: (key: string, value: string) => void;
+    send(body?: Document | XMLHttpRequestBodyInit | null): void;
+    readonly status: number;
+    readonly response: any;
+    readonly upload: FileUploaderUploadImplement;
+}
 export interface FileUploaderCreateFileUploaderElementOptions {
     createElement: {
         [mime in string]?: {
@@ -28,6 +44,7 @@ export interface FileUploaderCreateFileUploaderElementOptions {
     getBody: FileUploaderGetBody;
     getHeaders?: FileUploaderGetHeaders;
     getUrl: FileUploaderGetUrl;
+    uploader?: FileUploaderImplement;
 }
 export declare type FileUploaderUploadOptions = FileUploaderCreateFileUploaderElementOptions & GetFilesFromInputOptions & TransformsInsertNodesOptions;
 export interface FileUploader<T extends Editor = Editor> extends Withable {
@@ -35,3 +52,4 @@ export interface FileUploader<T extends Editor = Editor> extends Withable {
     createFileUploaderElement(editor: T, file: File, options: FileUploaderCreateFileUploaderElementOptions): Promise<FileUploaderElement | undefined>;
     upload(editor: T, options: FileUploaderUploadOptions): Promise<void>;
 }
+export {};

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/image/createImage.js

@@ -1,5 +1,5 @@
 import { isImageUrl } from '@quadrats/utils';
-import { getAboveByTypes, Element, isNodesTypeIn, Transforms, normalizeVoidElementChildren, normalizeOnlyInlineOrTextInChildren, Range, createParagraphElement, Editor } from '@quadrats/core';
+import { getAboveByTypes, Editor, Transforms, createParagraphElement, Element, isNodesTypeIn, normalizeVoidElementChildren, normalizeOnlyInlineOrTextInChildren, Range } from '@quadrats/core';
 import { IMAGE_TYPES } from './constants.js';
 
 function resolveSizeSteps(steps) {
@@ -19,6 +19,17 @@ 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,
@@ -97,7 +108,30 @@ function createImage(options = {}) {
                  */
                 if (selection && Range.isCollapsed(selection)) {
                     const [, captionPath] = getAboveImageCaption(editor) || [];
-                    if (captionPath && Editor[isEdgeMethodName](editor, selection.focus, captionPath)) {
+                    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;
+                                console.log(imageLocation, imageContainer);
+                                if (imageElement.type === types.figure) {
+                                    console.log('???');
+                                    Transforms.removeNodes(editor, { at: imageLocation });
+                                }
+                            }
+                        }
                         return;
                     }
                 }
@@ -115,6 +149,15 @@ function createImage(options = {}) {
                  * Avoid from splitting children of caption.
                  */
                 if (captionEntry) {
+                    const [, captionLocation] = captionEntry;
+                    const imageEntry = Editor.parent(editor, captionLocation);
+                    if (imageEntry) {
+                        const [imageElement, imagePosition] = imageEntry;
+                        if (imageElement.type === types.figure) {
+                            Transforms.insertNodes(editor, createParagraphElement(), { at: Editor.after(editor, imagePosition) });
+                            Transforms.move(editor);
+                        }
+                    }
                     return;
                 }
                 insertBreak();

package/image/index.cjs.js

@@ -47,6 +47,17 @@ 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,
@@ -125,7 +136,30 @@ function createImage(options = {}) {
                  */
                 if (selection && core.Range.isCollapsed(selection)) {
                     const [, captionPath] = getAboveImageCaption(editor) || [];
-                    if (captionPath && core.Editor[isEdgeMethodName](editor, selection.focus, captionPath)) {
+                    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;
+                                console.log(imageLocation, imageContainer);
+                                if (imageElement.type === types.figure) {
+                                    console.log('???');
+                                    core.Transforms.removeNodes(editor, { at: imageLocation });
+                                }
+                            }
+                        }
                         return;
                     }
                 }
@@ -143,6 +177,15 @@ function createImage(options = {}) {
                  * Avoid from splitting children of caption.
                  */
                 if (captionEntry) {
+                    const [, captionLocation] = captionEntry;
+                    const imageEntry = core.Editor.parent(editor, captionLocation);
+                    if (imageEntry) {
+                        const [imageElement, imagePosition] = imageEntry;
+                        if (imageElement.type === types.figure) {
+                            core.Transforms.insertNodes(editor, core.createParagraphElement(), { at: core.Editor.after(editor, imagePosition) });
+                            core.Transforms.move(editor);
+                        }
+                    }
                     return;
                 }
                 insertBreak();

package/package.json

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