From c49357e115ee8c989657c06e46f866f14e27b846 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Thu, 6 Feb 2025 21:54:17 +0000 Subject: [PATCH] move post ctrls to #/components --- .../post-ctrls/PostCtrls.tsx | 8 ++++---- .../post-ctrls}/PostDropdownBtn.tsx | 2 +- .../post-ctrls}/PostDropdownBtnMenuItems.tsx | 2 +- .../post-ctrls/RepostButton.tsx | 2 +- .../post-ctrls/RepostButton.web.tsx | 4 ++-- src/screens/VideoFeed/index.tsx | 2 +- src/view/com/post-thread/PostThreadItem.tsx | 2 +- src/view/com/post/Post.tsx | 20 +++++++++---------- src/view/com/posts/PostFeedItem.tsx | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename src/{view/com/util => components}/post-ctrls/PostCtrls.tsx (98%) rename src/{view/com/util/forms => components/post-ctrls}/PostDropdownBtn.tsx (98%) rename src/{view/com/util/forms => components/post-ctrls}/PostDropdownBtnMenuItems.tsx (99%) rename src/{view/com/util => components}/post-ctrls/RepostButton.tsx (99%) rename src/{view/com/util => components}/post-ctrls/RepostButton.web.tsx (97%) diff --git a/src/view/com/util/post-ctrls/PostCtrls.tsx b/src/components/post-ctrls/PostCtrls.tsx similarity index 98% rename from src/view/com/util/post-ctrls/PostCtrls.tsx rename to src/components/post-ctrls/PostCtrls.tsx index 9a077d6f2d..f17cc6f220 100644 --- a/src/view/com/util/post-ctrls/PostCtrls.tsx +++ b/src/components/post-ctrls/PostCtrls.tsx @@ -38,15 +38,15 @@ import { ProgressGuideAction, useProgressGuideControls, } from '#/state/shell/progress-guide' +import {formatCount} from '#/view/com/util/numeric/format' +import {Text} from '#/view/com/util/text/Text' +import * as Toast from '#/view/com/util/Toast' import {atoms as a, useTheme} from '#/alf' import {useDialogControl} from '#/components/Dialog' import {ArrowOutOfBox_Stroke2_Corner0_Rounded as ArrowOutOfBox} from '#/components/icons/ArrowOutOfBox' import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '#/components/icons/Bubble' import * as Prompt from '#/components/Prompt' -import {PostDropdownBtn} from '../forms/PostDropdownBtn' -import {formatCount} from '../numeric/format' -import {Text} from '../text/Text' -import * as Toast from '../Toast' +import {PostDropdownBtn} from './PostDropdownBtn' import {RepostButton} from './RepostButton' let PostCtrls = ({ diff --git a/src/view/com/util/forms/PostDropdownBtn.tsx b/src/components/post-ctrls/PostDropdownBtn.tsx similarity index 98% rename from src/view/com/util/forms/PostDropdownBtn.tsx rename to src/components/post-ctrls/PostDropdownBtn.tsx index fd577605a9..127f487aee 100644 --- a/src/view/com/util/forms/PostDropdownBtn.tsx +++ b/src/components/post-ctrls/PostDropdownBtn.tsx @@ -20,7 +20,7 @@ import {atoms as a, useTheme as useAlf} from '#/alf' import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid' import {useMenuControl} from '#/components/Menu' import * as Menu from '#/components/Menu' -import {EventStopper} from '../EventStopper' +import {EventStopper} from '../../view/com/util/EventStopper' import {PostDropdownMenuItems} from './PostDropdownBtnMenuItems' let PostDropdownBtn = ({ diff --git a/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx b/src/components/post-ctrls/PostDropdownBtnMenuItems.tsx similarity index 99% rename from src/view/com/util/forms/PostDropdownBtnMenuItems.tsx rename to src/components/post-ctrls/PostDropdownBtnMenuItems.tsx index f50c601733..04f402624e 100644 --- a/src/view/com/util/forms/PostDropdownBtnMenuItems.tsx +++ b/src/components/post-ctrls/PostDropdownBtnMenuItems.tsx @@ -48,6 +48,7 @@ import { import {useToggleReplyVisibilityMutation} from '#/state/queries/threadgate' import {useSession} from '#/state/session' import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies' +import * as Toast from '#/view/com/util/Toast' import {useBreakpoints} from '#/alf' import {useDialogControl} from '#/components/Dialog' import {useGlobalDialogsControlContext} from '#/components/dialogs/Context' @@ -82,7 +83,6 @@ import {Loader} from '#/components/Loader' import * as Menu from '#/components/Menu' import * as Prompt from '#/components/Prompt' import {ReportDialog, useReportDialogControl} from '#/components/ReportDialog' -import * as Toast from '../Toast' let PostDropdownMenuItems = ({ post, diff --git a/src/view/com/util/post-ctrls/RepostButton.tsx b/src/components/post-ctrls/RepostButton.tsx similarity index 99% rename from src/view/com/util/post-ctrls/RepostButton.tsx rename to src/components/post-ctrls/RepostButton.tsx index ca1647a991..b0566ddae1 100644 --- a/src/view/com/util/post-ctrls/RepostButton.tsx +++ b/src/components/post-ctrls/RepostButton.tsx @@ -6,13 +6,13 @@ import {useLingui} from '@lingui/react' import {POST_CTRL_HITSLOP} from '#/lib/constants' import {useHaptics} from '#/lib/haptics' import {useRequireAuth} from '#/state/session' +import {formatCount} from '#/view/com/util/numeric/format' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' import {CloseQuote_Stroke2_Corner1_Rounded as Quote} from '#/components/icons/Quote' import {Repost_Stroke2_Corner2_Rounded as Repost} from '#/components/icons/Repost' import {Text} from '#/components/Typography' -import {formatCount} from '../numeric/format' interface Props { isReposted: boolean diff --git a/src/view/com/util/post-ctrls/RepostButton.web.tsx b/src/components/post-ctrls/RepostButton.web.tsx similarity index 97% rename from src/view/com/util/post-ctrls/RepostButton.web.tsx rename to src/components/post-ctrls/RepostButton.web.tsx index 54119b532d..3140e3e4b8 100644 --- a/src/view/com/util/post-ctrls/RepostButton.web.tsx +++ b/src/components/post-ctrls/RepostButton.web.tsx @@ -5,14 +5,14 @@ import {useLingui} from '@lingui/react' import {useRequireAuth} from '#/state/session' import {useSession} from '#/state/session' +import {EventStopper} from '#/view/com/util/EventStopper' +import {formatCount} from '#/view/com/util/numeric/format' import {atoms as a, useTheme} from '#/alf' import {Button} from '#/components/Button' import {CloseQuote_Stroke2_Corner1_Rounded as Quote} from '#/components/icons/Quote' import {Repost_Stroke2_Corner2_Rounded as Repost} from '#/components/icons/Repost' import * as Menu from '#/components/Menu' import {Text} from '#/components/Typography' -import {EventStopper} from '../EventStopper' -import {formatCount} from '../numeric/format' interface Props { isReposted: boolean diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx index 04c2d77927..ac1dd74078 100644 --- a/src/screens/VideoFeed/index.tsx +++ b/src/screens/VideoFeed/index.tsx @@ -73,7 +73,6 @@ import {useComposerControls, useSetMinimalShellMode} from '#/state/shell' import {useSetLightStatusBar} from '#/state/shell/light-status-bar' import {PostThreadComposePrompt} from '#/view/com/post-thread/PostThreadComposePrompt' import {List} from '#/view/com/util/List' -import {PostCtrls} from '#/view/com/util/post-ctrls/PostCtrls' import {UserAvatar} from '#/view/com/util/UserAvatar' import {Header} from '#/screens/VideoFeed/components/Header' import {atoms as a, ios, platform, ThemeProvider, useTheme} from '#/alf' @@ -88,6 +87,7 @@ import * as Layout from '#/components/Layout' import {Link} from '#/components/Link' import {ListFooter} from '#/components/Lists' import * as Hider from '#/components/moderation/Hider' +import {PostCtrls} from '#/components/post-ctrls/PostCtrls' import {RichText} from '#/components/RichText' import {Text} from '#/components/Typography' import * as bsky from '#/types/bsky' diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx index 0246291982..12eb822ca0 100644 --- a/src/view/com/post-thread/PostThreadItem.tsx +++ b/src/view/com/post-thread/PostThreadItem.tsx @@ -36,7 +36,6 @@ import {PostThreadFollowBtn} from '#/view/com/post-thread/PostThreadFollowBtn' import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' import {Link, TextLink} from '#/view/com/util/Link' import {formatCount} from '#/view/com/util/numeric/format' -import {PostCtrls} from '#/view/com/util/post-ctrls/PostCtrls' import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds' import {PostMeta} from '#/view/com/util/PostMeta' import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' @@ -53,6 +52,7 @@ import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe' import {PostAlerts} from '#/components/moderation/PostAlerts' import {PostHider} from '#/components/moderation/PostHider' import {AppModerationCause} from '#/components/Pills' +import {PostCtrls} from '#/components/post-ctrls/PostCtrls' import * as Prompt from '#/components/Prompt' import {RichText} from '#/components/RichText' import {SubtleWebHover} from '#/components/SubtleWebHover' diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx index 2645237ad3..3b9e843c42 100644 --- a/src/view/com/post/Post.tsx +++ b/src/view/com/post/Post.tsx @@ -24,21 +24,21 @@ import {precacheProfile} from '#/state/queries/profile' import {useSession} from '#/state/session' import {useComposerControls} from '#/state/shell/composer' import {AviFollowButton} from '#/view/com/posts/AviFollowButton' +import {Link, TextLink} from '#/view/com/util/Link' +import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds' +import {PostMeta} from '#/view/com/util/PostMeta' +import {Text} from '#/view/com/util/text/Text' +import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' +import {UserInfoText} from '#/view/com/util/UserInfoText' import {atoms as a} from '#/alf' +import {ContentHider} from '#/components/moderation/ContentHider' +import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe' +import {PostAlerts} from '#/components/moderation/PostAlerts' +import {PostCtrls} from '#/components/post-ctrls/PostCtrls' import {ProfileHoverCard} from '#/components/ProfileHoverCard' import {RichText} from '#/components/RichText' import {SubtleWebHover} from '#/components/SubtleWebHover' import * as bsky from '#/types/bsky' -import {ContentHider} from '../../../components/moderation/ContentHider' -import {LabelsOnMyPost} from '../../../components/moderation/LabelsOnMe' -import {PostAlerts} from '../../../components/moderation/PostAlerts' -import {Link, TextLink} from '../util/Link' -import {PostCtrls} from '../util/post-ctrls/PostCtrls' -import {PostEmbeds, PostEmbedViewContext} from '../util/post-embeds' -import {PostMeta} from '../util/PostMeta' -import {Text} from '../util/text/Text' -import {PreviewableUserAvatar} from '../util/UserAvatar' -import {UserInfoText} from '../util/UserInfoText' export function Post({ post, diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx index 13c243c0a5..957162555d 100644 --- a/src/view/com/posts/PostFeedItem.tsx +++ b/src/view/com/posts/PostFeedItem.tsx @@ -32,7 +32,6 @@ import {useSession} from '#/state/session' import {useComposerControls} from '#/state/shell/composer' import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies' import {FeedNameText} from '#/view/com/util/FeedInfoText' -import {PostCtrls} from '#/view/com/util/post-ctrls/PostCtrls' import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds' import {PostMeta} from '#/view/com/util/PostMeta' import {Text} from '#/view/com/util/text/Text' @@ -44,6 +43,7 @@ import {ContentHider} from '#/components/moderation/ContentHider' import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe' import {PostAlerts} from '#/components/moderation/PostAlerts' import {AppModerationCause} from '#/components/Pills' +import {PostCtrls} from '#/components/post-ctrls/PostCtrls' import {ProfileHoverCard} from '#/components/ProfileHoverCard' import {RichText} from '#/components/RichText' import {SubtleWebHover} from '#/components/SubtleWebHover'