This repository was archived by the owner on Nov 8, 2022. It is now read-only.
- Notifications
You must be signed in to change notification settings - Fork37
refactor(follow-button): UI/UX adjust#1119
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
30 changes: 0 additions & 30 deletionssrc/components/Buttons/FollowButton/FollowedBtn.js
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
29 changes: 29 additions & 0 deletionssrc/components/Buttons/FollowButton/FollowedBtn.tsx
This file contains hidden or 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,29 @@ | ||
| import { FC, memo } from 'react' | ||
| import { TSIZE_TSM } from '@/spec' | ||
| import { LavaLampLoading } from '@/components/Loading' | ||
| import { BtnWrapper, FollowedButton } from '../styles/follow_button' | ||
| type TProps = { | ||
| size: TSIZE_TSM | ||
| loading: boolean | ||
| text: string | ||
| onClick: () => void | ||
| } | ||
| const FollowBtn: FC<TProps> = ({ size, loading, text, onClick }) => { | ||
| return ( | ||
| <> | ||
| {loading ? ( | ||
| <LavaLampLoading size="small" /> | ||
| ) : ( | ||
| <FollowedButton size={size} type="primary" onClick={onClick} ghost> | ||
| <BtnWrapper>{text}</BtnWrapper> | ||
| </FollowedButton> | ||
| )} | ||
| </> | ||
| ) | ||
| } | ||
| export default memo(FollowBtn) |
49 changes: 0 additions & 49 deletionssrc/components/Buttons/FollowButton/FollowingBtn.js
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
53 changes: 53 additions & 0 deletionssrc/components/Buttons/FollowButton/FollowingBtn.tsx
This file contains hidden or 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,53 @@ | ||
| import { FC, memo } from 'react' | ||
| import { TSIZE_TSM } from '@/spec' | ||
| import { ICON } from '@/config' | ||
| import { LavaLampLoading } from '@/components/Loading' | ||
| import Tooltip from '@/components/Tooltip' | ||
| import { | ||
| BtnWrapper, | ||
| Popinfo, | ||
| CheckedIcon, | ||
| FollowingButton, | ||
| } from '../styles/follow_button' | ||
| type TProps = { | ||
| size: TSIZE_TSM | ||
| loading: boolean | ||
| text: string | ||
| onClick: () => void | ||
| } | ||
| const FollowingBtn: FC<TProps> = ({ size, loading, text, onClick }) => { | ||
| return ( | ||
| <> | ||
| {loading ? ( | ||
| <LavaLampLoading size="small" /> | ||
| ) : ( | ||
| <Tooltip | ||
| placement="bottom" | ||
| delay={800} | ||
| content={<Popinfo>点击取消关注</Popinfo>} | ||
| noPadding | ||
| > | ||
| <FollowingButton | ||
| size={size} | ||
| type="primary" | ||
| ghost | ||
| onClick={onClick} | ||
| noBorder | ||
| > | ||
| <BtnWrapper> | ||
| <CheckedIcon src={`${ICON}/shape/checked.svg`} /> | ||
| {text} | ||
| </BtnWrapper> | ||
| </FollowingButton> | ||
| </Tooltip> | ||
| )} | ||
| </> | ||
| ) | ||
| } | ||
| export default memo(FollowingBtn) |
86 changes: 0 additions & 86 deletionssrc/components/Buttons/FollowButton/index.js
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
80 changes: 80 additions & 0 deletionssrc/components/Buttons/FollowButton/index.tsx
This file contains hidden or 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,80 @@ | ||
| /* | ||
| * FollowButton | ||
| */ | ||
| import { FC, memo, useState, useCallback } from 'react' | ||
| import { TID, TSIZE_TSM } from '@/spec' | ||
| import { buildLog } from '@/utils' | ||
| import { SIZE } from '@/constant' | ||
| import FollowingBtn from './FollowingBtn' | ||
| import FollowedBtn from './FollowedBtn' | ||
| /* eslint-disable-next-line */ | ||
| const log = buildLog('c:FollowButton:index') | ||
| type TProps = { | ||
| hasFollowed?: boolean | ||
| userId?: TID | ||
| size?: TSIZE_TSM | ||
| loading?: boolean | ||
| fakeLoading?: boolean | ||
| followText?: string | ||
| followingText?: string | ||
| onFollow?: (userId: TID) => void | ||
| onUndoFollow?: (userId: TID) => void | ||
| } | ||
| const FollowButton: FC<TProps> = ({ | ||
| userId, | ||
| size = SIZE.SMALL, | ||
| fakeLoading = false, | ||
| loading = false, | ||
| hasFollowed = false, | ||
| followText = '关 注', | ||
| followingText = '已关注', | ||
| onFollow = log, | ||
| onUndoFollow = log, | ||
| }) => { | ||
| const [simuLoading, setSimuLoading] = useState(false) | ||
| const isLoading = fakeLoading ? simuLoading : loading | ||
| const handleFollow = useCallback(() => { | ||
| if (fakeLoading) { | ||
| setSimuLoading(true) | ||
| setTimeout(() => setSimuLoading(false), 1500) | ||
| } | ||
| onFollow(userId) | ||
| }, [fakeLoading, onFollow, userId]) | ||
| const handleUndoFollow = useCallback(() => { | ||
| if (fakeLoading) { | ||
| setSimuLoading(true) | ||
| setTimeout(() => setSimuLoading(false), 1500) | ||
| } | ||
| onUndoFollow(userId) | ||
| }, [fakeLoading, onUndoFollow, userId]) | ||
| return ( | ||
| <> | ||
| {hasFollowed ? ( | ||
| <FollowingBtn | ||
| size={size} | ||
| loading={isLoading} | ||
| text={followingText} | ||
| onClick={handleUndoFollow} | ||
| /> | ||
| ) : ( | ||
| <FollowedBtn | ||
| size={size} | ||
| loading={isLoading} | ||
| text={followText} | ||
| onClick={handleFollow} | ||
| /> | ||
| )} | ||
| </> | ||
| ) | ||
| } | ||
| export default memo(FollowButton) |
28 changes: 24 additions & 4 deletionssrc/components/Buttons/styles/follow_button/index.ts
This file contains hidden or 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
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.