Merge branch 'master' of github.com:egret-labs/egret-core

egret-labs · May 26, 2021 · 5913071 · 5913071
2 parents a36f4f3 + 0682ceb
commit 5913071
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/build/egret/egret.d.ts b/build/egret/egret.d.ts
@@ -1,4 +1,4 @@
-declare var global: any;
+declare var global: NodeJS.Global;
 declare var __global: any;
 declare let __define: any;
 declare namespace egret {

diff --git a/build/egret/egret.js b/build/egret/egret.js
@@ -20346,6 +20346,10 @@ var egret;
             this.tempStage.removeEventListener(egret.TouchEvent.TOUCH_BEGIN, this.onStageDownHandler, this);
             this.stageText.removeEventListener("blur", this.blurHandler, this);
             this.stageText.removeEventListener("focus", this.focusHandler, this);
+            if (this._isFocus) {
+                this._isFocus = false;
+                this._text.$setIsTyping(false);
+            }
             this.stageTextAdded = false;
         };
         /**

diff --git a/build/egret/egret.min.js b/build/egret/egret.min.js
diff --git a/src/egret/text/InputController.ts b/src/egret/text/InputController.ts
@@ -120,6 +120,12 @@ namespace egret {
             this.stageText.removeEventListener("blur", this.blurHandler, this);
             this.stageText.removeEventListener("focus", this.focusHandler, this);
 
+
+            if (this._isFocus) {
+                this._isFocus = false;
+                this._text.$setIsTyping(false);
+            }
+
             this.stageTextAdded = false;
         }