From 107cada98f73c6a71be3fa552eb65a5a87447560 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Mon, 30 Dec 2024 19:04:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=9C=9F=E6=9C=BA=E4=B8=8A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  9 +++----
 src/packages/loading/demos/taro/demo1.tsx     |  2 +-
 src/packages/lottie/mp.taro.tsx               | 25 +++++++++++++++++--
 .../pulltorefresh/pulltorefresh.taro.tsx      |  1 +
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index a44ba3b731..92c1f9ddad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@nutui/nutui-react-taro",
-  "version": "3.0.0-beta.10",
+  "name": "@dongdesign/components",
+  "version": "3.0.0-beta.0",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -40,10 +40,7 @@
     "LICENSE",
     "CHANGELOG.md"
   ],
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
+
   "scripts": {
     "add": "node scripts/create-component-mode.js && npm run prepare",
     "add:taro:config": "node scripts/taro/generate-taro-route.js",
diff --git a/src/packages/loading/demos/taro/demo1.tsx b/src/packages/loading/demos/taro/demo1.tsx
index 191165dfdf..d1306dcfb2 100644
--- a/src/packages/loading/demos/taro/demo1.tsx
+++ b/src/packages/loading/demos/taro/demo1.tsx
@@ -25,7 +25,7 @@ const Demo1 = () => {
           type="lottie"
           jsonData={data}
           lottieProps={{
-            autoplay: false,
+            autoPlay: false,
             loop: false,
             style: { width: 56, height: 56 },
           }}
diff --git a/src/packages/lottie/mp.taro.tsx b/src/packages/lottie/mp.taro.tsx
index 57ef4d9aa3..2109298746 100644
--- a/src/packages/lottie/mp.taro.tsx
+++ b/src/packages/lottie/mp.taro.tsx
@@ -1,11 +1,11 @@
 import React, { useImperativeHandle, useRef } from 'react'
 import {
   createSelectorQuery,
+  getEnv,
   getSystemInfoSync,
   useReady,
   useUnload,
 } from '@tarojs/taro'
-import { Canvas } from '@tarojs/components'
 import lottie from 'lottie-miniprogram'
 import useUuid from '@/utils/use-uuid'
 import { LottieProps } from './types'
@@ -82,7 +82,28 @@ export const Lottie = React.forwardRef((props: LottieProps, ref: any) => {
       animation.current.removeEventListener('complete', onComplete)
     animation.current && animation.current.destroy()
   })
-  return <Canvas id={id} canvas-id={id} type="2d" style={style} />
+
+  return getEnv() === 'WEAPP' || getEnv() === 'JD' ? (
+    <canvas
+      id={id}
+      // @ts-ignore
+      // eslint-disable-next-line react/no-unknown-property
+      canvasId={id}
+      // eslint-disable-next-line react/no-unknown-property
+      disalbeScroll
+      type="2d"
+      style={style}
+    />
+  ) : (
+    <canvas
+      id={id}
+      // eslint-disable-next-line react/no-unknown-property
+      canvas-id={id}
+      // eslint-disable-next-line react/no-unknown-property
+      disalbe-scroll
+      style={style}
+    />
+  )
 })
 
 Lottie.displayName = 'NutLottie'
diff --git a/src/packages/pulltorefresh/pulltorefresh.taro.tsx b/src/packages/pulltorefresh/pulltorefresh.taro.tsx
index c98e8b58f0..10f96811d4 100644
--- a/src/packages/pulltorefresh/pulltorefresh.taro.tsx
+++ b/src/packages/pulltorefresh/pulltorefresh.taro.tsx
@@ -176,6 +176,7 @@ export const PullToRefresh: FunctionComponent<Partial<PullToRefreshProps>> = (
     <View
       className={classes}
       style={props.style}
+      catchMove
       onTouchStart={handleTouchStart}
       onTouchMove={handleTouchMove}
       onTouchEnd={handleTouchEnd}

From 707e4099fdd01dc3d075dd7e8b17b24a5bafe4f4 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Tue, 31 Dec 2024 14:45:10 +0800
Subject: [PATCH 2/2] chore: revert version

---
 package.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 92c1f9ddad..a44ba3b731 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@dongdesign/components",
-  "version": "3.0.0-beta.0",
+  "name": "@nutui/nutui-react-taro",
+  "version": "3.0.0-beta.10",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -40,7 +40,10 @@
     "LICENSE",
     "CHANGELOG.md"
   ],
-
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "add": "node scripts/create-component-mode.js && npm run prepare",
     "add:taro:config": "node scripts/taro/generate-taro-route.js",