From 160804225bb9511d0a5eb334edd9cb289b147872 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Thu, 12 Sep 2024 13:49:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E6=84=8F?=
 =?UTF-8?q?=E4=B9=89=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/audio/audio.taro.tsx             | 22 +++----
 .../avatarcropper/avatarcropper.taro.tsx      | 66 +++++++++----------
 src/packages/avatarcropper/avatarcropper.tsx  | 56 ++++++++--------
 .../calendaritem/calendaritem.taro.tsx        | 12 ++--
 src/packages/calendaritem/calendaritem.tsx    | 12 ++--
 src/packages/ellipsis/ellipsis.taro.tsx       | 42 ++++++------
 src/packages/inputnumber/inputnumber.taro.tsx | 26 ++++----
 src/packages/inputnumber/inputnumber.tsx      | 22 +++----
 src/packages/layout/layout.taro.tsx           |  4 +-
 src/packages/layout/layout.tsx                |  4 +-
 src/packages/overlay/overlay.taro.tsx         | 40 ++++++-----
 src/packages/overlay/overlay.tsx              | 38 +++++------
 src/packages/pagination/pagination.taro.tsx   | 10 ++-
 src/packages/pagination/pagination.tsx        | 10 ++-
 src/packages/popup/popup.taro.tsx             | 26 ++++----
 src/packages/popup/popup.tsx                  | 26 ++++----
 src/packages/tour/tour.taro.tsx               |  1 +
 17 files changed, 188 insertions(+), 229 deletions(-)

diff --git a/src/packages/audio/audio.taro.tsx b/src/packages/audio/audio.taro.tsx
index 0ee6a0c1d7..f30f1b49d7 100644
--- a/src/packages/audio/audio.taro.tsx
+++ b/src/packages/audio/audio.taro.tsx
@@ -168,20 +168,16 @@ export const Audio: FunctionComponent<
 
   const renderIcon = () => {
     return (
-      <>
-        <div className={`${classPrefix}-icon`}>
-          <div
-            className={`${classPrefix}-icon-box} ${
-              playing
-                ? `${classPrefix}-icon-play}`
-                : `${classPrefix}-icon-stop}`
-            }`}
-            onClick={handleStatusChange}
-          >
-            <Service className={playing ? 'nut-icon-loading' : ''} />
-          </div>
+      <div className={`${classPrefix}-icon`}>
+        <div
+          className={`${classPrefix}-icon-box} ${
+            playing ? `${classPrefix}-icon-play}` : `${classPrefix}-icon-stop}`
+          }`}
+          onClick={handleStatusChange}
+        >
+          <Service className={playing ? 'nut-icon-loading' : ''} />
         </div>
-      </>
+      </div>
     )
   }
 
diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx
index 2f6b3f0a66..8840b88063 100644
--- a/src/packages/avatarcropper/avatarcropper.taro.tsx
+++ b/src/packages/avatarcropper/avatarcropper.taro.tsx
@@ -661,50 +661,46 @@ export const AvatarCropper: FunctionComponent<Partial<AvatarCropperProps>> = (
   const ToolBar = () => {
     const actions = [cancel, reset, rotate, confirm]
     return (
-      <>
-        <div className={`${classPrefix}-popup-toolbar-flex`}>
-          {actions.map((action, index) => (
-            <div
-              key={index}
-              className={`${classPrefix}-popup-toolbar-item`}
-              onClick={(_e) => action()}
-            >
-              {toolbar[index]}
-            </div>
-          ))}
-        </div>
-      </>
+      <div className={`${classPrefix}-popup-toolbar-flex`}>
+        {actions.map((action, index) => (
+          <div
+            key={index}
+            className={`${classPrefix}-popup-toolbar-item`}
+            onClick={(_e) => action()}
+          >
+            {toolbar[index]}
+          </div>
+        ))}
+      </div>
     )
   }
 
   const CropperPopup = () => {
     const { canvasId } = canvasAll
     return (
-      <>
+      <div
+        className={`${classPrefix}-popup`}
+        style={{ display: visible ? 'block' : 'none' }}
+      >
+        <Canvas
+          id={canvasId}
+          canvas-id={canvasId}
+          type={showAlipayCanvas2D ? '2d' : undefined}
+          style={canvasStyle}
+          className={`${classPrefix}-popup-canvas`}
+        />
         <div
-          className={`${classPrefix}-popup`}
-          style={{ display: visible ? 'block' : 'none' }}
+          className={`${classPrefix}-popup-highlight`}
+          onTouchStart={onTouchStart}
+          onTouchMove={onTouchMove}
+          onTouchEnd={onTouchEnd}
         >
-          <Canvas
-            id={canvasId}
-            canvas-id={canvasId}
-            type={showAlipayCanvas2D ? '2d' : undefined}
-            style={canvasStyle}
-            className={`${classPrefix}-popup-canvas`}
-          />
-          <div
-            className={`${classPrefix}-popup-highlight`}
-            onTouchStart={onTouchStart}
-            onTouchMove={onTouchMove}
-            onTouchEnd={onTouchEnd}
-          >
-            <div className="highlight" style={highlightStyle} />
-          </div>
-          <div className={toolbarPositionCls}>
-            <ToolBar />
-          </div>
+          <div className="highlight" style={highlightStyle} />
         </div>
-      </>
+        <div className={toolbarPositionCls}>
+          <ToolBar />
+        </div>
+      </div>
     )
   }
 
diff --git a/src/packages/avatarcropper/avatarcropper.tsx b/src/packages/avatarcropper/avatarcropper.tsx
index e7db92f32c..dd9a902283 100644
--- a/src/packages/avatarcropper/avatarcropper.tsx
+++ b/src/packages/avatarcropper/avatarcropper.tsx
@@ -423,44 +423,40 @@ export const AvatarCropper: FunctionComponent<Partial<AvatarCropperProps>> = (
   const ToolBar = () => {
     const actions = [cancel, reset, rotate, confirm]
     return (
-      <>
-        <div className={`${classPrefix}-popup-toolbar-flex`}>
-          {actions.map((action, index) => (
-            <div
-              key={index}
-              className={`${classPrefix}-popup-toolbar-item`}
-              onClick={(_e) => action()}
-            >
-              {toolbar[index]}
-            </div>
-          ))}
-        </div>
-      </>
+      <div className={`${classPrefix}-popup-toolbar-flex`}>
+        {actions.map((action, index) => (
+          <div
+            key={index}
+            className={`${classPrefix}-popup-toolbar-item`}
+            onClick={(_e) => action()}
+          >
+            {toolbar[index]}
+          </div>
+        ))}
+      </div>
     )
   }
 
   const CropperPopup = () => {
     return (
-      <>
+      <div
+        ref={cropperPopupRef}
+        className={`${classPrefix}-popup`}
+        style={{ display: visible ? 'block' : 'none' }}
+      >
+        <canvas ref={canvasRef} className={`${classPrefix}-popup-canvas`} />
         <div
-          ref={cropperPopupRef}
-          className={`${classPrefix}-popup`}
-          style={{ display: visible ? 'block' : 'none' }}
+          className={`${classPrefix}-popup-highlight`}
+          onTouchStart={onTouchStart}
+          onTouchMove={onTouchMove}
+          onTouchEnd={onTouchEnd}
         >
-          <canvas ref={canvasRef} className={`${classPrefix}-popup-canvas`} />
-          <div
-            className={`${classPrefix}-popup-highlight`}
-            onTouchStart={onTouchStart}
-            onTouchMove={onTouchMove}
-            onTouchEnd={onTouchEnd}
-          >
-            <div className="highlight" style={highlightStyle} />
-          </div>
-          <div className={toolbarPositionCls}>
-            <ToolBar />
-          </div>
+          <div className="highlight" style={highlightStyle} />
         </div>
-      </>
+        <div className={toolbarPositionCls}>
+          <ToolBar />
+        </div>
+      </div>
     )
   }
 
diff --git a/src/packages/calendaritem/calendaritem.taro.tsx b/src/packages/calendaritem/calendaritem.taro.tsx
index 9c5f815098..fa772e210e 100644
--- a/src/packages/calendaritem/calendaritem.taro.tsx
+++ b/src/packages/calendaritem/calendaritem.taro.tsx
@@ -884,13 +884,11 @@ export const CalendarItem = React.forwardRef<
   }
 
   return (
-    <>
-      <div className={classes} style={style}>
-        {renderHeader()}
-        {renderContent()}
-        {popup && !autoBackfill ? renderFooter() : ''}
-      </div>
-    </>
+    <div className={classes} style={style}>
+      {renderHeader()}
+      {renderContent()}
+      {popup && !autoBackfill ? renderFooter() : ''}
+    </div>
   )
 })
 
diff --git a/src/packages/calendaritem/calendaritem.tsx b/src/packages/calendaritem/calendaritem.tsx
index 79fd637ae4..445d28abc5 100644
--- a/src/packages/calendaritem/calendaritem.tsx
+++ b/src/packages/calendaritem/calendaritem.tsx
@@ -883,13 +883,11 @@ export const CalendarItem = React.forwardRef<
   }
 
   return (
-    <>
-      <div className={classes} style={style}>
-        {renderHeader()}
-        {renderContent()}
-        {popup && !autoBackfill ? renderFooter() : ''}
-      </div>
-    </>
+    <div className={classes} style={style}>
+      {renderHeader()}
+      {renderContent()}
+      {popup && !autoBackfill ? renderFooter() : ''}
+    </div>
   )
 })
 
diff --git a/src/packages/ellipsis/ellipsis.taro.tsx b/src/packages/ellipsis/ellipsis.taro.tsx
index 1cc6217f40..2636686296 100644
--- a/src/packages/ellipsis/ellipsis.taro.tsx
+++ b/src/packages/ellipsis/ellipsis.taro.tsx
@@ -358,28 +358,26 @@ export const Ellipsis: FunctionComponent<
             </View>
           ) : null}
           {exceeded && expanded ? (
-            <>
-              <View
-                style={{
-                  width: `${
-                    !Number.isNaN(Number(width)) ? `${width}px` : 'auto'
-                  }`,
-                }}
-              >
-                {content}
-                {expandText ? (
-                  <span
-                    className="nut-ellipsis-text"
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      clickHandle(2)
-                    }}
-                  >
-                    {collapseText}
-                  </span>
-                ) : null}
-              </View>
-            </>
+            <View
+              style={{
+                width: `${
+                  !Number.isNaN(Number(width)) ? `${width}px` : 'auto'
+                }`,
+              }}
+            >
+              {content}
+              {expandText ? (
+                <span
+                  className="nut-ellipsis-text"
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    clickHandle(2)
+                  }}
+                >
+                  {collapseText}
+                </span>
+              ) : null}
+            </View>
           ) : null}
         </View>
       </div>
diff --git a/src/packages/inputnumber/inputnumber.taro.tsx b/src/packages/inputnumber/inputnumber.taro.tsx
index dffcb9a029..6ea4848876 100644
--- a/src/packages/inputnumber/inputnumber.taro.tsx
+++ b/src/packages/inputnumber/inputnumber.taro.tsx
@@ -248,20 +248,18 @@ export const InputNumber: FunctionComponent<
           })}
         />
       </div>
-      <>
-        <input
-          className="nut-number-input"
-          type={type}
-          ref={inputRef}
-          inputMode={type === 'digit' ? 'decimal' : 'numeric'}
-          disabled={disabled}
-          readOnly={readOnly}
-          value={inputValue}
-          onInput={handleInputChange}
-          onBlur={handleBlur}
-          onFocus={handleFocus}
-        />
-      </>
+      <input
+        className="nut-number-input"
+        type={type}
+        ref={inputRef}
+        inputMode={type === 'digit' ? 'decimal' : 'numeric'}
+        disabled={disabled}
+        readOnly={readOnly}
+        value={inputValue}
+        onInput={handleInputChange}
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+      />
       <div className="nut-input-add" onClick={handlePlus}>
         <Plus
           className={classNames('nut-inputnumber-icon icon-plus', {
diff --git a/src/packages/inputnumber/inputnumber.tsx b/src/packages/inputnumber/inputnumber.tsx
index 9c1dcee620..60b3c67d45 100644
--- a/src/packages/inputnumber/inputnumber.tsx
+++ b/src/packages/inputnumber/inputnumber.tsx
@@ -244,18 +244,16 @@ export const InputNumber: FunctionComponent<
           })}
         />
       </div>
