@textbus/platform-browser 3.0.0-alpha.40 → 3.0.0-alpha.42

package/bundles/dom-support/parser.d.ts

@@ -52,5 +52,4 @@ export declare class Parser {
     private readComponent;
     private readFormats;
     private readSlot;
-    private applyFormats;
 }

package/bundles/index.esm.js

@@ -1250,11 +1250,9 @@ let Parser = Parser_1 = class Parser {
     }
     parse(html, rootSlot) {
         const element = Parser_1.parseHTML(html);
-        const formatItems = this.readFormats(element, rootSlot, []);
-        this.applyFormats(rootSlot, formatItems);
-        return rootSlot;
+        return this.readFormats(element, rootSlot);
     }
-    readComponent(el, slot, formatItems) {
+    readComponent(el, slot) {
         if (el.nodeType === Node.ELEMENT_NODE) {
             if (el.tagName === 'BR') {
                 slot.insert('\n');
@@ -1273,7 +1271,7 @@ let Parser = Parser_1 = class Parser {
                     return;
                 }
             }
-            this.readFormats(el, slot, formatItems);
+            this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
             const textContent = el.textContent;
@@ -1283,26 +1281,21 @@ let Parser = Parser_1 = class Parser {
             slot.insert(textContent);
         }
     }
-    readFormats(el, slot, formatItems) {
-        const formats = this.formatLoaders.filter(f => {
+    readFormats(el, slot) {
+        this.formatLoaders.filter(f => {
             return f.match(el);
-        }).map(f => {
-            return f.read(el);
+        }).forEach(f => {
+            const v = f.read(el);
+            slot.applyFormat(v.formatter, {
+                startIndex: 0,
+                endIndex: slot.length,
+                value: v.value
+            });
         });
-        const startIndex = slot.index;
         Array.from(el.childNodes).forEach(child => {
-            this.readComponent(child, slot, formatItems);
+            this.readComponent(child, slot);
         });
-        const endIndex = slot.index;
-        formatItems.unshift(...formats.map(i => {
-            return {
-                formatter: i.formatter,
-                value: i.value,
-                startIndex,
-                endIndex
-            };
-        }));
-        return formatItems;
+        return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
         this.attributeLoaders.filter(a => {
@@ -1311,15 +1304,7 @@ let Parser = Parser_1 = class Parser {
             const r = a.read(slotRootElement);
             childSlot.setAttribute(r.attribute, r.value);
         });
-        const childFormatItems = this.readFormats(slotContentElement, childSlot, []);
-        this.applyFormats(childSlot, childFormatItems);
-        return childSlot;
-    }
-    applyFormats(slot, formatItems) {
-        formatItems.forEach(i => {
-            slot.retain(i.startIndex);
-            slot.retain(i.endIndex - i.startIndex, i.formatter, i.value);
-        });
+        return this.readFormats(slotContentElement, childSlot);
     }
 };
 Parser = Parser_1 = __decorate([
@@ -2199,142 +2184,140 @@ OutputTranslator = OutputTranslator_1 = __decorate([
 /**
  * Textbus PC 端默认按键绑定
  */
-class DefaultShortcut {
-    setup(injector) {
-        const selection = injector.get(Selection);
-        const keyboard = injector.get(Keyboard);
-        const history = injector.get(History);
-        const commander = injector.get(Commander);
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Enter'
-            },
-            action: () => {
-                commander.break();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Enter',
-                shiftKey: true
-            },
-            action: () => {
-                const startOffset = selection.startOffset;
-                const startSlot = selection.startSlot;
-                const isToEnd = startOffset === startSlot.length || startSlot.isEmpty;
-                const content = isToEnd ? '\n\n' : '\n';
-                const isInserted = commander.insert(content);
-                if (isInserted && isToEnd) {
-                    selection.setPosition(startSlot, startOffset + 1);
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['Delete', 'Backspace']
-            },
-            action: (key) => {
-                commander.delete(key === 'Backspace');
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']
-            },
-            action: (key) => {
-                switch (key) {
-                    case 'ArrowLeft':
-                        selection.toPrevious();
-                        break;
-                    case 'ArrowRight':
-                        selection.toNext();
-                        break;
-                    case 'ArrowUp':
-                        selection.toPreviousLine();
-                        break;
-                    case 'ArrowDown':
-                        selection.toNextLine();
-                        break;
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'],
-                shiftKey: true
-            },
-            action: (key) => {
-                switch (key) {
-                    case 'ArrowLeft':
-                        selection.wrapToBefore();
-                        break;
-                    case 'ArrowRight':
-                        selection.wrapToAfter();
-                        break;
-                    case 'ArrowUp':
-                        selection.wrapToPreviousLine();
-                        break;
-                    case 'ArrowDown':
-                        selection.wrapToNextLine();
-                        break;
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Tab'
-            },
-            action: () => {
-                commander.insert('    ');
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'a',
-                ctrlKey: true
-            },
-            action: () => {
-                selection.selectAll();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'c',
-                ctrlKey: true
-            },
-            action: () => {
-                commander.copy();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'x',
-                ctrlKey: true
-            },
-            action: () => {
-                commander.cut();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'z',
-                ctrlKey: true
-            },
-            action: () => {
-                history.back();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'z',
-                ctrlKey: true,
-                shiftKey: true
-            },
-            action: () => {
-                history.forward();
-            }
-        });
-    }
+function setDefaultShortcut(injector) {
+    const selection = injector.get(Selection);
+    const keyboard = injector.get(Keyboard);
+    const history = injector.get(History);
+    const commander = injector.get(Commander);
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Enter'
+        },
+        action: () => {
+            commander.break();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Enter',
+            shiftKey: true
+        },
+        action: () => {
+            const startOffset = selection.startOffset;
+            const startSlot = selection.startSlot;
+            const isToEnd = startOffset === startSlot.length || startSlot.isEmpty;
+            const content = isToEnd ? '\n\n' : '\n';
+            const isInserted = commander.insert(content);
+            if (isInserted && isToEnd) {
+                selection.setPosition(startSlot, startOffset + 1);
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['Delete', 'Backspace']
+        },
+        action: (key) => {
+            commander.delete(key === 'Backspace');
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']
+        },
+        action: (key) => {
+            switch (key) {
+                case 'ArrowLeft':
+                    selection.toPrevious();
+                    break;
+                case 'ArrowRight':
+                    selection.toNext();
+                    break;
+                case 'ArrowUp':
+                    selection.toPreviousLine();
+                    break;
+                case 'ArrowDown':
+                    selection.toNextLine();
+                    break;
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'],
+            shiftKey: true
+        },
+        action: (key) => {
+            switch (key) {
+                case 'ArrowLeft':
+                    selection.wrapToBefore();
+                    break;
+                case 'ArrowRight':
+                    selection.wrapToAfter();
+                    break;
+                case 'ArrowUp':
+                    selection.wrapToPreviousLine();
+                    break;
+                case 'ArrowDown':
+                    selection.wrapToNextLine();
+                    break;
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Tab'
+        },
+        action: () => {
+            commander.insert('    ');
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'a',
+            ctrlKey: true
+        },
+        action: () => {
+            selection.selectAll();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'c',
+            ctrlKey: true
+        },
+        action: () => {
+            commander.copy();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'x',
+            ctrlKey: true
+        },
+        action: () => {
+            commander.cut();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'z',
+            ctrlKey: true
+        },
+        action: () => {
+            history.back();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'z',
+            ctrlKey: true,
+            shiftKey: true
+        },
+        action: () => {
+            history.forward();
+        }
+    });
 }
 
 const editorError = makeError('CoreEditor');
@@ -2370,7 +2353,7 @@ class Viewer extends Starter {
                 provide: Viewer,
                 useFactory: () => this
             }];
-        super(Object.assign(Object.assign({}, options), { plugins: [...(options.plugins || []), () => new DefaultShortcut()], providers: [
+        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: [
                 ...(options.providers || []),
                 ...staticProviders,
                 DomRenderer,
@@ -2441,6 +2424,7 @@ class Viewer extends Starter {
                     this.saveEvent.next();
                 }
             });
+            setDefaultShortcut(this);
             let component;
             const content = this.options.content;
             if (content) {
@@ -2688,4 +2672,4 @@ class Viewer extends Starter {
     }
 }
 
-export { CollaborateCursor, CollaborateSelectionAwarenessDelegate, DefaultShortcut, DomRenderer, EDITOR_OPTIONS, Input, MagicInput, NativeInput, OutputTranslator, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, Viewer, createElement, createTextNode, getLayoutRectByRange, isMac, isSafari, isWindows };
+export { CollaborateCursor, CollaborateSelectionAwarenessDelegate, DomRenderer, EDITOR_OPTIONS, Input, MagicInput, NativeInput, OutputTranslator, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, Viewer, createElement, createTextNode, getLayoutRectByRange, isMac, isSafari, isWindows, setDefaultShortcut };

package/bundles/index.js

@@ -1252,11 +1252,9 @@ exports.Parser = Parser_1 = class Parser {
     }
     parse(html, rootSlot) {
         const element = Parser_1.parseHTML(html);
-        const formatItems = this.readFormats(element, rootSlot, []);
-        this.applyFormats(rootSlot, formatItems);
-        return rootSlot;
+        return this.readFormats(element, rootSlot);
     }
-    readComponent(el, slot, formatItems) {
+    readComponent(el, slot) {
         if (el.nodeType === Node.ELEMENT_NODE) {
             if (el.tagName === 'BR') {
                 slot.insert('\n');
@@ -1275,7 +1273,7 @@ exports.Parser = Parser_1 = class Parser {
                     return;
                 }
             }
-            this.readFormats(el, slot, formatItems);
+            this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
             const textContent = el.textContent;
@@ -1285,26 +1283,21 @@ exports.Parser = Parser_1 = class Parser {
             slot.insert(textContent);
         }
     }
-    readFormats(el, slot, formatItems) {
-        const formats = this.formatLoaders.filter(f => {
+    readFormats(el, slot) {
+        this.formatLoaders.filter(f => {
             return f.match(el);
-        }).map(f => {
-            return f.read(el);
+        }).forEach(f => {
+            const v = f.read(el);
+            slot.applyFormat(v.formatter, {
+                startIndex: 0,
+                endIndex: slot.length,
+                value: v.value
+            });
         });
-        const startIndex = slot.index;
         Array.from(el.childNodes).forEach(child => {
-            this.readComponent(child, slot, formatItems);
+            this.readComponent(child, slot);
         });
-        const endIndex = slot.index;
-        formatItems.unshift(...formats.map(i => {
-            return {
-                formatter: i.formatter,
-                value: i.value,
-                startIndex,
-                endIndex
-            };
-        }));
-        return formatItems;
+        return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
         this.attributeLoaders.filter(a => {
@@ -1313,15 +1306,7 @@ exports.Parser = Parser_1 = class Parser {
             const r = a.read(slotRootElement);
             childSlot.setAttribute(r.attribute, r.value);
         });
-        const childFormatItems = this.readFormats(slotContentElement, childSlot, []);
-        this.applyFormats(childSlot, childFormatItems);
-        return childSlot;
-    }
-    applyFormats(slot, formatItems) {
-        formatItems.forEach(i => {
-            slot.retain(i.startIndex);
-            slot.retain(i.endIndex - i.startIndex, i.formatter, i.value);
-        });
+        return this.readFormats(slotContentElement, childSlot);
     }
 };
 exports.Parser = Parser_1 = __decorate([
@@ -2201,142 +2186,140 @@ exports.OutputTranslator = OutputTranslator_1 = __decorate([
 /**
  * Textbus PC 端默认按键绑定
  */
-class DefaultShortcut {
-    setup(injector) {
-        const selection = injector.get(core.Selection);
-        const keyboard = injector.get(core.Keyboard);
-        const history = injector.get(core.History);
-        const commander = injector.get(core.Commander);
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Enter'
-            },
-            action: () => {
-                commander.break();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Enter',
-                shiftKey: true
-            },
-            action: () => {
-                const startOffset = selection.startOffset;
-                const startSlot = selection.startSlot;
-                const isToEnd = startOffset === startSlot.length || startSlot.isEmpty;
-                const content = isToEnd ? '\n\n' : '\n';
-                const isInserted = commander.insert(content);
-                if (isInserted && isToEnd) {
-                    selection.setPosition(startSlot, startOffset + 1);
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['Delete', 'Backspace']
-            },
-            action: (key) => {
-                commander.delete(key === 'Backspace');
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']
-            },
-            action: (key) => {
-                switch (key) {
-                    case 'ArrowLeft':
-                        selection.toPrevious();
-                        break;
-                    case 'ArrowRight':
-                        selection.toNext();
-                        break;
-                    case 'ArrowUp':
-                        selection.toPreviousLine();
-                        break;
-                    case 'ArrowDown':
-                        selection.toNextLine();
-                        break;
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'],
-                shiftKey: true
-            },
-            action: (key) => {
-                switch (key) {
-                    case 'ArrowLeft':
-                        selection.wrapToBefore();
-                        break;
-                    case 'ArrowRight':
-                        selection.wrapToAfter();
-                        break;
-                    case 'ArrowUp':
-                        selection.wrapToPreviousLine();
-                        break;
-                    case 'ArrowDown':
-                        selection.wrapToNextLine();
-                        break;
-                }
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'Tab'
-            },
-            action: () => {
-                commander.insert('    ');
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'a',
-                ctrlKey: true
-            },
-            action: () => {
-                selection.selectAll();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'c',
-                ctrlKey: true
-            },
-            action: () => {
-                commander.copy();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'x',
-                ctrlKey: true
-            },
-            action: () => {
-                commander.cut();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'z',
-                ctrlKey: true
-            },
-            action: () => {
-                history.back();
-            }
-        });
-        keyboard.addShortcut({
-            keymap: {
-                key: 'z',
-                ctrlKey: true,
-                shiftKey: true
-            },
-            action: () => {
-                history.forward();
-            }
-        });
-    }
+function setDefaultShortcut(injector) {
+    const selection = injector.get(core.Selection);
+    const keyboard = injector.get(core.Keyboard);
+    const history = injector.get(core.History);
+    const commander = injector.get(core.Commander);
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Enter'
+        },
+        action: () => {
+            commander.break();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Enter',
+            shiftKey: true
+        },
+        action: () => {
+            const startOffset = selection.startOffset;
+            const startSlot = selection.startSlot;
+            const isToEnd = startOffset === startSlot.length || startSlot.isEmpty;
+            const content = isToEnd ? '\n\n' : '\n';
+            const isInserted = commander.insert(content);
+            if (isInserted && isToEnd) {
+                selection.setPosition(startSlot, startOffset + 1);
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['Delete', 'Backspace']
+        },
+        action: (key) => {
+            commander.delete(key === 'Backspace');
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']
+        },
+        action: (key) => {
+            switch (key) {
+                case 'ArrowLeft':
+                    selection.toPrevious();
+                    break;
+                case 'ArrowRight':
+                    selection.toNext();
+                    break;
+                case 'ArrowUp':
+                    selection.toPreviousLine();
+                    break;
+                case 'ArrowDown':
+                    selection.toNextLine();
+                    break;
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'],
+            shiftKey: true
+        },
+        action: (key) => {
+            switch (key) {
+                case 'ArrowLeft':
+                    selection.wrapToBefore();
+                    break;
+                case 'ArrowRight':
+                    selection.wrapToAfter();
+                    break;
+                case 'ArrowUp':
+                    selection.wrapToPreviousLine();
+                    break;
+                case 'ArrowDown':
+                    selection.wrapToNextLine();
+                    break;
+            }
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'Tab'
+        },
+        action: () => {
+            commander.insert('    ');
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'a',
+            ctrlKey: true
+        },
+        action: () => {
+            selection.selectAll();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'c',
+            ctrlKey: true
+        },
+        action: () => {
+            commander.copy();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'x',
+            ctrlKey: true
+        },
+        action: () => {
+            commander.cut();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'z',
+            ctrlKey: true
+        },
+        action: () => {
+            history.back();
+        }
+    });
+    keyboard.addShortcut({
+        keymap: {
+            key: 'z',
+            ctrlKey: true,
+            shiftKey: true
+        },
+        action: () => {
+            history.forward();
+        }
+    });
 }
 
 const editorError = core.makeError('CoreEditor');
@@ -2372,7 +2355,7 @@ class Viewer extends core.Starter {
                 provide: Viewer,
                 useFactory: () => this
             }];
-        super(Object.assign(Object.assign({}, options), { plugins: [...(options.plugins || []), () => new DefaultShortcut()], providers: [
+        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: [
                 ...(options.providers || []),
                 ...staticProviders,
                 exports.DomRenderer,
@@ -2443,6 +2426,7 @@ class Viewer extends core.Starter {
                     this.saveEvent.next();
                 }
             });
+            setDefaultShortcut(this);
             let component;
             const content = this.options.content;
             if (content) {
@@ -2691,7 +2675,6 @@ class Viewer extends core.Starter {
 }
 
 exports.CollaborateSelectionAwarenessDelegate = CollaborateSelectionAwarenessDelegate;
-exports.DefaultShortcut = DefaultShortcut;
 exports.EDITOR_OPTIONS = EDITOR_OPTIONS;
 exports.Input = Input;
 exports.VIEW_CONTAINER = VIEW_CONTAINER;
@@ -2704,3 +2687,4 @@ exports.getLayoutRectByRange = getLayoutRectByRange;
 exports.isMac = isMac;
 exports.isSafari = isSafari;
 exports.isWindows = isWindows;
+exports.setDefaultShortcut = setDefaultShortcut;

package/bundles/preset/default-shortcut.d.ts

@@ -1,8 +1,5 @@
 import { Injector } from '@tanbo/di';
-import { Plugin } from '@textbus/core';
 /**
  * Textbus PC 端默认按键绑定
  */
-export declare class DefaultShortcut implements Plugin {
-    setup(injector: Injector): void;
-}
+export declare function setDefaultShortcut(injector: Injector): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-alpha.40",
+  "version": "3.0.0-alpha.42",
   "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": "7f1b573782e02a5e840d3a30507add78235c08c1"
+  "gitHead": "5ac4dfb4ae18393afc93ffac9df4012d68adeffa"
 }