@textbus/platform-browser 3.8.1 → 3.8.3

package/bundles/core/magic-input.d.ts

@@ -73,7 +73,9 @@ export declare class MagicInput extends Input {
     destroy(): void;
     private init;
     private handleDefaultActions;
-    private handlePaste;
+    copyHandler(ev: ClipboardEvent): void;
+    pasteHandler(ev: ClipboardEvent): void;
+    private paste;
     private handleShortcut;
     private handleInput;
     private createEditableFrame;

package/bundles/core/native-input.d.ts

@@ -47,7 +47,9 @@ export declare class NativeInput extends Input {
     blur(): void;
     destroy(): void;
     private handleDefaultActions;
-    private handlePaste;
+    copyHandler(ev: ClipboardEvent): void;
+    pasteHandler(ev: ClipboardEvent): void;
+    private paste;
     private handleShortcut;
     private handleInput;
     private handleMobileInput;

package/bundles/index.esm.js

@@ -1736,60 +1736,67 @@ let MagicInput = class MagicInput extends Input {
     }
     handleDefaultActions(textarea) {
         this.subscription.add(fromEvent(isFirefox() ? textarea : document, 'copy').subscribe(ev => {
-            const selection = this.selection;
-            if (!selection.isSelected) {
-                return;
-            }
-            if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
-                const content = selection.startSlot.getContentAtIndex(selection.startOffset);
-                if (typeof content === 'object') {
-                    const clipboardData = ev.clipboardData;
-                    const nativeSelection = document.getSelection();
-                    const range = nativeSelection.getRangeAt(0);
-                    const div = document.createElement('div');
-                    const fragment = range.cloneContents();
-                    div.append(fragment);
-                    clipboardData.setData('text/html', div.innerHTML);
-                    clipboardData.setData('text', div.innerText);
-                    ev.preventDefault();
-                }
-            }
+            this.copyHandler(ev);
         }), fromEvent(textarea, 'paste').subscribe(ev => {
-            const text = ev.clipboardData.getData('Text');
-            const files = Array.from(ev.clipboardData.files);
-            if (files.length) {
-                Promise.all(files.filter(i => {
-                    return /image/i.test(i.type);
-                }).map(item => {
-                    const reader = new FileReader();
-                    return new Promise(resolve => {
-                        reader.onload = (event) => {
-                            resolve(event.target.result);
-                        };
-                        reader.readAsDataURL(item);
-                    });
-                })).then(urls => {
-                    const html = urls.map(i => {
-                        return `<img src=${i}>`;
-                    }).join('');
-                    this.handlePaste(html, text);
-                });
+            this.pasteHandler(ev);
+        }));
+    }
+    copyHandler(ev) {
+        const selection = this.selection;
+        if (!selection.isSelected) {
+            return;
+        }
+        if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
+            const content = selection.startSlot.getContentAtIndex(selection.startOffset);
+            if (typeof content === 'object') {
+                const clipboardData = ev.clipboardData;
+                const nativeSelection = document.getSelection();
+                const range = nativeSelection.getRangeAt(0);
+                const div = document.createElement('div');
+                const fragment = range.cloneContents();
+                div.append(fragment);
+                clipboardData.setData('text/html', div.innerHTML);
+                clipboardData.setData('text', div.innerText);
                 ev.preventDefault();
-                return;
             }
-            const div = this.doc.createElement('div');
-            div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
-            div.contentEditable = 'true';
-            this.doc.body.appendChild(div);
-            div.focus();
-            setTimeout(() => {
-                this.doc.body.removeChild(div);
-                div.style.cssText = '';
-                this.handlePaste(div, text);
+        }
+    }
+    pasteHandler(ev) {
+        const text = ev.clipboardData.getData('Text');
+        const types = Array.from(ev.clipboardData.types || []);
+        const files = Array.from(ev.clipboardData.files);
+        if (types.every(type => type === 'Files') && files.length) {
+            Promise.all(files.filter(i => {
+                return /image/i.test(i.type);
+            }).map(item => {
+                const reader = new FileReader();
+                return new Promise(resolve => {
+                    reader.onload = (event) => {
+                        resolve(event.target.result);
+                    };
+                    reader.readAsDataURL(item);
+                });
+            })).then(urls => {
+                const html = urls.map(i => {
+                    return `<img src=${i}>`;
+                }).join('');
+                this.paste(html, text);
             });
-        }));
+            ev.preventDefault();
+            return;
+        }
+        const div = this.doc.createElement('div');
+        div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
+        div.contentEditable = 'true';
+        this.doc.body.appendChild(div);
+        div.focus();
+        setTimeout(() => {
+            this.doc.body.removeChild(div);
+            div.style.cssText = '';
+            this.paste(div, text);
+        });
     }
