From 6f20c0a36c96e653651a60aaa6d5a3520e938180 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 19 Nov 2019 15:23:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20v3-app=20focus=20=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=AE=E7=9B=98=E9=AB=98=E5=BA=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/input/index.vue      | 13 +++--
 src/core/view/components/textarea/index.vue   |  6 ++-
 src/core/view/mixins/index.js                 |  7 ++-
 src/core/view/mixins/keyboard.js              | 20 +++++++
 .../service/framework/plugins/keyboard.js     | 54 +++++++++++++++++++
 .../service/framework/plugins/vdom-sync.js    | 16 +++++-
 6 files changed, 106 insertions(+), 10 deletions(-)
 create mode 100644 src/core/view/mixins/keyboard.js
 create mode 100644 src/platforms/app-plus/service/framework/plugins/keyboard.js

diff --git a/src/core/view/components/input/index.vue b/src/core/view/components/input/index.vue
index 547fa976a..c3a27a73e 100644
--- a/src/core/view/components/input/index.vue
+++ b/src/core/view/components/input/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <uni-input
-    @change.stop
+  <uni-input
+    @change.stop
     v-on="$listeners">
     <div
       ref="wrapper"
@@ -33,13 +33,14 @@
 </template>
 <script>
 import {
-  emitter
+  emitter,
+  keyboard
 } from 'uni-mixins'
 const INPUT_TYPES = ['text', 'number', 'idcard', 'digit', 'password']
 const NUMBER_TYPES = ['number', 'digit']
 export default {
   name: 'Input',
-  mixins: [emitter],
+  mixins: [emitter, keyboard],
   model: {
     prop: 'value',
     event: 'update:value'
@@ -165,6 +166,8 @@ export default {
       $vm = $vm.$parent
     }
 
+    this.initKeyboard(this.$refs.input)
+
     this.focus && this._focusInput()
   },
   beforeDestroy () {
@@ -308,7 +311,7 @@ uni-input[hidden] {
   height: 100%;
   background: none;
   color: inherit;
-  opacity: 1;
+  opacity: 1;
   -webkit-text-fill-color: currentcolor;
   font: inherit;
   line-height: inherit;
diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue
index f424cf8f4..2f408c696 100644
--- a/src/core/view/components/textarea/index.vue
+++ b/src/core/view/components/textarea/index.vue
@@ -51,11 +51,12 @@
 </template>
 <script>
 import {
-  emitter
+  emitter,
+  keyboard
 } from 'uni-mixins'
 export default {
   name: 'Textarea',
-  mixins: [emitter],
+  mixins: [emitter, keyboard],
   model: {
     prop: 'value',
     event: 'update:value'
@@ -210,6 +211,7 @@ export default {
     this._resize({
       height: this.$refs.sensor.$el.offsetHeight
     })
+    this.initKeyboard(this.$refs.textarea)
   },
   beforeDestroy () {
     this.$dispatch('Form', 'uni-form-group-update', {
diff --git a/src/core/view/mixins/index.js b/src/core/view/mixins/index.js
index 57c109ae8..6ac0ae102 100644
--- a/src/core/view/mixins/index.js
+++ b/src/core/view/mixins/index.js
@@ -16,4 +16,9 @@ export {
 export {
   default as subscriber
 }
-  from './subscriber'
+  from './subscriber'
+
+export {
+  default as keyboard
+}
+  from './keyboard'
diff --git a/src/core/view/mixins/keyboard.js b/src/core/view/mixins/keyboard.js
new file mode 100644
index 000000000..e6b25130c
--- /dev/null
+++ b/src/core/view/mixins/keyboard.js
@@ -0,0 +1,20 @@
+function hideKeyboard () {
+  document.activeElement.blur()
+}
+
+export default {
+  name: 'Keyboard',
+  beforeDestroy () {
+    UniViewJSBridge.unsubscribe('hideKeyboard', hideKeyboard)
+  },
+  methods: {
+    initKeyboard (el) {
+      el.addEventListener('focus', () => {
+        UniViewJSBridge.subscribe('hideKeyboard', hideKeyboard)
+      })
+      el.addEventListener('blur', () => {
+        UniViewJSBridge.unsubscribe('hideKeyboard', hideKeyboard)
+      })
+    }
+  }
+}
diff --git a/src/platforms/app-plus/service/framework/plugins/keyboard.js b/src/platforms/app-plus/service/framework/plugins/keyboard.js
new file mode 100644
index 000000000..42998eeb9
--- /dev/null
+++ b/src/platforms/app-plus/service/framework/plugins/keyboard.js
@@ -0,0 +1,54 @@
+import {
+  onMethod,
+  getCurrentPageId
+} from '../../../../../core/service/platform'
+
+const isAndroid = plus.os.name.toLowerCase() === 'android'
+const FOCUS_TIMEOUT = isAndroid ? 300 : 700
+const HIDE_TIMEOUT = 300
+let keyboardHeight = 0
+let onKeyboardShow
+let focusTimer
+let hideKeyboardTimeout
+
+export function hookKeyboardEvent (event, callback) {
+  onKeyboardShow = null
+  focusTimer && clearTimeout(focusTimer)
+  if (event.type === 'focus') {
+    if (keyboardHeight > 0) {
+      event.detail.height = keyboardHeight
+    } else {
+      focusTimer = setTimeout(function () {
+        event.detail.height = keyboardHeight
+        callback(event)
+      }, FOCUS_TIMEOUT)
+      onKeyboardShow = function () {
+        clearTimeout(focusTimer)
+        event.detail.height = keyboardHeight
+        callback(event)
+      }
+      return
+    }
+  }
+  callback(event)
+}
+
+onMethod('onKeyboardHeightChange', res => {
+  keyboardHeight = res.height
+  if (keyboardHeight > 0) {
+    onKeyboardShow && onKeyboardShow()
+    if (hideKeyboardTimeout) {
+      clearTimeout(hideKeyboardTimeout)
+      hideKeyboardTimeout = null
+    }
+  } else {
+    // 仅安卓收起键盘时通知view层失去焦点
+    if (isAndroid) {
+      hideKeyboardTimeout = setTimeout(function () {
+        hideKeyboardTimeout = null
+        var pageId = getCurrentPageId()
+        UniServiceJSBridge.publishHandler('hideKeyboard', {}, pageId)
+      }, HIDE_TIMEOUT)
+    }
+  }
+})
diff --git a/src/platforms/app-plus/service/framework/plugins/vdom-sync.js b/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
index 375d0cff3..0f6f55b00 100644
--- a/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
+++ b/src/platforms/app-plus/service/framework/plugins/vdom-sync.js
@@ -20,6 +20,10 @@ import {
   vdSyncCallbacks
 } from '../subscribe-handlers/on-vd-sync-callback'
 
+import {
+  hookKeyboardEvent
+} from './keyboard'
+
 function wrapperEvent (event) {
   event.preventDefault = noop
   event.stopPropagation = noop
@@ -37,7 +41,15 @@ const handleVdData = {
       if (!target) {
         return console.error(`event handler[${cid}][${nid}] not found`)
       }
-      target.dispatchEvent(event.type, wrapperEvent(event))
+      const type = event.type
+      const mpEvent = wrapperEvent(event)
+      if (type === 'focus' || type === 'blur') {
+        hookKeyboardEvent(mpEvent, event => {
+          target.dispatchEvent(type, event)
+        })
+      } else {
+        target.dispatchEvent(type, mpEvent)
+      }
     })
   }
 }
@@ -181,4 +193,4 @@ export class VDomSync {
     this.elements.length = 0
     removeVdSync(this.pageId)
   }
-}
+}
-- 
GitLab