From 11cd61cd44e87cbab3c9e4a238e7a039d4862e32 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 24 Aug 2026 08:21:54 +0200 Subject: [PATCH] nowrap on parent is actually enough --- .../src/components/header/Header.tsx | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/commafeed-client/src/components/header/Header.tsx b/commafeed-client/src/components/header/Header.tsx index d4d3cc76..d648d990 100644 --- a/commafeed-client/src/components/header/Header.tsx +++ b/commafeed-client/src/components/header/Header.tsx @@ -2,8 +2,7 @@ import { msg } from "@lingui/core/macro" import { useLingui } from "@lingui/react" import { Box, Center, CloseButton, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core" import { useForm } from "@mantine/form" -import { useElementSize, useViewportSize } from "@mantine/hooks" -import { type ReactNode, type RefCallback, useEffect } from "react" +import { type ReactNode, useEffect } from "react" import { TbArrowDown, TbArrowUp, @@ -21,7 +20,7 @@ import { import { markAllAsReadWithConfirmationIfRequired, reloadEntries, search, selectNextEntry, selectPreviousEntry } from "@/app/entries/thunks" import { useAppDispatch, useAppSelector } from "@/app/store" import { changeSettings } from "@/app/user/thunks" -import { ActionButton, type Mode } from "@/components/ActionButton" +import { ActionButton } from "@/components/ActionButton" import { Loader } from "@/components/Loader" import { useActionButton } from "@/hooks/useActionButton" import { useBrowserExtension } from "@/hooks/useBrowserExtension" @@ -32,7 +31,7 @@ function HeaderDivider() { return } -function HeaderToolbar(props: { children: ReactNode; ref?: RefCallback }) { +function HeaderToolbar(props: { children: ReactNode }) { const { spacing } = useActionButton() const mobile = useMobile("480px") return mobile ? ( @@ -62,13 +61,6 @@ export function Header() { const searchFromStore = useAppSelector(state => state.entries.search) const { isBrowserExtensionPopup, openSettingsPage, openAppInNewTab } = useBrowserExtension() const dispatch = useAppDispatch() - - const viewport = useViewportSize() - const { ref: headerRef, width: headerWidth } = useElementSize() - const sidebarWidth = useAppSelector(state => state.user.localSettings.sidebarWidth) - const headerTooLarge = headerWidth > viewport.width - sidebarWidth - const mode: Mode = headerTooLarge ? "mobile" : "auto" - const { _ } = useLingui() const searchForm = useForm<{ search: string }>() @@ -102,11 +94,10 @@ export function Header() { return (
- + } label={msg`Previous`} - mode={mode} onClick={async () => await dispatch( selectPreviousEntry({ @@ -120,7 +111,6 @@ export function Header() { } label={msg`Next`} - mode={mode} onClick={async () => await dispatch( selectNextEntry({ @@ -137,13 +127,11 @@ export function Header() { } label={msg`Refresh`} - mode={mode} onClick={async () => await dispatch(reloadEntries())} /> } label={msg`Mark all as read`} - mode={mode} onClick={() => dispatch(markAllAsReadWithConfirmationIfRequired())} /> @@ -152,20 +140,18 @@ export function Header() { : } label={settings.readingMode === "all" ? msg`All` : msg`Unread`} - mode={mode} onClick={toggleReadingMode} /> : } label={settings.readingOrder === "asc" ? msg`Asc` : msg`Desc`} - mode={mode} onClick={toggleReadingOrder} /> - } label={msg`Search`} mode={mode} /> + } label={msg`Search`} /> @@ -183,7 +169,7 @@ export function Header() { - } label={profile?.name} mode={mode} />} /> + } label={profile?.name} />} /> {isBrowserExtensionPopup && ( <> @@ -192,13 +178,11 @@ export function Header() { } label={msg`Extension options`} - mode={mode} onClick={() => openSettingsPage()} /> } label={msg`Open CommaFeed`} - mode={mode} onClick={() => openAppInNewTab()} />