bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use StatusActionBar for both types of statuses

Browse source
This commit is contained in:
Alex Gleason 2022-08-08 23:21:18 -05:00
parent 4edd28a08b
commit f87be8ce9a
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/components/status_action_bar.tsx
View file

@ -73,6 +73,7 @@ interface IStatusActionBar extends RouteComponentProps {
onOpenReblogsModal: (acct: string, statusId: string) => void, onOpenReblogsModal: (acct: string, statusId: string) => void,
onReply: (status: Status) => void, onReply: (status: Status) => void,
onFavourite: (status: Status) => void, onFavourite: (status: Status) => void,
onEmojiReact: (status: Status, emoji: string) => void,
onBookmark: (status: Status) => void, onBookmark: (status: Status) => void,
onReblog: (status: Status, e: React.MouseEvent) => void, onReblog: (status: Status, e: React.MouseEvent) => void,
onQuote: (status: Status) => void, onQuote: (status: Status) => void,
@ -91,8 +92,8 @@ interface IStatusActionBar extends RouteComponentProps {
onDeleteStatus: (status: Status) => void, onDeleteStatus: (status: Status) => void,
onMuteConversation: (status: Status) => void, onMuteConversation: (status: Status) => void,
onPin: (status: Status) => void, onPin: (status: Status) => void,
withDismiss: boolean, withDismiss?: boolean,
withGroupAdmin: boolean, withGroupAdmin?: boolean,
intl: IntlShape, intl: IntlShape,
me: string | null | false | undefined, me: string | null | false | undefined,
isStaff: boolean, isStaff: boolean,
@ -100,6 +101,7 @@ interface IStatusActionBar extends RouteComponentProps {
allowedEmoji: ImmutableList<string>, allowedEmoji: ImmutableList<string>,
emojiSelectorFocused: boolean, emojiSelectorFocused: boolean,
handleEmojiSelectorUnfocus: () => void, handleEmojiSelectorUnfocus: () => void,
handleEmojiSelectorExpand?: React.EventHandler<React.KeyboardEvent>,
features: Features, features: Features,
history: History, history: History,
dispatch: Dispatch, dispatch: Dispatch,

6
app/soapbox/features/status/index.tsx
View file

@ -49,6 +49,7 @@ import {
import MissingIndicator from 'soapbox/components/missing_indicator'; import MissingIndicator from 'soapbox/components/missing_indicator';
import PullToRefresh from 'soapbox/components/pull-to-refresh'; import PullToRefresh from 'soapbox/components/pull-to-refresh';
import ScrollableList from 'soapbox/components/scrollable_list'; import ScrollableList from 'soapbox/components/scrollable_list';
import StatusActionBar from 'soapbox/components/status_action_bar';
import SubNavigation from 'soapbox/components/sub_navigation'; import SubNavigation from 'soapbox/components/sub_navigation';
import Tombstone from 'soapbox/components/tombstone'; import Tombstone from 'soapbox/components/tombstone';
import { Column, Stack } from 'soapbox/components/ui'; import { Column, Stack } from 'soapbox/components/ui';
@ -58,7 +59,6 @@ import { useAppDispatch, useAppSelector, useSettings, useSoapboxConfig } from 's
import { makeGetStatus } from 'soapbox/selectors'; import { makeGetStatus } from 'soapbox/selectors';
import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status';
import ActionBar from './components/action-bar';
import DetailedStatus from './components/detailed-status'; import DetailedStatus from './components/detailed-status';
import ThreadLoginCta from './components/thread-login-cta'; import ThreadLoginCta from './components/thread-login-cta';
import ThreadStatus from './components/thread-status'; import ThreadStatus from './components/thread-status';
@ -480,7 +480,7 @@ const Thread: React.FC<IThread> = (props) => {
e.preventDefault(); e.preventDefault();
}; };
const handleEmojiSelectorUnfocus: React.EventHandler<React.KeyboardEvent> = () => { const handleEmojiSelectorUnfocus = () => {
setEmojiSelectorFocused(false); setEmojiSelectorFocused(false);
}; };
@ -640,7 +640,7 @@ const Thread: React.FC<IThread> = (props) => {
<hr className='mb-2 border-t-2 dark:border-primary-800' /> <hr className='mb-2 border-t-2 dark:border-primary-800' />
<ActionBar <StatusActionBar
status={status} status={status}
onReply={handleReplyClick} onReply={handleReplyClick}
onFavourite={handleFavouriteClick} onFavourite={handleFavouriteClick}