From b0d8781231452b2c952e1d512e6733f693ce6b7e Mon Sep 17 00:00:00 2001
From: oasis-cloud <suanbanren@foxmail.com>
Date: Wed, 20 Nov 2024 14:49:35 +0800
Subject: [PATCH 1/2] fix(popup): display should not trigger the scrollview to
 update

---
 src/packages/popup/popup.taro.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/packages/popup/popup.taro.tsx b/src/packages/popup/popup.taro.tsx
index 759195e01c..a18033e460 100644
--- a/src/packages/popup/popup.taro.tsx
+++ b/src/packages/popup/popup.taro.tsx
@@ -1,20 +1,20 @@
 import React, {
   FunctionComponent,
-  useState,
-  useEffect,
   ReactElement,
-  ReactPortal,
   ReactNode,
+  ReactPortal,
+  useEffect,
+  useState,
 } from 'react'
 import { createPortal } from 'react-dom'
 import { CSSTransition } from 'react-transition-group'
 import classNames from 'classnames'
 import { Close } from '@nutui/icons-react-taro'
 import { EnterHandler, ExitHandler } from 'react-transition-group/Transition'
-import { View, ITouchEvent } from '@tarojs/components'
+import { ITouchEvent, View } from '@tarojs/components'
 import {
-  OverlayProps,
   defaultOverlayProps,
+  OverlayProps,
 } from '@/packages/overlay/overlay.taro'
 import Overlay from '@/packages/overlay/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
@@ -271,7 +271,7 @@ export const Popup: FunctionComponent<
 
   const renderNode = () => {
     return (
-      <>
+      <View catchMove>
         {overlay ? (
           <Overlay
             style={overlayStyles}
@@ -283,8 +283,8 @@ export const Popup: FunctionComponent<
             onClick={onHandleClickOverlay}
           />
         ) : null}
-        <>{renderPop()}</>
-      </>
+        {renderPop()}
+      </View>
     )
   }
 

From af8187539b442fd209dd1432bab92e30b8d27565 Mon Sep 17 00:00:00 2001
From: oasis-cloud <suanbanren@foxmail.com>
Date: Wed, 20 Nov 2024 16:56:15 +0800
Subject: [PATCH 2/2] fix: test error

---
 src/packages/textarea/textarea.taro.tsx | 1 -
 src/packages/textarea/textarea.tsx      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/packages/textarea/textarea.taro.tsx b/src/packages/textarea/textarea.taro.tsx
index 3a15ae7271..21b74b37fc 100644
--- a/src/packages/textarea/textarea.taro.tsx
+++ b/src/packages/textarea/textarea.taro.tsx
@@ -28,7 +28,6 @@ const defaultProps = {
   defaultValue: '',
   showCount: false,
   maxLength: 140,
-  placeholder: '',
   readOnly: false,
   disabled: false,
   autoSize: false,
diff --git a/src/packages/textarea/textarea.tsx b/src/packages/textarea/textarea.tsx
index 61b61d64a3..176ad9b3f9 100644
--- a/src/packages/textarea/textarea.tsx
+++ b/src/packages/textarea/textarea.tsx
@@ -26,7 +26,6 @@ const defaultProps = {
   showCount: false,
   rows: 2,
   maxLength: 140,
-  placeholder: '',
   readOnly: false,
   disabled: false,
   autoSize: false,