ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: upvote widget not rendered when comment is collapsed (#1583) 

* fix: upvote widget not rendered when comment is collapsed

* fix: restored missing conditional on handleShortPress

* chore: icon horizontal space maintained even if the comment is collapsed

* chore: 'rendered' argument renamed to 'visible'

* chore: collapsed condition merged with the 'disabled' variable

* reduce unecessary code

---------

Co-authored-by: Keyan <34140557+huumn@users.noreply.github.com>
Co-authored-by: k00b <k00b@stacker.news>
This commit is contained in:
Lorenzo 2024-11-17 00:04:49 +01:00 committed by GitHub
parent 73df5e0308
commit 8a2bd84f69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/comment.js
View File

@ -149,7 +149,7 @@ export default function Comment ({
? <Boost item={item} className={styles.upvote} /> ? <Boost item={item} className={styles.upvote} />
: item.meDontLikeSats > item.meSats : item.meDontLikeSats > item.meSats
? <DownZap width={24} height={24} className={styles.dontLike} item={item} /> ? <DownZap width={24} height={24} className={styles.dontLike} item={item} />
: pin ? <Pin width={22} height={22} className={styles.pin} /> : <UpVote item={item} className={styles.upvote} />} : pin ? <Pin width={22} height={22} className={styles.pin} /> : <UpVote item={item} className={styles.upvote} collapsed={collapse === 'yep'} />}
<div className={`${itemStyles.hunk} ${styles.hunk}`}> <div className={`${itemStyles.hunk} ${styles.hunk}`}>
<div className='d-flex align-items-center'> <div className='d-flex align-items-center'>
{item.user?.meMute && !includeParent && collapse === 'yep' {item.user?.meMute && !includeParent && collapse === 'yep'

10
components/upvote.js
View File

@ -103,7 +103,7 @@ export const nextTip = (meSats, { tipDefault, turboTipping, tipRandom, tipRandom
return defaultTipIncludingRandom({ tipDefault, tipRandom, tipRandomMin, tipRandomMax }) return defaultTipIncludingRandom({ tipDefault, tipRandom, tipRandomMin, tipRandomMax })
} }
export default function UpVote ({ item, className }) { export default function UpVote ({ item, className, collapsed }) {
const showModal = useShowModal() const showModal = useShowModal()
const [voteShow, _setVoteShow] = useState(false) const [voteShow, _setVoteShow] = useState(false)
const [tipShow, _setTipShow] = useState(false) const [tipShow, _setTipShow] = useState(false)
@ -150,8 +150,8 @@ export default function UpVote ({ item, className }) {
const zap = useZap() const zap = useZap()
const disabled = useMemo(() => item?.mine || item?.meForward || item?.deletedAt, const disabled = useMemo(() => collapsed || item?.mine || item?.meForward || item?.deletedAt,
[item?.mine, item?.meForward, item?.deletedAt]) [collapsed, item?.mine, item?.meForward, item?.deletedAt])
const [meSats, overlayText, color, nextColor] = useMemo(() => { const [meSats, overlayText, color, nextColor] = useMemo(() => {
const meSats = (me ? item?.meSats : item?.meAnonSats) || 0 const meSats = (me ? item?.meSats : item?.meAnonSats) || 0
@ -244,9 +244,7 @@ export default function UpVote ({ item, className }) {
onShortPress={handleShortPress} onShortPress={handleShortPress}
> >
<ActionTooltip notForm disable={disabled} overlayText={overlayText}> <ActionTooltip notForm disable={disabled} overlayText={overlayText}>
<div <div className={classNames(disabled && styles.noSelfTips, styles.upvoteWrapper)}>
className={classNames(disabled && styles.noSelfTips, styles.upvoteWrapper)}
>
<UpBolt <UpBolt
onPointerEnter={() => setHover(true)} onPointerEnter={() => setHover(true)}
onMouseLeave={() => setHover(false)} onMouseLeave={() => setHover(false)}