@textbus/platform-browser 3.0.0-y.0 → 3.0.1

package/README.md

@@ -11,7 +11,7 @@ API，且提供了更高的抽象层，使 Textbus 不仅易于上手，同时
 ## 安装
 
 ```
-npm install @textbus/core @textbus/browser
+npm install @textbus/core @textbus/platform-browser
 ```
 
 ## 创建编辑器

package/bundles/core/dom-renderer.d.ts

@@ -48,5 +48,5 @@ export declare class DomRenderer implements NativeRenderer {
     removeXlinkAttribute(target: NativeNode, key: string): void;
     replace(newChild: NativeNode, oldChild: NativeNode): void;
     copy(): void;
-    static replaceEmpty(s: string, target: string): string;
+    static replaceEmpty(s: string): string;
 }

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

@@ -25,6 +25,7 @@ declare class ExperimentalCaret implements Caret {
     private _display;
     private flashing;
     private subs;
+    private subscription;
     private positionChangeEvent;
     private styleChangeEvent;
     private oldRange;

package/bundles/index.esm.js

@@ -1134,7 +1134,7 @@ let DomRenderer = DomRenderer_1 = class DomRenderer {
         node.removeEventListener(type, callback);
     }
     createTextNode(textContent) {
-        return document.createTextNode(DomRenderer_1.replaceEmpty(textContent, '\u00a0'));
+        return document.createTextNode(DomRenderer_1.replaceEmpty(textContent));
     }
     createElement(name) {
         if (this.isSVG.test(name)) {
@@ -1165,8 +1165,9 @@ let DomRenderer = DomRenderer_1 = class DomRenderer {
         target.style[key] = value !== null && value !== void 0 ? value : '';
     }
     syncTextContent(target, content) {
-        if (target.textContent !== content) {
-            target.textContent = content;
+        const c = DomRenderer_1.replaceEmpty(content);
+        if (target.textContent !== c) {
+            target.textContent = c;
         }
     }
     removeStyle(target, key) {
@@ -1205,12 +1206,13 @@ let DomRenderer = DomRenderer_1 = class DomRenderer {
     copy() {
         document.execCommand('copy');
     }
-    static replaceEmpty(s, target) {
+    static replaceEmpty(s) {
+        const empty = '\u00a0';
         return s.replace(/\s\s+/g, str => {
             return ' ' + Array.from({
                 length: str.length - 1
-            }).fill(target).join('');
-        }).replace(/^\s|\s$/g, target);
+            }).fill(empty).join('');
+        }).replace(/^\s|\s$/g, empty);
     }
 };
 DomRenderer = DomRenderer_1 = __decorate([
@@ -1373,6 +1375,7 @@ class ExperimentalCaret {
         this._display = true;
         this.flashing = true;
         this.subs = [];
+        this.subscription = new Subscription();
         this.positionChangeEvent = new Subject();
         this.styleChangeEvent = new Subject();
         this.oldRange = null;
@@ -1397,7 +1400,7 @@ class ExperimentalCaret {
                 })
             ]
         });
-        this.subs.push(fromEvent(document, 'mousedown').subscribe(() => {
+        this.subscription.add(fromEvent(document, 'mousedown').subscribe(() => {
             this.flashing = false;
         }), fromEvent(document, 'mouseup').subscribe(() => {
             this.flashing = true;
@@ -1446,6 +1449,7 @@ class ExperimentalCaret {
     }
     destroy() {
         clearTimeout(this.timer);
+        this.subscription.unsubscribe();
         this.subs.forEach(i => i.unsubscribe());
     }
     correctScrollTop(scroller) {
@@ -1755,9 +1759,11 @@ let MagicInput = class MagicInput extends Input {
             return !isWriting; // || !this.textarea.value
         })).subscribe(ev => {
             let key = ev.key;
-            const b = key === 'Process' && ev.code === 'Digit2';
+            const keys = ')!@#$%^Z&*(';
+            const b = key === 'Process' && /Digit\d/.test(ev.code) && ev.shiftKey;
             if (b) {
-                key = '@';
+                // 大小写锁定为大写 + 全角 + shift + 数字键，还存在问题
+                key = keys.charAt(+ev.code.substring(5));
                 this.isSougouPinYin = true;
                 ev.preventDefault();
             }

package/bundles/index.js

@@ -1136,7 +1136,7 @@ exports.DomRenderer = DomRenderer_1 = class DomRenderer {
         node.removeEventListener(type, callback);
     }
     createTextNode(textContent) {
-        return document.createTextNode(DomRenderer_1.replaceEmpty(textContent, '\u00a0'));
+        return document.createTextNode(DomRenderer_1.replaceEmpty(textContent));
     }
     createElement(name) {
         if (this.isSVG.test(name)) {
@@ -1167,8 +1167,9 @@ exports.DomRenderer = DomRenderer_1 = class DomRenderer {
         target.style[key] = value !== null && value !== void 0 ? value : '';
     }
     syncTextContent(target, content) {
-        if (target.textContent !== content) {
-            target.textContent = content;
+        const c = DomRenderer_1.replaceEmpty(content);
+        if (target.textContent !== c) {
+            target.textContent = c;
         }
     }
     removeStyle(target, key) {
@@ -1207,12 +1208,13 @@ exports.DomRenderer = DomRenderer_1 = class DomRenderer {
     copy() {
         document.execCommand('copy');
     }
-    static replaceEmpty(s, target) {
+    static replaceEmpty(s) {
+        const empty = '\u00a0';
         return s.replace(/\s\s+/g, str => {
             return ' ' + Array.from({
                 length: str.length - 1
-            }).fill(target).join('');
-        }).replace(/^\s|\s$/g, target);
+            }).fill(empty).join('');
+        }).replace(/^\s|\s$/g, empty);
     }
 };
 exports.DomRenderer = DomRenderer_1 = __decorate([
@@ -1375,6 +1377,7 @@ class ExperimentalCaret {
         this._display = true;
         this.flashing = true;
         this.subs = [];
+        this.subscription = new stream.Subscription();
         this.positionChangeEvent = new stream.Subject();
         this.styleChangeEvent = new stream.Subject();
         this.oldRange = null;
@@ -1399,7 +1402,7 @@ class ExperimentalCaret {
                 })
             ]
         });
-        this.subs.push(stream.fromEvent(document, 'mousedown').subscribe(() => {
+        this.subscription.add(stream.fromEvent(document, 'mousedown').subscribe(() => {
             this.flashing = false;
         }), stream.fromEvent(document, 'mouseup').subscribe(() => {
             this.flashing = true;
@@ -1448,6 +1451,7 @@ class ExperimentalCaret {
     }
     destroy() {
         clearTimeout(this.timer);
+        this.subscription.unsubscribe();
         this.subs.forEach(i => i.unsubscribe());
     }
     correctScrollTop(scroller) {
@@ -1757,9 +1761,11 @@ exports.MagicInput = class MagicInput extends Input {
             return !isWriting; // || !this.textarea.value
         })).subscribe(ev => {
             let key = ev.key;
-            const b = key === 'Process' && ev.code === 'Digit2';
+            const keys = ')!@#$%^Z&*(';
+            const b = key === 'Process' && /Digit\d/.test(ev.code) && ev.shiftKey;
             if (b) {
-                key = '@';
+                // 大小写锁定为大写 + 全角 + shift + 数字键，还存在问题
+                key = keys.charAt(+ev.code.substring(5));
                 this.isSougouPinYin = true;
                 ev.preventDefault();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-y.0",
+  "version": "3.0.1",
   "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",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@tanbo/di": "^1.1.4",
     "@tanbo/stream": "^1.1.9",
-    "@textbus/core": "^3.0.0-y.0",
+    "@textbus/core": "^3.0.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "27059f131ab49e1ca739b91071d2ce52285c4746"
+  "gitHead": "a74f952c6e72e51005208e0b79921007e11bb6b0"
 }