-
Notifications
You must be signed in to change notification settings - Fork 66
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(list): add list component #463
Open
feaswcy
wants to merge
5
commits into
Tencent:develop
Choose a base branch
from
feaswcy:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+459
−10
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
565d530
feat(list): add list component
ddfeab4
feat(list): merge origin entry
feaswcy 40d7180
feat(list): fix list review qa
feaswcy fb655da
style(list): fix code review comment
feaswcy 7491bcc
Merge branch 'develop' of https://github.com/Tencent/tdesign-mobile-r…
feaswcy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { useState } from 'react'; | ||
|
||
const useWindowHeight = () => { | ||
const [height, setHeight] = useState(window.innerHeight); | ||
window.onresize = () => { | ||
const height = window.innerHeight; | ||
setHeight(height); | ||
}; | ||
return height; | ||
}; | ||
|
||
export default useWindowHeight; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
import React, { useEffect, useState, useRef } from 'react'; | ||
import './style/index.less'; | ||
import { Cell, List } from 'tdesign-mobile-react'; | ||
|
||
interface ListItem { | ||
id: number; | ||
content: string; | ||
icon: string; | ||
title: string; | ||
} | ||
|
||
export default function ListDemo() { | ||
const [isLoading, setIsLoading] = useState(false); | ||
const pageSize = 20; | ||
const stateRef = useRef([]); | ||
const pageRef = useRef(1); | ||
const dataSource: ListItem[] = []; | ||
const total = 100; | ||
for (let i = 0; i < total; i++) { | ||
dataSource.push({ | ||
id: i, | ||
content: '列表内容列表内容列表内容', | ||
icon: 'https://tdesign.gtimg.com/list-icon.png', | ||
title: '列表主内容', | ||
}); | ||
} | ||
|
||
// 模拟请求 | ||
const fetchData = async (pageInfo) => { | ||
if (isLoading) return; | ||
setIsLoading(true); | ||
try { | ||
setTimeout(() => { | ||
const { pageNum, pageSize } = pageInfo; | ||
const newDataSource = dataSource.slice((pageNum - 1) * pageSize, pageNum * pageSize); | ||
const newListData = stateRef.current.concat(newDataSource); | ||
pageRef.current = pageNum; | ||
stateRef.current = newListData; | ||
setIsLoading(false); | ||
}, 0); | ||
} catch (err) { | ||
stateRef.current = []; | ||
} | ||
}; | ||
|
||
const onScroll = (scrollBottom) => { | ||
if (!scrollBottom && stateRef.current.length < total) { | ||
fetchData({ pageNum: pageRef.current + 1, pageSize }); | ||
} | ||
}; | ||
|
||
useEffect(() => { | ||
fetchData({ pageNum: pageRef.current, pageSize }); | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, []); | ||
|
||
return ( | ||
<List asyncLoading={isLoading} onScroll={onScroll}> | ||
{stateRef.current.map((item) => ( | ||
<Cell key={item.id} align="middle"> | ||
<span className="cell">{item.id}</span> | ||
</Cell> | ||
))} | ||
</List> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
import React, { useState, useRef, useEffect } from 'react'; | ||
import { Cell, List, Loading } from 'tdesign-mobile-react'; | ||
|
||
export default function ListDemo() { | ||
const listError = useRef<string[]>([]); | ||
const [loading, setLoading] = useState(''); | ||
const [showError, setShowError] = useState(false); | ||
|
||
const onLoadError = () => { | ||
setLoading('loading'); | ||
|
||
setTimeout(() => { | ||
const newVal: string[] = [...listError.current]; | ||
for (let i = listError.current.length; i < 8; i++) { | ||
newVal.push(`${i}`); | ||
} | ||
listError.current = newVal; | ||
|
||
setShowError(true); | ||
setLoading(''); | ||
}, 1000); | ||
}; | ||
|
||
const onLoadMore = () => { | ||
setShowError(false); | ||
if (listError.current.length >= 60 || loading) { | ||
return; | ||
} | ||
setLoading('loading'); | ||
|
||
setTimeout(() => { | ||
for (let i = 0; i < 15; i++) { | ||
listError.current.push(`${listError.current.length + 1}`); | ||
} | ||
setLoading(''); | ||
}, 1000); | ||
}; | ||
|
||
useEffect(() => { | ||
onLoadError(); | ||
}, []); | ||
|
||
return ( | ||
<List | ||
asyncLoading={loading} | ||
onScroll={onLoadMore} | ||
footer={ | ||
showError && ( | ||
<Loading indicator={false}> | ||
<div className="custom-error"> | ||
请求失败,点击重新<span onClick={onLoadMore}>加载</span> | ||
</div> | ||
</Loading> | ||
) | ||
} | ||
> | ||
{listError.current.map((item) => ( | ||
<Cell key={item} align="middle"> | ||
<span className="cell">{item}</span> | ||
</Cell> | ||
))} | ||
</List> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
import React, { useState } from 'react'; | ||
import { Button } from 'tdesign-mobile-react'; | ||
import TDemoBlock from '../../../site/mobile/components/DemoBlock'; | ||
// import TDemoHeader from '../../../site/mobile/components/DemoHeader'; | ||
import './style/index.less'; | ||
|
||
import BaseList from './base.jsx'; | ||
import ErrTipDemo from './err-tip.jsx'; | ||
import PullRefreshDemo from './pull-refresh.jsx'; | ||
|
||
export default function ListDemo() { | ||
const [currentTab, setCurrentTab] = useState('info'); | ||
|
||
const onChangeTab = (val) => { | ||
setCurrentTab(val); | ||
history.pushState({}, '', '?tab=demo'); | ||
}; | ||
|
||
return ( | ||
<div className="tdesign-mobile-demo"> | ||
<div className="list-demo"> | ||
{currentTab === 'info' && ( | ||
<div> | ||
<h1 className="title">List 列表</h1> | ||
<p className="summary"> | ||
瀑布流滚动加载,用于展示同一类型信息的长列表。当列表即将滚动到底部时,会触发事件并加载更多列表项。 | ||
</p> | ||
<TDemoBlock title="01 类型" summary="基础列表"> | ||
<Button size="large" variant="outline" theme="primary" onClick={() => onChangeTab('base')}> | ||
{' '} | ||
基础列表{' '} | ||
</Button> | ||
<Button size="large" variant="outline" theme="primary" onClick={() => onChangeTab('pull-refresh')}> | ||
下拉刷新 | ||
</Button> | ||
<Button size="large" variant="outline" theme="primary" onClick={() => onChangeTab('error-tip')}> | ||
错误提示 | ||
</Button> | ||
</TDemoBlock> | ||
</div> | ||
)} | ||
{currentTab === 'base' && <BaseList></BaseList>} | ||
{currentTab === 'error-tip' && <ErrTipDemo></ErrTipDemo>} | ||
{currentTab === 'pull-refresh' && ( | ||
<div className="pull-refresh-wrap"> | ||
<PullRefreshDemo /> | ||
</div> | ||
)} | ||
</div> | ||
</div> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
import React, { useState, useEffect, useRef } from 'react'; | ||
import { Cell, List, PullDownRefresh } from 'tdesign-mobile-react'; | ||
|
||
export default function ListDemo() { | ||
const [loading, setLoading] = useState(''); | ||
const [refreshing, setRefreshing] = useState(false); | ||
|
||
const listData = useRef<string[]>([]); | ||
|
||
const MAX_DATA_LEN = 60; | ||
|
||
const loadData = (isRefresh) => { | ||
const ONCE_LOAD_NUM = 20; | ||
return new Promise(() => { | ||
setTimeout(() => { | ||
const temp: string[] = []; | ||
for (let i = 0; i < ONCE_LOAD_NUM; i++) { | ||
if (isRefresh) { | ||
temp.push(`${i + 1}`); | ||
} else { | ||
temp.push(`${listData.current.length + 1 + i}`); | ||
} | ||
} | ||
|
||
if (isRefresh) { | ||
listData.current = temp; | ||
} else { | ||
listData.current = [...listData.current, ...temp]; | ||
} | ||
setLoading(''); | ||
setRefreshing(false); | ||
}, 1000); | ||
}); | ||
}; | ||
|
||
const onLoadData = (isRefresh?) => { | ||
if ((listData.current.length >= MAX_DATA_LEN && !isRefresh) || loading.value) { | ||
return; | ||
} | ||
setLoading('loading'); | ||
loadData(isRefresh); | ||
}; | ||
|
||
const onScroll = (scrollBottom) => { | ||
if (scrollBottom < 50) { | ||
onLoadData(); | ||
} | ||
}; | ||
|
||
const onRefresh = () => { | ||
setRefreshing(true); | ||
onLoadData(true); | ||
}; | ||
|
||
useEffect(() => { | ||
onLoadData(); | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, []); | ||
|
||
return ( | ||
<PullDownRefresh value={refreshing} onChange={(val) => setRefreshing(val)} onRefresh={onRefresh}> | ||
<List asyncLoading={loading} onScroll={onScroll}> | ||
{listData.current.map((item) => ( | ||
<Cell key={item} align="middle"> | ||
<span className="cell">{item}</span> | ||
</Cell> | ||
))} | ||
</List> | ||
</PullDownRefresh> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
.list-demo { | ||
.t-list { | ||
.cell { | ||
width: 100%; | ||
text-align: center; | ||
} | ||
.error { | ||
text-align: center; | ||
color: #969799; | ||
font-size: 14px; | ||
margin-top: 8px; | ||
} | ||
} | ||
.custom-error { | ||
font-size: 14px; | ||
color: #969799; | ||
text-align: center; | ||
padding-top: 16px; | ||
cursor: default; | ||
|
||
span { | ||
color: #0052d9; | ||
cursor: pointer; | ||
} | ||
} | ||
.t-button { | ||
margin: 0 16px 16px 16px; | ||
width: calc(100% - 32px); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import _List from './list'; | ||
|
||
import './style/index.js'; | ||
|
||
export * from './type'; | ||
|
||
export const List = _List; | ||
export default List; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
:: BASE_DOC :: | ||
|
||
## API | ||
|
||
### List Props | ||
|
||
name | type | default | description | required | ||
-- | -- | -- | -- | -- | ||
asyncLoading | TNode / Function | - | Typescript:`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
footer | TNode / Function | - | Typescript:`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
header | TNode / Function | - | Typescript:`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
onLoadMore | Function | | Typescript:`() => void`<br/> | N | ||
onScroll | Function | | Typescript:`(bottomDistance: number, scrollTop: number) => void`<br/> | N |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
:: BASE_DOC :: | ||
|
||
## API | ||
|
||
### List Props | ||
|
||
名称 | 类型 | 默认值 | 描述 | 必传 | ||
-- | -- | -- | -- | -- | ||
asyncLoading | String / TNode | - | 自定义加载中。值为空不显示加载中,值为 'loading' 显示加载中状态,值为 'load-more' 显示加载更多状态。值类型为函数,则表示自定义加载状态呈现内容。TS 类型:`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
footer | String / TNode | - | 底部。TS 类型:`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
header | String / TNode | - | 头部。TS 类型:`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N | ||
onLoadMore | Function | | TS 类型:`() => void`<br/>点击加载更多时触发 | N | ||
onScroll | Function | | TS 类型:`(bottomDistance: number, scrollTop: number) => void`<br/>列表滚动时触发,bottomDistance 表示底部距离;scrollTop 表示顶部滚动距离 | N |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
以前的hooks的写法就有问题,你要么直接使用ahooks里的useSize好了,这个hooks删掉?