diff --git a/app/soapbox/components/status_action_bar.tsx b/app/soapbox/components/status_action_bar.tsx index c3a3087a3..920929d78 100644 --- a/app/soapbox/components/status_action_bar.tsx +++ b/app/soapbox/components/status_action_bar.tsx @@ -73,6 +73,7 @@ interface IStatusActionBar extends RouteComponentProps { onOpenReblogsModal: (acct: string, statusId: string) => void, onReply: (status: Status) => void, onFavourite: (status: Status) => void, + onEmojiReact: (status: Status, emoji: string) => void, onBookmark: (status: Status) => void, onReblog: (status: Status, e: React.MouseEvent) => void, onQuote: (status: Status) => void, @@ -91,8 +92,8 @@ interface IStatusActionBar extends RouteComponentProps { onDeleteStatus: (status: Status) => void, onMuteConversation: (status: Status) => void, onPin: (status: Status) => void, - withDismiss: boolean, - withGroupAdmin: boolean, + withDismiss?: boolean, + withGroupAdmin?: boolean, intl: IntlShape, me: string | null | false | undefined, isStaff: boolean, @@ -100,6 +101,7 @@ interface IStatusActionBar extends RouteComponentProps { allowedEmoji: ImmutableList, emojiSelectorFocused: boolean, handleEmojiSelectorUnfocus: () => void, + handleEmojiSelectorExpand?: React.EventHandler, features: Features, history: History, dispatch: Dispatch, diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index 5d00bce07..1f8f3d4e0 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -49,6 +49,7 @@ import { import MissingIndicator from 'soapbox/components/missing_indicator'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; import ScrollableList from 'soapbox/components/scrollable_list'; +import StatusActionBar from 'soapbox/components/status_action_bar'; import SubNavigation from 'soapbox/components/sub_navigation'; import Tombstone from 'soapbox/components/tombstone'; import { Column, Stack } from 'soapbox/components/ui'; @@ -58,7 +59,6 @@ import { useAppDispatch, useAppSelector, useSettings, useSoapboxConfig } from 's import { makeGetStatus } from 'soapbox/selectors'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status'; -import ActionBar from './components/action-bar'; import DetailedStatus from './components/detailed-status'; import ThreadLoginCta from './components/thread-login-cta'; import ThreadStatus from './components/thread-status'; @@ -480,7 +480,7 @@ const Thread: React.FC = (props) => { e.preventDefault(); }; - const handleEmojiSelectorUnfocus: React.EventHandler = () => { + const handleEmojiSelectorUnfocus = () => { setEmojiSelectorFocused(false); }; @@ -640,7 +640,7 @@ const Thread: React.FC = (props) => {
-