From ffd5f8d314034fedef2ae9ad98f8300a056d8db4 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 14 Jun 2019 21:12:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20textarea=20?=
 =?UTF-8?q?=E5=9C=A8=20iOS=20=E4=B8=8A=E8=87=AA=E5=8A=A8=E5=A2=9E=E9=AB=98?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=A4=E4=BE=A7=E5=A4=9A=203px=20=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/resize-sensor/index.vue | 14 +-------------
 src/core/view/components/textarea/index.vue      | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/core/view/components/resize-sensor/index.vue b/src/core/view/components/resize-sensor/index.vue
index 688024cd8..da07a6a22 100644
--- a/src/core/view/components/resize-sensor/index.vue
+++ b/src/core/view/components/resize-sensor/index.vue
@@ -32,19 +32,7 @@ export default {
       this.$el.parentNode.style.position = 'relative'
     }
 
-    if ('attachEvent' in this.$el && !('AnimationEvent' in window)) {
-      var onresizeHandler = function () {
-        this.update()
-        removeOnresizeEvent()
-      }.bind(this)
-
-      var removeOnresizeEvent = function () {
-        this.$el.detachEvent('onresize', onresizeHandler)
-        this.$off('resizeSensorBeforeDestroy', removeOnresizeEvent)
-      }.bind(this)
-
-      this.$el.attachEvent('onresize', onresizeHandler)
-      this.$on('resizeSensorBeforeDestroy', removeOnresizeEvent)
+    if (!('AnimationEvent' in window)) {
       this.reset()
     }
   },
diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue
index acadb4c33..55368e50f 100644
--- a/src/core/view/components/textarea/index.vue
+++ b/src/core/view/components/textarea/index.vue
@@ -14,9 +14,7 @@
     :selection-end="selectionEndNumber"
     v-on="$listeners"
   >
-    <div
-      ref="wrapped"
-      class="uni-textarea-wrapped">
+    <div class="uni-textarea-wrapper">
       <div
         v-show="!(composition||valueSync.length)"
         ref="placeholder"
@@ -38,6 +36,7 @@
         :disabled="disabled"
         :maxlength="maxlengthNumber"
         :autofocus="autoFocus"
+        :class="{'uni-textarea-textarea-ios': isIOS}"
         class="uni-textarea-textarea"
         @compositionstart="_compositionstart"
         @compositionend="_compositionend"
@@ -121,7 +120,8 @@ export default {
       composition: false,
       focusSync: this.focus,
       height: 0,
-      focusChangeSource: ''
+      focusChangeSource: '',
+      isIOS: String(navigator.platform).indexOf('iP') === 0 && String(navigator.vendor).indexOf('Apple') === 0
     }
   },
   computed: {
@@ -299,7 +299,7 @@ uni-textarea[hidden] {
 uni-textarea[auto-height] .uni-textarea-textarea {
   overflow-y: hidden;
 }
-.uni-textarea-wrapped {
+.uni-textarea-wrapper {
   position: relative;
   width: 100%;
   height: 100%;
@@ -351,4 +351,10 @@ uni-textarea[auto-height] .uni-textarea-textarea {
   background-color: transparent;
   opacity: inherit;
 }
+/* 用于解决 iOS textarea 内部默认边距 */
+.uni-textarea-textarea-ios {
+  width: auto;
+  right: 0;
+  margin: 0 -3px;
+}
 </style>
-- 
GitLab