From dfa010f7ee15297a85086fadd1da5fcde22c12b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 9 Mar 2026 22:14:52 +0100 Subject: [PATCH] nicolium: limit usage of hstack/stack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- .../nicolium/src/components/accounts/avatar-stack.tsx | 5 ++--- packages/nicolium/src/components/accounts/scrobble.tsx | 5 ++--- .../nicolium/src/components/authorize-reject-buttons.tsx | 5 ++--- .../nicolium/src/components/statuses/hashtags-bar.tsx | 5 ++--- packages/nicolium/src/pages/dashboard/reports.tsx | 9 ++------- packages/nicolium/src/pages/dashboard/rules.tsx | 5 ++--- .../src/pages/developers/service-worker-info.tsx | 5 ++--- packages/nicolium/src/pages/fun/circle.tsx | 4 ++-- packages/nicolium/src/pages/search/search.tsx | 9 ++------- packages/nicolium/src/pages/settings/backups.tsx | 5 ++--- packages/nicolium/src/pages/settings/edit-filter.tsx | 9 ++++----- packages/nicolium/src/pages/settings/edit-profile.tsx | 5 ++--- packages/nicolium/src/pages/status-lists/events.tsx | 5 ++--- .../src/pages/status-lists/interaction-requests.tsx | 9 ++++----- .../nicolium/src/pages/timelines/landing-timeline.tsx | 5 ++--- .../nicolium/src/pages/timelines/remote-timeline.tsx | 5 ++--- packages/nicolium/src/pages/utils/landing.tsx | 5 ++--- 17 files changed, 38 insertions(+), 62 deletions(-) diff --git a/packages/nicolium/src/components/accounts/avatar-stack.tsx b/packages/nicolium/src/components/accounts/avatar-stack.tsx index a94cd9e4b..c76de3891 100644 --- a/packages/nicolium/src/components/accounts/avatar-stack.tsx +++ b/packages/nicolium/src/components/accounts/avatar-stack.tsx @@ -2,7 +2,6 @@ import clsx from 'clsx'; import React from 'react'; import Avatar from '@/components/ui/avatar'; -import HStack from '@/components/ui/hstack'; import { useAccounts } from '@/queries/accounts/use-accounts'; interface IAvatarStack { @@ -14,7 +13,7 @@ const AvatarStack: React.FC = ({ accountIds, limit = 3 }) => { const { data: accounts } = useAccounts(accountIds.slice(0, limit)); return ( - +
{accounts.map((account, i) => (
= ({ accountIds, limit = 3 }) => { />
))} - +
); }; diff --git a/packages/nicolium/src/components/accounts/scrobble.tsx b/packages/nicolium/src/components/accounts/scrobble.tsx index 18c923aa6..8809ceb68 100644 --- a/packages/nicolium/src/components/accounts/scrobble.tsx +++ b/packages/nicolium/src/components/accounts/scrobble.tsx @@ -2,7 +2,6 @@ import clsx from 'clsx'; import React, { useMemo, useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from '@/components/ui/hstack'; import Icon from '@/components/ui/icon'; import Text from '@/components/ui/text'; @@ -41,7 +40,7 @@ const Scrobble: React.FC = ({ scrobble }) => { if (!isRecent) return null; return ( - +
= ({ scrobble }) => { />
-
+ ); }; diff --git a/packages/nicolium/src/components/authorize-reject-buttons.tsx b/packages/nicolium/src/components/authorize-reject-buttons.tsx index a65770f54..f39a5beec 100644 --- a/packages/nicolium/src/components/authorize-reject-buttons.tsx +++ b/packages/nicolium/src/components/authorize-reject-buttons.tsx @@ -2,7 +2,6 @@ import clsx from 'clsx'; import React, { useEffect, useRef, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import HStack from '@/components/ui/hstack'; import IconButton from '@/components/ui/icon-button'; import Text from '@/components/ui/text'; @@ -127,7 +126,7 @@ const AuthorizeRejectButtons: React.FC = ({ ); default: return ( - +
= ({ style={renderStyle('authorizing')} title={intl.formatMessage(messages.authorize)} /> - +
); } }; diff --git a/packages/nicolium/src/components/statuses/hashtags-bar.tsx b/packages/nicolium/src/components/statuses/hashtags-bar.tsx index 0ba1b6fa8..eda31c858 100644 --- a/packages/nicolium/src/components/statuses/hashtags-bar.tsx +++ b/packages/nicolium/src/components/statuses/hashtags-bar.tsx @@ -3,7 +3,6 @@ import { Link } from '@tanstack/react-router'; import React, { useCallback, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from '../ui/hstack'; import Text from '../ui/text'; // Fit on a single line on desktop @@ -28,7 +27,7 @@ const HashtagsBar: React.FC = ({ hashtags }) => { const revealedHashtags = expanded ? hashtags : hashtags.slice(0, VISIBLE_HASHTAGS); return ( - +
{revealedHashtags.map((hashtag) => ( = ({ hashtags }) => { )} - +
); }; diff --git a/packages/nicolium/src/pages/dashboard/reports.tsx b/packages/nicolium/src/pages/dashboard/reports.tsx index 0cac8f8d2..9ad4db841 100644 --- a/packages/nicolium/src/pages/dashboard/reports.tsx +++ b/packages/nicolium/src/pages/dashboard/reports.tsx @@ -4,7 +4,6 @@ import { defineMessages, FormattedList, FormattedMessage, useIntl } from 'react- import ScrollableList from '@/components/scrollable-list'; import Column from '@/components/ui/column'; -import HStack from '@/components/ui/hstack'; import IconButton from '@/components/ui/icon-button'; import Text from '@/components/ui/text'; import Report from '@/features/admin/components/report'; @@ -46,11 +45,7 @@ const Reports: React.FC = () => { return ( {(accountId ?? targetAccountId) && ( - +
{ }} /> - +
)} = ({ rule }) => { {rule.priority} )} - +
- +
); diff --git a/packages/nicolium/src/pages/developers/service-worker-info.tsx b/packages/nicolium/src/pages/developers/service-worker-info.tsx index 72e5e11bc..878440a4d 100644 --- a/packages/nicolium/src/pages/developers/service-worker-info.tsx +++ b/packages/nicolium/src/pages/developers/service-worker-info.tsx @@ -5,7 +5,6 @@ import List, { ListItem } from '@/components/list'; import Button from '@/components/ui/button'; import Column from '@/components/ui/column'; import FormActions from '@/components/ui/form-actions'; -import HStack from '@/components/ui/hstack'; import Icon from '@/components/ui/icon'; import Indicator from '@/components/ui/indicator'; import Stack from '@/components/ui/stack'; @@ -88,12 +87,12 @@ const ServiceWorkerInfo: React.FC = () => { - +
{getMessage()} - +
{url && ( diff --git a/packages/nicolium/src/pages/fun/circle.tsx b/packages/nicolium/src/pages/fun/circle.tsx index fc3b2f23a..20f5ce08d 100644 --- a/packages/nicolium/src/pages/fun/circle.tsx +++ b/packages/nicolium/src/pages/fun/circle.tsx @@ -249,7 +249,7 @@ const CirclePage: React.FC = () => { {users?.map((user) => ( - +
{ {user.acct} - +
))}
diff --git a/packages/nicolium/src/pages/search/search.tsx b/packages/nicolium/src/pages/search/search.tsx index c4b84171a..21fb3c2f2 100644 --- a/packages/nicolium/src/pages/search/search.tsx +++ b/packages/nicolium/src/pages/search/search.tsx @@ -6,7 +6,6 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import SearchColumn from '@/columns/search'; import Column from '@/components/ui/column'; -import HStack from '@/components/ui/hstack'; import IconButton from '@/components/ui/icon-button'; import Input from '@/components/ui/input'; import SvgIcon from '@/components/ui/svg-icon'; @@ -193,11 +192,7 @@ const SearchResults = () => { return ( <> {accountId ? ( - +
{ values={{ acct: {account?.acct} }} /> - +
) : ( renderFilterBar() )} diff --git a/packages/nicolium/src/pages/settings/backups.tsx b/packages/nicolium/src/pages/settings/backups.tsx index bb87f7937..9de4bbfa7 100644 --- a/packages/nicolium/src/pages/settings/backups.tsx +++ b/packages/nicolium/src/pages/settings/backups.tsx @@ -5,7 +5,6 @@ import Button from '@/components/ui/button'; import Card from '@/components/ui/card'; import Column from '@/components/ui/column'; import FormActions from '@/components/ui/form-actions'; -import HStack from '@/components/ui/hstack'; import Spinner from '@/components/ui/spinner'; import Stack from '@/components/ui/stack'; import Text from '@/components/ui/text'; @@ -51,7 +50,7 @@ const Backup: React.FC = ({ backup }) => { />
- + ); diff --git a/packages/nicolium/src/pages/settings/edit-filter.tsx b/packages/nicolium/src/pages/settings/edit-filter.tsx index 0428f8c8d..01b1d802f 100644 --- a/packages/nicolium/src/pages/settings/edit-filter.tsx +++ b/packages/nicolium/src/pages/settings/edit-filter.tsx @@ -9,7 +9,6 @@ import Column from '@/components/ui/column'; import Form from '@/components/ui/form'; import FormActions from '@/components/ui/form-actions'; import FormGroup from '@/components/ui/form-group'; -import HStack from '@/components/ui/hstack'; import Input from '@/components/ui/input'; import Select from '@/components/ui/select'; import Stack from '@/components/ui/stack'; @@ -64,7 +63,7 @@ const FilterField: StreamfieldComponent = ({ value, onChange }) => }; return ( - +
= ({ value, onChange }) => onChange={handleChange('keyword')} placeholder={intl.formatMessage(messages.keyword)} /> - +
- - +
+
); }; diff --git a/packages/nicolium/src/pages/settings/edit-profile.tsx b/packages/nicolium/src/pages/settings/edit-profile.tsx index fc87f79f1..9fdaa3675 100644 --- a/packages/nicolium/src/pages/settings/edit-profile.tsx +++ b/packages/nicolium/src/pages/settings/edit-profile.tsx @@ -12,7 +12,6 @@ import Column from '@/components/ui/column'; import Form from '@/components/ui/form'; import FormActions from '@/components/ui/form-actions'; import FormGroup from '@/components/ui/form-group'; -import HStack from '@/components/ui/hstack'; import Input from '@/components/ui/input'; import Streamfield from '@/components/ui/streamfield'; import Textarea from '@/components/ui/textarea'; @@ -230,7 +229,7 @@ const ProfileField: StreamfieldComponent = ({ }; return ( - +
= ({ if (field) field.draggable = true; }} /> - +
); }; diff --git a/packages/nicolium/src/pages/status-lists/events.tsx b/packages/nicolium/src/pages/status-lists/events.tsx index 4902a5842..ba20a5d65 100644 --- a/packages/nicolium/src/pages/status-lists/events.tsx +++ b/packages/nicolium/src/pages/status-lists/events.tsx @@ -7,7 +7,6 @@ import EventPreview from '@/components/statuses/event-preview'; import Button from '@/components/ui/button'; import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; import Column from '@/components/ui/column'; -import HStack from '@/components/ui/hstack'; import Icon from '@/components/ui/icon'; import PlaceholderEventPreview from '@/features/placeholder/components/placeholder-event-preview'; import { useStatus } from '@/queries/statuses/use-status'; @@ -109,14 +108,14 @@ const EventsPage = () => { return ( - +
} /> - +
= ({ }); const actions = ( - +
); const handleMoveUp = () => { @@ -230,7 +229,7 @@ const InteractionRequest: React.FC = ({
- +
= ({
)} - +
{interactionRequest.status_id && ( diff --git a/packages/nicolium/src/pages/timelines/landing-timeline.tsx b/packages/nicolium/src/pages/timelines/landing-timeline.tsx index 770465dc8..9a214d91a 100644 --- a/packages/nicolium/src/pages/timelines/landing-timeline.tsx +++ b/packages/nicolium/src/pages/timelines/landing-timeline.tsx @@ -7,7 +7,6 @@ import Markup from '@/components/markup'; import { ParsedContent } from '@/components/statuses/parsed-content'; import Button from '@/components/ui/button'; import Column from '@/components/ui/column'; -import HStack from '@/components/ui/hstack'; import Stack from '@/components/ui/stack'; import { useInstance } from '@/hooks/use-instance'; import { useRegistrationStatus } from '@/hooks/use-registration-status'; @@ -64,7 +63,7 @@ const LandingTimelinePage = () => {
- +
@@ -73,7 +72,7 @@ const LandingTimelinePage = () => { )} - +
{timelineEnabled && !isError ? ( { {instance && } {!pinned && ( - +
{ values={{ instance }} /> - +
)} ( defaultMessage='Nicolium is a feature-rich Fediverse web client.' /> - +
- +