-      <>
-        <input
-          ref={inputRef}
-          inputMode="decimal"
-          disabled={disabled}
-          readOnly={readOnly}
-          value={inputValue}
-          onInput={handleInputChange}
-          onBlur={handleBlur}
-          onFocus={handleFocus}
-        />
-      </>
+      <input
+        ref={inputRef}
+        inputMode="decimal"
+        disabled={disabled}
+        readOnly={readOnly}
+        value={inputValue}
+        onInput={handleInputChange}
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+      />
       <div className="nut-input-add" onClick={handlePlus}>
         <Plus
           className={classNames('nut-inputnumber-icon icon-plus', {
diff --git a/src/packages/layout/layout.taro.tsx b/src/packages/layout/layout.taro.tsx
index 7844dbc17a..ab3dcf73b9 100644
--- a/src/packages/layout/layout.taro.tsx
+++ b/src/packages/layout/layout.taro.tsx
@@ -1,11 +1,9 @@
 import React, { FunctionComponent } from 'react'
 
 export interface LayoutProps {}
-const defaultProps = {} as LayoutProps
 export const Layout: FunctionComponent<
   Partial<LayoutProps> & React.HTMLAttributes<HTMLDivElement>
-> = (props) => {
-  const { children } = { ...defaultProps, ...props }
+> = () => {
   return <div className="nut-layout">Layout</div>
 }
 
diff --git a/src/packages/layout/layout.tsx b/src/packages/layout/layout.tsx
index 7844dbc17a..ab3dcf73b9 100644
--- a/src/packages/layout/layout.tsx
+++ b/src/packages/layout/layout.tsx
@@ -1,11 +1,9 @@
 import React, { FunctionComponent } from 'react'
 
 export interface LayoutProps {}
-const defaultProps = {} as LayoutProps
 export const Layout: FunctionComponent<
   Partial<LayoutProps> & React.HTMLAttributes<HTMLDivElement>
-> = (props) => {
-  const { children } = { ...defaultProps, ...props }
+> = () => {
   return <div className="nut-layout">Layout</div>
 }
 
diff --git a/src/packages/overlay/overlay.taro.tsx b/src/packages/overlay/overlay.taro.tsx
index 4365f53bc8..3eb20405aa 100644
--- a/src/packages/overlay/overlay.taro.tsx
+++ b/src/packages/overlay/overlay.taro.tsx
@@ -85,28 +85,26 @@ export const Overlay: FunctionComponent<
   }
 
   return (
-    <>
-      <CSSTransition
-        nodeRef={nodeRef}
-        classNames={`${classPrefix}-slide`}
-        unmountOnExit
-        timeout={duration}
-        in={innerVisible}
-        onEntered={onHandleOpened}
-        onExited={onHandleClosed}
+    <CSSTransition
+      nodeRef={nodeRef}
+      classNames={`${classPrefix}-slide`}
+      unmountOnExit
+      timeout={duration}
+      in={innerVisible}
+      onEntered={onHandleOpened}
+      onExited={onHandleClosed}
+    >
+      <View
+        ref={nodeRef}
+        className={classes}
+        style={styles}
+        {...(rest as any)}
+        catchMove={lockScroll}
+        onClick={handleClick}
       >
-        <View
-          ref={nodeRef}
-          className={classes}
-          style={styles}
-          {...(rest as any)}
-          catchMove={lockScroll}
-          onClick={handleClick}
-        >
-          {children}
-        </View>
-      </CSSTransition>
-    </>
+        {children}
+      </View>
+    </CSSTransition>
   )
 }
 
diff --git a/src/packages/overlay/overlay.tsx b/src/packages/overlay/overlay.tsx
index 20031daac1..3db024f6a7 100644
--- a/src/packages/overlay/overlay.tsx
+++ b/src/packages/overlay/overlay.tsx
@@ -93,27 +93,25 @@ export const Overlay: FunctionComponent<
   }
 
   return (
-    <>
-      <CSSTransition
-        nodeRef={nodeRef}
-        classNames={`${classPrefix}-slide`}
-        unmountOnExit
-        timeout={duration}
-        in={innerVisible}
-        onEntered={onHandleOpened}
-        onExited={onHandleClosed}
+    <CSSTransition
+      nodeRef={nodeRef}
+      classNames={`${classPrefix}-slide`}
+      unmountOnExit
+      timeout={duration}
+      in={innerVisible}
+      onEntered={onHandleOpened}
+      onExited={onHandleClosed}
+    >
+      <div
+        ref={nodeRef}
+        className={classes}
+        style={styles}
+        {...rest}
+        onClick={handleClick}
       >
-        <div
-          ref={nodeRef}
-          className={classes}
-          style={styles}
-          {...rest}
-          onClick={handleClick}
-        >
-          {children}
-        </div>
-      </CSSTransition>
-    </>
+        {children}
+      </div>
+    </CSSTransition>
   )
 }
 
diff --git a/src/packages/pagination/pagination.taro.tsx b/src/packages/pagination/pagination.taro.tsx
index b1906cca8f..18509c0d4b 100644
--- a/src/packages/pagination/pagination.taro.tsx
+++ b/src/packages/pagination/pagination.taro.tsx
@@ -157,12 +157,10 @@ export const Pagination: FunctionComponent<
         </>
       )}
       {mode === 'lite' && (
-        <>
-          <div className={`${classPrefix}-lite`}>
-            <div className={`${classPrefix}-lite-active`}>{2}</div>
-            <div className={`${classPrefix}-lite-default`}>{8}</div>
-          </div>
-        </>
+        <div className={`${classPrefix}-lite`}>
+          <div className={`${classPrefix}-lite-active`}>{2}</div>
+          <div className={`${classPrefix}-lite-default`}>{8}</div>
+        </div>
       )}
     </div>
   )
diff --git a/src/packages/pagination/pagination.tsx b/src/packages/pagination/pagination.tsx
index 39683c5814..5dad4ff529 100644
--- a/src/packages/pagination/pagination.tsx
+++ b/src/packages/pagination/pagination.tsx
@@ -157,12 +157,10 @@ export const Pagination: FunctionComponent<
         </>
       )}
       {mode === 'lite' && (
-        <>
-          <div className={`${classPrefix}-lite`}>
-            <div className={`${classPrefix}-lite-active`}>{2}</div>
-            <div className={`${classPrefix}-lite-default`}>{8}</div>
-          </div>
-        </>
+        <div className={`${classPrefix}-lite`}>
+          <div className={`${classPrefix}-lite-active`}>{2}</div>
+          <div className={`${classPrefix}-lite-default`}>{8}</div>
+        </div>
       )}
     </div>
   )
diff --git a/src/packages/popup/popup.taro.tsx b/src/packages/popup/popup.taro.tsx
index 27c1a64282..759195e01c 100644
--- a/src/packages/popup/popup.taro.tsx
+++ b/src/packages/popup/popup.taro.tsx
@@ -273,21 +273,17 @@ export const Popup: FunctionComponent<
     return (
       <>
         {overlay ? (
-          <>
-            <Overlay
-              style={overlayStyles}
-              className={overlayClassName}
-              visible={innerVisible}
-              closeOnOverlayClick={closeOnOverlayClick}
-              lockScroll={lockScroll}
-              duration={duration}
-              onClick={onHandleClickOverlay}
-            />
-            {renderPop()}
-          </>
-        ) : (
-          <>{renderPop()}</>
-        )}
+          <Overlay
+            style={overlayStyles}
+            className={overlayClassName}
+            visible={innerVisible}
+            closeOnOverlayClick={closeOnOverlayClick}
+            lockScroll={lockScroll}
+            duration={duration}
+            onClick={onHandleClickOverlay}
+          />
+        ) : null}
+        <>{renderPop()}</>
       </>
     )
   }
diff --git a/src/packages/popup/popup.tsx b/src/packages/popup/popup.tsx
index a5f7fff117..6987e39c9b 100644
--- a/src/packages/popup/popup.tsx
+++ b/src/packages/popup/popup.tsx
@@ -272,21 +272,17 @@ export const Popup: FunctionComponent<
     return (
       <>
         {overlay ? (
-          <>
-            <Overlay
-              style={overlayStyles}
-              className={overlayClassName}
-              visible={innerVisible}
-              closeOnOverlayClick={closeOnOverlayClick}
-              lockScroll={lockScroll}
-              duration={duration}
-              onClick={onHandleClickOverlay}
-            />
-            {renderPop()}
-          </>
-        ) : (
-          <>{renderPop()}</>
-        )}
+          <Overlay
+            style={overlayStyles}
+            className={overlayClassName}
+            visible={innerVisible}
+            closeOnOverlayClick={closeOnOverlayClick}
+            lockScroll={lockScroll}
+            duration={duration}
+            onClick={onHandleClickOverlay}
+          />
+        ) : null}
+        <>{renderPop()}</>
       </>
     )
   }
diff --git a/src/packages/tour/tour.taro.tsx b/src/packages/tour/tour.taro.tsx
index 2e7aaec021..348f5029e7 100644
--- a/src/packages/tour/tour.taro.tsx
+++ b/src/packages/tour/tour.taro.tsx
@@ -197,6 +197,7 @@ export const Tour: FunctionComponent<
                   offset={item.popoverOffset || [0, 12]}
                   arrowOffset={item.arrowOffset || 0}
                 >
+                  {/* placeholder don't delete <></> */}
                   <></>
                   <>
                     {children || (