fix text field releases focus immediately when after cycle

nyannyacha · Dec 10, 2020 · 62baa98 · 62baa98
1 parent 049373c
commit 62baa98
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 28 deletions.
diff --git a/bundles/puxi.js/dist/puxi.js b/bundles/puxi.js/dist/puxi.js
diff --git a/bundles/puxi.js/lib/puxi.cjs b/bundles/puxi.js/lib/puxi.cjs
@@ -1,6 +1,6 @@
 /*!
  * puxi.js - v1.0.1
- * Compiled Sat, 07 Nov 2020 17:57:12 UTC
+ * Compiled Thu, 10 Dec 2020 11:56:53 UTC
  *
  * puxi.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license

diff --git a/bundles/puxi.js/lib/puxi.mjs b/bundles/puxi.js/lib/puxi.mjs
@@ -1,6 +1,6 @@
 /*!
  * puxi.js - v1.0.1
- * Compiled Sat, 07 Nov 2020 17:57:12 UTC
+ * Compiled Thu, 10 Dec 2020 11:56:53 UTC
  *
  * puxi.js is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license

diff --git a/packages/core/dist/puxi-core.js b/packages/core/dist/puxi-core.js
diff --git a/packages/core/dist/puxi-core.js.map b/packages/core/dist/puxi-core.js.map
diff --git a/packages/core/lib/puxi-core.js b/packages/core/lib/puxi-core.js
diff --git a/packages/core/lib/puxi-core.js.map b/packages/core/lib/puxi-core.js.map
diff --git a/packages/core/src/FocusableWidget.ts b/packages/core/src/FocusableWidget.ts
@@ -81,9 +81,9 @@ export abstract class FocusableWidget extends InteractiveGroup implements IFocus
          */
         this.tabGroup = options.tabGroup;
 
-        this.insetContainer.on('pointerdown', () =>
+        this.insetContainer.on('pointerdown', (ev: PIXI.interaction.InteractionEvent) =>
         {
-            this.focus();
+            this.focus(ev);
             this._isMousePressed = true;
         });
 
@@ -94,7 +94,7 @@ export abstract class FocusableWidget extends InteractiveGroup implements IFocus
     /**
      * Brings this widget into focus.
      */
-    focus(): void
+    focus(ev?: PIXI.interaction.InteractionEvent): void
     {
         if (this.isFocused)
         {

diff --git a/packages/core/src/TextInput.ts b/packages/core/src/TextInput.ts
@@ -913,7 +913,6 @@ export class TextInput extends FocusableWidget
 
             mockDOMInput.setAttribute('style', `position:fixed; left:${l}; top:${t}; height:${h}; width:${w};`);
             mockDOMInput.value = '';
-            mockDOMInput.focus();
             mockDOMInput.setAttribute('style', 'position:fixed; left:-10px; top:-10px; width:0px; height: 0px;');
 
             this.innerContainer.cacheAsBitmap = false;
@@ -936,6 +935,8 @@ export class TextInput extends FocusableWidget
 
             setTimeout(() =>
             {
+                mockDOMInput.focus();
+
                 if (!this.caret.visible && !this.selection.visible && !this.multiLine)
                 {
                     this.setCaretIndex(this.chars.length);

diff --git a/packages/kit/dist/puxi-kit.js b/packages/kit/dist/puxi-kit.js
diff --git a/packages/kit/lib/puxi-kit.js b/packages/kit/lib/puxi-kit.js
diff --git a/packages/kit/lib/puxi-kit.mjs b/packages/kit/lib/puxi-kit.mjs
@@ -1,6 +1,6 @@
 /*!
  * @puxi/kit - v1.0.1
- * Compiled Sat, 07 Nov 2020 17:57:12 UTC
+ * Compiled Thu, 10 Dec 2020 11:56:53 UTC
  *
  * @puxi/kit is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license

diff --git a/packages/navigation/dist/puxi-navigation.js b/packages/navigation/dist/puxi-navigation.js
diff --git a/packages/navigation/lib/puxi-navigation.js b/packages/navigation/lib/puxi-navigation.js
diff --git a/packages/navigation/lib/puxi-navigation.mjs b/packages/navigation/lib/puxi-navigation.mjs
@@ -1,6 +1,6 @@
 /*!
  * @puxi/navigation - v1.0.1
- * Compiled Sat, 07 Nov 2020 17:57:12 UTC
+ * Compiled Thu, 10 Dec 2020 11:56:53 UTC
  *
  * @puxi/navigation is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license

diff --git a/packages/tween/dist/puxi-tween.js b/packages/tween/dist/puxi-tween.js
diff --git a/packages/tween/lib/puxi-tween.js b/packages/tween/lib/puxi-tween.js
diff --git a/packages/tween/lib/puxi-tween.mjs b/packages/tween/lib/puxi-tween.mjs
@@ -1,6 +1,6 @@
 /*!
  * @puxi/tween - v1.0.1
- * Compiled Sat, 07 Nov 2020 17:57:12 UTC
+ * Compiled Thu, 10 Dec 2020 11:56:53 UTC
  *
  * @puxi/tween is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license