mirror of
https://github.com/bitsocialnet/5chan.git
synced 2026-08-03 07:41:04 +02:00
fix(replymodal): replying didn't work from multiboard feeds (p/all, p/subscriptions)
This commit is contained in:
@@ -147,7 +147,7 @@ const PostInfo = ({ openReplyModal, post, postReplyCount = 0, roles, isHidden }:
|
|||||||
<Link to={`/p/${subplebbitAddress}/c/${cid}`} className={styles.linkToPost} title={t('link_to_post')} onClick={(e) => !cid && e.preventDefault()}>
|
<Link to={`/p/${subplebbitAddress}/c/${cid}`} className={styles.linkToPost} title={t('link_to_post')} onClick={(e) => !cid && e.preventDefault()}>
|
||||||
c/
|
c/
|
||||||
</Link>
|
</Link>
|
||||||
<span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={() => openReplyModal && openReplyModal(cid, postCid)}>
|
<span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={() => openReplyModal && openReplyModal(cid, postCid, subplebbitAddress)}>
|
||||||
{shortCid}
|
{shortCid}
|
||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ const PostInfoAndMedia = ({ openReplyModal, post, postReplyCount = 0, roles }: P
|
|||||||
<Link to={`/p/${subplebbitAddress}/c/${cid}`} className={styles.linkToPost} title={t('link_to_post')} onClick={(e) => !cid && e.preventDefault()}>
|
<Link to={`/p/${subplebbitAddress}/c/${cid}`} className={styles.linkToPost} title={t('link_to_post')} onClick={(e) => !cid && e.preventDefault()}>
|
||||||
c/
|
c/
|
||||||
</Link>
|
</Link>
|
||||||
<span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={() => openReplyModal && openReplyModal(cid, postCid)}>
|
<span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={() => openReplyModal && openReplyModal(cid, postCid, subplebbitAddress)}>
|
||||||
{shortCid}
|
{shortCid}
|
||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ interface ReplyModalProps {
|
|||||||
parentCid: string;
|
parentCid: string;
|
||||||
postCid: string;
|
postCid: string;
|
||||||
scrollY: number;
|
scrollY: number;
|
||||||
|
subplebbitAddress: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ReplyModal = ({ closeModal, showReplyModal, parentCid, postCid, scrollY }: ReplyModalProps) => {
|
const ReplyModal = ({ closeModal, showReplyModal, parentCid, postCid, scrollY, subplebbitAddress }: ReplyModalProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { subplebbitAddress } = useParams() as { subplebbitAddress: string };
|
|
||||||
const { setPublishReplyOptions, publishReply } = usePublishReply({ cid: parentCid, subplebbitAddress });
|
const { setPublishReplyOptions, publishReply } = usePublishReply({ cid: parentCid, subplebbitAddress });
|
||||||
const account = useAccount();
|
const account = useAccount();
|
||||||
const { displayName } = account?.author || {};
|
const { displayName } = account?.author || {};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const useReplyModal = () => {
|
|||||||
const [showReplyModal, setShowReplyModal] = useState(false);
|
const [showReplyModal, setShowReplyModal] = useState(false);
|
||||||
const [activeCid, setActiveCid] = useState<string | null>(null);
|
const [activeCid, setActiveCid] = useState<string | null>(null);
|
||||||
const [threadCid, setThreadCid] = useState<string | null>(null);
|
const [threadCid, setThreadCid] = useState<string | null>(null);
|
||||||
|
const [subplebbitAddress, setSubplebbitAddress] = useState<string | null>(null);
|
||||||
const { resetSelectedText, setSelectedText } = useSelectedTextStore();
|
const { resetSelectedText, setSelectedText } = useSelectedTextStore();
|
||||||
|
|
||||||
// on mobile, the css position is absolute instead of fixed, so we need to calculate the top position
|
// on mobile, the css position is absolute instead of fixed, so we need to calculate the top position
|
||||||
@@ -23,7 +24,7 @@ const useReplyModal = () => {
|
|||||||
text && setSelectedText(`>${text}\n`);
|
text && setSelectedText(`>${text}\n`);
|
||||||
};
|
};
|
||||||
|
|
||||||
const openReplyModal = (parentCid: string, postCid: string) => {
|
const openReplyModal = (parentCid: string, postCid: string, subplebbitAddress: string) => {
|
||||||
getSelectedText();
|
getSelectedText();
|
||||||
|
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
@@ -37,9 +38,10 @@ const useReplyModal = () => {
|
|||||||
setActiveCid(parentCid);
|
setActiveCid(parentCid);
|
||||||
setThreadCid(postCid);
|
setThreadCid(postCid);
|
||||||
setShowReplyModal(true);
|
setShowReplyModal(true);
|
||||||
|
setSubplebbitAddress(subplebbitAddress);
|
||||||
};
|
};
|
||||||
|
|
||||||
return { activeCid, threadCid, closeModal, openReplyModal, scrollY, showReplyModal };
|
return { activeCid, threadCid, closeModal, openReplyModal, scrollY, showReplyModal, subplebbitAddress };
|
||||||
};
|
};
|
||||||
|
|
||||||
export default useReplyModal;
|
export default useReplyModal;
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ const Board = () => {
|
|||||||
const { createdAt, description, error, rules, shortAddress, state, suggested } = subplebbit || {};
|
const { createdAt, description, error, rules, shortAddress, state, suggested } = subplebbit || {};
|
||||||
const title = isInAllView ? t('all') : isInSubscriptionsView ? t('subscriptions') : subplebbit?.title;
|
const title = isInAllView ? t('all') : isInSubscriptionsView ? t('subscriptions') : subplebbit?.title;
|
||||||
|
|
||||||
const { activeCid, threadCid, closeModal, openReplyModal, showReplyModal, scrollY } = useReplyModal();
|
const { activeCid, threadCid, closeModal, openReplyModal, showReplyModal, scrollY, subplebbitAddress: postSubplebbitAddress } = useReplyModal();
|
||||||
|
|
||||||
const { blocked, unblock } = useBlock({ address: subplebbitAddress });
|
const { blocked, unblock } = useBlock({ address: subplebbitAddress });
|
||||||
const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading');
|
const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading');
|
||||||
@@ -158,7 +158,16 @@ const Board = () => {
|
|||||||
return (
|
return (
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
{location.pathname.endsWith('/settings') && <SettingsModal />}
|
{location.pathname.endsWith('/settings') && <SettingsModal />}
|
||||||
{activeCid && threadCid && <ReplyModal closeModal={closeModal} parentCid={activeCid} postCid={threadCid} scrollY={scrollY} showReplyModal={showReplyModal} />}
|
{activeCid && threadCid && postSubplebbitAddress && (
|
||||||
|
<ReplyModal
|
||||||
|
closeModal={closeModal}
|
||||||
|
parentCid={activeCid}
|
||||||
|
postCid={threadCid}
|
||||||
|
scrollY={scrollY}
|
||||||
|
showReplyModal={showReplyModal}
|
||||||
|
subplebbitAddress={postSubplebbitAddress}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{feed.length !== 0 ? (
|
{feed.length !== 0 ? (
|
||||||
<>
|
<>
|
||||||
{rules && rules.length > 0 && <SubplebbitRules subplebbitAddress={subplebbitAddress} createdAt={createdAt} rules={rules} />}
|
{rules && rules.length > 0 && <SubplebbitRules subplebbitAddress={subplebbitAddress} createdAt={createdAt} rules={rules} />}
|
||||||
|
|||||||
+12
-3
@@ -22,7 +22,7 @@ export interface PostProps {
|
|||||||
roles?: Role[];
|
roles?: Role[];
|
||||||
showAllReplies?: boolean;
|
showAllReplies?: boolean;
|
||||||
showReplies?: boolean;
|
showReplies?: boolean;
|
||||||
openReplyModal?: (parentCid: string, postCid: string) => void;
|
openReplyModal?: (parentCid: string, postCid: string, subplebbitAddress: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Post = ({ post, showAllReplies = false, showReplies = true, openReplyModal }: PostProps) => {
|
export const Post = ({ post, showAllReplies = false, showReplies = true, openReplyModal }: PostProps) => {
|
||||||
@@ -62,7 +62,7 @@ const PostPage = () => {
|
|||||||
const subplebbit = useSubplebbit({ subplebbitAddress });
|
const subplebbit = useSubplebbit({ subplebbitAddress });
|
||||||
const { createdAt, description, rules, shortAddress, suggested, title } = subplebbit;
|
const { createdAt, description, rules, shortAddress, suggested, title } = subplebbit;
|
||||||
|
|
||||||
const { activeCid, threadCid, closeModal, openReplyModal, showReplyModal, scrollY } = useReplyModal();
|
const { activeCid, threadCid, closeModal, openReplyModal, showReplyModal, scrollY, subplebbitAddress: postSubplebbitAddress } = useReplyModal();
|
||||||
|
|
||||||
const comment = useComment({ commentCid });
|
const comment = useComment({ commentCid });
|
||||||
|
|
||||||
@@ -91,7 +91,16 @@ const PostPage = () => {
|
|||||||
return (
|
return (
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
{isInSettigsView && <SettingsModal />}
|
{isInSettigsView && <SettingsModal />}
|
||||||
{activeCid && threadCid && <ReplyModal closeModal={closeModal} parentCid={activeCid} postCid={threadCid} scrollY={scrollY} showReplyModal={showReplyModal} />}
|
{activeCid && threadCid && postSubplebbitAddress && (
|
||||||
|
<ReplyModal
|
||||||
|
closeModal={closeModal}
|
||||||
|
parentCid={activeCid}
|
||||||
|
postCid={threadCid}
|
||||||
|
scrollY={scrollY}
|
||||||
|
showReplyModal={showReplyModal}
|
||||||
|
subplebbitAddress={postSubplebbitAddress}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{/* TODO: remove this replyCount error once api supports scrolling replies pages */}
|
{/* TODO: remove this replyCount error once api supports scrolling replies pages */}
|
||||||
{replyCount > 60 && <span className={styles.error}>Error: this thread has too many replies, some of them cannot be displayed right now.</span>}
|
{replyCount > 60 && <span className={styles.error}>Error: this thread has too many replies, some of them cannot be displayed right now.</span>}
|
||||||
{error && <span className={styles.error}>Error: {error.message}</span>}
|
{error && <span className={styles.error}>Error: {error.message}</span>}
|
||||||
|
|||||||
Reference in New Issue
Block a user