Skip to content

Commit 977bdd3

Browse files
irisSongirisSong
committed
Merge remote-tracking branch 'upstream/V3.0' into 3.0-countdown
2 parents c791e44 + dffe1ac commit 977bdd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+805
-1044
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@nutui/nutui-react",
3-
"version": "3.0.0-beta.1",
2+
"name": "@nutui/nutui-react-taro",
3+
"version": "3.0.0-beta.2",
44
"style": "dist/style.css",
55
"main": "dist/nutui.react.umd.js",
66
"module": "dist/es/packages/nutui.react.build.js",

‎packages/nutui-taro-demo/src/pages/index/index.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Taro from '@tarojs/taro'
2-
import { View, Image, Text, ScrollView } from '@tarojs/components'
2+
import { View, Image, Text, ScrollView, Button, Input, Video } from '@tarojs/components'
33
import pkg from '@/packages/../config.json'
44
import packageJson from '@/packages/../../package.json'
55
import './index.scss'
@@ -8,6 +8,10 @@ import './index.scss'
88
const navs = pkg.nav
99
// console.log(navs)
1010

11+
12+
// hack taro load button xml
13+
console.log(Button, Input, Video )
14+
1115
// try {
1216
// console.log('xxx', Schema)
1317
// } catch (e) {}

‎src/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
"author": "Ymm0008"
310310
},
311311
{
312-
"version": "2.0.0",
312+
"version": "3.0.0",
313313
"name": "NavBar",
314314
"type": "component",
315315
"cName": "头部导航",
@@ -1134,7 +1134,7 @@
11341134
"author": "swag~jun"
11351135
},
11361136
{
1137-
"version": "2.0.0",
1137+
"version": "3.0.0",
11381138
"name": "Video",
11391139
"type": "component",
11401140
"cName": "视频播放器",

‎src/packages/button/button.taro.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ export const Button = React.forwardRef<HTMLButtonElement, Partial<ButtonProps>>(
158158
onClick={(e) => handleClick(e as any)}
159159
>
160160
<View className="nut-button-wrap">
161-
{loading && !harmonyAndRn() && (
162-
<Loading className="nut-icon-loading" />
163-
)}
161+
{loading && <Loading className="nut-icon-loading" />}
164162
{!loading && icon ? icon : null}
165163
{children && (
166164
<View

0 commit comments

Comments
 (0)