From c8c0458764444f053362a4b84ab07240711aab46 Mon Sep 17 00:00:00 2001 From: ajnart Date: Wed, 9 Sep 2026 15:19:03 +0200 Subject: [PATCH] fix: align widget layouts with visible board size --- .../components/board/items/item-content.tsx | 10 +-- .../board/layout/scaled-board-canvas.tsx | 8 +- .../board/sections/grid/section-grid.tsx | 12 ++- .../widgets/src/air-quality/component.tsx | 15 +++- .../widgets/src/anchor-note/component.tsx | 13 ++- packages/widgets/src/app/component.tsx | 5 +- .../src/archive-team-warrior/component.tsx | 13 ++- .../widgets/src/audio-stats/component.tsx | 13 +-- packages/widgets/src/bazarr/component.tsx | 13 ++- .../src/beszel-system-grid/component.tsx | 16 +++- .../src/beszel-system-stats/component.tsx | 14 +-- .../src/beszel-system-table/component.tsx | 7 +- .../src/bookmarks/bookmarks-widget.tsx | 13 +-- packages/widgets/src/calendar/component.tsx | 22 ++++- packages/widgets/src/clock/component.tsx | 15 +++- .../widgets/src/common/widget-layout-size.ts | 22 +++++ packages/widgets/src/coolify/component.tsx | 7 +- packages/widgets/src/definition.ts | 2 + .../src/dns-hole/controls/component.tsx | 8 +- .../src/dns-hole/summary/component.tsx | 29 ++++-- packages/widgets/src/docker/component.tsx | 7 +- packages/widgets/src/downloads/component.tsx | 13 ++- packages/widgets/src/firewall/component.tsx | 13 ++- .../cluster/cluster-health.tsx | 6 +- .../src/health-monitoring/system-health.tsx | 11 ++- .../widgets/src/indexer-manager/component.tsx | 13 ++- .../widgets/src/media-missing/component.tsx | 6 +- .../src/media-requests/list/component.tsx | 8 +- .../src/media-requests/stats/component.tsx | 14 ++- .../widgets/src/media-server/component.tsx | 6 +- .../src/media-transcoding/component.tsx | 13 ++- .../src/minecraft/server-status/component.tsx | 12 ++- .../network-status/component.tsx | 13 +-- packages/widgets/src/notebook/notebook.tsx | 7 +- .../widgets/src/paperless-ngx/component.tsx | 13 +-- packages/widgets/src/patchmon/component.tsx | 13 ++- packages/widgets/src/rssFeed/component.tsx | 15 +++- .../src/smart-home/entity-state/component.tsx | 13 ++- .../execute-automation/component.tsx | 12 ++- .../src/speedtest-tracker/averages.tsx | 5 ++ .../src/speedtest-tracker/component.tsx | 22 ++++- .../src/speedtest-tracker/latest-result.tsx | 6 ++ .../src/speedtest-tracker/speed-stat-card.tsx | 6 +- packages/widgets/src/stocks/component.tsx | 12 ++- .../chart/combined-network-traffic.tsx | 3 + .../system-resources/chart/common-chart.tsx | 89 +++++-------------- .../src/system-resources/chart/cpu-chart.tsx | 3 + .../src/system-resources/chart/gpu-chart.tsx | 3 + .../system-resources/chart/memory-chart.tsx | 3 + .../chart/network-traffic.tsx | 3 + .../src/system-resources/component.tsx | 21 ++++- packages/widgets/src/timer/component.tsx | 13 ++- packages/widgets/src/timetable/component.tsx | 13 ++- packages/widgets/src/tracearr/component.tsx | 7 +- packages/widgets/src/traefik/component.tsx | 6 +- packages/widgets/src/umami/component.tsx | 12 ++- packages/widgets/src/ups/component.tsx | 19 ++-- .../widgets/src/uptime-kuma/component.tsx | 12 ++- packages/widgets/src/vpn/component.tsx | 16 +++- packages/widgets/src/weather/component.tsx | 12 ++- packages/widgets/src/wud/component.tsx | 19 ++-- 61 files changed, 580 insertions(+), 190 deletions(-) create mode 100644 packages/widgets/src/common/widget-layout-size.ts diff --git a/apps/nextjs/src/components/board/items/item-content.tsx b/apps/nextjs/src/components/board/items/item-content.tsx index 2e5647ca9..a84d00331 100644 --- a/apps/nextjs/src/components/board/items/item-content.tsx +++ b/apps/nextjs/src/components/board/items/item-content.tsx @@ -27,7 +27,7 @@ import { WidgetCardShell, WidgetTitleBadge } from "@homarr/widgets/widget-card-s import type { SectionItem } from "~/app/[locale]/boards/_types"; import { getLogicalTrackSize } from "~/components/board/layout"; -import { useBoardCanvasScale } from "~/components/board/layout/scaled-board-canvas"; +import { useBoardContentScale } from "~/components/board/layout/scaled-board-canvas"; import advancedFocusClasses from "../advanced-focus/advanced-focus.module.css"; import { useAdvancedFocus } from "../advanced-focus/context"; import { startAdvancedFocusEntrance } from "../advanced-focus/entrance"; @@ -148,7 +148,7 @@ const LoadedBoardItemContent = ({ const cardRef = useRef(null); const previewEntranceFrameRef = useRef(null); const board = useRequiredBoard(); - const boardCanvasScale = useBoardCanvasScale(); + const boardContentScale = useBoardContentScale(); const t = useI18n(); const [isEditMode] = useEditMode(); const settings = useSettings(); @@ -163,8 +163,8 @@ const LoadedBoardItemContent = ({ const supportsAdvancedFocus = definitionSupportsAdvancedFocus(definition); const widgetName = getWidgetName(item.kind, t); const previewDimensions = useMemo( - () => ({ width, height, scale: boardCanvasScale }), - [boardCanvasScale, height, width], + () => ({ width, height, scale: boardContentScale }), + [boardContentScale, height, width], ); const advancedViewLabel = t("item.advancedFocus.label", { widget: widgetName }); const advancedViewId = `advanced-focus-${item.id}`; @@ -314,7 +314,7 @@ const LoadedBoardItemContent = ({ item={item} width={width} height={height} - displayScale={boardCanvasScale} + displayScale={boardContentScale} widgetStateRef={widgetStateRef} widgetRuntimeRef={widgetRuntimeRef} displayMode={isAdvanced ? "advanced" : "compact"} diff --git a/apps/nextjs/src/components/board/layout/scaled-board-canvas.tsx b/apps/nextjs/src/components/board/layout/scaled-board-canvas.tsx index d9bc3a636..2cb296b2e 100644 --- a/apps/nextjs/src/components/board/layout/scaled-board-canvas.tsx +++ b/apps/nextjs/src/components/board/layout/scaled-board-canvas.tsx @@ -8,6 +8,10 @@ import { useElementSize } from "@mantine/hooks"; import classes from "./scaled-board-canvas.module.css"; const BoardCanvasScaleContext = createContext(1); +// Widget content can also be scaled by containers inside the board canvas. +const BoardContentScaleContext = createContext(1); +export const BoardContentScaleProvider = BoardContentScaleContext.Provider; +export const useBoardContentScale = () => useContext(BoardContentScaleContext); export const useBoardCanvasScale = () => useContext(BoardCanvasScaleContext); @@ -86,7 +90,9 @@ export const ScaledBoardCanvas = ({ zoom: scale, }} > - {children} + + {children} + diff --git a/apps/nextjs/src/components/board/sections/grid/section-grid.tsx b/apps/nextjs/src/components/board/sections/grid/section-grid.tsx index d606e30db..bfff836d3 100644 --- a/apps/nextjs/src/components/board/sections/grid/section-grid.tsx +++ b/apps/nextjs/src/components/board/sections/grid/section-grid.tsx @@ -18,7 +18,12 @@ import { getReadonlyCanvasAttributes, normalizeGridPlacement, } from "~/components/board/layout"; -import { calculateBoardUiScale, useBoardCanvasScale } from "~/components/board/layout/scaled-board-canvas"; +import { + BoardContentScaleProvider, + calculateBoardUiScale, + useBoardCanvasScale, + useBoardContentScale, +} from "~/components/board/layout/scaled-board-canvas"; import { useGridEditorRuntimeStatus } from "./grid-editor-runtime"; import { createGridEntryElementStore, useGridEditorRegistry } from "./grid-editor-registry"; import type { SectionGridPlacement } from "./use-grid-layout-actions"; @@ -50,6 +55,7 @@ export const SectionGrid = ({ }: SectionGridProps) => { const [isEditMode] = useEditMode(); const canvasScale = useBoardCanvasScale(); + const parentContentScale = useBoardContentScale(); const editorRuntimeStatus = useGridEditorRuntimeStatus(); const editorRegistry = useGridEditorRegistry(); const editorHostRef = useRef(null); @@ -327,7 +333,9 @@ export const SectionGrid = ({ data-kind={section.kind} data-grid-editor-error={isEditMode && editorRuntimeStatus === "error" ? "true" : undefined} > - + + +
diff --git a/packages/widgets/src/air-quality/component.tsx b/packages/widgets/src/air-quality/component.tsx index e2c5c24e1..ef05aa495 100644 --- a/packages/widgets/src/air-quality/component.tsx +++ b/packages/widgets/src/air-quality/component.tsx @@ -8,6 +8,7 @@ import { IconMapPin } from "@tabler/icons-react"; import { clientApi } from "@homarr/api/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { formatLocalizedDate, formatLocalizedTime } from "../common/locale"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; @@ -27,7 +28,19 @@ import { getUvCategory, } from "./display"; -export default function AirQualityWidget({ options, width, height, displayMode }: WidgetComponentProps<"airQuality">) { +export default function AirQualityWidget({ + options, + width: logicalWidth, + height: logicalHeight, + displayMode, + displayScale, +}: WidgetComponentProps<"airQuality">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const query = clientApi.widget.airQuality.atLocation.useQuery({ latitude: options.location.latitude, longitude: options.location.longitude, diff --git a/packages/widgets/src/anchor-note/component.tsx b/packages/widgets/src/anchor-note/component.tsx index 692ac1ef6..125e7ad3e 100644 --- a/packages/widgets/src/anchor-note/component.tsx +++ b/packages/widgets/src/anchor-note/component.tsx @@ -11,6 +11,7 @@ import { useTimeAgo } from "@homarr/common"; import type { AnchorNotePermission } from "@homarr/integrations"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData } from "../common/query-state"; @@ -37,10 +38,18 @@ const isForbiddenError = (error: unknown): boolean => { export default function AnchorNoteWidget({ options, integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + + displayScale, }: WidgetComponentProps<"anchorNote">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.anchorNote"); const noteId = options.noteId.trim(); if (!noteId) { diff --git a/packages/widgets/src/app/component.tsx b/packages/widgets/src/app/component.tsx index 474832b0d..52cf4c7e8 100644 --- a/packages/widgets/src/app/component.tsx +++ b/packages/widgets/src/app/component.tsx @@ -12,6 +12,7 @@ import { useSettings } from "@homarr/settings"; import { useI18n } from "@homarr/translation/client"; import { MaskedOrNormalImage } from "@homarr/ui"; +import { getWidgetDisplayScale } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { getSafeAppHref, SAFE_NEW_TAB_REL } from "../common/application-url"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; @@ -27,6 +28,7 @@ export default function AppWidget({ height, width, displayScale = 1, + displayMode, }: WidgetComponentProps<"app">) { const tCommon = useI18n("common"); const settings = useSettings(); @@ -41,8 +43,7 @@ export default function AppWidget({ // Readable board tokens stay fixed on screen, but must yield space to the icon // when the tile itself becomes small. Below 100px, scale the whole composition. - let scale = 1; - if (Number.isFinite(displayScale) && displayScale > 0) scale = displayScale; + const scale = getWidgetDisplayScale({ displayScale, displayMode }); const contentScale = Math.min(1 / Math.min(scale, 1), Math.min(width, height) / 100); const textSize = `${14 * contentScale}px`; const spacing = 12 * contentScale; diff --git a/packages/widgets/src/archive-team-warrior/component.tsx b/packages/widgets/src/archive-team-warrior/component.tsx index a644ce9a5..397f7862e 100644 --- a/packages/widgets/src/archive-team-warrior/component.tsx +++ b/packages/widgets/src/archive-team-warrior/component.tsx @@ -7,15 +7,24 @@ import { getIconUrl } from "@homarr/definitions"; import { useByteFormatter } from "@homarr/settings"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; export default function ArchiveTeamWarriorWidget({ integrationIds, options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + + displayScale, }: WidgetComponentProps<"archiveTeamWarrior">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const integrationId = integrationIds[0]; if (!integrationId) { diff --git a/packages/widgets/src/audio-stats/component.tsx b/packages/widgets/src/audio-stats/component.tsx index 9ed4c8ff8..8630a11ec 100644 --- a/packages/widgets/src/audio-stats/component.tsx +++ b/packages/widgets/src/audio-stats/component.tsx @@ -8,6 +8,7 @@ import { formatDuration } from "@homarr/common"; import type { AudiobookshelfDashboardData } from "@homarr/integrations/types"; import { useByteFormatter } from "@homarr/settings"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import type { WidgetComponentProps } from "../definition"; @@ -42,12 +43,12 @@ export default function AudioStatsWidget({ const currentStreams = streamResults ?? []; if (!response) return ; - let responsiveWidth = width; - let responsiveHeight = height; - if (displayMode === "compact" && Number.isFinite(displayScale) && displayScale > 0) { - responsiveWidth *= displayScale; - responsiveHeight *= displayScale; - } + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); const summary = ( ) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.bazarr"); const { data: badges, error } = clientApi.widget.bazarr.getBadges.useQuery( { integrationId: integrationIds[0] ?? "" }, diff --git a/packages/widgets/src/beszel-system-grid/component.tsx b/packages/widgets/src/beszel-system-grid/component.tsx index 8d7eac4d4..0b84cf575 100644 --- a/packages/widgets/src/beszel-system-grid/component.tsx +++ b/packages/widgets/src/beszel-system-grid/component.tsx @@ -37,6 +37,7 @@ import { useByteFormatter } from "@homarr/settings"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetDisplayScale, getWidgetLayoutSize } from "../common/widget-layout-size"; import classes from "./component.module.css"; import type { WidgetComponentProps } from "../definition"; @@ -456,10 +457,17 @@ export default function BeszelSystemGridWidget({ options, integrationIds, isEditMode, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + displayScale, }: WidgetComponentProps<"beszelSystemGrid">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.beszel"); const tCommon = useI18n("common"); const board = useRequiredBoard(); @@ -520,7 +528,9 @@ export default function BeszelSystemGridWidget({ style={{ display: "grid", gridTemplateColumns: `repeat(${cols}, 1fr)`, - gridTemplateRows: scrollEnabled ? `repeat(${rows}, ${minimumCellHeight}px)` : `repeat(${rows}, 1fr)`, + gridTemplateRows: scrollEnabled + ? `repeat(${rows}, ${minimumCellHeight / getWidgetDisplayScale({ displayScale, displayMode })}px)` + : `repeat(${rows}, 1fr)`, gap: size.gap, overflow: scrollEnabled ? "auto" : "hidden", }} diff --git a/packages/widgets/src/beszel-system-stats/component.tsx b/packages/widgets/src/beszel-system-stats/component.tsx index eb24774eb..6ad8076b1 100644 --- a/packages/widgets/src/beszel-system-stats/component.tsx +++ b/packages/widgets/src/beszel-system-stats/component.tsx @@ -13,6 +13,7 @@ import { showErrorNotification } from "@homarr/notifications"; import { useI18n } from "@homarr/translation/client"; import { iconSizes, zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import classes from "./component.module.css"; import type { WidgetComponentProps } from "../definition"; @@ -33,6 +34,7 @@ export default function BeszelSystemStatsWidget({ width, height, displayScale = 1, + displayMode, boardId, itemId, setOptions, @@ -71,12 +73,12 @@ export default function BeszelSystemStatsWidget({ { value: "1w", label: t("period.oneWeek") }, { value: "30d", label: t("period.thirtyDays") }, ]; - let responsiveWidth = width; - let responsiveHeight = height; - if (Number.isFinite(displayScale) && displayScale > 0) { - responsiveWidth *= displayScale; - responsiveHeight *= displayScale; - } + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); useWidgetRuntimeQueries( widgetRuntimeRef, selectedSystem && options.timePeriod !== "1m" diff --git a/packages/widgets/src/beszel-system-table/component.tsx b/packages/widgets/src/beszel-system-table/component.tsx index cd35248f7..fae05cd46 100644 --- a/packages/widgets/src/beszel-system-table/component.tsx +++ b/packages/widgets/src/beszel-system-table/component.tsx @@ -27,6 +27,7 @@ import { showErrorNotification } from "@homarr/notifications"; import { useByteFormatter } from "@homarr/settings"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { HomarrDataTable } from "../common/homarr-data-table"; import { getUsableWidgetQueryData } from "../common/query-state"; @@ -112,12 +113,16 @@ export default function BeszelSystemTableWidget({ options, integrationIds, isEditMode, - width, + width: logicalWidth, boardId, itemId, setOptions, displayMode, + + height: logicalHeight, + displayScale, }: WidgetComponentProps<"beszelSystemTable">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.beszelSystemTable"); const tBeszel = useI18n("widget.beszel"); const tCommon = useI18n("common"); diff --git a/packages/widgets/src/bookmarks/bookmarks-widget.tsx b/packages/widgets/src/bookmarks/bookmarks-widget.tsx index 01fac1958..2662e7d31 100644 --- a/packages/widgets/src/bookmarks/bookmarks-widget.tsx +++ b/packages/widgets/src/bookmarks/bookmarks-widget.tsx @@ -25,6 +25,7 @@ import { useRegisterSpotlightContextResults } from "@homarr/spotlight"; import { useI18n } from "@homarr/translation/client"; import { iconSizes, zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { getSafeAppHref, SAFE_NEW_TAB_REL } from "../common/application-url"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; import { WidgetQueryLoadingState } from "../common/query-state-indicator"; @@ -68,12 +69,12 @@ export default function BookmarksWidget({ }); const data = [...configuredItems, ...legacyItems]; - let responsiveWidth = width; - let responsiveHeight = height; - if (!advanced && Number.isFinite(displayScale) && displayScale > 0) { - responsiveWidth *= displayScale; - responsiveHeight *= displayScale; - } + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); const contentHeight = Math.max(0, responsiveHeight - (options.title.length > 0 ? 36 : 0)); let layoutWidth = responsiveWidth; if (options.layout === "gridHorizontal") layoutWidth = width; diff --git a/packages/widgets/src/calendar/component.tsx b/packages/widgets/src/calendar/component.tsx index 2c87f5769..be93e575e 100644 --- a/packages/widgets/src/calendar/component.tsx +++ b/packages/widgets/src/calendar/component.tsx @@ -13,6 +13,7 @@ import { useRequiredBoard } from "@homarr/boards/context"; import { useSettings } from "@homarr/settings"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import actionTargetClasses from "../common/action-target.module.css"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; @@ -68,7 +69,15 @@ interface FetchCalendarProps extends WidgetComponentProps<"calendar"> { setMonth: (date: Date) => void; } -const FetchCalendar = ({ month, setMonth, isEditMode, integrationIds, options, displayMode }: FetchCalendarProps) => { +const FetchCalendar = ({ + month, + setMonth, + isEditMode, + integrationIds, + options, + displayMode, + displayScale, +}: FetchCalendarProps) => { const input = { integrationIds, month: month.getMonth() + 1, @@ -111,11 +120,13 @@ const FetchCalendar = ({ month, setMonth, isEditMode, integrationIds, options, d setMonth={setMonth} options={options} displayMode={displayMode} + displayScale={displayScale} /> ); }; interface CalendarBaseProps { + displayScale?: number; isEditMode: boolean; events: CalendarEventWithSource[]; failedIntegrations: { integrationId: string; integrationName: string; error: string }[]; @@ -135,13 +146,20 @@ const CalendarBase = ({ setMonth, options, displayMode, + displayScale, }: CalendarBaseProps) => { const locale = useCurrentIntlLocale(); const { firstDayOfWeek } = useSettings(); const board = useRequiredBoard(); const mantineTheme = useMantineTheme(); const actualItemRadius = mantineTheme.radius[board.itemRadius]; - const { ref, width, height } = useElementSize(); + const { ref, width: logicalWidth, height: logicalHeight } = useElementSize(); + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const isSmall = width < 256; const normalizedEvents = useMemo( diff --git a/packages/widgets/src/clock/component.tsx b/packages/widgets/src/clock/component.tsx index 426480297..e8459d8bb 100644 --- a/packages/widgets/src/clock/component.tsx +++ b/packages/widgets/src/clock/component.tsx @@ -4,6 +4,7 @@ import { Box, Center, Stack, Text, Title } from "@mantine/core"; import dayjs from "dayjs"; import advancedFormat from "dayjs/plugin/advancedFormat"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { AdvancedClockView } from "./advanced-view"; import { clockTimeFormatShowsSeconds, resolveClockTimeFormat } from "./format"; @@ -13,7 +14,19 @@ import { getResolvedLocalTimeZone, isTimeZoneSupported } from "./world-clock"; dayjs.extend(advancedFormat); -export default function ClockWidget({ options, width, height, displayMode }: WidgetComponentProps<"clock">) { +export default function ClockWidget({ + options, + width: logicalWidth, + height: logicalHeight, + displayMode, + displayScale, +}: WidgetComponentProps<"clock">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const isAdvanced = displayMode === "advanced"; const showSeconds = clockTimeFormatShowsSeconds(options.customTimeFormat); const time = useCurrentTime({ showSeconds }); diff --git a/packages/widgets/src/common/widget-layout-size.ts b/packages/widgets/src/common/widget-layout-size.ts new file mode 100644 index 000000000..baf3def41 --- /dev/null +++ b/packages/widgets/src/common/widget-layout-size.ts @@ -0,0 +1,22 @@ +interface WidgetDisplay { + displayScale?: number; + displayMode?: "compact" | "advanced"; +} + +export const getWidgetDisplayScale = ({ displayScale = 1, displayMode }: WidgetDisplay): number => { + // Advanced surfaces are outside the scaled board, even when their source tile is not. + if (displayMode === "advanced" || !Number.isFinite(displayScale) || displayScale <= 0) return 1; + return displayScale; +}; + +/** Visible dimensions for density, breakpoints, and content budgets. + * Keep the original logical dimensions for canvas/SVG geometry and CSS pixel sizes. + */ +export const getWidgetLayoutSize = ({ + width, + height, + ...display +}: WidgetDisplay & { width: number; height: number }) => { + const scale = getWidgetDisplayScale(display); + return { width: width * scale, height: height * scale }; +}; diff --git a/packages/widgets/src/coolify/component.tsx b/packages/widgets/src/coolify/component.tsx index 7751ae61b..a80c0295f 100644 --- a/packages/widgets/src/coolify/component.tsx +++ b/packages/widgets/src/coolify/component.tsx @@ -5,6 +5,7 @@ import { Badge, Box, Group, ScrollArea, SimpleGrid, Stack, Text } from "@mantine import { clientApi } from "@homarr/api/client"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { getUsableWidgetQueryData } from "../common/query-state"; import { WidgetEmptyState } from "../common/empty-state"; import type { WidgetComponentProps } from "../definition"; @@ -16,9 +17,13 @@ import type { InstanceData } from "./types"; export default function CoolifyWidget({ options, integrationIds, - width, + width: logicalWidth, displayMode, + + height: logicalHeight, + displayScale, }: WidgetComponentProps<"coolify">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.coolify"); if (integrationIds.length === 0) { diff --git a/packages/widgets/src/definition.ts b/packages/widgets/src/definition.ts index 321a0be04..dab7db694 100644 --- a/packages/widgets/src/definition.ts +++ b/packages/widgets/src/definition.ts @@ -175,8 +175,10 @@ export type WidgetComponentProps = WidgetProps isEditMode: boolean; displayMode?: "compact" | "advanced"; setOptions: ({ newOptions }: { newOptions: Partial>> }) => void; + /** Logical pixels for rendering geometry. Use getWidgetLayoutSize for responsive decisions. */ width: number; height: number; + /** Board scale; advanced surfaces render outside the board at scale 1. */ displayScale?: number; widgetRuntimeRef?: WidgetRuntimeRef; widgetStateRef?: React.MutableRefObject | null>; diff --git a/packages/widgets/src/dns-hole/controls/component.tsx b/packages/widgets/src/dns-hole/controls/component.tsx index dec4e56aa..77a2cc16b 100644 --- a/packages/widgets/src/dns-hole/controls/component.tsx +++ b/packages/widgets/src/dns-hole/controls/component.tsx @@ -1,7 +1,8 @@ "use client"; /* eslint-disable react/no-unstable-nested-components -- TimerPopover uses render props to wire controlled targets. */ -/* eslint-disable import/no-unassigned-import -- The shared widget stylesheet is loaded for its side effects. */ +/* eslint-disable import/no-unassigned-import { getWidgetLayoutSize } from "../../common/widget-layout-size"; +import -- The shared widget stylesheet is loaded for its side effects. */ import "../../widgets-common.css"; @@ -58,9 +59,12 @@ export default function DnsHoleControlsWidget({ options, integrationIds, isEditMode, - width, + width: logicalWidth, displayMode, + height: logicalHeight, + displayScale, }: WidgetComponentProps) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const board = useRequiredBoard(); // DnsHole integrations with interaction permissions const integrationsWithInteractions = useIntegrationsWithInteractAccess() diff --git a/packages/widgets/src/dns-hole/summary/component.tsx b/packages/widgets/src/dns-hole/summary/component.tsx index a51a725f0..c6e671ba8 100644 --- a/packages/widgets/src/dns-hole/summary/component.tsx +++ b/packages/widgets/src/dns-hole/summary/component.tsx @@ -29,6 +29,7 @@ import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; import type { TablerIcon } from "@homarr/ui"; +import { getWidgetDisplayScale, getWidgetLayoutSize } from "../../common/widget-layout-size"; import type { widgetKind } from "."; import type { WidgetComponentProps, WidgetProps } from "../../definition"; import { IntegrationErrorIndicator } from "../../common/integration-error-indicator"; @@ -38,9 +39,18 @@ import { WidgetQueryLoadingState } from "../../common/query-state-indicator"; export default function DnsHoleSummaryWidget({ options, integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, }: WidgetComponentProps) { + const scale = getWidgetDisplayScale({ displayScale, displayMode }); + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const summaryQuery = clientApi.widget.dnsHole.summary.useQuery({ integrationIds, }); @@ -67,7 +77,14 @@ export default function DnsHoleSummaryWidget({ {data.length > 0 ? ( stats.map((item) => ( - + )) ) : ( { - const { ref, height, width } = useElementSize(); +const StatCard = ({ item, data, usePiHoleColors, t, displayScale }: StatCardProps) => { + const { ref, height: logicalHeight, width: logicalWidth } = useElementSize(); + const { width, height } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale }); const isLong = width > height + 20; const canStackText = height > 32; const hideLabel = (height <= 32 && width <= 256) || (height <= 64 && width <= 92); diff --git a/packages/widgets/src/docker/component.tsx b/packages/widgets/src/docker/component.tsx index 9ccb5acb5..aef8c8d54 100644 --- a/packages/widgets/src/docker/component.tsx +++ b/packages/widgets/src/docker/component.tsx @@ -46,6 +46,7 @@ import { useByteFormatter } from "@homarr/settings"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData } from "../common/query-state"; import actionTargetClasses from "../common/action-target.module.css"; @@ -241,13 +242,17 @@ const useContainerAction = (action: ContainerAction) => { export default function DockerWidget({ options, - width, + width: logicalWidth, isEditMode, displayMode, boardId, itemId, setOptions, + + height: logicalHeight, + displayScale, }: WidgetComponentProps<"dockerContainers">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("docker"); const tCommon = useI18n("common"); const tWidget = useI18n("widget.dockerContainers"); diff --git a/packages/widgets/src/downloads/component.tsx b/packages/widgets/src/downloads/component.tsx index e6ac70486..09793ff79 100644 --- a/packages/widgets/src/downloads/component.tsx +++ b/packages/widgets/src/downloads/component.tsx @@ -53,6 +53,7 @@ import { showErrorNotification } from "@homarr/notifications"; import { useByteFormatter } from "@homarr/settings"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; @@ -302,10 +303,18 @@ export default function DownloadClientsWidget({ setOptions, boardId, itemId, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + + displayScale, }: WidgetComponentProps<"downloads">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const { formatByteRate, formatBytes, formatBytesPair } = useByteFormatter(); const board = useOptionalBoard(); const { data: session } = useSession(); diff --git a/packages/widgets/src/firewall/component.tsx b/packages/widgets/src/firewall/component.tsx index 025a48395..6a18f3de2 100644 --- a/packages/widgets/src/firewall/component.tsx +++ b/packages/widgets/src/firewall/component.tsx @@ -25,6 +25,7 @@ import type { FirewallInterfacesSummary } from "@homarr/integrations"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { calculateBandwidth } from "./bandwidth"; import { FirewallMenu } from "./firewall-menu"; @@ -60,11 +61,19 @@ export const hasFirewallPartialFailure = (firewallId: string, queries: readonly export default function FirewallWidget({ integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, itemId, displayMode, + + displayScale, }: WidgetComponentProps<"firewall">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const [selectedFirewall, setSelectedFirewall] = useState(""); const isAdvanced = displayMode === "advanced"; const isTiny = !isAdvanced && (width < 256 || height < 180); diff --git a/packages/widgets/src/health-monitoring/cluster/cluster-health.tsx b/packages/widgets/src/health-monitoring/cluster/cluster-health.tsx index 96254ca04..127a7f4ff 100644 --- a/packages/widgets/src/health-monitoring/cluster/cluster-health.tsx +++ b/packages/widgets/src/health-monitoring/cluster/cluster-health.tsx @@ -8,6 +8,7 @@ import type { Resource } from "@homarr/integrations/types"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import { WidgetEmptyState } from "../../common/empty-state"; import { getUsableWidgetQueryData } from "../../common/query-state"; import type { WidgetComponentProps } from "../../definition"; @@ -38,6 +39,8 @@ export const ClusterHealthMonitoring = ({ integrationId, options, width, + height, + displayScale, displayMode, }: WidgetComponentProps<"healthMonitoring"> & { integrationId: string }) => { const t = useI18n("widget.healthMonitoring"); @@ -68,7 +71,8 @@ export const ClusterHealthMonitoring = ({ const cpuPercent = maxCpu ? (usedCpu / maxCpu) * 100 : 0; const memPercent = maxMem ? (usedMem / maxMem) * 100 : 0; const isAdvanced = displayMode === "advanced"; - const isTiny = displayMode !== "advanced" && width < 256; + const { width: responsiveWidth } = getWidgetLayoutSize({ width, height, displayScale, displayMode }); + const isTiny = displayMode !== "advanced" && responsiveWidth < 256; return ( {(isAdvanced || options.showUptime) && !isTiny && ( diff --git a/packages/widgets/src/health-monitoring/system-health.tsx b/packages/widgets/src/health-monitoring/system-health.tsx index dc747308e..fe8dc854b 100644 --- a/packages/widgets/src/health-monitoring/system-health.tsx +++ b/packages/widgets/src/health-monitoring/system-health.tsx @@ -42,6 +42,7 @@ import type { ScopedTranslationFunction } from "@homarr/translation"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { filterStorageVolumes, normalizeStorageDeviceName } from "../filter-storage-volumes"; import { WidgetEmptyState } from "../common/empty-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; @@ -77,9 +78,13 @@ export const SystemHealthMonitoring = ({ const { formatBytes, formatBytesPair } = useByteFormatter(); const isAdvanced = displayMode === "advanced"; - let scale = 1; - if (!isAdvanced && Number.isFinite(displayScale) && displayScale > 0) scale = displayScale; - const isTiny = !isAdvanced && (width * scale < 256 || height * scale < 160); + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); + const isTiny = !isAdvanced && (responsiveWidth < 256 || responsiveHeight < 160); const showCpu = isAdvanced || options.cpu; const showMemory = isAdvanced || options.memory; const showGpu = isAdvanced || options.gpu; diff --git a/packages/widgets/src/indexer-manager/component.tsx b/packages/widgets/src/indexer-manager/component.tsx index c0d809b97..91c97844f 100644 --- a/packages/widgets/src/indexer-manager/component.tsx +++ b/packages/widgets/src/indexer-manager/component.tsx @@ -27,6 +27,7 @@ import { showErrorNotification } from "@homarr/notifications"; import { useI18n } from "@homarr/translation/client"; import { iconSizes } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { useWidgetRuntimeActions } from "../runtime-hooks"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../common/application-url"; @@ -45,12 +46,20 @@ const statusPresentation = { export default function IndexerManagerWidget({ options, integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, isEditMode, widgetRuntimeRef, displayMode, + + displayScale, }: WidgetComponentProps<"indexerManager">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.indexerManager"); const tCommon = useI18n("common"); const indexersQuery = clientApi.widget.indexerManager.getIndexersStatus.useQuery({ integrationIds }); diff --git a/packages/widgets/src/media-missing/component.tsx b/packages/widgets/src/media-missing/component.tsx index fc4695218..6d200e1d9 100644 --- a/packages/widgets/src/media-missing/component.tsx +++ b/packages/widgets/src/media-missing/component.tsx @@ -26,6 +26,7 @@ import type { MissingMediaItem, QueuedMediaItem } from "@homarr/integrations/typ import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../common/application-url"; import { getUsableWidgetQueryData } from "../common/query-state"; @@ -66,10 +67,13 @@ const getMediaMissingDensity = (contentWidth: number, columns: number, isThin: b export default function MediaMissingWidget({ integrationIds, options, - width, + width: logicalWidth, displayMode, widgetRuntimeRef, + height: logicalHeight, + displayScale, }: WidgetComponentProps<"mediaMissing">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.mediaMissing"); const isAdvanced = displayMode === "advanced"; const showMissing = isAdvanced || options.showMissing; diff --git a/packages/widgets/src/media-requests/list/component.tsx b/packages/widgets/src/media-requests/list/component.tsx index 59d2e14be..4bb44d3c9 100644 --- a/packages/widgets/src/media-requests/list/component.tsx +++ b/packages/widgets/src/media-requests/list/component.tsx @@ -13,6 +13,7 @@ import { mediaAvailabilityConfiguration, mediaRequestStatusConfiguration } from import { openMediaRequestSearch } from "@homarr/spotlight"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import { WidgetEmptyState } from "../../common/empty-state"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../../common/application-url"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../../common/query-state"; @@ -28,8 +29,13 @@ export default function MediaServerWidget({ integrationIds, isEditMode, options, - width, + width: logicalWidth, + + height: logicalHeight, + displayScale, + displayMode, }: WidgetComponentProps<"mediaRequests-requestList">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.mediaRequests-requestList"); const interactIntegrationIds = new Set( useIntegrationsWithInteractAccess() diff --git a/packages/widgets/src/media-requests/stats/component.tsx b/packages/widgets/src/media-requests/stats/component.tsx index 074014264..faa235c53 100644 --- a/packages/widgets/src/media-requests/stats/component.tsx +++ b/packages/widgets/src/media-requests/stats/component.tsx @@ -21,6 +21,7 @@ import type { RequestStats } from "@homarr/integrations/types"; import { openMediaRequestSearch } from "@homarr/spotlight"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import { WidgetEmptyState } from "../../common/empty-state"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../../common/application-url"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../../common/query-state"; @@ -38,9 +39,18 @@ const JELLYSEERR_COLOR = "#6677CC"; export default function MediaServerWidget({ integrationIds, isEditMode, - width, - height, + width: logicalWidth, + height: logicalHeight, + + displayScale, + displayMode, }: WidgetComponentProps<"mediaRequests-requestStats">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.mediaRequests-requestStats"); const tCommon = useI18n("common"); const requestStatsQuery = clientApi.widget.mediaRequests.getStats.useQuery({ integrationIds }); diff --git a/packages/widgets/src/media-server/component.tsx b/packages/widgets/src/media-server/component.tsx index 6f86b2ae8..8468f24ee 100644 --- a/packages/widgets/src/media-server/component.tsx +++ b/packages/widgets/src/media-server/component.tsx @@ -38,6 +38,7 @@ import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; import type { TablerIcon } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData } from "../common/query-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; @@ -169,10 +170,13 @@ function StreamTableHeader({ export default function MediaServerWidget({ options, integrationIds, - width, + width: logicalWidth, isEditMode, displayMode, + height: logicalHeight, + displayScale, }: WidgetComponentProps<"mediaServer">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const currentStreamsQuery = clientApi.widget.mediaServer.getCurrentStreams.useQuery({ integrationIds, showOnlyPlaying: options.showOnlyPlaying, diff --git a/packages/widgets/src/media-transcoding/component.tsx b/packages/widgets/src/media-transcoding/component.tsx index adc06fb10..b2a63ea24 100644 --- a/packages/widgets/src/media-transcoding/component.tsx +++ b/packages/widgets/src/media-transcoding/component.tsx @@ -10,6 +10,7 @@ import { clientApi } from "@homarr/api/client"; import { useI18n } from "@homarr/translation/client"; import type { TablerIcon } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData } from "../common/query-state"; @@ -51,11 +52,19 @@ const getTranscodingWidthLayout = (width: number) => export default function MediaTranscodingWidget({ integrationIds, options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, widgetRuntimeRef, + + displayScale, }: WidgetComponentProps<"mediaTranscoding">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const isAdvanced = displayMode === "advanced"; const queuePageSize = getQueuePageSize(height, isAdvanced); const [queuePagination, setQueuePagination] = useState(() => ({ diff --git a/packages/widgets/src/minecraft/server-status/component.tsx b/packages/widgets/src/minecraft/server-status/component.tsx index 38b9d423e..4264d885f 100644 --- a/packages/widgets/src/minecraft/server-status/component.tsx +++ b/packages/widgets/src/minecraft/server-status/component.tsx @@ -9,14 +9,22 @@ import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; import { WidgetEmptyState } from "../../common/empty-state"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import type { WidgetComponentProps } from "../../definition"; export default function MinecraftServerStatusWidget({ options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + displayScale, }: WidgetComponentProps<"minecraftServerStatus">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const { data: result, isPending, error } = clientApi.widget.minecraft.getServerStatus.useQuery(options); const t = useI18n("widget.minecraftServerStatus"); const tCommon = useI18n("common"); diff --git a/packages/widgets/src/network-controller/network-status/component.tsx b/packages/widgets/src/network-controller/network-status/component.tsx index de38bfa72..19b48f137 100644 --- a/packages/widgets/src/network-controller/network-status/component.tsx +++ b/packages/widgets/src/network-controller/network-status/component.tsx @@ -5,6 +5,7 @@ import { Badge, Box, Card, Center, Group, ScrollArea, SimpleGrid, Stack, Text } import { clientApi } from "@homarr/api/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import type { WidgetComponentProps } from "../../definition"; import { IntegrationErrorIndicator } from "../../common/integration-error-indicator"; import { getUsableWidgetQueryData } from "../../common/query-state"; @@ -41,12 +42,12 @@ export default function NetworkControllerNetworkStatusWidget({ const countWifiUsers = summaries.reduce((sum, { summary }) => sum + summary.wifi.users, 0); const countLanGuests = summaries.reduce((sum, { summary }) => sum + summary.lan.guests, 0); const countLanUsers = summaries.reduce((sum, { summary }) => sum + summary.lan.users, 0); - let responsiveWidth = width; - let responsiveHeight = height; - if (!isAdvanced && Number.isFinite(displayScale) && displayScale > 0) { - responsiveWidth *= displayScale; - responsiveHeight *= displayScale; - } + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); const layout = getNetworkControllerStatusLayout({ width: responsiveWidth, height: responsiveHeight, diff --git a/packages/widgets/src/notebook/notebook.tsx b/packages/widgets/src/notebook/notebook.tsx index c247db634..35ee6db06 100644 --- a/packages/widgets/src/notebook/notebook.tsx +++ b/packages/widgets/src/notebook/notebook.tsx @@ -58,6 +58,7 @@ import { useI18n } from "@homarr/translation/client"; import type { TablerIcon } from "@homarr/ui"; import { InlineConfirmActionIcon } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import actionTargetClasses from "../common/action-target.module.css"; import { createReadOnlyTaskItemTransaction, ReadOnlyTaskItem } from "./read-only-task-item"; @@ -88,9 +89,13 @@ export function Notebook({ isEditMode, boardId, itemId, - height, + height: logicalHeight, displayMode = "compact", + + width: logicalWidth, + displayScale, }: WidgetComponentProps<"notebook">) { + const { height } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const [content, setContent] = useState(options.content); const previousContentRef = useRef(options.content); const [saveError, setSaveError] = useState(null); diff --git a/packages/widgets/src/paperless-ngx/component.tsx b/packages/widgets/src/paperless-ngx/component.tsx index a455c11b0..4f4f2527f 100644 --- a/packages/widgets/src/paperless-ngx/component.tsx +++ b/packages/widgets/src/paperless-ngx/component.tsx @@ -9,6 +9,7 @@ import { clientApi } from "@homarr/api/client"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { getCompactStatLayout } from "../common/compact-stat-layout"; import { WidgetEmptyState } from "../common/empty-state"; import type { WidgetComponentProps } from "../definition"; @@ -149,12 +150,12 @@ export default function PaperlessNgxWidget({ .map(([, statKey]) => statKey) .filter((statKey) => !(showHero && gridHiddenWhenHeroShown.has(statKey))); - let responsiveWidth = width; - let responsiveHeight = height; - if (displayMode === "compact" && Number.isFinite(displayScale) && displayScale > 0) { - responsiveWidth *= displayScale; - responsiveHeight *= displayScale; - } + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode, + }); const advanced = displayMode === "advanced"; const layout = getCompactStatLayout({ width: responsiveWidth, diff --git a/packages/widgets/src/patchmon/component.tsx b/packages/widgets/src/patchmon/component.tsx index 3950c26a8..be66cf052 100644 --- a/packages/widgets/src/patchmon/component.tsx +++ b/packages/widgets/src/patchmon/component.tsx @@ -20,6 +20,7 @@ import { useI18n } from "@homarr/translation/client"; import { iconSizes, zoomCompensatedSize } from "@homarr/ui"; import type { TablerIcon } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; import { WidgetQueryLoadingState } from "../common/query-state-indicator"; @@ -70,10 +71,18 @@ const getLayoutMode = (width: number, height: number): LayoutMode => { export default function PatchMonWidget({ integrationIds, options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + + displayScale, }: WidgetComponentProps<"patchmon">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.patchmon"); const integrationId = integrationIds[0] ?? ""; const statsQuery = clientApi.widget.patchmon.getStats.useQuery({ integrationId }, { staleTime: 60 * 1000 }); diff --git a/packages/widgets/src/rssFeed/component.tsx b/packages/widgets/src/rssFeed/component.tsx index 158fbd06e..0c2c240ca 100644 --- a/packages/widgets/src/rssFeed/component.tsx +++ b/packages/widgets/src/rssFeed/component.tsx @@ -9,6 +9,7 @@ import { clientApi } from "@homarr/api/client"; import { useRequiredBoard } from "@homarr/boards/context"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../common/application-url"; import { WidgetEmptyState } from "../common/empty-state"; import { WidgetQueryLoadingState } from "../common/query-state-indicator"; @@ -43,7 +44,19 @@ const useLiveFeed = (input: RouterInputs["widget"]["rssFeed"]["getFeeds"]) => { }; }; -export default function RssFeed({ options, width, height, displayMode }: WidgetComponentProps<"rssFeed">) { +export default function RssFeed({ + options, + width: logicalWidth, + height: logicalHeight, + displayMode, + displayScale, +}: WidgetComponentProps<"rssFeed">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const feed = useLiveFeed({ urls: options.feedUrls, maximumAmountPosts: typeof options.maximumAmountPosts === "number" ? options.maximumAmountPosts : 100, diff --git a/packages/widgets/src/smart-home/entity-state/component.tsx b/packages/widgets/src/smart-home/entity-state/component.tsx index 8247f19cb..a98a6f07a 100644 --- a/packages/widgets/src/smart-home/entity-state/component.tsx +++ b/packages/widgets/src/smart-home/entity-state/component.tsx @@ -10,6 +10,7 @@ import { showErrorNotification } from "@homarr/notifications"; import { useRegisterSpotlightContextActions } from "@homarr/spotlight"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import type { WidgetComponentProps } from "../../definition"; import { isSmartHomeTiny } from "../layout"; import { getEntityStateLabel } from "./state"; @@ -18,10 +19,18 @@ export default function SmartHomeEntityStateWidget({ options, integrationIds, isEditMode, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + + displayScale, }: WidgetComponentProps<"smartHome-entityState">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.smartHome-entityState"); const tWidgetCommon = useI18n("widget.common"); const tCommon = useI18n("common"); diff --git a/packages/widgets/src/smart-home/execute-automation/component.tsx b/packages/widgets/src/smart-home/execute-automation/component.tsx index cb60cd91c..08c6fbef6 100644 --- a/packages/widgets/src/smart-home/execute-automation/component.tsx +++ b/packages/widgets/src/smart-home/execute-automation/component.tsx @@ -21,6 +21,7 @@ import { useRegisterSpotlightContextActions } from "@homarr/spotlight"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../../common/widget-layout-size"; import type { WidgetComponentProps } from "../../definition"; import { isSmartHomeTiny } from "../layout"; @@ -28,10 +29,17 @@ export default function SmartHomeTriggerAutomationWidget({ options, integrationIds, isEditMode, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + displayScale, }: WidgetComponentProps<"smartHome-executeAutomation">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const integrationId = integrationIds[0]; const canInteract = useIntegrationsWithInteractAccess().some(({ id }) => id === integrationId); const [lastExecutedAt, setLastExecutedAt] = React.useState(null); diff --git a/packages/widgets/src/speedtest-tracker/averages.tsx b/packages/widgets/src/speedtest-tracker/averages.tsx index 08f7dd4ac..ef92398a3 100644 --- a/packages/widgets/src/speedtest-tracker/averages.tsx +++ b/packages/widgets/src/speedtest-tracker/averages.tsx @@ -14,10 +14,12 @@ export function AveragesSection({ stats, width = 500, compactSurface = false, + displayScale, }: { stats: SpeedtestTrackerStats; width?: number; compactSurface?: boolean; + displayScale?: number; }) { const t = useI18n("widget.speedtestTracker"); @@ -28,6 +30,7 @@ export function AveragesSection({ ) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.speedtestTracker"); const dashboardQuery = clientApi.widget.speedtestTracker.getDashboard.useQuery({ integrationIds }); const dashboardData = getUsableWidgetQueryData(dashboardQuery) ?? emptyDashboardData; @@ -44,10 +50,20 @@ export default function SpeedtestTrackerWidget({ const noSectionsEnabled = !options.showLatestResult && !options.showStats && !options.showRecentResults; const latest = showLatestResult && combined.latestResult && ( - + ); const averages = showStats && combined.stats && ( - + ); return ( diff --git a/packages/widgets/src/speedtest-tracker/latest-result.tsx b/packages/widgets/src/speedtest-tracker/latest-result.tsx index f7764736f..f0337aa8b 100644 --- a/packages/widgets/src/speedtest-tracker/latest-result.tsx +++ b/packages/widgets/src/speedtest-tracker/latest-result.tsx @@ -14,10 +14,12 @@ export function LatestResultSection({ result, width = 500, compactSurface = false, + displayScale, }: { result: SpeedtestTrackerResult; width?: number; compactSurface?: boolean; + displayScale?: number; }) { const t = useI18n("widget.speedtestTracker"); const locale = useCurrentIntlLocale(); @@ -40,6 +42,7 @@ export function LatestResultSection({ {result.healthy !== null && ( (); + const { ref, height: logicalHeight, width: logicalWidth } = useElementSize(); + const { width, height } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale }); const board = useRequiredBoard(); const isWide = width > height + 20; const hideLabel = height > 0 && height <= 38; diff --git a/packages/widgets/src/stocks/component.tsx b/packages/widgets/src/stocks/component.tsx index e3b3af46e..980634579 100644 --- a/packages/widgets/src/stocks/component.tsx +++ b/packages/widgets/src/stocks/component.tsx @@ -7,6 +7,7 @@ import { IconMinus, IconTrendingDown, IconTrendingUp } from "@tabler/icons-react import { clientApi } from "@homarr/api/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; import { WidgetQueryLoadingState } from "../common/query-state-indicator"; @@ -71,10 +72,17 @@ export function getStockSummary(priceHistory: number[], previousClose: number): export default function StockPriceWidget({ options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode = "compact", + displayScale, }: WidgetComponentProps<"stockPrice">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.stockPrice"); const tCommon = useI18n("common"); const locale = useCurrentIntlLocale(); diff --git a/packages/widgets/src/system-resources/chart/combined-network-traffic.tsx b/packages/widgets/src/system-resources/chart/combined-network-traffic.tsx index b512b7414..58e27f3f4 100644 --- a/packages/widgets/src/system-resources/chart/combined-network-traffic.tsx +++ b/packages/widgets/src/system-resources/chart/combined-network-traffic.tsx @@ -12,6 +12,7 @@ export const CombinedNetworkTrafficChart = ({ hasShadow, labelDisplayMode, advanced = false, + displayScale, }: { usageOverTime: { up: number; @@ -20,6 +21,7 @@ export const CombinedNetworkTrafficChart = ({ hasShadow: boolean; labelDisplayMode: LabelDisplayModeOption; advanced?: boolean; + displayScale?: number; }) => { const chartData = usageOverTime.map((usage, index) => ({ index, @@ -51,6 +53,7 @@ export const CombinedNetworkTrafficChart = ({ return ( []; dataKey: string; @@ -53,8 +42,11 @@ export const CommonChart = ({ lastValue?: string; chartType?: "line" | "area"; advanced?: boolean; + displayScale?: number; }) => { - const { ref: elementSizeRef, height } = useElementSize(); + const { ref: elementSizeRef, height: logicalHeight } = useElementSize(); + const height = + logicalHeight * getWidgetDisplayScale({ displayScale, displayMode: advanced ? "advanced" : "compact" }); const theme = useMantineTheme(); const colorScheme = useComputedColorScheme("light"); const board = useRequiredBoard(); @@ -62,28 +54,22 @@ export const CommonChart = ({ const ref = useMergedRef(elementSizeRef, hoverRef); const opacity = board.opacity / 100; - let backgroundColor = - colorScheme === "dark" - ? `rgba(57, 57, 57, ${opacity})` - : `rgba(246, 247, 248, ${opacity})`; + let backgroundColor = colorScheme === "dark" ? `rgba(57, 57, 57, ${opacity})` : `rgba(246, 247, 248, ${opacity})`; const cardStyle: CSSProperties = { overflow: "hidden" }; const chartRootStyle: CSSProperties = { padding: 5, borderRadius: theme.radius[board.itemRadius], }; if (advanced) { - backgroundColor = - "rgb(from var(--mantine-color-primaryColor-filled) r g b / calc(var(--opacity, 1) * 0.12))"; + backgroundColor = "rgb(from var(--mantine-color-primaryColor-filled) r g b / calc(var(--opacity, 1) * 0.12))"; cardStyle.border = "1px solid rgb(from var(--mantine-color-secondaryColor-filled) r g b / calc(var(--opacity, 1) * 0.45))"; chartRootStyle.backgroundColor = backgroundColor; } const ChartComponent = chartType === "line" ? LineChart : AreaChart; - const showIcon = - labelDisplayMode === "icon" || labelDisplayMode === "textWithIcon"; - const showText = - labelDisplayMode === "text" || labelDisplayMode === "textWithIcon"; + const showIcon = labelDisplayMode === "icon" || labelDisplayMode === "textWithIcon"; + const showText = labelDisplayMode === "text" || labelDisplayMode === "textWithIcon"; // Track which data point the cursor is over so the tooltip can reflect that point // instead of always showing the latest value while scrubbing across the chart. @@ -100,20 +86,12 @@ export const CommonChart = ({ // Clamp on read rather than syncing via an effect - handles data growing/shrinking // between renders (e.g. history resetting on integration change) without ever // handing a stale or out-of-range index to tooltipLabel. - const clampedHoveredIndex = Math.max( - 0, - Math.min(hoveredIndex, data.length - 1), - ); + const clampedHoveredIndex = Math.max(0, Math.min(hoveredIndex, data.length - 1)); const resolvedTooltipLabel = - typeof tooltipLabel === "function" - ? tooltipLabel(clampedHoveredIndex) - : (tooltipLabel ?? lastValue); + typeof tooltipLabel === "function" ? tooltipLabel(clampedHoveredIndex) : (tooltipLabel ?? lastValue); return ( - + )} {lastValue && ( - 100 ? "md" : "xs"} - lineClamp={1} - > + 100 ? "md" : "xs"} lineClamp={1}> {lastValue} )} )} - {advanced && - data.length > 1 && - height > 0 && - height <= 40 && - lastValue && - !hovered && ( -
- - {lastValue} - -
- )} + {advanced && data.length > 1 && height > 0 && height <= 40 && lastValue && !hovered && ( +
+ + {lastValue} + +
+ )} {data.length <= 1 ? (
@@ -187,12 +151,7 @@ export const CommonChart = ({ /> )} {showText && ( - 100 ? "md" : "xs"} - fw={"bold"} - ta="center" - > + 100 ? "md" : "xs"} fw={"bold"} ta="center"> {title} )} diff --git a/packages/widgets/src/system-resources/chart/cpu-chart.tsx b/packages/widgets/src/system-resources/chart/cpu-chart.tsx index 33ff0cc86..56f3b87ae 100644 --- a/packages/widgets/src/system-resources/chart/cpu-chart.tsx +++ b/packages/widgets/src/system-resources/chart/cpu-chart.tsx @@ -10,16 +10,19 @@ export const SystemResourceCPUChart = ({ hasShadow, labelDisplayMode, advanced = false, + displayScale, }: { cpuUsageOverTime: number[]; hasShadow: boolean; labelDisplayMode: LabelDisplayModeOption; advanced?: boolean; + displayScale?: number; }) => { const chartData = cpuUsageOverTime.map((usage, index) => ({ index, usage })); return ( { const chartData = gpuUsageOverTime.map((usage, index) => ({ index, usage })); return ( { const chartData = memoryUsageOverTime.map((usage, index) => ({ index, @@ -45,6 +47,7 @@ export const SystemResourceMemoryChart = ({ return ( { const chartData = usageOverTime.map((usage, index) => ({ index, usage })); const t = useI18n("widget.systemResources.card"); @@ -29,6 +31,7 @@ export const NetworkTrafficChart = ({ return ( ) { const healthQuery = clientApi.widget.healthMonitoring.getSystemHealthStatus.useQuery({ integrationIds }); @@ -150,6 +152,7 @@ export default function SystemResources({ width={availableWidth} height={availableHeight} isAdvanced={isAdvanced} + displayScale={displayScale} showTitle={isAdvanced || data.length > 1} /> ); @@ -211,6 +214,7 @@ interface SystemChartsProps { height: number; isAdvanced: boolean; showTitle: boolean; + displayScale?: number; } const SystemCharts = ({ @@ -223,13 +227,20 @@ const SystemCharts = ({ height, isAdvanced, showTitle, + displayScale, }: SystemChartsProps) => { + const { width: responsiveWidth, height: responsiveHeight } = getWidgetLayoutSize({ + width, + height, + displayScale, + displayMode: isAdvanced ? "advanced" : "compact", + }); const networkItems = getNetworkHistory(items); const visibleCharts = getVisibleSystemCharts({ configuredCharts: options.visibleCharts, hasGpu, hasNetwork: networkItems.length > 0, - height, + height: responsiveHeight, isAdvanced, }); const showNetwork = visibleCharts.includes("network"); @@ -270,6 +281,7 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> )} @@ -281,6 +293,7 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> )} @@ -291,11 +304,12 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> )} {showNetwork && - (width >= 300 ? ( + (responsiveWidth >= 300 ? ( network.down)} @@ -303,6 +317,7 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> network.up)} @@ -310,6 +325,7 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> ) : ( @@ -319,6 +335,7 @@ const SystemCharts = ({ hasShadow={options.hasShadow} labelDisplayMode={labelDisplayMode} advanced={isAdvanced} + displayScale={displayScale} /> ))} diff --git a/packages/widgets/src/timer/component.tsx b/packages/widgets/src/timer/component.tsx index 635cc6514..4843c0462 100644 --- a/packages/widgets/src/timer/component.tsx +++ b/packages/widgets/src/timer/component.tsx @@ -29,6 +29,7 @@ import { requestBrowserNotificationPermission, showBrowserNotification, } from "../common/browser-alert"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { useLocalWidgetState } from "../common/use-local-widget-state"; import { useWidgetNow } from "../common/use-widget-now"; import type { WidgetComponentProps } from "../definition"; @@ -52,12 +53,20 @@ const completionSoundIntervalMs = 300; export default function TimerWidget({ boardId, displayMode, - height, + height: logicalHeight, isEditMode, itemId, options, - width, + width: logicalWidth, + + displayScale, }: WidgetComponentProps<"timer">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const now = useWidgetNow("second"); const t = useI18n("widget.timer"); const reducedMotion = useReducedMotion(); diff --git a/packages/widgets/src/timetable/component.tsx b/packages/widgets/src/timetable/component.tsx index 16fd607b6..2de893e12 100644 --- a/packages/widgets/src/timetable/component.tsx +++ b/packages/widgets/src/timetable/component.tsx @@ -4,6 +4,7 @@ import { IconAlertTriangle } from "@tabler/icons-react"; import { clientApi } from "@homarr/api/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { DynamicSelectOption } from "../_inputs/widget-dynamic-select-input"; import { formatLocalizedTime } from "../common/locale"; import type { WidgetComponentProps } from "../definition"; @@ -11,10 +12,18 @@ import type { WidgetComponentProps } from "../definition"; export default function TimetableWidget({ options, displayMode = "compact", - width, - height, + width: logicalWidth, + height: logicalHeight, itemId, + + displayScale, }: WidgetComponentProps<"timetable">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.timetable"); if (!options.station) { diff --git a/packages/widgets/src/tracearr/component.tsx b/packages/widgets/src/tracearr/component.tsx index b2793cbc7..75eb5df91 100644 --- a/packages/widgets/src/tracearr/component.tsx +++ b/packages/widgets/src/tracearr/component.tsx @@ -6,6 +6,7 @@ import { clientApi } from "@homarr/api/client"; import type { TracearrDashboardData } from "@homarr/integrations/types"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import { getUsableWidgetQueryData } from "../common/query-state"; @@ -36,9 +37,13 @@ export const getTracearrSectionVisibility = (options: TracearrSectionOptions, is export default function TracearrWidget({ options, integrationIds, - width, + width: logicalWidth, displayMode = "compact", + + height: logicalHeight, + displayScale, }: WidgetComponentProps<"tracearr">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); if (integrationIds.length === 0) { throw new NoIntegrationDataError(); } diff --git a/packages/widgets/src/traefik/component.tsx b/packages/widgets/src/traefik/component.tsx index 725ce5c3d..e942958ad 100644 --- a/packages/widgets/src/traefik/component.tsx +++ b/packages/widgets/src/traefik/component.tsx @@ -16,6 +16,7 @@ import type { TraefikDashboardData, TraefikProtocolSummary, TraefikResourceSumma import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import type { WidgetComponentProps } from "../definition"; @@ -103,9 +104,12 @@ export default function TraefikWidget(props: WidgetComponentProps<"traefik">) { function TraefikWidgetContent({ integrationIds, options, - width, + width: logicalWidth, displayMode = "compact", + height: logicalHeight, + displayScale, }: WidgetComponentProps<"traefik">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const t = useI18n("widget.traefik"); const tCommon = useI18n("common"); const dashboardQuery = clientApi.widget.traefik.getDashboard.useQuery({ integrationIds }); diff --git a/packages/widgets/src/umami/component.tsx b/packages/widgets/src/umami/component.tsx index e32bac9bb..4002b6240 100644 --- a/packages/widgets/src/umami/component.tsx +++ b/packages/widgets/src/umami/component.tsx @@ -6,6 +6,7 @@ import { getQueryKey } from "@trpc/react-query"; import { clientApi } from "@homarr/api/client"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { useWidgetRuntimeQueries } from "../runtime-hooks"; import { UmamiContent } from "./umami-content"; @@ -13,11 +14,18 @@ import { UmamiContent } from "./umami-content"; export default function UmamiWidget({ options, integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode = "compact", widgetRuntimeRef, + displayScale, }: WidgetComponentProps<"umami">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const integrationId = integrationIds[0] ?? ""; const commonTopInput = { integrationId, diff --git a/packages/widgets/src/ups/component.tsx b/packages/widgets/src/ups/component.tsx index ce9ee3042..77e00a910 100644 --- a/packages/widgets/src/ups/component.tsx +++ b/packages/widgets/src/ups/component.tsx @@ -20,6 +20,7 @@ import type { UpsStatus, UpsSummary } from "@homarr/integrations/types"; import type { ScopedTranslationFunction } from "@homarr/translation"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import type { WidgetComponentProps } from "../definition"; @@ -34,20 +35,26 @@ const statusColors: Record = { unknown: "gray", }; -const neutralSurfaceBackground = - "rgb(from var(--mantine-color-default-hover) r g b / calc(var(--opacity, 1) * 0.12))"; -const neutralSurfaceBorder = - "rgb(from var(--mantine-color-default-border) r g b / calc(var(--opacity, 1) * 0.45))"; +const neutralSurfaceBackground = "rgb(from var(--mantine-color-default-hover) r g b / calc(var(--opacity, 1) * 0.12))"; +const neutralSurfaceBorder = "rgb(from var(--mantine-color-default-border) r g b / calc(var(--opacity, 1) * 0.45))"; type UpsLayout = "mini" | "compact" | "full"; export default function UpsWidget({ options, integrationIds, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode = "compact", + + displayScale, }: WidgetComponentProps<"ups">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); if (integrationIds.length === 0) { throw new NoIntegrationSelectedError(); } diff --git a/packages/widgets/src/uptime-kuma/component.tsx b/packages/widgets/src/uptime-kuma/component.tsx index 6108fec8f..6cc3424e1 100644 --- a/packages/widgets/src/uptime-kuma/component.tsx +++ b/packages/widgets/src/uptime-kuma/component.tsx @@ -9,6 +9,7 @@ import { formatNumber } from "@homarr/common"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { IntegrationErrorIndicator } from "../common/integration-error-indicator"; import type { WidgetComponentProps } from "../definition"; @@ -82,10 +83,17 @@ const heroVariantByRing = { export default function UptimeKumaWidget({ integrationIds, options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode = "compact", + displayScale, }: WidgetComponentProps<"uptimeKuma">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); if (integrationIds.length === 0) { throw new NoIntegrationDataError(); } diff --git a/packages/widgets/src/vpn/component.tsx b/packages/widgets/src/vpn/component.tsx index d20edd8cf..590279ae3 100644 --- a/packages/widgets/src/vpn/component.tsx +++ b/packages/widgets/src/vpn/component.tsx @@ -5,11 +5,25 @@ import { Center, Flex, ScrollArea, SimpleGrid, Stack, Text } from "@mantine/core import { clientApi } from "@homarr/api/client"; import { useCurrentIntlLocale, useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import type { WidgetComponentProps } from "../definition"; import { getUsableWidgetQueryData } from "../common/query-state"; import { VpnIntegrationCard } from "./vpn-card"; -export default function VpnWidget({ options, integrationIds, width, height }: WidgetComponentProps<"vpn">) { +export default function VpnWidget({ + options, + integrationIds, + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, +}: WidgetComponentProps<"vpn">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const summariesQuery = clientApi.widget.vpn.getSummaries.useQuery({ ...options, integrationIds, diff --git a/packages/widgets/src/weather/component.tsx b/packages/widgets/src/weather/component.tsx index d78a0ce3a..cb974df15 100644 --- a/packages/widgets/src/weather/component.tsx +++ b/packages/widgets/src/weather/component.tsx @@ -5,6 +5,7 @@ import { Box, Center, Text } from "@mantine/core"; import { clientApi } from "@homarr/api/client"; import { useI18n } from "@homarr/translation/client"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state"; import { WidgetQueryLoadingState } from "../common/query-state-indicator"; import type { WidgetComponentProps } from "../definition"; @@ -15,10 +16,17 @@ import { CompactWeather } from "./compact"; export default function WeatherWidget({ isEditMode, options, - width, - height, + width: logicalWidth, + height: logicalHeight, displayMode, + displayScale, }: WidgetComponentProps<"weather">) { + const { width, height } = getWidgetLayoutSize({ + width: logicalWidth, + height: logicalHeight, + displayScale, + displayMode, + }); const t = useI18n("widget.weather"); const input = { latitude: options.location.latitude, diff --git a/packages/widgets/src/wud/component.tsx b/packages/widgets/src/wud/component.tsx index 28c8c299a..556173df8 100644 --- a/packages/widgets/src/wud/component.tsx +++ b/packages/widgets/src/wud/component.tsx @@ -11,12 +11,21 @@ import type { WudContainerUpdate } from "@homarr/integrations"; import { useI18n } from "@homarr/translation/client"; import { zoomCompensatedSize } from "@homarr/ui"; +import { getWidgetLayoutSize } from "../common/widget-layout-size"; import { WidgetEmptyState } from "../common/empty-state"; import { getSafeApplicationUrl, SAFE_NEW_TAB_REL } from "../common/application-url"; import type { WidgetComponentProps } from "../definition"; import classes from "./component.module.css"; -export default function WudWidget({ integrationIds, options, width, displayMode }: WidgetComponentProps<"wud">) { +export default function WudWidget({ + integrationIds, + options, + width: logicalWidth, + displayMode, + height: logicalHeight, + displayScale, +}: WidgetComponentProps<"wud">) { + const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode }); const integrationId = integrationIds[0]; if (!integrationId) return null; return ( @@ -208,13 +217,7 @@ const UpdateCard = ({ const showVersionTooltip = versionText !== null && !isDigestUpdate && versionText !== fullVersionText; return ( - + {update.name}