fix: align widget layouts with visible board size

This commit is contained in:
ajnart committed 2026-09-09 15:19:03 +02:00
1 parent 19a887ea55
commit c8c0458764
61 files changed
+580 -190

No files matched your search

@@ -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<HTMLDivElement>(null);
const previewEntranceFrameRef = useRef<number | null>(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"}
@@ -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,
}}
>
<BoardCanvasScaleContext.Provider value={scale}>{children}</BoardCanvasScaleContext.Provider>
<BoardCanvasScaleContext.Provider value={scale}>
<BoardContentScaleProvider value={scale}>{children}</BoardContentScaleProvider>
</BoardCanvasScaleContext.Provider>
</Box>
</Box>
</Box>
@@ -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<HTMLDivElement>(null);
@@ -327,7 +333,9 @@ export const SectionGrid = ({
data-kind={section.kind}
data-grid-editor-error={isEditMode && editorRuntimeStatus === "error" ? "true" : undefined}
>
<SectionContent />
<BoardContentScaleProvider value={parentContentScale * containerContentScale}>
<SectionContent />
</BoardContentScaleProvider>
</Box>
<div ref={editorHostRef} className={classes.editorPortalHost} />
</Box>
+14 -1
View File
@@ -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,
+11 -2
View File
@@ -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) {
+3 -2
View File
@@ -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;
@@ -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) {
@@ -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 <WidgetEmptyState />;
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 = (
<AudioStatsContent
+11 -2
View File
@@ -9,6 +9,7 @@ import { getIntegrationName } from "@homarr/definitions";
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 type { WidgetComponentProps } from "../definition";
import classes from "./component.module.css";
@@ -58,10 +59,18 @@ const iconSizeByWidth = [
export default function BazarrWidget({
integrationIds,
options,
width,
height,
width: logicalWidth,
height: logicalHeight,
displayMode,
displayScale,
}: WidgetComponentProps<"bazarr">) {
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] ?? "" },
@@ -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",
}}
@@ -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"
@@ -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");
@@ -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;
+20 -2
View File
@@ -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(
+14 -1
View File
@@ -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 });
@@ -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 };
};
+6 -1
View File
@@ -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) {
+2
View File
@@ -175,8 +175,10 @@ export type WidgetComponentProps<TKind extends WidgetKind> = WidgetProps<TKind>
isEditMode: boolean;
displayMode?: "compact" | "advanced";
setOptions: ({ newOptions }: { newOptions: Partial<inferOptionsFromCreator<WidgetOptionsRecordOf<TKind>>> }) => 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<Record<string, unknown> | null>;
@@ -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<typeof widgetKind>) {
const { width } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale, displayMode });
const board = useRequiredBoard();
// DnsHole integrations with interaction permissions
const integrationsWithInteractions = useIntegrationsWithInteractAccess()
@@ -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<typeof widgetKind>) {
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({
<SimpleGrid cols={2} spacing="xs" p="xs" {...layoutProps} style={{ ...layoutProps.style, flex: 1, minHeight: 0 }}>
{data.length > 0 ? (
stats.map((item) => (
<StatCard key={item.color} item={item} usePiHoleColors={options.usePiHoleColors} data={data} t={t} />
<StatCard
displayScale={scale}
key={item.color}
item={item}
usePiHoleColors={options.usePiHoleColors}
data={data}
t={t}
/>
))
) : (
<Stack
@@ -171,13 +188,15 @@ interface StatItem {
}
interface StatCardProps {
displayScale: number;
item: StatItem;
data: DnsHoleSummary[];
usePiHoleColors: boolean;
t: TranslationFunction;
}
const StatCard = ({ item, data, usePiHoleColors, t }: StatCardProps) => {
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);
+6 -1
View File
@@ -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");
+11 -2
View File
@@ -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();
+11 -2
View File
@@ -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);
@@ -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 (
<Stack h={isAdvanced ? "auto" : "100%"} p="xs" gap={isTiny ? "xs" : "md"} pos="relative">
{(isAdvanced || options.showUptime) && !isTiny && (
@@ -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;
@@ -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 });
@@ -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;
@@ -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()
@@ -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 });
@@ -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,
@@ -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<QueuePaginationState>(() => ({
@@ -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");
@@ -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,
+6 -1
View File
@@ -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<string | null>(null);
@@ -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,
+11 -2
View File
@@ -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 });
+14 -1
View File
@@ -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,
@@ -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");
@@ -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<Date | null>(null);
@@ -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({
</SectionLabel>
<SimpleGrid cols={width < 220 ? 1 : 3} spacing="xs" style={{ flex: 1, gridTemplateRows: "1fr" }}>
<SpeedStatCard
displayScale={displayScale}
icon={IconArrowDown}
color="blue"
value={formatStatsSpeed(stats.download)}
@@ -36,6 +39,7 @@ export function AveragesSection({
legacySurface={compactSurface}
/>
<SpeedStatCard
displayScale={displayScale}
icon={IconArrowUp}
color="teal"
value={formatStatsSpeed(stats.upload)}
@@ -44,6 +48,7 @@ export function AveragesSection({
legacySurface={compactSurface}
/>
<SpeedStatCard
displayScale={displayScale}
icon={IconWaveSine}
color="orange"
value={`${stats.ping.avg.toFixed(1)} ms`}
@@ -6,6 +6,7 @@ import { Box, Group, Stack, Text } from "@mantine/core";
import { clientApi } from "@homarr/api/client";
import { useI18n } from "@homarr/translation/client";
import { getWidgetDisplayScale, getWidgetLayoutSize } from "../common/widget-layout-size";
import type { WidgetComponentProps } from "../definition";
import { IntegrationErrorIndicator } from "../common/integration-error-indicator";
import { getUsableWidgetQueryData } from "../common/query-state";
@@ -20,8 +21,13 @@ const emptyDashboardData = [] as const;
export default function SpeedtestTrackerWidget({
options,
integrationIds,
width,
width: logicalWidth,
height: logicalHeight,
displayScale,
displayMode,
}: WidgetComponentProps<"speedtestTracker">) {
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 && (
<LatestResultSection result={combined.latestResult} width={width} compactSurface />
<LatestResultSection
result={combined.latestResult}
width={width}
displayScale={getWidgetDisplayScale({ displayScale, displayMode })}
compactSurface
/>
);
const averages = showStats && combined.stats && (
<AveragesSection stats={combined.stats} width={width} compactSurface />
<AveragesSection
stats={combined.stats}
width={width}
displayScale={getWidgetDisplayScale({ displayScale, displayMode })}
compactSurface
/>
);
return (
@@ -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({
</Group>
<SimpleGrid cols={cols} spacing="xs" style={{ flex: 1, gridTemplateRows: "1fr" }}>
<SpeedStatCard
displayScale={displayScale}
icon={IconArrowDown}
color="blue"
value={formatResultSpeed(result, "download")}
@@ -47,6 +50,7 @@ export function LatestResultSection({
legacySurface={compactSurface}
/>
<SpeedStatCard
displayScale={displayScale}
icon={IconArrowUp}
color="teal"
value={formatResultSpeed(result, "upload")}
@@ -54,6 +58,7 @@ export function LatestResultSection({
legacySurface={compactSurface}
/>
<SpeedStatCard
displayScale={displayScale}
icon={IconWaveSine}
color="orange"
value={result.ping !== null ? `${result.ping.toFixed(1)} ms` : "—"}
@@ -62,6 +67,7 @@ export function LatestResultSection({
/>
{result.healthy !== null && (
<SpeedStatCard
displayScale={displayScale}
icon={result.healthy ? IconCircleCheck : IconCircleX}
color={result.healthy ? "green" : "red"}
value={result.healthy ? t("healthy") : t("unhealthy")}
@@ -1,5 +1,6 @@
"use client";
import { getWidgetLayoutSize } from "../common/widget-layout-size";
import { Card, Flex, Text, Tooltip, VisuallyHidden } from "@mantine/core";
import { useElementSize } from "@mantine/hooks";
@@ -14,6 +15,7 @@ export interface SpeedStatCardProps {
label: string;
compact?: boolean;
legacySurface?: boolean;
displayScale?: number;
}
export function SpeedStatCard({
@@ -23,8 +25,10 @@ export function SpeedStatCard({
label,
compact = false,
legacySurface = false,
displayScale,
}: SpeedStatCardProps) {
const { ref, height, width } = useElementSize<HTMLDivElement>();
const { ref, height: logicalHeight, width: logicalWidth } = useElementSize<HTMLDivElement>();
const { width, height } = getWidgetLayoutSize({ width: logicalWidth, height: logicalHeight, displayScale });
const board = useRequiredBoard();
const isWide = width > height + 20;
const hideLabel = height > 0 && height <= 38;
+10 -2
View File
@@ -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();
@@ -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 (
<CommonChart
displayScale={displayScale}
data={chartData}
dataKey={"index"}
series={[
@@ -1,22 +1,9 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import type {
CSSProperties,
PointerEvent as ReactPointerEvent,
ReactNode,
} from "react";
import type { CSSProperties, PointerEvent as ReactPointerEvent, ReactNode } from "react";
import { useState } from "react";
import type { AreaChartSeries } from "@mantine/charts";
import { AreaChart, LineChart } from "@mantine/charts";
import {
Card,
Center,
Group,
Stack,
Text,
Tooltip,
useComputedColorScheme,
useMantineTheme,
} from "@mantine/core";
import { Card, Center, Group, Stack, Text, Tooltip, useComputedColorScheme, useMantineTheme } from "@mantine/core";
import { useElementSize, useHover, useMergedRef } from "@mantine/hooks";
import type { YAxisProps } from "recharts";
@@ -24,6 +11,7 @@ import { useRequiredBoard } from "@homarr/boards/context";
import { zoomCompensatedSize } from "@homarr/ui";
import type { TablerIcon } from "@homarr/ui";
import { getWidgetDisplayScale } from "../../common/widget-layout-size";
import type { LabelDisplayModeOption } from "..";
export const CommonChart = ({
@@ -38,6 +26,7 @@ export const CommonChart = ({
lastValue,
chartType = "line",
advanced = false,
displayScale,
}: {
data: Record<string, any>[];
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 (
<Tooltip.Floating
label={resolvedTooltipLabel}
disabled={data.length <= 1 || !resolvedTooltipLabel}
>
<Tooltip.Floating label={resolvedTooltipLabel} disabled={data.length <= 1 || !resolvedTooltipLabel}>
<Card
ref={ref}
h={"100%"}
@@ -149,33 +127,19 @@ export const CommonChart = ({
</Text>
)}
{lastValue && (
<Text
c={"dimmed"}
size={height > 100 ? "md" : "xs"}
lineClamp={1}
>
<Text c={"dimmed"} size={height > 100 ? "md" : "xs"} lineClamp={1}>
{lastValue}
</Text>
)}
</Group>
)}
{advanced &&
data.length > 1 &&
height > 0 &&
height <= 40 &&
lastValue &&
!hovered && (
<Center
pos="absolute"
w="100%"
h="100%"
style={{ zIndex: 2, pointerEvents: "none" }}
>
<Text size="xs" fw={600}>
{lastValue}
</Text>
</Center>
)}
{advanced && data.length > 1 && height > 0 && height <= 40 && lastValue && !hovered && (
<Center pos="absolute" w="100%" h="100%" style={{ zIndex: 2, pointerEvents: "none" }}>
<Text size="xs" fw={600}>
{lastValue}
</Text>
</Center>
)}
{data.length <= 1 ? (
<Center pos="absolute" w="100%" h="100%">
<Stack px={"xs"} align={"center"} gap={4}>
@@ -187,12 +151,7 @@ export const CommonChart = ({
/>
)}
{showText && (
<Text
c={"dimmed"}
size={height > 100 ? "md" : "xs"}
fw={"bold"}
ta="center"
>
<Text c={"dimmed"} size={height > 100 ? "md" : "xs"} fw={"bold"} ta="center">
{title}
</Text>
)}
@@ -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 (
<CommonChart
displayScale={displayScale}
data={chartData}
dataKey={"index"}
series={[{ name: "usage", color: "blue.5" }]}
@@ -10,16 +10,19 @@ export const SystemResourceGPUChart = ({
hasShadow,
labelDisplayMode,
advanced = false,
displayScale,
}: {
gpuUsageOverTime: number[];
hasShadow: boolean;
labelDisplayMode: LabelDisplayModeOption;
advanced?: boolean;
displayScale?: number;
}) => {
const chartData = gpuUsageOverTime.map((usage, index) => ({ index, usage }));
return (
<CommonChart
displayScale={displayScale}
data={chartData}
dataKey={"index"}
series={[{ name: "usage", color: "grape.5" }]}
@@ -12,12 +12,14 @@ export const SystemResourceMemoryChart = ({
hasShadow,
labelDisplayMode,
advanced = false,
displayScale,
}: {
memoryUsageOverTime: number[];
totalCapacityInBytes: number;
hasShadow: boolean;
labelDisplayMode: LabelDisplayModeOption;
advanced?: boolean;
displayScale?: number;
}) => {
const chartData = memoryUsageOverTime.map((usage, index) => ({
index,
@@ -45,6 +47,7 @@ export const SystemResourceMemoryChart = ({
return (
<CommonChart
displayScale={displayScale}
data={chartData}
dataKey={"index"}
series={[{ name: "usage", color: "red.6" }]}
@@ -12,12 +12,14 @@ export const NetworkTrafficChart = ({
hasShadow,
labelDisplayMode,
advanced = false,
displayScale,
}: {
usageOverTime: number[];
isUp: boolean;
hasShadow: boolean;
labelDisplayMode: LabelDisplayModeOption;
advanced?: boolean;
displayScale?: number;
}) => {
const chartData = usageOverTime.map((usage, index) => ({ index, usage }));
const t = useI18n("widget.systemResources.card");
@@ -29,6 +31,7 @@ export const NetworkTrafficChart = ({
return (
<CommonChart
displayScale={displayScale}
data={chartData}
dataKey={"index"}
series={[{ name: "usage", color: "yellow.5" }]}
@@ -5,6 +5,7 @@ import { Box, Center, Group, Loader, ScrollArea, SimpleGrid, Stack, Text } from
import { clientApi } from "@homarr/api/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";
@@ -89,6 +90,7 @@ export default function SystemResources({
options,
width,
height,
displayScale,
displayMode,
}: WidgetComponentProps<"systemResources">) {
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}
/>
</Box>
)}
@@ -281,6 +293,7 @@ const SystemCharts = ({
hasShadow={options.hasShadow}
labelDisplayMode={labelDisplayMode}
advanced={isAdvanced}
displayScale={displayScale}
/>
</Box>
)}
@@ -291,11 +304,12 @@ const SystemCharts = ({
hasShadow={options.hasShadow}
labelDisplayMode={labelDisplayMode}
advanced={isAdvanced}
displayScale={displayScale}
/>
</Box>
)}
{showNetwork &&
(width >= 300 ? (
(responsiveWidth >= 300 ? (
<Group h="100%" gap="xs" grow wrap="nowrap">
<NetworkTrafficChart
usageOverTime={networkItems.map((network) => network.down)}
@@ -303,6 +317,7 @@ const SystemCharts = ({
hasShadow={options.hasShadow}
labelDisplayMode={labelDisplayMode}
advanced={isAdvanced}
displayScale={displayScale}
/>
<NetworkTrafficChart
usageOverTime={networkItems.map((network) => network.up)}
@@ -310,6 +325,7 @@ const SystemCharts = ({
hasShadow={options.hasShadow}
labelDisplayMode={labelDisplayMode}
advanced={isAdvanced}
displayScale={displayScale}
/>
</Group>
) : (
@@ -319,6 +335,7 @@ const SystemCharts = ({
hasShadow={options.hasShadow}
labelDisplayMode={labelDisplayMode}
advanced={isAdvanced}
displayScale={displayScale}
/>
</Box>
))}
+11 -2
View File
@@ -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();
+11 -2
View File
@@ -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) {
+6 -1
View File
@@ -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();
}
+5 -1
View File
@@ -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 });
+10 -2
View File
@@ -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,
+13 -6
View File
@@ -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<UpsStatus, string> = {
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();
}
+10 -2
View File
@@ -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();
}
+15 -1
View File
@@ -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,
+10 -2
View File
@@ -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,
+11 -8
View File
@@ -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 (
<Card
className={combineClasses(className)}
radius={radius}
p="xs"
bg="transparent"
style={{ overflow: "visible" }}
>
<Card className={combineClasses(className)} radius={radius} p="xs" bg="transparent" style={{ overflow: "visible" }}>
<Group justify="space-between" wrap="nowrap" gap="xs" miw={0}>
<Text size="xs" fw={500} lineClamp={1} miw={0}>
{update.name}