-    handlePaste(dom, text) {
+    paste(dom, text) {
         const slot = this.parser.parse(dom, new Slot([
             ContentType.BlockComponent,
             ContentType.InlineComponent,
@@ -2121,60 +2128,67 @@ let NativeInput = class NativeInput extends Input {
     }
     handleDefaultActions(textarea) {
         this.subscription.add(fromEvent(isFirefox() ? textarea : document, 'copy').subscribe(ev => {
-            const selection = this.selection;
-            if (!selection.isSelected) {
-                return;
-            }
-            if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
-                const content = selection.startSlot.getContentAtIndex(selection.startOffset);
-                if (typeof content === 'object') {
-                    const clipboardData = ev.clipboardData;
-                    const nativeSelection = document.getSelection();
-                    const range = nativeSelection.getRangeAt(0);
-                    const div = document.createElement('div');
-                    const fragment = range.cloneContents();
-                    div.append(fragment);
-                    clipboardData.setData('text/html', div.innerHTML);
-                    clipboardData.setData('text', div.innerText);
-                    ev.preventDefault();
-                }
-            }
+            this.copyHandler(ev);
         }), fromEvent(textarea, 'paste').subscribe(ev => {
-            const text = ev.clipboardData.getData('Text');
-            const files = Array.from(ev.clipboardData.files);
-            if (files.length) {
-                Promise.all(files.filter(i => {
-                    return /image/i.test(i.type);
-                }).map(item => {
-                    const reader = new FileReader();
-                    return new Promise(resolve => {
-                        reader.onload = (event) => {
-                            resolve(event.target.result);
-                        };
-                        reader.readAsDataURL(item);
-                    });
-                })).then(urls => {
-                    const html = urls.map(i => {
-                        return `<img src=${i}>`;
-                    }).join('');
-                    this.handlePaste(html, text);
-                });
+            this.pasteHandler(ev);
+        }));
+    }
+    copyHandler(ev) {
+        const selection = this.selection;
+        if (!selection.isSelected) {
+            return;
+        }
+        if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
+            const content = selection.startSlot.getContentAtIndex(selection.startOffset);
+            if (typeof content === 'object') {
+                const clipboardData = ev.clipboardData;
+                const nativeSelection = document.getSelection();
+                const range = nativeSelection.getRangeAt(0);
+                const div = document.createElement('div');
+                const fragment = range.cloneContents();
+                div.append(fragment);
+                clipboardData.setData('text/html', div.innerHTML);
+                clipboardData.setData('text', div.innerText);
                 ev.preventDefault();
-                return;
             }
-            const div = document.createElement('div');
-            div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
-            div.contentEditable = 'true';
-            document.body.appendChild(div);
-            div.focus();
-            setTimeout(() => {
-                document.body.removeChild(div);
-                div.style.cssText = '';
-                this.handlePaste(div, text);
+        }
+    }
+    pasteHandler(ev) {
+        const text = ev.clipboardData.getData('Text');
+        const types = Array.from(ev.clipboardData.types || []);
+        const files = Array.from(ev.clipboardData.files);
+        if (types.every(type => type === 'Files') && files.length) {
+            Promise.all(files.filter(i => {
+                return /image/i.test(i.type);
+            }).map(item => {
+                const reader = new FileReader();
+                return new Promise(resolve => {
+                    reader.onload = (event) => {
+                        resolve(event.target.result);
+                    };
+                    reader.readAsDataURL(item);
+                });
+            })).then(urls => {
+                const html = urls.map(i => {
+                    return `<img src=${i}>`;
+                }).join('');
+                this.paste(html, text);
             });
-        }));
+            ev.preventDefault();
+            return;
+        }
+        const div = document.createElement('div');
+        div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
+        div.contentEditable = 'true';
+        document.body.appendChild(div);
+        div.focus();
+        setTimeout(() => {
+            document.body.removeChild(div);
+            div.style.cssText = '';
+            this.paste(div, text);
+        });
     }
-    handlePaste(dom, text) {
+    paste(dom, text) {
         const slot = this.parser.parse(dom, new Slot([
             ContentType.BlockComponent,
             ContentType.InlineComponent,

package/bundles/index.js

@@ -1738,60 +1738,67 @@ exports.MagicInput = class MagicInput extends Input {
     }
     handleDefaultActions(textarea) {
         this.subscription.add(stream.fromEvent(isFirefox() ? textarea : document, 'copy').subscribe(ev => {
-            const selection = this.selection;
-            if (!selection.isSelected) {
-                return;
-            }
-            if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
-                const content = selection.startSlot.getContentAtIndex(selection.startOffset);
-                if (typeof content === 'object') {
-                    const clipboardData = ev.clipboardData;
-                    const nativeSelection = document.getSelection();
-                    const range = nativeSelection.getRangeAt(0);
-                    const div = document.createElement('div');
-                    const fragment = range.cloneContents();
-                    div.append(fragment);
-                    clipboardData.setData('text/html', div.innerHTML);
-                    clipboardData.setData('text', div.innerText);
-                    ev.preventDefault();
-                }
-            }
+            this.copyHandler(ev);
         }), stream.fromEvent(textarea, 'paste').subscribe(ev => {
-            const text = ev.clipboardData.getData('Text');
-            const files = Array.from(ev.clipboardData.files);
-            if (files.length) {
-                Promise.all(files.filter(i => {
-                    return /image/i.test(i.type);
-                }).map(item => {
-                    const reader = new FileReader();
-                    return new Promise(resolve => {
-                        reader.onload = (event) => {
-                            resolve(event.target.result);
-                        };
-                        reader.readAsDataURL(item);
-                    });
-                })).then(urls => {
-                    const html = urls.map(i => {
-                        return `<img src=${i}>`;
-                    }).join('');
-                    this.handlePaste(html, text);
-                });
+            this.pasteHandler(ev);
+        }));
+    }
+    copyHandler(ev) {
+        const selection = this.selection;
+        if (!selection.isSelected) {
+            return;
+        }
+        if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
+            const content = selection.startSlot.getContentAtIndex(selection.startOffset);
+            if (typeof content === 'object') {
+                const clipboardData = ev.clipboardData;
+                const nativeSelection = document.getSelection();
+                const range = nativeSelection.getRangeAt(0);
+                const div = document.createElement('div');
+                const fragment = range.cloneContents();
+                div.append(fragment);
+                clipboardData.setData('text/html', div.innerHTML);
+                clipboardData.setData('text', div.innerText);
                 ev.preventDefault();
-                return;
             }
-            const div = this.doc.createElement('div');
-            div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
-            div.contentEditable = 'true';
-            this.doc.body.appendChild(div);
-            div.focus();
-            setTimeout(() => {
-                this.doc.body.removeChild(div);
-                div.style.cssText = '';
-                this.handlePaste(div, text);
+        }
+    }
+    pasteHandler(ev) {
+        const text = ev.clipboardData.getData('Text');
+        const types = Array.from(ev.clipboardData.types || []);
+        const files = Array.from(ev.clipboardData.files);
+        if (types.every(type => type === 'Files') && files.length) {
+            Promise.all(files.filter(i => {
+                return /image/i.test(i.type);
+            }).map(item => {
+                const reader = new FileReader();
+                return new Promise(resolve => {
+                    reader.onload = (event) => {
+                        resolve(event.target.result);
+                    };
+                    reader.readAsDataURL(item);
+                });
+            })).then(urls => {
+                const html = urls.map(i => {
+                    return `<img src=${i}>`;
+                }).join('');
+                this.paste(html, text);
             });
-        }));
+            ev.preventDefault();
+            return;
+        }
+        const div = this.doc.createElement('div');
+        div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
+        div.contentEditable = 'true';
+        this.doc.body.appendChild(div);
+        div.focus();
+        setTimeout(() => {
+            this.doc.body.removeChild(div);
+            div.style.cssText = '';
+            this.paste(div, text);
+        });
     }
-    handlePaste(dom, text) {
+    paste(dom, text) {
         const slot = this.parser.parse(dom, new core.Slot([
             core.ContentType.BlockComponent,
             core.ContentType.InlineComponent,
@@ -2123,60 +2130,67 @@ exports.NativeInput = class NativeInput extends Input {
     }
     handleDefaultActions(textarea) {
         this.subscription.add(stream.fromEvent(isFirefox() ? textarea : document, 'copy').subscribe(ev => {
-            const selection = this.selection;
-            if (!selection.isSelected) {
-                return;
-            }
-            if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
-                const content = selection.startSlot.getContentAtIndex(selection.startOffset);
-                if (typeof content === 'object') {
-                    const clipboardData = ev.clipboardData;
-                    const nativeSelection = document.getSelection();
-                    const range = nativeSelection.getRangeAt(0);
-                    const div = document.createElement('div');
-                    const fragment = range.cloneContents();
-                    div.append(fragment);
-                    clipboardData.setData('text/html', div.innerHTML);
-                    clipboardData.setData('text', div.innerText);
-                    ev.preventDefault();
-                }
-            }
+            this.copyHandler(ev);
         }), stream.fromEvent(textarea, 'paste').subscribe(ev => {
-            const text = ev.clipboardData.getData('Text');
-            const files = Array.from(ev.clipboardData.files);
-            if (files.length) {
-                Promise.all(files.filter(i => {
-                    return /image/i.test(i.type);
-                }).map(item => {
-                    const reader = new FileReader();
-                    return new Promise(resolve => {
-                        reader.onload = (event) => {
-                            resolve(event.target.result);
-                        };
-                        reader.readAsDataURL(item);
-                    });
-                })).then(urls => {
-                    const html = urls.map(i => {
-                        return `<img src=${i}>`;
-                    }).join('');
-                    this.handlePaste(html, text);
-                });
+            this.pasteHandler(ev);
+        }));
+    }
+    copyHandler(ev) {
+        const selection = this.selection;
+        if (!selection.isSelected) {
+            return;
+        }
+        if (selection.startSlot === selection.endSlot && selection.endOffset - selection.startOffset === 1) {
+            const content = selection.startSlot.getContentAtIndex(selection.startOffset);
+            if (typeof content === 'object') {
+                const clipboardData = ev.clipboardData;
+                const nativeSelection = document.getSelection();
+                const range = nativeSelection.getRangeAt(0);
+                const div = document.createElement('div');
+                const fragment = range.cloneContents();
+                div.append(fragment);
+                clipboardData.setData('text/html', div.innerHTML);
+                clipboardData.setData('text', div.innerText);
                 ev.preventDefault();
-                return;
             }
-            const div = document.createElement('div');
-            div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
-            div.contentEditable = 'true';
-            document.body.appendChild(div);
-            div.focus();
-            setTimeout(() => {
-                document.body.removeChild(div);
-                div.style.cssText = '';
-                this.handlePaste(div, text);
+        }
+    }
+    pasteHandler(ev) {
+        const text = ev.clipboardData.getData('Text');
+        const types = Array.from(ev.clipboardData.types || []);
+        const files = Array.from(ev.clipboardData.files);
+        if (types.every(type => type === 'Files') && files.length) {
+            Promise.all(files.filter(i => {
+                return /image/i.test(i.type);
+            }).map(item => {
+                const reader = new FileReader();
+                return new Promise(resolve => {
+                    reader.onload = (event) => {
+                        resolve(event.target.result);
+                    };
+                    reader.readAsDataURL(item);
+                });
+            })).then(urls => {
+                const html = urls.map(i => {
+                    return `<img src=${i}>`;
+                }).join('');
+                this.paste(html, text);
             });
-        }));
+            ev.preventDefault();
+            return;
+        }
+        const div = document.createElement('div');
+        div.style.cssText = 'width:1px; height:10px; overflow: hidden; position: fixed; left: 50%; top: 50%; opacity:0';
+        div.contentEditable = 'true';
+        document.body.appendChild(div);
+        div.focus();
+        setTimeout(() => {
+            document.body.removeChild(div);
+            div.style.cssText = '';
+            this.paste(div, text);
+        });
     }
-    handlePaste(dom, text) {
+    paste(dom, text) {
         const slot = this.parser.parse(dom, new core.Slot([
             core.ContentType.BlockComponent,
             core.ContentType.InlineComponent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.8.1",
+  "version": "3.8.3",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "cf4fd289b73bc777124a32fe42bb58eba05a34f1"
+  "gitHead": "bac004b8d0a7acd5c090385c5c2e2aeb41577773"
 }