Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

refactor: article list/viewer upvote action#1167

Merged
mydearxym merged 8 commits intodevfromarticle-list-upvote
Oct 10, 2021
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletionspackage-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

2 changes: 1 addition & 1 deletionpackage.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@
},
"dependencies": {
"@babel/core": "^7.13.14",
"@groupher/react-editor": "^1.1.25",
"@groupher/react-editor": "^1.1.26",
"@next/bundle-analyzer": "^9.4.4",
"@sentry/browser": "5.17.0",
"@sentry/node": "5.17.0",
Expand Down
23 changes: 19 additions & 4 deletionssrc/components/ArticleCard/Footer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FC, memo } from 'react'
import TimeAgo from 'timeago-react'

import type { TJob } from '@/spec'
import type { TArticle } from '@/spec'
import { upvoteOnArticleList } from '@/utils/helper'
import { ICON } from '@/config'
import Upvote from '@/components/Upvote'
import DotDivider from '@/components/DotDivider'
Expand All@@ -10,11 +11,18 @@ import IconText from '@/components/IconText'
import { Wrapper, PublishWrapper, Bottom } from './styles/footer'

type TProps = {
data:TJob
data:TArticle
}

const Footer: FC<TProps> = ({ data }) => {
const { author, insertedAt, commentsCount, upvotesCount, meta } = data
const {
author,
insertedAt,
commentsCount,
upvotesCount,
viewerHasUpvoted,
meta,
} = data

return (
<Wrapper>
Expand All@@ -23,7 +31,14 @@ const Footer: FC<TProps> = ({ data }) => {
<TimeAgo datetime={insertedAt} locale="zh_CN" />
</PublishWrapper>
<Bottom>
<Upvote count={upvotesCount} avatarList={meta.latestUpvotedUsers} />
<Upvote
count={upvotesCount}
avatarList={meta.latestUpvotedUsers}
viewerHasUpvoted={viewerHasUpvoted}
onAction={(viewerHasUpvoted) =>
upvoteOnArticleList(data, viewerHasUpvoted)
}
/>
<IconText iconSrc={`${ICON}/article/comment.svg`} size="medium">
{commentsCount}
</IconText>
Expand Down
2 changes: 1 addition & 1 deletionsrc/components/ArticleReadLabel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ const ArticleReadLabel: FC<TProps> = ({ entry, top = 24, left = -30 }) => {
if (entry.pin) return null
// return <ReadedLabel top={top} left={left} />
if (!isLogin) return null
if (markViewed && viewerHasViewed) {
if (markViewed &&!viewerHasViewed) {
return <ReadedLabel top={top} left={left} />
}

Expand Down
2 changes: 1 addition & 1 deletionsrc/components/AvatarsRow/RealAvatar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ import {
type TProps = {
user?: TUser
size?: TAvatarSize
scrollPosition?: any
popCardPlacement?: 'top' | 'bottom'
onUserSelect: (user: TUser) => void
}
Expand All@@ -36,6 +35,7 @@ const RealAvatar: FC<TProps> = ({
delay={0}
contentHeight={getAvatarSize(size, 'number') as string}
placement={popCardPlacement}
interactive={false}
>
<InnerWrapper>
<AvatarsImg
Expand Down
4 changes: 2 additions & 2 deletionssrc/components/AvatarsRow/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ const AvatarsRow: FC<TProps> = ({
onTotalSelect = log,
showMore = true,
showTotalNumber = false,
reverse =true,
reverse =false,
// see https://github.com/Aljullu/react-lazy-load-image-component/issues/42
scrollPosition = null,
popCardPlacement = 'bottom',
Expand All@@ -103,7 +103,7 @@ const AvatarsRow: FC<TProps> = ({
const totalCount = total || users.length

users = filter(validUser, getUniqueArray(users, 'login'))
const sortedUsers = reverse ? users :reverseFn(users)
const sortedUsers = reverse ?reverseFn(users) : users

return (
<Wrapper total={totalCount}>
Expand Down
1 change: 0 additions & 1 deletionsrc/components/AvatarsRow/styles/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@ export const Wrapper = styled.ul<{ total: number }>`
`
export const AvatarsWrapper = styled.div`
${css.flex()}
flex-direction: row-reverse;
`
export const TotalOneOffset = styled.span`
margin-right: 10px;
Expand Down
2 changes: 1 addition & 1 deletionsrc/components/AvatarsRow/styles/real_avatar.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export const Wrapper = styled.li<TWrapper>`
padding: 0px 0px 0px 0px;
position: relative;
width: ${({ size }) => getLiSize(size)};
z-index: 2;
/*z-index: 2; */

&:hover {
z-index: 3;
Expand Down
2 changes: 1 addition & 1 deletionsrc/components/Cards/UserCard.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ const UserCard: FC<TProps> = ({ item }) => {
<Avatar src={avatar} />
<Info>
<Title href={`user/${login}`}>
<Nickname>{nickname}</Nickname>
<Nickname>{cutRest(nickname, 12)}</Nickname>
<Login>{login}</Login>
</Title>
{/* <ShortBio>{bio || '--'}</ShortBio> */}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,14 +33,8 @@ const EmotionUnit: FC<TProps> = ({ item, onAction }) => {

return (
<Tooltip
content={
<UsersPanel
name={name}
count={count}
users={users}
hasEmotioned={hasEmotioned}
/>
}
content={<UsersPanel name={name} count={count} users={users} />}
interactive={false}
noPadding
>
<Wrapper
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
*/

import { FC, memo } from 'react'
import { buildLog } from '@/utils/logger'

import type { TSimpleUser, TEmotionType } from '@/spec'
import { buildLog } from '@/utils/logger'
import { cutRest } from '@/utils/helper'

import EmotionIcon from './EmotionIcon'

Expand All@@ -23,18 +24,17 @@ type TProps = {
name: TEmotionType
count: number
users: TSimpleUser[]
hasEmotioned: boolean
}

const UsersPanel: FC<TProps> = ({ name, count, users, hasEmotioned }) => {
const UsersPanel: FC<TProps> = ({ name, count, users }) => {
const showUnit = users.length > count

return (
<Wrapper>
<UsersWrapper>
{users.slice(0, 5).map((u, index) => (
<Username key={u.login}>
{u.nickname}
{cutRest(u.nickname, 12)}
{users.length - 1 !== index ? ',' : ''}
</Username>
))}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,4 +29,4 @@ const SelectedEmotions: FC<TProps> = ({ emotions, onAction }) => {
)
}

export defaultmemo(SelectedEmotions)
export default SelectedEmotions
2 changes: 1 addition & 1 deletionsrc/components/EmotionSelector/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import IconButton from '@/components/Buttons/IconButton'
import Tooltip from '@/components/Tooltip'

import { emotionsCoverter } from './helper'
import SelectedEmotions from './SelectedEmotions'
import SelectedEmotions from './SelectedEmotions/index'
import Panel from './Panel'
import { Wrapper } from './styles'

Expand Down
18 changes: 13 additions & 5 deletionssrc/components/PostItem/DesktopView/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
import { FC, Fragment, memo } from 'react'

import type { TPost, TUser, TAccount } from '@/spec'
import type { TPost } from '@/spec'
import { UPVOTE_LAYOUT } from '@/constant'

import { upvoteOnArticleList } from '@/utils/helper'
import TheAvatar from '@/components/TheAvatar'
import Upvote from '@/components/Upvote'

import { ArticleReadLabel, ArticlePinLabel } from '@/components/dynamic'

import Header from './Header'
Expand All@@ -13,11 +15,10 @@ import Body from './Body'
import { AvatarWrapper, UpvoteWrapper, Main } from '../styles/desktop_view'

type TProps = {
active?: TPost | null
entry: TPost

onUserSelect?: (obj: TUser) => void
onAuthorSelect?: (obj: TAccount) => void
//onUserSelect?: (obj: TUser) => void
//onAuthorSelect?: (obj: TAccount) => void
}

const DigestView: FC<TProps> = ({ entry }) => {
Expand All@@ -28,7 +29,14 @@ const DigestView: FC<TProps> = ({ entry }) => {
<AvatarWrapper>
<TheAvatar user={entry.author} />
<UpvoteWrapper>
<Upvote type={UPVOTE_LAYOUT.POST_LIST} count={entry.upvotesCount} />
<Upvote
type={UPVOTE_LAYOUT.POST_LIST}
count={entry.upvotesCount}
viewerHasUpvoted={entry.viewerHasUpvoted}
onAction={(viewerHasUpvoted) =>
upvoteOnArticleList(entry, viewerHasUpvoted)
}
/>
</UpvoteWrapper>
</AvatarWrapper>
<Main>
Expand Down
7 changes: 1 addition & 6 deletionssrc/components/PostItem/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@
*/

import { FC, memo } from 'react'
import dynamic from 'next/dynamic'

import type { TPost, TUser, TAccount, TC11N } from '@/spec'
import { buildLog } from '@/utils/logger'
Expand DownExpand Up@@ -39,11 +38,7 @@ const PostItem: FC<TProps> = ({
return (
<Wrapper entry={entry} c11n={c11n}>
{!isMobile ? (
<DesktopView
entry={entry}
onUserSelect={onUserSelect}
onAuthorSelect={onAuthorSelect}
/>
<DesktopView entry={entry} />
) : (
<MobileView entry={entry} onAuthorSelect={onAuthorSelect} />
)}
Expand Down
4 changes: 3 additions & 1 deletionsrc/components/Tooltip/RealTooltip.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ type TProps = {
* 暂时没有精力看 Tippy 的具体实现，小心使用。
*/
forceZIndex?: boolean
interactive?: boolean

onShow?: () => void
onHide?: () => void
Expand All@@ -67,6 +68,7 @@ type TProps = {
const Tooltip: FC<TProps> = ({
children,
noPadding = false,
interactive = true,
onHide,
onShow,
placement = 'top',
Expand DownExpand Up@@ -151,7 +153,7 @@ const Tooltip: FC<TProps> = ({
duration,
trigger,
// see https://github.com/atomiks/tippyjs/issues/751#issuecomment-611979594 for detail
interactive: true,
interactive,

onHide: () => {
setInstance(null)
Expand Down
1 change: 1 addition & 0 deletionssrc/components/Tooltip/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ type TProps = {
* 暂时没有精力看 Tippy 的具体实现，小心使用。
*/
forceZIndex?: boolean
interactive?: boolean

onShow?: () => void
onHide?: () => void
Expand Down
2 changes: 1 addition & 1 deletionsrc/components/Upvote/BlogListLayout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const Upvote: FC<TProps> = ({
<UpvoteBtn viewerHasUpvoted={viewerHasUpvoted} onAction={onAction} />
</UpWrapper>
<CountWrapper>
<AnimatedCount count={count} />
<AnimatedCount count={count}active={viewerHasUpvoted}/>
</CountWrapper>
</Wrapper>
)
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp