diff --git a/packages/react-demo/copyPages.sh b/packages/react-demo/copyPages.sh index eefac08f6..373149bad 100755 --- a/packages/react-demo/copyPages.sh +++ b/packages/react-demo/copyPages.sh @@ -4,7 +4,7 @@ path=$(cd $(dirname $0); pwd) if [ `echo $path | grep -e vantui$` ];then echo '在根目录' echo '删除' - rm -rf ./src/pages/ + rm -rf ./packages/vantui-demo/src/pages/ echo '平移' cp -r ./packages/vantui-demo/src/pages ./packages/react-ui/src/pages else diff --git a/packages/react-demo/src/components/demo-page/index.js b/packages/react-demo/src/components/demo-page/index.js index 01fcf2750..488ccbae2 100644 --- a/packages/react-demo/src/components/demo-page/index.js +++ b/packages/react-demo/src/components/demo-page/index.js @@ -1,6 +1,7 @@ import { Icon } from '@antmjs/vantui' import { View } from '@tarojs/components' -import * as React from 'react' +import { pageScrollTo } from '@tarojs/taro' +import React, { useEffect } from 'react' import history from './../../history' import './index.less' @@ -12,6 +13,16 @@ export default function Page(props) { history.go(-1) } + useEffect(() => { + if (process.env.LIBRARY_ENV === 'react') { + document.body.scrollTop = document.documentElement.scrollTop = 0 + } else { + pageScrollTo({ + scrollTop: 0, + }) + } + }) + return ( {'h5' === process.env.TARO_ENV && ( diff --git a/packages/vantui-demo/src/components/demo-page/index.js b/packages/vantui-demo/src/components/demo-page/index.js index b227ec01a..1da664b96 100644 --- a/packages/vantui-demo/src/components/demo-page/index.js +++ b/packages/vantui-demo/src/components/demo-page/index.js @@ -1,13 +1,23 @@ import { Icon } from '@antmjs/vantui' import { View } from '@tarojs/components' -import { navigateBack } from '@tarojs/taro' -import * as React from 'react' +import { navigateBack, pageScrollTo } from '@tarojs/taro' +import React, { useEffect } from 'react' import './index.less' export default function Page(props) { // eslint-disable-next-line react/prop-types const { title, children } = props + useEffect(() => { + if (process.env.LIBRARY_ENV === 'react') { + document.body.scrollTop = document.documentElement.scrollTop = 0 + } else { + pageScrollTo({ + scrollTop: 0, + }) + } + }) + return ( {'h5' === process.env.TARO_ENV && ( diff --git a/packages/vantui-demo/src/pages/grid/index.js b/packages/vantui-demo/src/pages/grid/index.js index 38a9db348..a40a000be 100644 --- a/packages/vantui-demo/src/pages/grid/index.js +++ b/packages/vantui-demo/src/pages/grid/index.js @@ -24,7 +24,7 @@ export default class Index extends Component { <> - + {array4.map((item) => { return ( @@ -33,7 +33,7 @@ export default class Index extends Component { - + {array6.map((item) => { return ( @@ -42,7 +42,7 @@ export default class Index extends Component { - + {array3.map((item, index) => { return ( @@ -60,7 +60,7 @@ export default class Index extends Component { - + {array8.map((item) => { return ( @@ -69,7 +69,7 @@ export default class Index extends Component { - + {array8.map((item) => { return ( @@ -78,7 +78,7 @@ export default class Index extends Component { - + {array3.map((item) => { return ( @@ -87,7 +87,7 @@ export default class Index extends Component { - + - + diff --git a/packages/vantui-demo/src/pages/radio/index.js b/packages/vantui-demo/src/pages/radio/index.js index 0956d64db..1a4854e46 100644 --- a/packages/vantui-demo/src/pages/radio/index.js +++ b/packages/vantui-demo/src/pages/radio/index.js @@ -180,10 +180,10 @@ export default class Index extends Component { }) }} > - + 单选框 - + 单选框 diff --git a/packages/vantui-demo/src/pages/sticky/index.js b/packages/vantui-demo/src/pages/sticky/index.js index a3a712626..4423b05a2 100644 --- a/packages/vantui-demo/src/pages/sticky/index.js +++ b/packages/vantui-demo/src/pages/sticky/index.js @@ -19,6 +19,10 @@ export default class Index extends Component { offsetTop: 0, } + componentDidMount() { + this.onReady() + } + onReady = () => { this.setState({ container: () => createSelectorQuery().select('#container'), @@ -42,45 +46,44 @@ export default class Index extends Component { const { container, scrollTop, offsetTop } = this.state return ( - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - + + + ) } diff --git a/packages/vantui-demo/src/pages/sticky/index.scss b/packages/vantui-demo/src/pages/sticky/index.scss index 737309d7e..3a8a4768c 100644 --- a/packages/vantui-demo/src/pages/sticky/index.scss +++ b/packages/vantui-demo/src/pages/sticky/index.scss @@ -1,5 +1,5 @@ .sticky-page { - height: 200vh; + height: 800px; } .sticky-container { diff --git a/packages/vantui-demo/src/pages/tabbar/index.js b/packages/vantui-demo/src/pages/tabbar/index.js index 5aa52302b..2f213ff7d 100644 --- a/packages/vantui-demo/src/pages/tabbar/index.js +++ b/packages/vantui-demo/src/pages/tabbar/index.js @@ -153,7 +153,7 @@ export default class Index extends Component { > } - renderIconactive={ + renderIconActive={ <> = minSwipeDistance) { diff --git a/packages/vantui/types/grid.d.ts b/packages/vantui/types/grid.d.ts index f43177143..9c8ffd151 100644 --- a/packages/vantui/types/grid.d.ts +++ b/packages/vantui/types/grid.d.ts @@ -9,7 +9,7 @@ export interface GridProps extends StandardProps { center?: boolean border?: boolean direction?: string - iconSize?: string + iconSize?: string | number reverse?: boolean children?: React.ReactNode }