Workaround Android hiding the keyboard on cut.

fastmail · Jul 14, 2016 · 1324102 · 1324102
1 parent d4abc18
commit 1324102
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/build/squire-raw.js b/build/squire-raw.js
@@ -31,6 +31,8 @@ var ua = navigator.userAgent;
 var isIOS = /iP(?:ad|hone|od)/.test( ua );
 var isMac = /Mac OS X/.test( ua );
 
+var isAndroid = /Android/.test( ua );
+
 var isGecko = /Gecko\//.test( ua );
 var isIElt11 = /Trident\/[456]\./.test( ua );
 var isPresto = !!win.opera;
@@ -1644,6 +1646,13 @@ var keyHandlers = {
                 !node.nextSibling && range.endOffset === getLength( node ) ) {
             range.setStartAfter( parent );
         }
+        // Delete the selection if not collapsed
+        else if ( !range.collapsed ) {
+            deleteContentsOfRange( range, self._root );
+            self._ensureBottomLine();
+            self.setSelection( range );
+            self._updatePath( range, true );
+        }
 
         self.setSelection( range );
     },
@@ -2717,6 +2726,16 @@ proto.setSelection = function ( range ) {
         // needing restore on focus.
         if ( !this._isFocused ) {
             enableRestoreSelection.call( this );
+        } else if ( isAndroid && !this._restoreSelection ) {
+            // Android closes the keyboard on removeAllRanges() and doesn't
+            // open it again when addRange() is called, sigh.
+            // Since Android doesn't trigger a focus event in setSelection(),
+            // use a blur/focus dance to work around this by letting the
+            // selection be restored on focus.
+            // Need to check for !this._restoreSelection to avoid infinite loop
+            enableRestoreSelection.call( this );
+            this.blur();
+            this.focus();
         } else {
             // iOS bug: if you don't focus the iframe before setting the
             // selection, you can end up in a state where you type but the input

diff --git a/build/squire.js b/build/squire.js
diff --git a/source/Constants.js b/source/Constants.js
@@ -27,6 +27,8 @@ var ua = navigator.userAgent;
 var isIOS = /iP(?:ad|hone|od)/.test( ua );
 var isMac = /Mac OS X/.test( ua );
 
+var isAndroid = /Android/.test( ua );
+
 var isGecko = /Gecko\//.test( ua );
 var isIElt11 = /Trident\/[456]\./.test( ua );
 var isPresto = !!win.opera;

diff --git a/source/Editor.js b/source/Editor.js
@@ -427,6 +427,16 @@ proto.setSelection = function ( range ) {
         // needing restore on focus.
         if ( !this._isFocused ) {
             enableRestoreSelection.call( this );
+        } else if ( isAndroid && !this._restoreSelection ) {
+            // Android closes the keyboard on removeAllRanges() and doesn't
+            // open it again when addRange() is called, sigh.
+            // Since Android doesn't trigger a focus event in setSelection(),
+            // use a blur/focus dance to work around this by letting the
+            // selection be restored on focus.
+            // Need to check for !this._restoreSelection to avoid infinite loop
+            enableRestoreSelection.call( this );
+            this.blur();
+            this.focus();
         } else {
             // iOS bug: if you don't focus the iframe before setting the
             // selection, you can end up in a state where you type but the input