diff --git a/packages/nicolium/src/columns/timeline.tsx b/packages/nicolium/src/columns/timeline.tsx index 26cf76500..3f8480d8a 100644 --- a/packages/nicolium/src/columns/timeline.tsx +++ b/packages/nicolium/src/columns/timeline.tsx @@ -4,7 +4,7 @@ import React, { useRef } from 'react'; import { defineMessages, FormattedList, FormattedMessage } from 'react-intl'; import ScrollTopButton from '@/components/scroll-top-button'; -import ScrollableList from '@/components/scrollable-list'; +import ScrollableList, { type IScrollableList } from '@/components/scrollable-list'; import Status, { StatusFollowedTagInfo } from '@/components/statuses/status'; import StatusInfo from '@/components/statuses/status-info'; import Tombstone from '@/components/statuses/tombstone'; @@ -210,7 +210,9 @@ const TimelineStatus: React.FC = (props): React.JSX.Element => ); }; -interface ITimeline { +type IBaseTimeline = Pick; + +interface ITimeline extends IBaseTimeline { query: ReturnType; contextType?: FilterContextType; } @@ -288,13 +290,13 @@ const Timeline: React.FC = ({ query, contextType = 'public' }) => { ); }; -const HomeTimelineColumn = () => { +const HomeTimelineColumn: React.FC = () => { const timelineQuery = useHomeTimeline(); return ; }; -interface IPublicTimelineColumn { +interface IPublicTimelineColumn extends IBaseTimeline { local?: boolean; remote?: boolean; instance?: string; @@ -306,7 +308,7 @@ const PublicTimelineColumn: React.FC = (params) => { return ; }; -interface IHashtagTimelineColumn { +interface IHashtagTimelineColumn extends IBaseTimeline { hashtag: string; } @@ -316,7 +318,7 @@ const HashtagTimelineColumn: React.FC = ({ hashtag }) => return ; }; -interface ILinkTimelineColumn { +interface ILinkTimelineColumn extends IBaseTimeline { url: string; } @@ -326,7 +328,7 @@ const LinkTimelineColumn: React.FC = ({ url }) => { return ; }; -interface IListTimelineColumn { +interface IListTimelineColumn extends IBaseTimeline { listId: string; } @@ -336,7 +338,7 @@ const ListTimelineColumn: React.FC = ({ listId }) => { return ; }; -interface IGroupTimelineColumn { +interface IGroupTimelineColumn extends IBaseTimeline { groupId: string; } @@ -346,13 +348,13 @@ const GroupTimelineColumn: React.FC = ({ groupId }) => { return ; }; -const BubbleTimelineColumn = () => { +const BubbleTimelineColumn: React.FC = () => { const timelineQuery = useBubbleTimeline(); return ; }; -interface IAntennaTimelineColumn { +interface IAntennaTimelineColumn extends IBaseTimeline { antennaId: string; } @@ -362,7 +364,7 @@ const AntennaTimelineColumn: React.FC = ({ antennaId }) return ; }; -interface ICircleTimelineColumn { +interface ICircleTimelineColumn extends IBaseTimeline { circleId: string; } @@ -372,13 +374,13 @@ const CircleTimelineColumn: React.FC = ({ circleId }) => return ; }; -const WrenchedTimelineColumn = () => { +const WrenchedTimelineColumn: React.FC = () => { const timelineQuery = useWrenchedTimeline(); return ; }; -interface IAccountTimelineColumn { +interface IAccountTimelineColumn extends IBaseTimeline { accountId: string; excludeReplies?: boolean; } diff --git a/packages/nicolium/src/pages/timelines/antenna-timeline.tsx b/packages/nicolium/src/pages/timelines/antenna-timeline.tsx index 9a168c97f..41f1564b4 100644 --- a/packages/nicolium/src/pages/timelines/antenna-timeline.tsx +++ b/packages/nicolium/src/pages/timelines/antenna-timeline.tsx @@ -48,8 +48,6 @@ const AntennaTimeline: React.FC = ({ antennaId }) => { id='empty_column.antenna' defaultMessage='There is nothing in this antenna yet. When posts matching the criteria will be created, they will appear here.' /> - {/*

- */} );