Compare commits

..
Author SHA1 Message Date
ajnart 1f64bcfbf1 fix(beszel): restore balanced system grid layout 2026-08-21 13:08:09 +02:00
33 changed files with 741 additions and 885 deletions

No files matched your search

@@ -20,7 +20,7 @@ import {
import { ScaledBoardCanvas } from "~/components/board/layout/scaled-board-canvas"; import { ScaledBoardCanvas } from "~/components/board/layout/scaled-board-canvas";
import { BoardEmptySection } from "~/components/board/sections/empty-section"; import { BoardEmptySection } from "~/components/board/sections/empty-section";
import { BoardGridEditorBoundary } from "~/components/board/sections/grid/board-grid-editor-boundary"; import { BoardGridEditorBoundary } from "~/components/board/sections/grid/board-grid-editor-boundary";
import { BoardGridPortalHost } from "~/components/board/sections/grid/grid-portal-host"; import { BoardGridPortalHost, BoardGridPortalRenderer } from "~/components/board/sections/grid/grid-portal-host";
import { BoardSectionCollapseProvider } from "~/components/board/sections/section-collapse"; import { BoardSectionCollapseProvider } from "~/components/board/sections/section-collapse";
import { BoardBackgroundVideo } from "~/components/layout/background"; import { BoardBackgroundVideo } from "~/components/layout/background";
import { BoardSelectionProvider } from "~/components/board/selection/board-selection-context"; import { BoardSelectionProvider } from "~/components/board/selection/board-selection-context";
@@ -80,6 +80,7 @@ export const ClientBoard = () => {
label={board.name} label={board.name}
> >
<BoardGridEditorBoundary key={currentLayoutId}> <BoardGridEditorBoundary key={currentLayoutId}>
<BoardGridPortalRenderer />
<div className={classes.columns} style={{ gridTemplateColumns }}> <div className={classes.columns} style={{ gridTemplateColumns }}>
{leftColumnCount > 0 && leftSection && ( {leftColumnCount > 0 && leftSection && (
<aside <aside
@@ -25,14 +25,12 @@ import type { WidgetComponentProps, WidgetDefinition, WidgetRuntimeRef } from "@
import { loadWidgetResources, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest"; import { loadWidgetResources, reduceWidgetOptionsWithDefinition } from "@homarr/widgets/manifest";
import type { SectionItem } from "~/app/[locale]/boards/_types"; import type { SectionItem } from "~/app/[locale]/boards/_types";
import { getLogicalTrackSize } from "~/components/board/layout";
import advancedFocusClasses from "../advanced-focus/advanced-focus.module.css"; import advancedFocusClasses from "../advanced-focus/advanced-focus.module.css";
import { useAdvancedFocus } from "../advanced-focus/context"; import { useAdvancedFocus } from "../advanced-focus/context";
import { startAdvancedFocusEntrance } from "../advanced-focus/entrance"; import { startAdvancedFocusEntrance } from "../advanced-focus/entrance";
import { getAdvancedFocusClosePosition, getAdvancedFocusRect } from "../advanced-focus/geometry"; import { getAdvancedFocusClosePosition, getAdvancedFocusRect } from "../advanced-focus/geometry";
import { AdvancedFocusManualSurface } from "../advanced-focus/manual-surface"; import { AdvancedFocusManualSurface } from "../advanced-focus/manual-surface";
import { redirectShiftWheel } from "../advanced-focus/wheel"; import { redirectShiftWheel } from "../advanced-focus/wheel";
import { useBoardGridPortalHost } from "../sections/grid/grid-portal-host";
import classes from "../sections/item.module.css"; import classes from "../sections/item.module.css";
import { useItemActions } from "./item-actions"; import { useItemActions } from "./item-actions";
import itemContentClasses from "./item-content.module.css"; import itemContentClasses from "./item-content.module.css";
@@ -105,11 +103,9 @@ const WidgetDefinitionLoadError = ({
); );
export const BoardItemContent = ({ item }: BoardItemContentProps) => { export const BoardItemContent = ({ item }: BoardItemContentProps) => {
const { ref, width: measuredWidth, height: measuredHeight } = useElementSize<HTMLDivElement>(); const { ref, width, height } = useElementSize<HTMLDivElement>();
const { getEntryRuntime } = useBoardGridPortalHost(); const widgetStateRef = useRef<Record<string, unknown> | null>(null);
const { widgetStateRef, widgetRuntimeRef } = getEntryRuntime(item.id, createBoardItemRuntime); const widgetRuntimeRef = useRef(createWidgetRuntimeState());
const width = measuredWidth || getLogicalTrackSize(item.width);
const height = measuredHeight || getLogicalTrackSize(item.height);
return ( return (
<ErrorBoundary <ErrorBoundary
@@ -138,11 +134,6 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
); );
}; };
const createBoardItemRuntime = () => ({
widgetStateRef: { current: null } as MutableRefObject<Record<string, unknown> | null>,
widgetRuntimeRef: { current: createWidgetRuntimeState() } as WidgetRuntimeRef,
});
interface LoadedBoardItemContentProps { interface LoadedBoardItemContentProps {
item: SectionItem; item: SectionItem;
width: number; width: number;
@@ -62,7 +62,7 @@ export const BoardContainerSection = ({ section }: Props) => {
radius={board.itemRadius} radius={board.itemRadius}
p={0} p={0}
> >
{options.collapsible && ( {options.collapsible && !isEditMode && (
<Button <Button
className={classes.containerToggle} className={classes.containerToggle}
pos="absolute" pos="absolute"
@@ -71,7 +71,7 @@ export const BoardContainerSection = ({ section }: Props) => {
w="100%" w="100%"
h={isVisuallyCollapsed ? "100%" : 24} h={isVisuallyCollapsed ? "100%" : 24}
px={12} px={12}
pe={isEditMode ? 48 : options.showOpenAll ? 40 : 12} pe={options.showOpenAll ? 40 : 12}
radius="sm" radius="sm"
variant="default" variant="default"
justify={options.showLabel ? "flex-start" : "center"} justify={options.showLabel ? "flex-start" : "center"}
@@ -101,7 +101,7 @@ export const BoardContainerSection = ({ section }: Props) => {
)} )}
</Button> </Button>
)} )}
{!isVisuallyCollapsed && !options.collapsible && options.showLabel && options.title && ( {!isVisuallyCollapsed && (!options.collapsible || isEditMode) && options.showLabel && options.title && (
<Badge <Badge
pos="absolute" pos="absolute"
top={-24} top={-24}
@@ -2,16 +2,13 @@
import type { ComponentType, PropsWithChildren } from "react"; import type { ComponentType, PropsWithChildren } from "react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { createPortal } from "react-dom";
import { useEditMode } from "@homarr/boards/edit-mode"; import { useEditMode } from "@homarr/boards/edit-mode";
import { getLoadedGridEditorModule, loadGridEditorAsync } from "./grid-editor-loader"; import { loadGridEditorAsync } from "./grid-editor-loader";
import { GridEditorRegistryProvider, useRegisteredGridEditors } from "./grid-editor-registry";
import { GridEditorRuntimeProvider } from "./grid-editor-runtime"; import { GridEditorRuntimeProvider } from "./grid-editor-runtime";
type BoardGridEditorProviderComponent = ComponentType<PropsWithChildren>; type BoardGridEditorProviderComponent = ComponentType<PropsWithChildren>;
type LoadedGridEditorModule = Awaited<ReturnType<typeof loadGridEditorAsync>>;
/** /**
* Keeps the dnd-kit runtime outside the read-only bundle while guaranteeing * Keeps the dnd-kit runtime outside the read-only bundle while guaranteeing
@@ -19,20 +16,17 @@ type LoadedGridEditorModule = Awaited<ReturnType<typeof loadGridEditorAsync>>;
*/ */
export const BoardGridEditorBoundary = ({ children }: PropsWithChildren) => { export const BoardGridEditorBoundary = ({ children }: PropsWithChildren) => {
const [isEditMode] = useEditMode(); const [isEditMode] = useEditMode();
const [EditorModule, setEditorModule] = useState<LoadedGridEditorModule | null>( const [Provider, setProvider] = useState<BoardGridEditorProviderComponent | null>(null);
getLoadedGridEditorModule() ?? null,
);
const [hasLoadError, setHasLoadError] = useState(false); const [hasLoadError, setHasLoadError] = useState(false);
const resolvedEditorModule = EditorModule ?? getLoadedGridEditorModule() ?? null;
useEffect(() => { useEffect(() => {
if (!isEditMode || resolvedEditorModule) return; if (!isEditMode || Provider) return;
let cancelled = false; let cancelled = false;
setHasLoadError(false); setHasLoadError(false);
void loadGridEditorAsync() void loadGridEditorAsync()
.then((module) => { .then((module) => {
if (!cancelled) setEditorModule(module); if (!cancelled) setProvider(() => module.BoardGridEditorProvider);
}) })
.catch(() => { .catch(() => {
if (!cancelled) setHasLoadError(true); if (!cancelled) setHasLoadError(true);
@@ -41,34 +35,23 @@ export const BoardGridEditorBoundary = ({ children }: PropsWithChildren) => {
return () => { return () => {
cancelled = true; cancelled = true;
}; };
}, [isEditMode, resolvedEditorModule]); }, [Provider, isEditMode]);
const runtimeStatus = !isEditMode if (!isEditMode) {
? "idle" return <GridEditorRuntimeProvider status="idle">{children}</GridEditorRuntimeProvider>;
: hasLoadError }
? "error"
: resolvedEditorModule if (hasLoadError) {
? "ready" return <GridEditorRuntimeProvider status="error">{children}</GridEditorRuntimeProvider>;
: "loading"; }
const Provider: BoardGridEditorProviderComponent | null = resolvedEditorModule?.BoardGridEditorProvider ?? null;
const GridEditor = resolvedEditorModule?.default ?? null; if (!Provider) {
return <GridEditorRuntimeProvider status="loading">{children}</GridEditorRuntimeProvider>;
}
return ( return (
<GridEditorRegistryProvider> <GridEditorRuntimeProvider status="ready">
<GridEditorRuntimeProvider status={runtimeStatus}>{children}</GridEditorRuntimeProvider> <Provider>{children}</Provider>
{isEditMode && Provider && GridEditor && ( </GridEditorRuntimeProvider>
<Provider>
<RegisteredGridEditors GridEditor={GridEditor} />
</Provider>
)}
</GridEditorRegistryProvider>
);
};
const RegisteredGridEditors = ({ GridEditor }: { GridEditor: LoadedGridEditorModule["default"] }) => {
const editors = useRegisteredGridEditors();
return Array.from(editors.values(), ({ host, disabled, ...props }) =>
disabled ? null : createPortal(<GridEditor {...props} />, host, props.sectionId),
); );
}; };
@@ -1,7 +1,7 @@
"use client"; "use client";
import type { FocusEvent, KeyboardEvent, PropsWithChildren } from "react"; import type { FocusEvent, KeyboardEvent, PropsWithChildren } from "react";
import { useCallback, useId, useRef, useState } from "react"; import { useId, useRef, useState } from "react";
import { Box } from "@mantine/core"; import { Box } from "@mantine/core";
import combineClasses from "clsx"; import combineClasses from "clsx";
@@ -34,7 +34,7 @@ interface FixedGridItemProps {
/** /**
* Static SSR geometry in view mode and the stable content/keyboard handle in * Static SSR geometry in view mode and the stable content/keyboard handle in
* edit mode. The focused tile owns grid-based keyboard movement while dnd-kit * edit mode. The focused tile owns grid-based keyboard movement while dnd-kit
* binds pointer and touch input to this same element without replacing it. * handles pointer and touch input on the outer editor shell.
*/ */
export const FixedGridItem = ({ export const FixedGridItem = ({
item, item,
@@ -46,16 +46,11 @@ export const FixedGridItem = ({
const runtimeStatus = useGridEditorRuntimeStatus(); const runtimeStatus = useGridEditorRuntimeStatus();
const currentLayoutId = useCurrentLayout(); const currentLayoutId = useCurrentLayout();
const t = useI18n(); const t = useI18n();
const { section, columnCount, maxRowCount, placements, interactionDisabled, announce, entryElementStore } = const { section, items, innerSections, columnCount, maxRowCount, announce } = useSectionContext();
useSectionContext();
const { commitSectionGrid } = useGridLayoutActions(); const { commitSectionGrid } = useGridLayoutActions();
const [isKeyboardEditing, setIsKeyboardEditing] = useState(false); const [isKeyboardEditing, setIsKeyboardEditing] = useState(false);
const { isSelected, toggleSelectItem } = useBoardSelection(); const { isSelected, toggleSelectItem } = useBoardSelection();
const selected = item.type === "item" && isSelected(item.id); const selected = item.type === "item" && isSelected(item.id);
const registerElement = useCallback(
(element: HTMLDivElement | null) => entryElementStore.register(item.id, element),
[entryElementStore, item.id],
);
const handleClickCapture = (event: React.MouseEvent) => { const handleClickCapture = (event: React.MouseEvent) => {
if (!isEditorActive || item.type !== "item" || (!event.metaKey && !event.ctrlKey)) return; if (!isEditorActive || item.type !== "item" || (!event.metaKey && !event.ctrlKey)) return;
@@ -65,14 +60,15 @@ export const FixedGridItem = ({
toggleSelectItem(item.id); toggleSelectItem(item.id);
}; };
const instructionsId = useId(); const instructionsId = useId();
const isEditorActive = isEditMode && runtimeStatus === "ready" && !interactionDisabled; const isEditorActive = isEditMode && runtimeStatus === "ready";
const placement = toPlacement(item); const placement = toPlacement(item);
const renderedPlacements = [...items, ...innerSections].map(toPlacement);
const keyboardGridRef = useRef<{ const keyboardGridRef = useRef<{
source: readonly SectionGridPlacement[]; source: readonly SectionGridPlacement[];
current: readonly SectionGridPlacement[]; current: readonly SectionGridPlacement[];
}>({ }>({
source: placements, source: renderedPlacements,
current: placements, current: renderedPlacements,
}); });
const displayName = const displayName =
item.type === "item" item.type === "item"
@@ -115,14 +111,14 @@ export const FixedGridItem = ({
setKeyboardEditing(false); setKeyboardEditing(false);
return; return;
} }
if (!arePlacementListsEqual(keyboardGridRef.current.source, placements)) { if (!arePlacementListsEqual(keyboardGridRef.current.source, renderedPlacements)) {
keyboardGridRef.current = { keyboardGridRef.current = {
source: placements, source: renderedPlacements,
current: placements, current: renderedPlacements,
}; };
} }
const currentPlacements = keyboardGridRef.current.current; const placements = keyboardGridRef.current.current;
const current = currentPlacements.find((candidate) => candidate.id === item.id); const current = placements.find((candidate) => candidate.id === item.id);
if (!current) return; if (!current) return;
let transaction: GridTransaction<SectionGridPlacement>; let transaction: GridTransaction<SectionGridPlacement>;
@@ -134,7 +130,7 @@ export const FixedGridItem = ({
id: section.id, id: section.id,
columnCount, columnCount,
maxRowCount, maxRowCount,
placements: currentPlacements, placements,
}, },
], ],
}, },
@@ -142,8 +138,8 @@ export const FixedGridItem = ({
); );
} catch { } catch {
keyboardGridRef.current = { keyboardGridRef.current = {
source: currentPlacements, source: renderedPlacements,
current: currentPlacements, current: renderedPlacements,
}; };
setKeyboardEditing(false); setKeyboardEditing(false);
return; return;
@@ -192,22 +188,13 @@ export const FixedGridItem = ({
return ( return (
<Box <Box
ref={registerElement}
{...semantics} {...semantics}
onClickCapture={handleClickCapture} onClickCapture={handleClickCapture}
data-board-item-selected={selected ? "true" : undefined} data-board-item-selected={selected ? "true" : undefined}
className={combineClasses( className={combineClasses(isEditorActive ? classes.editorEntry : classes.staticItem)}
classes.staticItem, style={isEditorActive ? { position: "relative", width: "100%", height: "100%" } : getLogicalItemStyle(placement)}
isEditorActive && "board-grid-entry", data-grid-item-id={isEditorActive ? undefined : item.id}
isEditorActive && classes.editorEntry, data-grid-item-type={isEditorActive ? undefined : item.type}
)}
style={getLogicalItemStyle(placement)}
data-grid-item-id={item.id}
data-grid-item-type={item.type}
data-grid-x={placement.x}
data-grid-y={placement.y}
data-grid-w={placement.w}
data-grid-h={placement.h}
data-editor-grid-entry={isEditorActive ? "true" : undefined} data-editor-grid-entry={isEditorActive ? "true" : undefined}
data-type={item.type} data-type={item.type}
data-kind={item.kind} data-kind={item.kind}
@@ -222,7 +209,7 @@ export const FixedGridItem = ({
onBlur={isEditorActive ? handleBlur : undefined} onBlur={isEditorActive ? handleBlur : undefined}
onKeyDown={isEditorActive ? handleKeyboard : undefined} onKeyDown={isEditorActive ? handleKeyboard : undefined}
> >
<div className={combineClasses("board-grid-content-mount", classes.contentMount)}>{children}</div> {children}
{isEditorActive && ( {isEditorActive && (
<span id={instructionsId} className={classes.liveRegion}> <span id={instructionsId} className={classes.liveRegion}>
{t("item.moveResize.keyboard.instructions")} {t("item.moveResize.keyboard.instructions")}
@@ -3,24 +3,16 @@
import type * as GridEditorModule from "./grid-editor"; import type * as GridEditorModule from "./grid-editor";
let editorModulePromise: Promise<typeof GridEditorModule> | undefined; let editorModulePromise: Promise<typeof GridEditorModule> | undefined;
let editorModule: typeof GridEditorModule | undefined;
export const loadGridEditorAsync = () => { export const loadGridEditorAsync = () => {
editorModulePromise ??= import("./grid-editor") editorModulePromise ??= import("./grid-editor").catch((error: unknown) => {
.then((loadedModule) => { editorModulePromise = undefined;
editorModule = loadedModule; throw error;
return loadedModule; });
})
.catch((error: unknown) => {
editorModulePromise = undefined;
throw error;
});
return editorModulePromise; return editorModulePromise;
}; };
export const getLoadedGridEditorModule = () => editorModule;
export const scheduleGridEditorWarmup = (loadAsync: () => Promise<unknown>) => { export const scheduleGridEditorWarmup = (loadAsync: () => Promise<unknown>) => {
let animationFrameId: number | undefined; let animationFrameId: number | undefined;
let idleCallbackId: number | undefined; let idleCallbackId: number | undefined;
@@ -1,117 +0,0 @@
"use client";
import type { PropsWithChildren } from "react";
import { createContext, useContext, useState, useSyncExternalStore } from "react";
import type { ContainerSectionItem, Section, SectionItem } from "~/app/[locale]/boards/_types";
import type { SectionGridPlacement } from "./use-grid-layout-actions";
export interface GridEntryElementSnapshot {
revision: number;
elements: ReadonlyMap<string, HTMLElement>;
}
export interface GridEntryElementStore {
getSnapshot: () => GridEntryElementSnapshot;
subscribe: (listener: () => void) => () => void;
register: (id: string, element: HTMLElement | null) => void;
}
export const createGridEntryElementStore = (): GridEntryElementStore => {
const elements = new Map<string, HTMLElement>();
const listeners = new Set<() => void>();
let snapshot: GridEntryElementSnapshot = { revision: 0, elements };
return {
getSnapshot: () => snapshot,
subscribe: (listener) => {
listeners.add(listener);
return () => listeners.delete(listener);
},
register: (id, element) => {
const current = elements.get(id);
if (element ? current === element : current === undefined) return;
if (element) elements.set(id, element);
else elements.delete(id);
snapshot = { revision: snapshot.revision + 1, elements };
for (const listener of listeners) listener();
},
};
};
export interface GridEditorRenderProps {
sectionId: string;
columnCount: number;
rowCount: number;
maxRowCount: number | null;
placements: readonly SectionGridPlacement[];
transactionPlacements: readonly SectionGridPlacement[];
className: string;
section: Exclude<Section, { kind: "container" }> | ContainerSectionItem;
items: SectionItem[];
innerSections: ContainerSectionItem[];
entryElementStore: GridEntryElementStore;
}
export interface RegisteredGridEditor extends GridEditorRenderProps {
host: HTMLElement;
disabled: boolean;
}
interface GridEditorRegistrySnapshot {
revision: number;
editors: ReadonlyMap<string, RegisteredGridEditor>;
}
interface GridEditorRegistry {
getSnapshot: () => GridEditorRegistrySnapshot;
subscribe: (listener: () => void) => () => void;
register: (editor: RegisteredGridEditor) => () => void;
}
const createGridEditorRegistry = (): GridEditorRegistry => {
const editors = new Map<string, RegisteredGridEditor>();
const listeners = new Set<() => void>();
let snapshot: GridEditorRegistrySnapshot = { revision: 0, editors };
const publish = () => {
snapshot = { revision: snapshot.revision + 1, editors };
for (const listener of listeners) listener();
};
return {
getSnapshot: () => snapshot,
subscribe: (listener) => {
listeners.add(listener);
return () => listeners.delete(listener);
},
register: (editor) => {
editors.set(editor.sectionId, editor);
publish();
return () => {
if (editors.get(editor.sectionId) !== editor) return;
editors.delete(editor.sectionId);
publish();
};
},
};
};
const GridEditorRegistryContext = createContext<GridEditorRegistry | null>(null);
export const GridEditorRegistryProvider = ({ children }: PropsWithChildren) => {
const [registry] = useState(createGridEditorRegistry);
return <GridEditorRegistryContext.Provider value={registry}>{children}</GridEditorRegistryContext.Provider>;
};
export const useGridEditorRegistry = () => {
const registry = useContext(GridEditorRegistryContext);
if (!registry) throw new Error("GridEditorRegistryProvider is required");
return registry;
};
export const useRegisteredGridEditors = () => {
const registry = useGridEditorRegistry();
return useSyncExternalStore(registry.subscribe, registry.getSnapshot, registry.getSnapshot).editors;
};
@@ -3,7 +3,6 @@
inset: 0 auto auto 0; inset: 0 auto auto 0;
overflow: visible; overflow: visible;
border-radius: var(--mantine-radius-md); border-radius: var(--mantine-radius-md);
pointer-events: none;
} }
.board-grid-entry { .board-grid-entry {
@@ -23,13 +22,6 @@
will-change: translate; will-change: translate;
} }
.board-grid-entry[data-grid-preview="true"]:not([data-dnd-active="true"]) {
transition:
translate 100ms ease,
width 100ms ease,
height 100ms ease;
}
.board-grid-entry[data-dnd-active="true"], .board-grid-entry[data-dnd-active="true"],
.board-grid-entry[data-dnd-drag-source="true"] { .board-grid-entry[data-dnd-drag-source="true"] {
z-index: 1000; z-index: 1000;
@@ -109,12 +101,24 @@
zoom: var(--board-grid-overlay-content-zoom, 1); zoom: var(--board-grid-overlay-content-zoom, 1);
} }
body[data-board-grid-interacting] .board-grid-entry[data-dnd-active="true"], body[data-board-grid-interacting] .board-grid-entry,
body[data-board-grid-interacting] .board-grid-entry[data-dnd-drag-source="true"],
body[data-board-grid-interacting] .board-grid-placeholder { body[data-board-grid-interacting] .board-grid-placeholder {
transition: none; transition: none;
} }
.board-grid-content-mount,
.board-grid-portal-content,
.board-grid-portal-content > [data-editor-grid-entry] {
width: 100%;
height: 100%;
overflow: visible;
}
.board-grid-content-mount {
position: absolute;
inset: 0;
}
body[data-board-grid-interacting="resize"] .board-grid-entry[data-dnd-active="true"] > .board-grid-content-mount { body[data-board-grid-interacting="resize"] .board-grid-entry[data-dnd-active="true"] > .board-grid-content-mount {
overflow: clip; overflow: clip;
} }
@@ -13,7 +13,6 @@ import {
useState, useState,
useSyncExternalStore, useSyncExternalStore,
} from "react"; } from "react";
import { createPortal } from "react-dom";
import "./grid-editor.css"; // oxlint-disable-line import/no-unassigned-import import "./grid-editor.css"; // oxlint-disable-line import/no-unassigned-import
@@ -38,7 +37,8 @@ import { IconGripHorizontal, IconGripVertical } from "@tabler/icons-react";
import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context"; import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
import { useI18n } from "@homarr/translation/client"; import { useI18n } from "@homarr/translation/client";
import { getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout"; import { getLogicalItemStyle, getLogicalTrackSize, LOGICAL_GRID_PITCH } from "~/components/board/layout";
import { useSectionContext } from "../section-context";
import { import {
beginGridTransaction, beginGridTransaction,
cancelGridTransaction, cancelGridTransaction,
@@ -57,18 +57,27 @@ import type { DragProjectionOrigin, GridResizeDirection, GridTransaction, Transa
import type { DndGridEntryProps } from "./grid-entry-memo"; import type { DndGridEntryProps } from "./grid-entry-memo";
import { areDndGridEntryPropsEqual } from "./grid-entry-memo"; import { areDndGridEntryPropsEqual } from "./grid-entry-memo";
import { getGridDepth } from "./grid-depth"; import { getGridDepth } from "./grid-depth";
import type { GridEditorRenderProps } from "./grid-editor-registry";
import { createGridInteractionStore } from "./grid-interaction-store"; import { createGridInteractionStore } from "./grid-interaction-store";
import { useBoardGridPortalHost } from "./grid-portal-host"; import { useBoardGridPortalHost } from "./grid-portal-host";
import type { GridInteraction } from "./grid-preview-layer"; import type { GridInteraction } from "./grid-preview-layer";
import { GridPreviewLayer } from "./grid-preview-layer"; import { GridPreviewLayer } from "./grid-preview-layer";
import { createGridResizeOutlineController } from "./grid-resize-outline"; import { createGridResizeOutlineController } from "./grid-resize-outline";
import { useBoardSelection } from "~/components/board/selection/board-selection-context";
import type { CommitSectionGridInput, SectionGridPlacement } from "./use-grid-layout-actions"; import type { CommitSectionGridInput, SectionGridPlacement } from "./use-grid-layout-actions";
import { useGridLayoutActions } from "./use-grid-layout-actions"; import { useGridLayoutActions } from "./use-grid-layout-actions";
const GRID_ENTRY_TYPE = "homarr-board-grid-entry"; const GRID_ENTRY_TYPE = "homarr-board-grid-entry";
const GRID_TARGET_TYPE = "homarr-board-grid-target"; const GRID_TARGET_TYPE = "homarr-board-grid-target";
interface GridEditorProps {
sectionId: string;
columnCount: number;
rowCount: number;
maxRowCount: number | null;
placements: readonly SectionGridPlacement[];
className: string;
}
interface GridEntryData { interface GridEntryData {
kind: typeof GRID_ENTRY_TYPE; kind: typeof GRID_ENTRY_TYPE;
sectionId: string; sectionId: string;
@@ -718,22 +727,14 @@ export default function GridEditor({
rowCount, rowCount,
maxRowCount, maxRowCount,
placements, placements,
transactionPlacements,
className, className,
section, }: GridEditorProps) {
items,
innerSections,
entryElementStore,
}: GridEditorRenderProps) {
const t = useI18n(); const t = useI18n();
const { section, items, innerSections } = useSectionContext();
const { registerGrid, getDepth, isDropTargetEligible } = useBoardGridEditorActions(); const { registerGrid, getDepth, isDropTargetEligible } = useBoardGridEditorActions();
const interactionStore = useBoardGridEditorInteractionStore(); const interactionStore = useBoardGridEditorInteractionStore();
const gridRef = useRef<HTMLDivElement>(null); const gridRef = useRef<HTMLDivElement>(null);
const entryElements = useSyncExternalStore( const [entryElements] = useState(() => new Map<string, HTMLElement>());
entryElementStore.subscribe,
entryElementStore.getSnapshot,
entryElementStore.getSnapshot,
).elements;
const parentGridId = "parentSectionId" in section ? section.parentSectionId : null; const parentGridId = "parentSectionId" in section ? section.parentSectionId : null;
const ownerPlacementId = "parentSectionId" in section ? section.id : null; const ownerPlacementId = "parentSectionId" in section ? section.id : null;
const depth = getDepth(sectionId); const depth = getDepth(sectionId);
@@ -768,6 +769,14 @@ export default function GridEditor({
}, },
[droppableRef], [droppableRef],
); );
const registerEntryElement = useCallback(
(id: string, element: HTMLElement | null) => {
if (element) entryElements.set(id, element);
else entryElements.delete(id);
},
[entryElements],
);
useLayoutEffect(() => { useLayoutEffect(() => {
const element = gridRef.current; const element = gridRef.current;
if (!element) return; if (!element) return;
@@ -777,11 +786,11 @@ export default function GridEditor({
maxRowCount, maxRowCount,
parentGridId, parentGridId,
ownerPlacementId, ownerPlacementId,
placements: transactionPlacements, placements,
depth, depth,
element, element,
}); });
}, [columnCount, depth, maxRowCount, ownerPlacementId, parentGridId, registerGrid, sectionId, transactionPlacements]); }, [columnCount, depth, maxRowCount, ownerPlacementId, parentGridId, placements, registerGrid, sectionId]);
return ( return (
<div <div
@@ -806,7 +815,7 @@ export default function GridEditor({
label={labelById.get(placement.id) ?? placement.id} label={labelById.get(placement.id) ?? placement.id}
columnCount={columnCount} columnCount={columnCount}
maxRowCount={maxRowCount} maxRowCount={maxRowCount}
element={entryElements.get(placement.id) ?? null} registerElement={registerEntryElement}
/> />
); );
})} })}
@@ -835,18 +844,24 @@ const DndGridEntryComponent = ({
label, label,
columnCount, columnCount,
maxRowCount, maxRowCount,
element, registerElement,
}: DndGridEntryProps) => { }: DndGridEntryProps) => {
const { acquireContainer, structureRevision } = useBoardGridPortalHost();
const { beginResize, previewResize, completeResize, cancelResize } = useBoardGridEditorActions(); const { beginResize, previewResize, completeResize, cancelResize } = useBoardGridEditorActions();
const { isSelected } = useBoardSelection();
const board = useRequiredBoard();
const isSelectedEntry = placement.type === "item" && isSelected(placement.id);
const mountRef = useRef<HTMLDivElement>(null);
const shellRef = useRef<HTMLDivElement>(null);
const placementRef = useRef(placement); const placementRef = useRef(placement);
placementRef.current = placement; placementRef.current = placement;
const resizeOutlineController = useMemo( const resizeOutlineController = useMemo(
() => () =>
createGridResizeOutlineController( createGridResizeOutlineController(
() => element, () => shellRef.current,
() => placementRef.current, () => placementRef.current,
), ),
[element], [],
); );
const sourceData = useMemo<GridEntryData>( const sourceData = useMemo<GridEntryData>(
() => ({ kind: GRID_ENTRY_TYPE, sectionId, placement, label }), () => ({ kind: GRID_ENTRY_TYPE, sectionId, placement, label }),
@@ -867,39 +882,67 @@ const DndGridEntryComponent = ({
const modifiers = useMemo( const modifiers = useMemo(
() => [ () => [
RestrictToElement.configure({ RestrictToElement.configure({
element: () => element?.closest('[data-testid="board-canvas"]') ?? null, element: () => shellRef.current?.closest('[data-testid="board-canvas"]') ?? null,
}), }),
], ],
[element], [],
); );
const { isDragSource, isDropping } = useDraggable<GridEntryData>({ const {
ref: draggableRef,
handleRef,
isDragSource,
isDropping,
} = useDraggable<GridEntryData>({
id: placement.id, id: placement.id,
type: GRID_ENTRY_TYPE, type: GRID_ENTRY_TYPE,
data: sourceData, data: sourceData,
element,
handle: element,
disabled: element === null,
sensors, sensors,
modifiers, modifiers,
}); });
const setShellRef = useCallback(
(element: HTMLDivElement | null) => {
shellRef.current = element;
registerElement(placement.id, element);
draggableRef(element);
handleRef(element);
},
[draggableRef, handleRef, placement.id, registerElement],
);
useEffect(() => () => resizeOutlineController.destroy(), [resizeOutlineController]); useEffect(() => () => resizeOutlineController.destroy(), [resizeOutlineController]);
useLayoutEffect(() => { useLayoutEffect(() => {
if (!element) return; const mount = mountRef.current;
if (isDragSource) element.dataset.dndDragSource = "true"; if (!mount) return;
else delete element.dataset.dndDragSource; const container = acquireContainer(placement.id);
if (isDropping) element.dataset.dndDropping = "true"; mount.replaceChildren(container);
else delete element.dataset.dndDropping;
return () => { return () => {
delete element.dataset.dndDragSource; if (container.parentElement === mount) container.remove();
delete element.dataset.dndDropping;
}; };
}, [element, isDragSource, isDropping]); }, [acquireContainer, placement.id, structureRevision]);
if (!element) return null; return (
<div
return createPortal( ref={setShellRef}
<> className="board-grid-entry"
style={
{
...getLogicalItemStyle(placement),
"--board-item-radius": `var(--mantine-radius-${board.itemRadius})`,
} as CSSProperties
}
data-grid-item-id={placement.id}
data-grid-item-type={placement.type}
data-grid-x={placement.x}
data-grid-y={placement.y}
data-grid-w={placement.w}
data-grid-h={placement.h}
data-dnd-drag-source={isDragSource ? "true" : undefined}
data-dnd-dropping={isDropping ? "true" : undefined}
data-board-item-selected={isSelectedEntry ? "true" : undefined}
>
<div ref={mountRef} className="board-grid-content-mount" />
<GridResizeHandles <GridResizeHandles
sectionId={sectionId} sectionId={sectionId}
placement={placement} placement={placement}
@@ -912,9 +955,7 @@ const DndGridEntryComponent = ({
cancelResize={cancelResize} cancelResize={cancelResize}
scheduleResizeOutline={resizeOutlineController.schedule} scheduleResizeOutline={resizeOutlineController.schedule}
/> />
</>, </div>
element,
`board-grid-resize-handles:${placement.id}`,
); );
}; };
@@ -6,7 +6,7 @@ export interface DndGridEntryProps {
label: string; label: string;
columnCount: number; columnCount: number;
maxRowCount: number | null; maxRowCount: number | null;
element: HTMLElement | null; registerElement: (id: string, element: HTMLElement | null) => void;
} }
export const areDndGridEntryPropsEqual = (previous: DndGridEntryProps, next: DndGridEntryProps) => export const areDndGridEntryPropsEqual = (previous: DndGridEntryProps, next: DndGridEntryProps) =>
@@ -14,7 +14,7 @@ export const areDndGridEntryPropsEqual = (previous: DndGridEntryProps, next: Dnd
previous.label === next.label && previous.label === next.label &&
previous.columnCount === next.columnCount && previous.columnCount === next.columnCount &&
previous.maxRowCount === next.maxRowCount && previous.maxRowCount === next.maxRowCount &&
previous.element === next.element && previous.registerElement === next.registerElement &&
previous.placement.id === next.placement.id && previous.placement.id === next.placement.id &&
previous.placement.type === next.placement.type && previous.placement.type === next.placement.type &&
previous.placement.x === next.placement.x && previous.placement.x === next.placement.x &&
@@ -2,23 +2,38 @@
import type { PropsWithChildren } from "react"; import type { PropsWithChildren } from "react";
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react"; import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
import { createPortal } from "react-dom";
import type { RouterOutputs } from "@homarr/api"; import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client"; import { clientApi } from "@homarr/api/client";
import { useSession } from "@homarr/auth/client"; import { useSession } from "@homarr/auth/client";
import { useRequiredBoard } from "@homarr/boards/context"; import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
import { useEditMode } from "@homarr/boards/edit-mode"; import { useEditMode } from "@homarr/boards/edit-mode";
import { getRootSectionLane } from "@homarr/definitions";
import type { ContainerSectionItem, Section } from "~/app/[locale]/boards/_types";
import { getBoardLaneColumnCount, normalizeGridPlacement } from "~/components/board/layout";
import { SectionContentItem } from "../content";
import { SectionProvider } from "../section-context";
import { useSectionItems } from "../use-section-items";
import classes from "./section-grid.module.css"; import classes from "./section-grid.module.css";
interface GridPortalHostContextValue { interface GridPortalHostContextValue {
announce: (message: string) => void; announce: (message: string) => void;
integrations: RouterOutputs["integration"]["all"] | undefined; integrations: RouterOutputs["integration"]["all"] | undefined;
getEntryRuntime: <TRuntime>(entryId: string, createRuntime: () => TRuntime) => TRuntime; containers: ReadonlyMap<string, HTMLElement>;
acquireContainer: (id: string) => HTMLElement;
structureRevision: string;
} }
const GridPortalHostContext = createContext<GridPortalHostContextValue | null>(null); const GridPortalHostContext = createContext<GridPortalHostContextValue | null>(null);
/** Shared board-grid services for editor announcements and integration data. */ /**
* One portal registry owns every edit-mode item on the board. Its content
* containers are stable even when drag-and-drop replaces or transfers the
* outer positioning shell, so moving between grids does not remount widget
* content.
*/
export const BoardGridPortalHost = ({ children }: PropsWithChildren) => { export const BoardGridPortalHost = ({ children }: PropsWithChildren) => {
const board = useRequiredBoard(); const board = useRequiredBoard();
const { data: session } = useSession(); const { data: session } = useSession();
@@ -26,27 +41,51 @@ export const BoardGridPortalHost = ({ children }: PropsWithChildren) => {
const { data: integrations } = clientApi.integration.all.useQuery(undefined, { const { data: integrations } = clientApi.integration.all.useQuery(undefined, {
enabled: Boolean(session) && isEditMode, enabled: Boolean(session) && isEditMode,
}); });
const containersRef = useRef<Map<string, HTMLElement>>(new Map());
const [containers, setContainers] = useState<Map<string, HTMLElement>>(() => new Map());
const [announcement, setAnnouncement] = useState({ id: 0, message: "" }); const [announcement, setAnnouncement] = useState({ id: 0, message: "" });
const entryRuntimesRef = useRef(new Map<string, unknown>());
const announce = useCallback((message: string) => { const announce = useCallback((message: string) => {
setAnnouncement((previous) => ({ id: previous.id + 1, message })); setAnnouncement((previous) => ({ id: previous.id + 1, message }));
}, []); }, []);
const getEntryRuntime = useCallback(<TRuntime,>(entryId: string, createRuntime: () => TRuntime): TRuntime => { const liveEntryIds = useMemo(
const existing = entryRuntimesRef.current.get(entryId); () => new Set([...board.items.map((item) => item.id), ...board.sections.map((section) => section.id)]),
if (existing !== undefined) return existing as TRuntime; [board.items, board.sections],
const runtime = createRuntime(); );
entryRuntimesRef.current.set(entryId, runtime); const structureRevision = useMemo(() => [...liveEntryIds].toSorted().join(":"), [liveEntryIds]);
return runtime;
const acquireContainer = useCallback((id: string) => {
const existing = containersRef.current.get(id);
if (existing) return existing;
const container = document.createElement("div");
container.className = "board-grid-portal-content";
container.dataset.boardGridPortal = id;
containersRef.current.set(id, container);
setContainers(new Map(containersRef.current));
return container;
}, []); }, []);
const liveItemIds = useMemo(() => new Set(board.items.map((item) => item.id)), [board.items]);
useEffect(() => { useEffect(() => {
for (const entryId of entryRuntimesRef.current.keys()) { // A cross-grid move can briefly have no shell, but the entry still exists
if (!liveItemIds.has(entryId)) entryRuntimesRef.current.delete(entryId); // on the board. Only remove containers whose board entity was deleted.
let didPrune = false;
for (const id of containersRef.current.keys()) {
if (liveEntryIds.has(id)) continue;
containersRef.current.delete(id);
didPrune = true;
} }
}, [liveItemIds]); if (didPrune) setContainers(new Map(containersRef.current));
}, [liveEntryIds]);
const value = useMemo<GridPortalHostContextValue>( const value = useMemo<GridPortalHostContextValue>(
() => ({ announce, integrations, getEntryRuntime }), () => ({
[announce, getEntryRuntime, integrations], announce,
integrations,
containers,
acquireContainer,
structureRevision,
}),
[acquireContainer, announce, containers, integrations, structureRevision],
); );
return ( return (
@@ -59,8 +98,158 @@ export const BoardGridPortalHost = ({ children }: PropsWithChildren) => {
); );
}; };
/**
* Renders stable portal content at this component's logical React position.
* Keep it inside the editor runtime and dnd-kit providers so portaled entries
* inherit the same keyboard, transaction, and nested-grid contexts as shells.
*/
export const BoardGridPortalRenderer = () => {
const board = useRequiredBoard();
const currentLayoutId = useCurrentLayout();
const { announce, containers, integrations } = useBoardGridPortalHost();
return (
<>
{Array.from(containers, ([id, container]) => {
const ownerSectionId = getOwnerSectionId(board, currentLayoutId, id);
return ownerSectionId
? createPortal(
<GridPortalContent
itemId={id}
ownerSectionId={ownerSectionId}
integrations={integrations}
announce={announce}
/>,
container,
id,
)
: null;
})}
</>
);
};
export const useBoardGridPortalHost = () => { export const useBoardGridPortalHost = () => {
const context = useContext(GridPortalHostContext); const context = useContext(GridPortalHostContext);
if (!context) throw new Error("BoardGridPortalHost is required"); if (!context) throw new Error("BoardGridPortalHost is required");
return context; return context;
}; };
interface GridPortalContentProps {
itemId: string;
ownerSectionId: string;
integrations: RouterOutputs["integration"]["all"] | undefined;
announce: (message: string) => void;
}
const GridPortalContent = ({ itemId, ownerSectionId, integrations, announce }: GridPortalContentProps) => {
const board = useRequiredBoard();
const currentLayoutId = useCurrentLayout();
const { items, innerSections } = useSectionItems(ownerSectionId);
const currentLayout = board.layouts.find((layout) => layout.id === currentLayoutId);
const section = currentLayout ? getRenderedSection(board, currentLayout, ownerSectionId) : null;
if (!section || !currentLayout) return null;
const columnCount = getSectionColumnCount(section, currentLayout);
if (columnCount < 1) return null;
const renderedItems = items.map((item) => normalizePortalEntry(item, columnCount));
const renderedInnerSections = innerSections.map((innerSection) => normalizePortalEntry(innerSection, columnCount));
const entry = [...renderedItems, ...renderedInnerSections].find((candidate) => candidate.id === itemId);
if (!entry) return null;
const configuredMaxRowCount = section.kind === "container" ? section.height : null;
const contentRowCount = Math.max(
1,
...renderedItems.map((item) => item.yOffset + item.height),
...renderedInnerSections.map((innerSection) => innerSection.yOffset + innerSection.height),
);
const maxRowCount = configuredMaxRowCount === null ? null : Math.max(configuredMaxRowCount, contentRowCount);
return (
<SectionProvider
value={{
section,
items: renderedItems,
innerSections: renderedInnerSections,
integrations,
columnCount,
maxRowCount,
announce,
}}
>
<SectionContentItem item={entry} integrations={integrations} />
</SectionProvider>
);
};
const getRenderedSection = (
board: ReturnType<typeof useRequiredBoard>,
currentLayout: ReturnType<typeof useRequiredBoard>["layouts"][number],
sectionId: string,
visited = new Set<string>(),
): Exclude<Section, { kind: "container" }> | ContainerSectionItem | null => {
const section = board.sections.find((candidate) => candidate.id === sectionId);
if (!section) return null;
if (section.kind !== "container") return section;
if (visited.has(section.id)) return null;
const layout = section.layouts.find((candidate) => candidate.layoutId === currentLayout.id);
if (!layout) return null;
const parentSection = getRenderedSection(
board,
currentLayout,
layout.parentSectionId,
new Set(visited).add(section.id),
);
if (!parentSection) return null;
const parentColumnCount = getSectionColumnCount(parentSection, currentLayout);
if (parentColumnCount < 1) return null;
const normalized = normalizePortalEntry(layout, parentColumnCount);
return {
...section,
...normalized,
type: "section",
};
};
const getSectionColumnCount = (
section: Exclude<Section, { kind: "container" }> | ContainerSectionItem,
currentLayout: ReturnType<typeof useRequiredBoard>["layouts"][number],
) =>
section.kind === "container"
? section.width
: section.kind === "empty"
? getBoardLaneColumnCount(currentLayout, getRootSectionLane(section.xOffset))
: currentLayout.columnCount;
const normalizePortalEntry = <
TEntry extends { id?: string; xOffset: number; yOffset: number; width: number; height: number },
>(
entry: TEntry,
columnCount: number,
) => {
const placement = normalizeGridPlacement(
{ id: entry.id ?? "portal-entry", x: entry.xOffset, y: entry.yOffset, w: entry.width, h: entry.height },
columnCount,
);
return {
...entry,
xOffset: placement.x,
yOffset: placement.y,
width: placement.w,
height: placement.h,
};
};
const getOwnerSectionId = (board: ReturnType<typeof useRequiredBoard>, layoutId: string, entryId: string) => {
const item = board.items.find((candidate) => candidate.id === entryId);
if (item) {
return item.layouts.find((layout) => layout.layoutId === layoutId)?.sectionId ?? null;
}
const section = board.sections.find((candidate) => candidate.kind === "container" && candidate.id === entryId);
if (!section || section.kind !== "container") return null;
return section.layouts.find((layout) => layout.layoutId === layoutId)?.parentSectionId ?? null;
};
@@ -14,23 +14,19 @@
inset: 0 auto auto 0; inset: 0 auto auto 0;
} }
.editorPortalHost {
display: contents;
}
.staticItem { .staticItem {
overflow: visible; overflow: visible;
} transition:
left 220ms ease,
.contentMount { top 220ms ease,
position: absolute; width 220ms ease,
inset: 0; height 220ms ease;
width: 100%;
height: 100%;
overflow: visible;
} }
.editorEntry { .editorEntry {
position: relative;
width: 100%;
height: 100%;
overflow: visible; overflow: visible;
cursor: grab; cursor: grab;
user-select: none; user-select: none;
@@ -47,6 +43,19 @@
border-radius: var(--mantine-radius-md); border-radius: var(--mantine-radius-md);
} }
.editorLoading {
position: absolute;
inset: 0;
z-index: 20;
overflow: hidden;
}
.editorLoadingItem {
background-color: var(--mantine-color-default);
border: 1px solid var(--mantine-color-default-border);
border-radius: var(--mantine-radius-md);
}
.liveRegion { .liveRegion {
position: absolute; position: absolute;
width: 1px; width: 1px;
@@ -58,3 +67,9 @@
white-space: nowrap; white-space: nowrap;
border: 0; border: 0;
} }
@media (prefers-reduced-motion: reduce) {
.staticItem {
transition: none;
}
}
@@ -1,12 +1,13 @@
"use client"; "use client";
import type { CSSProperties, KeyboardEvent, PointerEvent } from "react"; import { useEffect, useMemo, useState } from "react";
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; import dynamic from "next/dynamic";
import { Box } from "@mantine/core"; import { Box, LoadingOverlay } from "@mantine/core";
import combineClasses from "clsx"; import combineClasses from "clsx";
import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context"; import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
import { useEditMode } from "@homarr/boards/edit-mode"; import { useEditMode } from "@homarr/boards/edit-mode";
import { useI18n } from "@homarr/translation/client";
import type { ContainerSectionItem, Section } from "~/app/[locale]/boards/_types"; import type { ContainerSectionItem, Section } from "~/app/[locale]/boards/_types";
import { import {
@@ -14,21 +15,56 @@ import {
getEditableCanvasAttributes, getEditableCanvasAttributes,
getGridRowCountForVisualHeight, getGridRowCountForVisualHeight,
getLayoutRowCount, getLayoutRowCount,
getLogicalItemStyle,
getLogicalTrackSize, getLogicalTrackSize,
getReadonlyCanvasAttributes, getReadonlyCanvasAttributes,
normalizeGridPlacement, normalizeGridPlacement,
} from "~/components/board/layout"; } from "~/components/board/layout";
import { useBoardCanvasScale } from "~/components/board/layout/scaled-board-canvas"; import { useBoardCanvasScale } from "~/components/board/layout/scaled-board-canvas";
import { loadGridEditorAsync } from "./grid-editor-loader";
import { useGridEditorRuntimeStatus } from "./grid-editor-runtime"; import { useGridEditorRuntimeStatus } from "./grid-editor-runtime";
import { createGridEntryElementStore, useGridEditorRegistry } from "./grid-editor-registry";
import type { SectionGridPlacement } from "./use-grid-layout-actions"; import type { SectionGridPlacement } from "./use-grid-layout-actions";
import { SectionContent } from "../content"; import { SectionContent } from "../content";
import { useCollapsedSectionIds, useExpandSectionsForEditing } from "../section-collapse"; import { useCollapsedSectionIds } from "../section-collapse";
import { SectionProvider } from "../section-context"; import { SectionProvider, useSectionContext } from "../section-context";
import { useSectionItems } from "../use-section-items"; import { useSectionItems } from "../use-section-items";
import { useBoardGridPortalHost } from "./grid-portal-host"; import { useBoardGridPortalHost } from "./grid-portal-host";
import classes from "./section-grid.module.css"; import classes from "./section-grid.module.css";
const GridEditor = dynamic(loadGridEditorAsync, {
loading: GridEditorLoading,
ssr: false,
});
function GridEditorLoading() {
const t = useI18n();
const { items, innerSections } = useSectionContext();
return (
<Box
component="output"
className={classes.editorLoading}
data-testid="board-grid-editor-loading"
aria-label={t("common.action.loading")}
>
{[...items, ...innerSections].map((item) => (
<Box
key={item.id}
className={classes.editorLoadingItem}
style={getLogicalItemStyle({
x: item.xOffset,
y: item.yOffset,
w: item.width,
h: item.height,
})}
aria-hidden="true"
/>
))}
<LoadingOverlay visible />
</Box>
);
}
interface SectionGridProps { interface SectionGridProps {
section: Exclude<Section, { kind: "container" }> | ContainerSectionItem; section: Exclude<Section, { kind: "container" }> | ContainerSectionItem;
columnCount: number; columnCount: number;
@@ -49,19 +85,21 @@ export const SectionGrid = ({
const [isEditMode] = useEditMode(); const [isEditMode] = useEditMode();
const canvasScale = useBoardCanvasScale(); const canvasScale = useBoardCanvasScale();
const editorRuntimeStatus = useGridEditorRuntimeStatus(); const editorRuntimeStatus = useGridEditorRuntimeStatus();
const editorRegistry = useGridEditorRegistry();
const editorHostRef = useRef<HTMLDivElement>(null);
const [entryElementStore] = useState(createGridEntryElementStore);
const board = useRequiredBoard(); const board = useRequiredBoard();
const currentLayoutId = useCurrentLayout(); const currentLayoutId = useCurrentLayout();
const { items, innerSections } = useSectionItems(section.id); const { items, innerSections } = useSectionItems(section.id);
const { announce, integrations } = useBoardGridPortalHost(); const { announce, integrations } = useBoardGridPortalHost();
const collapsedSectionIds = useCollapsedSectionIds(); const collapsedSectionIds = useCollapsedSectionIds();
const expandSectionsForEditing = useExpandSectionsForEditing(); const minimumBySectionId = useMemo(
const minimumBySectionId = useMemo(() => { () =>
const minimumSizes = getContainerMinimumSizes(board, currentLayoutId); new Map(
return new Map(innerSections.map((innerSection) => [innerSection.id, minimumSizes.get(innerSection.id)])); innerSections.map((innerSection) => [
}, [board, currentLayoutId, innerSections]); innerSection.id,
getContainerMinimumSize(board, currentLayoutId, innerSection.id),
]),
),
[board, currentLayoutId, innerSections],
);
const placements = useMemo( const placements = useMemo(
() => () =>
@@ -83,112 +121,41 @@ export const SectionGrid = ({
}), }),
[columnCount, innerSections, items, minimumBySectionId], [columnCount, innerSections, items, minimumBySectionId],
); );
const collapsibleSectionIds = useMemo(
() =>
new Set(
innerSections.filter((innerSection) => innerSection.options.collapsible).map((innerSection) => innerSection.id),
),
[innerSections],
);
const directCollapsedIds = useMemo(
() =>
new Set(
placements
.filter(
(placement) =>
placement.type === "section" &&
collapsedSectionIds.has(placement.id) &&
collapsibleSectionIds.has(placement.id),
)
.map((placement) => placement.id),
),
[collapsedSectionIds, collapsibleSectionIds, placements],
);
const displayPlacements = useMemo(() => { const displayPlacements = useMemo(() => {
const directCollapsedIds = new Set(
placements
.filter(
(placement) =>
placement.type === "section" &&
collapsedSectionIds.has(placement.id) &&
innerSections.find((innerSection) => innerSection.id === placement.id)?.options.collapsible,
)
.map((placement) => placement.id),
);
if (directCollapsedIds.size === 0) return placements; if (directCollapsedIds.size === 0) return placements;
return getCollapsedDisplayLayout(placements, { return getCollapsedDisplayLayout(placements, {
columnCount, columnCount,
collapsedItemIds: directCollapsedIds, collapsedItemIds: directCollapsedIds,
}); });
}, [columnCount, directCollapsedIds, placements]); }, [collapsedSectionIds, columnCount, innerSections, placements]);
const placementById = useMemo( const placementById = useMemo(
() => new Map(displayPlacements.map((placement) => [placement.id, placement])), () => new Map(displayPlacements.map((placement) => [placement.id, placement])),
[displayPlacements], [displayPlacements],
); );
const displayedItems = useMemo( const displayedItems = items.map((item) => withPlacement(item, placementById.get(item.id)));
() => items.map((item) => withPlacement(item, placementById.get(item.id))), const displayedInnerSections = innerSections.map((item) => withPlacement(item, placementById.get(item.id)));
[items, placementById],
);
const displayedInnerSections = useMemo(
() => innerSections.map((item) => withPlacement(item, placementById.get(item.id))),
[innerSections, placementById],
);
const minimumViewportRowCount = useMinimumViewportRowCount(section.kind === "empty", canvasScale); const minimumViewportRowCount = useMinimumViewportRowCount(section.kind === "empty", canvasScale);
const contentRowCount = Math.max(1, getLayoutRowCount(displayPlacements)); const contentRowCount = Math.max(1, getLayoutRowCount(displayPlacements));
const rowCount = Math.max(contentRowCount, requestedRowCount, minimumViewportRowCount); const rowCount = Math.max(contentRowCount, requestedRowCount, minimumViewportRowCount);
const maxRowCount = section.kind === "container" || railPlacement !== "main" ? rowCount : null; const maxRowCount = section.kind === "container" || railPlacement !== "main" ? rowCount : null;
const logicalWidth = getLogicalTrackSize(columnCount); const logicalWidth = getLogicalTrackSize(columnCount);
const logicalHeight = getLogicalTrackSize(rowCount); const logicalHeight = getLogicalTrackSize(rowCount);
// A collapsed container's compact coordinates are display-only. Its own const canvasAttributes = isEditMode
// nested grid stays inactive until an explicit edit interaction expands it. ? getEditableCanvasAttributes({ label, columnCount, rowCount })
const isInteractionDisabled = section.kind === "container" && collapsedSectionIds.has(section.id); : getReadonlyCanvasAttributes({ label });
const canvasAttributes =
isEditMode && !isInteractionDisabled
? getEditableCanvasAttributes({ label, columnCount, rowCount })
: getReadonlyCanvasAttributes({ label });
const editorClassName = combineClasses("board-grid-editor", classes.editorGrid);
const expandCollapsedSectionsForPointerEdit = (event: PointerEvent<HTMLDivElement>) => {
if (!isEditMode || directCollapsedIds.size === 0 || event.button !== 0) return;
const target = event.target;
if (!(target instanceof Element)) return;
const entry = target.closest('[data-editor-grid-entry="true"]');
if (!entry || !event.currentTarget.contains(entry)) return;
if (!target.closest(".board-grid-resize-handle") && target.closest(INTERACTIVE_GRID_SELECTOR)) return;
expandSectionsForEditing(directCollapsedIds);
};
const expandCollapsedSectionsForKeyboardEdit = (event: KeyboardEvent<HTMLDivElement>) => {
if (!isEditMode || directCollapsedIds.size === 0 || !EDIT_ACTIVATION_KEYS.has(event.key)) return;
const target = event.target;
if (!(target instanceof Element) || !target.matches('[data-editor-grid-entry="true"]')) return;
expandSectionsForEditing(directCollapsedIds);
};
useLayoutEffect(() => {
const host = editorHostRef.current;
if (!host) return;
return editorRegistry.register({
host,
disabled: isInteractionDisabled,
sectionId: section.id,
section,
items: displayedItems,
innerSections: displayedInnerSections,
columnCount,
rowCount,
maxRowCount,
placements: displayPlacements,
transactionPlacements: placements,
className: editorClassName,
entryElementStore,
});
}, [
columnCount,
displayPlacements,
displayedInnerSections,
displayedItems,
editorClassName,
editorRegistry,
entryElementStore,
isInteractionDisabled,
maxRowCount,
placements,
rowCount,
section,
]);
return ( return (
<SectionProvider <SectionProvider
@@ -199,48 +166,47 @@ export const SectionGrid = ({
integrations, integrations,
columnCount, columnCount,
maxRowCount, maxRowCount,
placements: displayPlacements,
interactionDisabled: isInteractionDisabled,
announce, announce,
entryElementStore,
}} }}
> >
<Box <Box
{...canvasAttributes} {...canvasAttributes}
className={combineClasses(classes.viewport, className)} className={combineClasses(classes.viewport, className)}
style={ style={{
{ width: logicalWidth,
width: logicalWidth, height: `var(--board-grid-drag-height, ${logicalHeight}px)`,
height: `var(--board-grid-drag-height, ${logicalHeight}px)`, }}
"--board-item-radius": `var(--mantine-radius-${board.itemRadius})`,
} as CSSProperties
}
data-section-id={section.id} data-section-id={section.id}
data-section-kind={section.kind} data-section-kind={section.kind}
data-rail-placement={railPlacement} data-rail-placement={railPlacement}
data-grid-interaction-disabled={isEditMode && isInteractionDisabled ? "true" : undefined}
onPointerDownCapture={expandCollapsedSectionsForPointerEdit}
onKeyDownCapture={expandCollapsedSectionsForKeyboardEdit}
> >
<Box {isEditMode && editorRuntimeStatus === "ready" ? (
className={classes.staticGrid} <GridEditor
style={{ width: logicalWidth, height: logicalHeight }} sectionId={section.id}
data-grid-section-id={section.id} columnCount={columnCount}
data-kind={section.kind} rowCount={rowCount}
data-grid-editor-error={isEditMode && editorRuntimeStatus === "error" ? "true" : undefined} maxRowCount={maxRowCount}
> placements={displayPlacements}
<SectionContent /> className={combineClasses("board-grid-editor", classes.editorGrid)}
</Box> />
<div ref={editorHostRef} className={classes.editorPortalHost} /> ) : isEditMode && editorRuntimeStatus === "loading" ? (
<GridEditorLoading />
) : (
<Box
className={classes.staticGrid}
style={{ width: logicalWidth, height: logicalHeight }}
data-grid-section-id={section.id}
data-kind={section.kind}
data-grid-editor-error={isEditMode && editorRuntimeStatus === "error" ? "true" : undefined}
>
<SectionContent />
</Box>
)}
</Box> </Box>
</SectionProvider> </SectionProvider>
); );
}; };
const INTERACTIVE_GRID_SELECTOR =
'a,button,input,textarea,select,option,[contenteditable="true"],[role="button"],[data-grid-no-drag]';
const EDIT_ACTIVATION_KEYS = new Set(["Enter", " ", "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"]);
const useMinimumViewportRowCount = (enabled: boolean, canvasScale: number) => { const useMinimumViewportRowCount = (enabled: boolean, canvasScale: number) => {
const [visualHeight, setVisualHeight] = useState(0); const [visualHeight, setVisualHeight] = useState(0);
@@ -259,70 +225,37 @@ const useMinimumViewportRowCount = (enabled: boolean, canvasScale: number) => {
return enabled ? getGridRowCountForVisualHeight(visualHeight, canvasScale) : 0; return enabled ? getGridRowCountForVisualHeight(visualHeight, canvasScale) : 0;
}; };
const containerMinimumSizeCache = new WeakMap< const getContainerMinimumSize = (
ReturnType<typeof useRequiredBoard>, board: ReturnType<typeof useRequiredBoard>,
Map<string, ReadonlyMap<string, { width: number; height: number }>> layoutId: string,
>(); sectionId: string,
visited = new Set<string>(),
const getContainerMinimumSizes = (board: ReturnType<typeof useRequiredBoard>, layoutId: string) => { ): { width: number; height: number } => {
const cachedByLayout = containerMinimumSizeCache.get(board); if (visited.has(sectionId)) return { width: 1, height: 1 };
const cached = cachedByLayout?.get(layoutId); const nextVisited = new Set(visited).add(sectionId);
if (cached) return cached; const directItems: PlacementBounds[] = board.items.flatMap((item) => {
const directItemsBySectionId = new Map<string, PlacementBounds[]>();
for (const item of board.items) {
const layout = item.layouts.find((candidate) => candidate.layoutId === layoutId); const layout = item.layouts.find((candidate) => candidate.layoutId === layoutId);
if (!layout) continue; return layout?.sectionId === sectionId ? [layout] : [];
const entries = directItemsBySectionId.get(layout.sectionId) ?? []; });
entries.push(layout); const directSections: PlacementBounds[] = board.sections.flatMap((candidate) => {
directItemsBySectionId.set(layout.sectionId, entries); if (candidate.kind !== "container") return [];
} const layout = candidate.layouts.find((candidateLayout) => candidateLayout.layoutId === layoutId);
if (!layout || layout.parentSectionId !== sectionId) return [];
const minimum = getContainerMinimumSize(board, layoutId, candidate.id, nextVisited);
return [
{
...layout,
width: Math.max(layout.width, minimum.width),
height: Math.max(layout.height, minimum.height),
},
];
});
const children = [...directItems, ...directSections];
const directSectionsBySectionId = new Map<string, { id: string; placement: PlacementBounds }[]>(); return {
for (const section of board.sections) { width: Math.max(1, ...children.map((child) => child.xOffset + child.width)),
if (section.kind !== "container") continue; height: Math.max(1, ...children.map((child) => child.yOffset + child.height)),
const layout = section.layouts.find((candidate) => candidate.layoutId === layoutId);
if (!layout) continue;
const entries = directSectionsBySectionId.get(layout.parentSectionId) ?? [];
entries.push({ id: section.id, placement: layout });
directSectionsBySectionId.set(layout.parentSectionId, entries);
}
const minimumBySectionId = new Map<string, { width: number; height: number }>();
const visiting = new Set<string>();
const resolve = (sectionId: string): { width: number; height: number } => {
const existing = minimumBySectionId.get(sectionId);
if (existing) return existing;
if (visiting.has(sectionId)) return { width: 1, height: 1 };
visiting.add(sectionId);
const itemBounds = directItemsBySectionId.get(sectionId) ?? [];
const sectionBounds = (directSectionsBySectionId.get(sectionId) ?? []).map(({ id, placement }) => {
const minimum = resolve(id);
return {
...placement,
width: Math.max(placement.width, minimum.width),
height: Math.max(placement.height, minimum.height),
};
});
const children = [...itemBounds, ...sectionBounds];
const minimum = {
width: Math.max(1, ...children.map((child) => child.xOffset + child.width)),
height: Math.max(1, ...children.map((child) => child.yOffset + child.height)),
};
visiting.delete(sectionId);
minimumBySectionId.set(sectionId, minimum);
return minimum;
}; };
for (const section of board.sections) {
if (section.kind === "container") resolve(section.id);
}
const nextByLayout = cachedByLayout ?? new Map();
nextByLayout.set(layoutId, minimumBySectionId);
containerMinimumSizeCache.set(board, nextByLayout);
return minimumBySectionId;
}; };
interface PlacementBounds { interface PlacementBounds {
@@ -12,7 +12,6 @@ const mocks = vi.hoisted(() => ({
commitSectionGrid: vi.fn(), commitSectionGrid: vi.fn(),
isSelected: vi.fn(() => false), isSelected: vi.fn(() => false),
toggleSelectItem: vi.fn(), toggleSelectItem: vi.fn(),
registerElement: vi.fn(),
editMode: true, editMode: true,
maxRowCount: null as number | null, maxRowCount: null as number | null,
items: [ items: [
@@ -80,17 +79,7 @@ vi.mock("../../section-context", () => ({
innerSections: [], innerSections: [],
columnCount: 3, columnCount: 3,
maxRowCount: mocks.maxRowCount, maxRowCount: mocks.maxRowCount,
placements: mocks.items.map((item) => ({
id: item.id,
type: item.type,
x: item.xOffset,
y: item.yOffset,
w: item.width,
h: item.height,
})),
interactionDisabled: false,
announce: mocks.announce, announce: mocks.announce,
entryElementStore: { register: mocks.registerElement },
}), }),
})); }));
@@ -109,7 +98,6 @@ describe("fixed grid item behavior", () => {
beforeEach(() => { beforeEach(() => {
mocks.announce.mockReset(); mocks.announce.mockReset();
mocks.commitSectionGrid.mockReset(); mocks.commitSectionGrid.mockReset();
mocks.registerElement.mockReset();
mocks.editMode = true; mocks.editMode = true;
mocks.maxRowCount = null; mocks.maxRowCount = null;
getWeatherMock().advancedOptions.title = null; getWeatherMock().advancedOptions.title = null;
@@ -22,6 +22,7 @@ describe("grid entry memoization", () => {
{ {
"data-grid-id": props.placement.id, "data-grid-id": props.placement.id,
"data-x": props.placement.x, "data-x": props.placement.x,
ref: (element: HTMLSpanElement | null) => props.registerElement(props.placement.id, element),
}, },
createElement(WidgetProbe), createElement(WidgetProbe),
); );
@@ -78,17 +79,21 @@ describe("grid entry memoization", () => {
}); });
test("keeps 100 entry and widget renders frozen across interaction store previews", () => { test("keeps 100 entry and widget renders frozen across interaction store previews", () => {
const elements = new Map<string, HTMLElement>();
const interactionStore = createGridInteractionStore<GridInteraction>(); const interactionStore = createGridInteractionStore<GridInteraction>();
const gridRef = { current: null as HTMLDivElement | null }; const gridRef = { current: null as HTMLDivElement | null };
const setGridRef = (element: HTMLDivElement | null) => { const setGridRef = (element: HTMLDivElement | null) => {
gridRef.current = element; gridRef.current = element;
}; };
const registerElement = (id: string, element: HTMLElement | null) => {
if (element) elements.set(id, element);
else elements.delete(id);
};
const entries = Array.from({ length: 100 }, (_, index) => ({ const entries = Array.from({ length: 100 }, (_, index) => ({
...createProps(), ...createProps(),
element: document.createElement("span"), registerElement,
placement: { ...createProps().placement, id: `item-${index}`, x: index % 10, y: Math.floor(index / 10) }, placement: { ...createProps().placement, id: `item-${index}`, x: index % 10, y: Math.floor(index / 10) },
})); }));
const elements = new Map(entries.map((entry) => [entry.placement.id, entry.element]));
const renderPreviewBoard = (nextEntries: DndGridEntryProps[]) => { const renderPreviewBoard = (nextEntries: DndGridEntryProps[]) => {
act(() => act(() =>
root.render( root.render(
@@ -155,7 +160,7 @@ describe("grid entry memoization", () => {
test.each([ test.each([
["label", (props: DndGridEntryProps) => ({ ...props, label: "Changed" })], ["label", (props: DndGridEntryProps) => ({ ...props, label: "Changed" })],
["grid limits", (props: DndGridEntryProps) => ({ ...props, maxRowCount: 10 })], ["grid limits", (props: DndGridEntryProps) => ({ ...props, maxRowCount: 10 })],
["bound element", (props: DndGridEntryProps) => ({ ...props, element: document.createElement("span") })], ["element registration", (props: DndGridEntryProps) => ({ ...props, registerElement: () => undefined })],
[ [
"minimum size", "minimum size",
(props: DndGridEntryProps) => ({ (props: DndGridEntryProps) => ({
@@ -193,5 +198,5 @@ const createProps = (): DndGridEntryProps => ({
label: "Weather", label: "Weather",
columnCount: 12, columnCount: 12,
maxRowCount: null, maxRowCount: null,
element: null, registerElement: () => undefined,
}); });
@@ -5,7 +5,6 @@ import { describe, expect, test } from "vitest";
const gridDirectory = resolve(import.meta.dirname, ".."); const gridDirectory = resolve(import.meta.dirname, "..");
const nextjsSourceDirectory = resolve(gridDirectory, "../../../../"); const nextjsSourceDirectory = resolve(gridDirectory, "../../../../");
const sectionGridPath = resolve(gridDirectory, "section-grid.tsx"); const sectionGridPath = resolve(gridDirectory, "section-grid.tsx");
const editorBoundaryPath = resolve(gridDirectory, "board-grid-editor-boundary.tsx");
const editorLoaderPath = resolve(gridDirectory, "grid-editor-loader.ts"); const editorLoaderPath = resolve(gridDirectory, "grid-editor-loader.ts");
describe("board grid import boundary", () => { describe("board grid import boundary", () => {
@@ -34,16 +33,15 @@ describe("board grid import boundary", () => {
]); ]);
}); });
test("loads the editor only in edit mode without replacing static board content", () => { test("loads the editor through next/dynamic only in the edit branch", () => {
const sectionSource = readFileSync(sectionGridPath, "utf8"); const source = readFileSync(sectionGridPath, "utf8");
const boundarySource = readFileSync(editorBoundaryPath, "utf8");
expect(sectionSource).not.toMatch(/import dynamic from ["']next\/dynamic["']/); expect(source).toMatch(/import dynamic from ["']next\/dynamic["']/);
expect(sectionSource).toMatch(/<SectionContent\s*\/>/); expect(source).toMatch(
expect(sectionSource).toMatch(/<div ref={editorHostRef} className={classes\.editorPortalHost}\s*\/>/); /const GridEditor = dynamic\(loadGridEditorAsync,\s*{[\s\S]*?loading:\s*GridEditorLoading,[\s\S]*?ssr:\s*false,[\s\S]*?}\);/,
expect(boundarySource).toMatch(/loadGridEditorAsync\(\)/); );
expect(boundarySource).toMatch(/isEditMode\s*&&\s*Provider\s*&&\s*GridEditor/); expect(source.match(/<GridEditor\b/g)).toHaveLength(1);
expect(boundarySource).toMatch(/createPortal\(<GridEditor \{\.\.\.props} \/>, host, props\.sectionId\)/); expect(source).toMatch(/isEditMode\s*&&\s*editorRuntimeStatus\s*===\s*["']ready["']\s*\?\s*\(\s*<GridEditor\b/);
expect(getRuntimeImports(sectionGridPath).filter(({ specifier }) => specifier === "./grid-editor")).toEqual([]); expect(getRuntimeImports(sectionGridPath).filter(({ specifier }) => specifier === "./grid-editor")).toEqual([]);
expect( expect(
getRuntimeImports(editorLoaderPath) getRuntimeImports(editorLoaderPath)
@@ -0,0 +1,104 @@
import { act, createElement, useLayoutEffect } from "react";
import { createRoot } from "react-dom/client";
import type { Root } from "react-dom/client";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { BoardGridPortalHost, useBoardGridPortalHost } from "../grid-portal-host";
const mocks = vi.hoisted(() => ({
board: {
items: [{ id: "weather", layouts: [{ layoutId: "desktop", sectionId: "root" }] }],
sections: [],
},
}));
vi.mock("@homarr/api/client", () => ({
clientApi: {
integration: {
all: {
useQuery: () => ({ data: undefined }),
},
},
},
}));
vi.mock("@homarr/auth/client", () => ({
useSession: () => ({ data: { user: { id: "user" } } }),
}));
vi.mock("@homarr/boards/context", () => ({
useCurrentLayout: () => "desktop",
useRequiredBoard: () => mocks.board,
}));
vi.mock("@homarr/boards/edit-mode", () => ({
useEditMode: () => [true],
}));
describe("board grid portal host", () => {
let container: HTMLDivElement;
let root: Root;
beforeEach(() => {
mocks.board = {
items: [{ id: "weather", layouts: [{ layoutId: "desktop", sectionId: "root" }] }],
sections: [],
};
container = document.createElement("div");
document.body.append(container);
root = createRoot(container);
});
afterEach(() => {
act(() => root.unmount());
container.remove();
});
test("keeps a portal across relocation and prunes it after permanent deletion", () => {
const acquired: HTMLElement[] = [];
renderHost(root, true, 0, acquired);
expect(getContainerCount(container)).toBe("1");
mocks.board = {
items: [{ id: "weather", layouts: [{ layoutId: "desktop", sectionId: "other" }] }],
sections: [],
};
renderHost(root, true, 1, acquired);
expect(getContainerCount(container)).toBe("1");
expect(new Set(acquired).size).toBe(1);
mocks.board = { items: [], sections: [] };
renderHost(root, false, 2, acquired);
expect(getContainerCount(container)).toBe("0");
});
});
const renderHost = (root: Root, acquire: boolean, revision: number, acquired: HTMLElement[]) => {
act(() => {
root.render(
createElement(BoardGridPortalHost, null, createElement(PortalRegistryProbe, { acquire, revision, acquired })),
);
});
};
const PortalRegistryProbe = ({
acquire,
revision,
acquired,
}: {
acquire: boolean;
revision: number;
acquired: HTMLElement[];
}) => {
const portalHost = useBoardGridPortalHost();
useLayoutEffect(() => {
if (acquire) acquired.push(portalHost.acquireContainer("weather"));
}, [acquire, acquired, portalHost, revision]);
return createElement("span", { "data-container-count": String(portalHost.containers.size) });
};
const getContainerCount = (container: HTMLElement) =>
container.querySelector<HTMLElement>("[data-container-count]")?.dataset.containerCount;
@@ -12,16 +12,13 @@ import { readSectionCollapsedFromStorage, writeSectionCollapsedToStorage } from
interface SectionCollapseContextValue { interface SectionCollapseContextValue {
collapsedSectionIds: ReadonlySet<string>; collapsedSectionIds: ReadonlySet<string>;
visuallyCollapsedSectionIds: ReadonlySet<string>;
setCollapsed: (sectionId: string, collapsed: boolean) => void; setCollapsed: (sectionId: string, collapsed: boolean) => void;
expandForEditing: (sectionIds: ReadonlySet<string>) => void;
} }
const SectionCollapseContext = createContext<SectionCollapseContextValue | null>(null); const SectionCollapseContext = createContext<SectionCollapseContextValue | null>(null);
export const BoardSectionCollapseProvider = ({ children }: PropsWithChildren) => { export const BoardSectionCollapseProvider = ({ children }: PropsWithChildren) => {
const board = useRequiredBoard(); const board = useRequiredBoard();
const [isEditMode] = useEditMode();
const { status } = useSession(); const { status } = useSession();
const { mutate } = clientApi.section.changeCollapsed.useMutation(); const { mutate } = clientApi.section.changeCollapsed.useMutation();
const [collapsedById, setCollapsedById] = useState<Record<string, boolean>>(() => const [collapsedById, setCollapsedById] = useState<Record<string, boolean>>(() =>
@@ -30,13 +27,8 @@ export const BoardSectionCollapseProvider = ({ children }: PropsWithChildren) =>
), ),
); );
const collapsedByIdRef = useRef(collapsedById); const collapsedByIdRef = useRef(collapsedById);
const [temporarilyExpandedIds, setTemporarilyExpandedIds] = useState<ReadonlySet<string>>(() => new Set());
collapsedByIdRef.current = collapsedById; collapsedByIdRef.current = collapsedById;
useEffect(() => {
if (!isEditMode) setTemporarilyExpandedIds((current) => (current.size === 0 ? current : new Set()));
}, [isEditMode]);
useEffect(() => { useEffect(() => {
setCollapsedById((previous) => { setCollapsedById((previous) => {
const next = { ...previous }; const next = { ...previous };
@@ -65,12 +57,6 @@ export const BoardSectionCollapseProvider = ({ children }: PropsWithChildren) =>
const previousCollapsed = collapsedByIdRef.current[sectionId] ?? false; const previousCollapsed = collapsedByIdRef.current[sectionId] ?? false;
collapsedByIdRef.current = { ...collapsedByIdRef.current, [sectionId]: collapsed }; collapsedByIdRef.current = { ...collapsedByIdRef.current, [sectionId]: collapsed };
setCollapsedById((previous) => ({ ...previous, [sectionId]: collapsed })); setCollapsedById((previous) => ({ ...previous, [sectionId]: collapsed }));
setTemporarilyExpandedIds((current) => {
if (!current.has(sectionId)) return current;
const next = new Set(current);
next.delete(sectionId);
return next;
});
if (status === "authenticated") { if (status === "authenticated") {
mutate( mutate(
@@ -90,70 +76,47 @@ export const BoardSectionCollapseProvider = ({ children }: PropsWithChildren) =>
[mutate, status], [mutate, status],
); );
const expandForEditing = useCallback( const value = useMemo<SectionCollapseContextValue>(
(sectionIds: ReadonlySet<string>) => { () => ({
if (!isEditMode || sectionIds.size === 0) return; collapsedSectionIds: new Set(
setTemporarilyExpandedIds((current) => { Object.entries(collapsedById)
const next = new Set(current); .filter(([, collapsed]) => collapsed)
for (const sectionId of sectionIds) next.add(sectionId); .map(([sectionId]) => sectionId),
return next.size === current.size ? current : next;
});
},
[isEditMode],
);
const value = useMemo<SectionCollapseContextValue>(() => {
const collapsedSectionIds = new Set(
Object.entries(collapsedById)
.filter(([, collapsed]) => collapsed)
.map(([sectionId]) => sectionId),
);
return {
collapsedSectionIds,
visuallyCollapsedSectionIds: new Set(
[...collapsedSectionIds].filter((sectionId) => !isEditMode || !temporarilyExpandedIds.has(sectionId)),
), ),
setCollapsed, setCollapsed,
expandForEditing, }),
}; [collapsedById, setCollapsed],
}, [collapsedById, expandForEditing, isEditMode, setCollapsed, temporarilyExpandedIds]); );
return <SectionCollapseContext.Provider value={value}>{children}</SectionCollapseContext.Provider>; return <SectionCollapseContext.Provider value={value}>{children}</SectionCollapseContext.Provider>;
}; };
export const useSectionCollapse = ({ sectionId, collapsible }: { sectionId: string; collapsible: boolean }) => { export const useSectionCollapse = ({ sectionId, collapsible }: { sectionId: string; collapsible: boolean }) => {
const context = useContext(SectionCollapseContext); const context = useContext(SectionCollapseContext);
const [isEditMode] = useEditMode();
if (!context) { if (!context) {
throw new Error("BoardSectionCollapseProvider is required"); throw new Error("BoardSectionCollapseProvider is required");
} }
const isCollapsed = collapsible && context.collapsedSectionIds.has(sectionId); const isCollapsed = collapsible && context.collapsedSectionIds.has(sectionId);
const isVisuallyCollapsed = collapsible && context.visuallyCollapsedSectionIds.has(sectionId);
return { return {
isCollapsed, isCollapsed,
isVisuallyCollapsed, isVisuallyCollapsed: isCollapsed && !isEditMode,
setCollapsed: (collapsed: boolean) => context.setCollapsed(sectionId, collapsed), setCollapsed: (collapsed: boolean) => context.setCollapsed(sectionId, collapsed),
toggle: () => context.setCollapsed(sectionId, !isVisuallyCollapsed), toggle: () => context.setCollapsed(sectionId, !isCollapsed),
}; };
}; };
export const useCollapsedSectionIds = () => { export const useCollapsedSectionIds = () => {
const context = useContext(SectionCollapseContext); const context = useContext(SectionCollapseContext);
const [isEditMode] = useEditMode();
if (!context) { if (!context) {
throw new Error("BoardSectionCollapseProvider is required"); throw new Error("BoardSectionCollapseProvider is required");
} }
return context.visuallyCollapsedSectionIds; return isEditMode ? EMPTY_SET : context.collapsedSectionIds;
}; };
export const useExpandSectionsForEditing = () => { const EMPTY_SET = new Set<string>();
const context = useContext(SectionCollapseContext);
if (!context) {
throw new Error("BoardSectionCollapseProvider is required");
}
return context.expandForEditing;
};
@@ -3,8 +3,6 @@ import { createContext, useContext } from "react";
import type { RouterOutputs } from "@homarr/api"; import type { RouterOutputs } from "@homarr/api";
import type { ContainerSectionItem, Section, SectionItem } from "~/app/[locale]/boards/_types"; import type { ContainerSectionItem, Section, SectionItem } from "~/app/[locale]/boards/_types";
import type { GridEntryElementStore } from "./grid/grid-editor-registry";
import type { SectionGridPlacement } from "./grid/use-grid-layout-actions";
interface SectionContextProps { interface SectionContextProps {
section: Exclude<Section, { kind: "container" }> | ContainerSectionItem; section: Exclude<Section, { kind: "container" }> | ContainerSectionItem;
@@ -13,10 +11,7 @@ interface SectionContextProps {
integrations: RouterOutputs["integration"]["all"] | undefined; integrations: RouterOutputs["integration"]["all"] | undefined;
columnCount: number; columnCount: number;
maxRowCount: number | null; maxRowCount: number | null;
placements: readonly SectionGridPlacement[];
interactionDisabled: boolean;
announce: (message: string) => void; announce: (message: string) => void;
entryElementStore: GridEntryElementStore;
} }
const SectionContext = createContext<SectionContextProps | null>(null); const SectionContext = createContext<SectionContextProps | null>(null);
@@ -7,55 +7,47 @@ import type { ContainerSectionItem, SectionItem } from "~/app/[locale]/boards/_t
export const useSectionItems = (sectionId: string): { innerSections: ContainerSectionItem[]; items: SectionItem[] } => { export const useSectionItems = (sectionId: string): { innerSections: ContainerSectionItem[]; items: SectionItem[] } => {
const board = useRequiredBoard(); const board = useRequiredBoard();
const currentLayoutId = useCurrentLayout(); const currentLayoutId = useCurrentLayout();
const index = useMemo(() => getSectionItemsIndex(board, currentLayoutId), [board, currentLayoutId]);
const innerSections = useMemo(
() =>
board.sections
.filter((innerSection) => innerSection.kind === "container")
.map(({ layouts, ...innerSection }) => {
const layout = layouts.find((layout) => layout.layoutId === currentLayoutId);
if (!layout) return null;
return {
...layout,
...innerSection,
type: "section" as const,
};
})
.filter((item) => item !== null)
.filter((innerSection) => innerSection.parentSectionId === sectionId),
[board.sections, currentLayoutId, sectionId],
);
const items = useMemo(
() =>
board.items
.map(({ layouts, ...item }) => {
const layout = layouts.find((layout) => layout.layoutId === currentLayoutId);
if (!layout) return null;
return {
...layout,
...item,
type: "item" as const,
};
})
.filter((item) => item !== null)
.filter((item) => item.sectionId === sectionId),
[board.items, currentLayoutId, sectionId],
);
return { return {
innerSections: index.innerSectionsByParentId.get(sectionId) ?? EMPTY_INNER_SECTIONS, innerSections,
items: index.itemsBySectionId.get(sectionId) ?? EMPTY_ITEMS, items,
}; };
}; };
interface SectionItemsIndex {
innerSectionsByParentId: ReadonlyMap<string, ContainerSectionItem[]>;
itemsBySectionId: ReadonlyMap<string, SectionItem[]>;
}
const sectionItemsIndexCache = new WeakMap<
ReturnType<typeof useRequiredBoard>,
Map<string, SectionItemsIndex>
>();
const EMPTY_INNER_SECTIONS: ContainerSectionItem[] = [];
const EMPTY_ITEMS: SectionItem[] = [];
const getSectionItemsIndex = (board: ReturnType<typeof useRequiredBoard>, layoutId: string): SectionItemsIndex => {
const cachedByLayout = sectionItemsIndexCache.get(board);
const cached = cachedByLayout?.get(layoutId);
if (cached) return cached;
const innerSectionsByParentId = new Map<string, ContainerSectionItem[]>();
for (const section of board.sections) {
if (section.kind !== "container") continue;
const { layouts, ...definition } = section;
const layout = layouts.find((candidate) => candidate.layoutId === layoutId);
if (!layout) continue;
const entries = innerSectionsByParentId.get(layout.parentSectionId) ?? [];
entries.push({ ...layout, ...definition, type: "section" });
innerSectionsByParentId.set(layout.parentSectionId, entries);
}
const itemsBySectionId = new Map<string, SectionItem[]>();
for (const item of board.items) {
const { layouts, ...definition } = item;
const layout = layouts.find((candidate) => candidate.layoutId === layoutId);
if (!layout) continue;
const entries = itemsBySectionId.get(layout.sectionId) ?? [];
entries.push({ ...layout, ...definition, type: "item" });
itemsBySectionId.set(layout.sectionId, entries);
}
const index = { innerSectionsByParentId, itemsBySectionId };
const nextByLayout = cachedByLayout ?? new Map();
nextByLayout.set(layoutId, index);
sectionItemsIndexCache.set(board, nextByLayout);
return index;
};
+23 -23
View File
@@ -4836,70 +4836,70 @@
}, },
"items": { "items": {
"actions": { "actions": {
"columnTitle": "Actions" "columnTitle": "Controls"
}, },
"added": { "added": {
"columnTitle": "Added", "columnTitle": "Added",
"detailsTitle": "Added" "detailsTitle": "Date Added"
}, },
"category": { "category": {
"columnTitle": "Category", "columnTitle": "Extras",
"detailsTitle": "Category" "detailsTitle": "Categories (Or extra information)"
}, },
"downSpeed": { "downSpeed": {
"columnTitle": "Down", "columnTitle": "Down",
"detailsTitle": "Down" "detailsTitle": "Download Speed"
}, },
"index": { "index": {
"columnTitle": "#", "columnTitle": "#",
"detailsTitle": "Index" "detailsTitle": "Current index within client"
}, },
"id": { "id": {
"columnTitle": "ID", "columnTitle": "Id",
"detailsTitle": "ID" "detailsTitle": "Item ID"
}, },
"integration": { "integration": {
"columnTitle": "Source" "columnTitle": "Integration"
}, },
"name": { "name": {
"columnTitle": "Name" "columnTitle": "Job name"
}, },
"progress": { "progress": {
"columnTitle": "Progress", "columnTitle": "Progress",
"detailsTitle": "Progress" "detailsTitle": "Download Progress"
}, },
"ratio": { "ratio": {
"columnTitle": "Ratio", "columnTitle": "Ratio",
"detailsTitle": "Ratio" "detailsTitle": "Torrent ratio (received/sent)"
}, },
"received": { "received": {
"columnTitle": "Down", "columnTitle": "Total down",
"detailsTitle": "Downloaded" "detailsTitle": "Total downloaded"
}, },
"sent": { "sent": {
"columnTitle": "Up", "columnTitle": "Total up",
"detailsTitle": "Uploaded" "detailsTitle": "Total Uploaded"
}, },
"size": { "size": {
"columnTitle": "Size", "columnTitle": "File Size",
"detailsTitle": "Size" "detailsTitle": "Total Size of selection/files"
}, },
"state": { "state": {
"columnTitle": "State", "columnTitle": "State",
"detailsTitle": "State" "detailsTitle": "Job State"
}, },
"time": { "time": {
"columnTitle": "ETA", "columnTitle": "Finish time",
"detailsTitle": "ETA", "detailsTitle": "Time since/to completion",
"eta": "ETA" "eta": "ETA"
}, },
"type": { "type": {
"columnTitle": "Type", "columnTitle": "Type",
"detailsTitle": "Type" "detailsTitle": "Download Client type"
}, },
"upSpeed": { "upSpeed": {
"columnTitle": "Up", "columnTitle": "Up",
"detailsTitle": "Up" "detailsTitle": "Upload Speed"
} }
}, },
"states": { "states": {
@@ -12,18 +12,11 @@
background-color: transparent; background-color: transparent;
} }
.homarr-data-table .mantine-datatable-table {
width: 100% !important;
max-width: 100%;
table-layout: fixed !important;
}
.homarr-data-table .mantine-datatable-table tbody tr:hover { .homarr-data-table .mantine-datatable-table tbody tr:hover {
background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important; background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important;
} }
.homarr-data-table th { .homarr-data-table th {
padding: 0;
white-space: nowrap; white-space: nowrap;
background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important; background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important;
backdrop-filter: blur(8px); backdrop-filter: blur(8px);
@@ -35,13 +28,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* Lets a cell's content (e.g. an oversized action icon) visually overflow its own box without
growing it - used to make a per-row icon look bigger without inflating row height, since the
icon is pulled out of flow via absolute positioning rather than actually being a bigger cell. */
.homarr-data-table td.docker-actions-cell {
overflow: visible;
}
.homarr-data-table td .mantine-Text-root, .homarr-data-table td .mantine-Text-root,
.homarr-data-table td .mantine-Group-root { .homarr-data-table td .mantine-Group-root {
white-space: nowrap; white-space: nowrap;
@@ -54,25 +40,6 @@
transition: opacity 150ms ease-out; transition: opacity 150ms ease-out;
} }
.homarr-data-table .mantine-datatable-header-cell-sortable-group {
gap: 0;
}
.homarr-data-table .mantine-datatable-header-cell-draggable-action-icon {
margin: 0;
}
.homarr-data-table .mantine-datatable-header-cell-sortable-unsorted-icon {
display: none;
}
.homarr-data-table .mantine-datatable-header-cell-draggable-action-icon svg,
.homarr-data-table .mantine-datatable-header-cell-sortable-text svg,
.homarr-data-table .mantine-datatable-header-cell-sortable-icon svg {
width: var(--mantine-font-size-md);
height: var(--mantine-font-size-md);
}
.homarr-data-table th:hover .mantine-datatable-header-cell-sortable-icon, .homarr-data-table th:hover .mantine-datatable-header-cell-sortable-icon,
.homarr-data-table th:hover .mantine-datatable-header-cell-draggable-action-icon, .homarr-data-table th:hover .mantine-datatable-header-cell-draggable-action-icon,
.homarr-data-table .mantine-datatable-header-cell-draggable-action-icon:focus-visible, .homarr-data-table .mantine-datatable-header-cell-draggable-action-icon:focus-visible,
@@ -2,24 +2,10 @@
import "./homarr-data-table.css"; import "./homarr-data-table.css";
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import type { DataTableProps } from "mantine-datatable";
import type { DataTableColumn, DataTableProps } from "mantine-datatable";
import { DataTable } from "mantine-datatable"; import { DataTable } from "mantine-datatable";
const fallbackColumnWidth = 60;
const getColumnWidth = (width: string | number | undefined): number => {
if (typeof width === "number" && Number.isFinite(width) && width > 0) return width;
if (typeof width === "string") {
const parsedWidth = Number.parseFloat(width);
if (Number.isFinite(parsedWidth) && parsedWidth > 0) return parsedWidth;
}
return fallbackColumnWidth;
};
type HomarrDataTableProps<T> = DataTableProps<T> & { type HomarrDataTableProps<T> = DataTableProps<T> & {
columns: DataTableColumn<T>[];
groups?: never;
isEditMode: boolean; isEditMode: boolean;
cellPadding: string; cellPadding: string;
rowCursor?: "auto" | "default"; rowCursor?: "auto" | "default";
@@ -30,78 +16,11 @@ export function HomarrDataTable<T>({
cellPadding, cellPadding,
rowCursor = "auto", rowCursor = "auto",
className, className,
columns,
defaultColumnProps, defaultColumnProps,
onMouseDownCapture,
scrollAreaProps, scrollAreaProps,
style, style,
...props ...props
}: HomarrDataTableProps<T>) { }: HomarrDataTableProps<T>) {
const [resizePreviewWidths, setResizePreviewWidths] = useState<Record<string, number>>();
const removeResizeListeners = useRef<() => void>(() => undefined);
useEffect(() => () => removeResizeListeners.current(), []);
const handleMouseDownCapture = useCallback(
(event: React.MouseEvent<HTMLTableElement>) => {
onMouseDownCapture?.(event);
const target = event.target;
if (!(target instanceof Element)) return;
const handle = target.closest(".mantine-datatable-header-resizable-handle");
const currentCell = handle?.closest<HTMLTableCellElement>("th[data-accessor]");
const headerRow = currentCell?.parentElement;
if (!currentCell || !headerRow) return;
const cells = Array.from(headerRow.querySelectorAll<HTMLTableCellElement>("th[data-accessor]"));
const currentIndex = cells.indexOf(currentCell);
const nextCell = cells[currentIndex + 1];
const currentAccessor = currentCell.dataset.accessor;
const nextAccessor = nextCell?.dataset.accessor;
if (!nextCell || !currentAccessor || !nextAccessor) return;
const widths = Object.fromEntries(
cells.flatMap((cell) => {
const accessor = cell.dataset.accessor;
if (!accessor) return [];
return [[accessor, cell.getBoundingClientRect().width]];
}),
);
const currentWidth = widths[currentAccessor];
const nextWidth = widths[nextAccessor];
if (currentWidth === undefined || nextWidth === undefined) return;
const visualScale = currentCell.getBoundingClientRect().width / currentCell.offsetWidth;
const minimumWidth = fallbackColumnWidth * visualScale;
const startX = event.clientX;
removeResizeListeners.current();
const handleMouseMove = (moveEvent: MouseEvent) => {
const delta = Math.min(
nextWidth - minimumWidth,
Math.max(minimumWidth - currentWidth, moveEvent.clientX - startX),
);
setResizePreviewWidths({
...widths,
[currentAccessor]: currentWidth + delta,
[nextAccessor]: nextWidth - delta,
});
};
const handleResizeEnd = () => {
removeResizeListeners.current();
requestAnimationFrame(() => requestAnimationFrame(() => setResizePreviewWidths(undefined)));
};
removeResizeListeners.current = () => {
window.removeEventListener("mousemove", handleMouseMove);
window.removeEventListener("mouseup", handleResizeEnd);
window.removeEventListener("blur", handleResizeEnd);
};
window.addEventListener("mousemove", handleMouseMove);
window.addEventListener("mouseup", handleResizeEnd);
window.addEventListener("blur", handleResizeEnd);
},
[onMouseDownCapture],
);
const mergedClassName = [ const mergedClassName = [
"homarr-data-table", "homarr-data-table",
rowCursor === "default" ? "homarr-data-table-row-cursor-default" : undefined, rowCursor === "default" ? "homarr-data-table-row-cursor-default" : undefined,
@@ -109,26 +28,6 @@ export function HomarrDataTable<T>({
] ]
.filter(Boolean) .filter(Boolean)
.join(" "); .join(" ");
const fittedColumns = useMemo(() => {
const visibleColumns = columns.filter(({ hidden }) => !hidden);
const getRenderedWidth = (column: DataTableColumn<T>) =>
resizePreviewWidths?.[String(column.accessor)] ?? getColumnWidth(column.width);
const totalWidth = visibleColumns.reduce((total, column) => total + getRenderedWidth(column), 0);
if (totalWidth <= 0) return columns;
return columns.map((column) => {
if (column.hidden) return column;
const width = `${(getRenderedWidth(column) / totalWidth) * 100}%`;
const fittedWidth = { width, minWidth: width, maxWidth: width };
const cellsStyle = column.cellsStyle ?? defaultColumnProps?.cellsStyle;
return {
...column,
titleStyle: [column.titleStyle, fittedWidth],
cellsStyle: (record: T, index: number) => [cellsStyle?.(record, index), fittedWidth, { padding: cellPadding }],
};
});
}, [cellPadding, columns, defaultColumnProps?.cellsStyle, resizePreviewWidths]);
return ( return (
<DataTable<T> <DataTable<T>
@@ -143,8 +42,6 @@ export function HomarrDataTable<T>({
textSelectionDisabled textSelectionDisabled
height="100%" height="100%"
{...props} {...props}
columns={fittedColumns}
onMouseDownCapture={handleMouseDownCapture}
className={mergedClassName} className={mergedClassName}
style={[{ pointerEvents: isEditMode ? "none" : undefined }, style]} style={[{ pointerEvents: isEditMode ? "none" : undefined }, style]}
defaultColumnProps={{ defaultColumnProps={{
@@ -107,7 +107,7 @@ export const parseColumnWidths = (value: string, columnAccessors: readonly strin
} }
}; };
export const usePersistedTableLayout = <T,>({ export const usePersistedTableLayout = <T>({
columns, columns,
columnAccessors, columnAccessors,
columnOrder, columnOrder,
+1 -1
View File
@@ -39,6 +39,7 @@ describe("supportsAdvancedFocus", () => {
beszelSystemStatsDefinition, beszelSystemStatsDefinition,
beszelSystemTableDefinition, beszelSystemTableDefinition,
customApiDefinition, customApiDefinition,
dockerDefinition,
indexerManagerDefinition, indexerManagerDefinition,
notebookDefinition, notebookDefinition,
])("keeps non-enhanced widgets compact", (widgetDefinition) => { ])("keeps non-enhanced widgets compact", (widgetDefinition) => {
@@ -48,7 +49,6 @@ describe("supportsAdvancedFocus", () => {
test("requires an explicit opt-in", () => { test("requires an explicit opt-in", () => {
expect(supportsAdvancedFocus({})).toBe(false); expect(supportsAdvancedFocus({})).toBe(false);
expect(supportsAdvancedFocus(clockDefinition)).toBe(true); expect(supportsAdvancedFocus(clockDefinition)).toBe(true);
expect(supportsAdvancedFocus(dockerDefinition)).toBe(true);
expect(supportsAdvancedFocus(downloadsDefinition)).toBe(true); expect(supportsAdvancedFocus(downloadsDefinition)).toBe(true);
}); });
}); });
+16 -49
View File
@@ -69,18 +69,6 @@ interface ContainerActionHandlers {
const columnAccessors = ["name", "state", "host", "cpuUsage", "memoryUsage", "actions"] as const; const columnAccessors = ["name", "state", "host", "cpuUsage", "memoryUsage", "actions"] as const;
const containerMenuWidth = 240; const containerMenuWidth = 240;
// The *button* sizes stay small and fixed - row height is set by the tallest cell, and the
// actions button is repeated once per row, so any growth here multiplies across every row and
// tanks how many containers fit on screen. The *icon* sizes are rendered larger than their
// button via absolute positioning (see ContainerMenuButton/footer refresh below) - an
// absolutely-positioned element is removed from normal flow, so it doesn't count toward its
// ancestor's height even though it visually overflows the button. This lets the icon look
// properly sized without the button (and therefore the row) growing to match.
const rowActionButtonSize = 22;
const rowActionIconVisualSize = 32;
const footerRefreshButtonSize = 24;
const footerRefreshIconVisualSize = 30;
const createContainerLogsPath = (container: Pick<DockerContainer, "endpointId" | "id" | "name">) => const createContainerLogsPath = (container: Pick<DockerContainer, "endpointId" | "id" | "name">) =>
`/manage/tools/docker/logs/${container.id}?name=${encodeURIComponent(container.name)}&endpointId=${encodeURIComponent(container.endpointId)}`; `/manage/tools/docker/logs/${container.id}?name=${encodeURIComponent(container.name)}&endpointId=${encodeURIComponent(container.endpointId)}`;
@@ -95,13 +83,7 @@ const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
const t = useScopedI18n("docker.field.state.option"); const t = useScopedI18n("docker.field.state.option");
return ( return (
<Badge <Badge size="xs" radius="sm" variant="light" color={containerStateColorMap[state]}>
size="xs"
radius="sm"
variant="light"
color={containerStateColorMap[state]}
styles={{ label: { lineHeight: 1.2 } }}
>
{t(state)} {t(state)}
</Badge> </Badge>
); );
@@ -144,15 +126,16 @@ const createColumns = (
<Group gap="xs" wrap="nowrap" style={{ overflow: "hidden" }}> <Group gap="xs" wrap="nowrap" style={{ overflow: "hidden" }}>
{inlineState && <ContainerStateDot state={container.state} />} {inlineState && <ContainerStateDot state={container.state} />}
<Avatar <Avatar
radius="xl" variant="outline"
size={24} radius="sm"
size={20}
styles={{ image: { objectFit: "contain" } }} styles={{ image: { objectFit: "contain" } }}
src={container.iconUrl} src={container.iconUrl}
style={{ flexShrink: 0 }} style={{ flexShrink: 0 }}
> >
{container.name.at(0)?.toUpperCase()} {container.name.at(0)?.toUpperCase()}
</Avatar> </Avatar>
<Text size="sm" lh={1.2} truncate> <Text size="sm" truncate>
{container.name} {container.name}
</Text> </Text>
</Group> </Group>
@@ -208,12 +191,8 @@ const createColumns = (
{ {
accessor: "actions", accessor: "actions",
title: "", title: "",
width: rowActionButtonSize + 18, width: 44,
textAlign: "right", textAlign: "right",
// The default `.homarr-data-table td { overflow: hidden }` (needed for name/host ellipsis
// truncation) would clip the actions icon's intentional visual overflow - opt this one
// cell out of it.
cellsClassName: "docker-actions-cell",
render: (container) => <ContainerMenuButton container={container} handlers={handlers} />, render: (container) => <ContainerMenuButton container={container} handlers={handlers} />,
}, },
]; ];
@@ -428,7 +407,7 @@ export default function DockerWidget({
<Box style={{ flex: 1, minHeight: 0 }}> <Box style={{ flex: 1, minHeight: 0 }}>
<HomarrDataTable <HomarrDataTable
isEditMode={isEditMode} isEditMode={isEditMode}
cellPadding="2px 8px" cellPadding={width < 400 ? "2px 8px" : "4px 8px"}
rowCursor="default" rowCursor="default"
fetching={isFetching && containers.length === 0} fetching={isFetching && containers.length === 0}
fz={width < 400 ? "xs" : "sm"} fz={width < 400 ? "xs" : "sm"}
@@ -452,43 +431,38 @@ export default function DockerWidget({
style={{ style={{
borderTop: "0.0625rem solid var(--border-color)", borderTop: "0.0625rem solid var(--border-color)",
}} }}
py={2} p={4}
px={8}
wrap="nowrap" wrap="nowrap"
> >
<Group gap={4} wrap="nowrap"> <Group gap={4} wrap="nowrap">
<IconBrandDocker size="var(--mantine-font-size-md)" style={{ flexShrink: 0 }} /> <IconBrandDocker size="var(--mantine-font-size-xl)" style={{ flexShrink: 0 }} />
<Text size="xs" truncate> <Text size="sm" truncate>
{t("table.footer", { count: containers.length.toString() })} {t("table.footer", { count: containers.length.toString() })}
</Text> </Text>
</Group> </Group>
<Group gap="sm" wrap="nowrap" justify="flex-end" style={{ minWidth: 0 }}> <Group gap="sm" wrap="nowrap" justify="flex-end" style={{ minWidth: 0 }}>
{footerVisibility.cpu && ( {footerVisibility.cpu && (
<Text size="xs" style={{ whiteSpace: "nowrap" }}> <Text size="sm" style={{ whiteSpace: "nowrap" }}>
{t("table.totalCpu", { cpu: totals.cpu.toFixed(2) })} {t("table.totalCpu", { cpu: totals.cpu.toFixed(2) })}
</Text> </Text>
)} )}
{footerVisibility.memory && ( {footerVisibility.memory && (
<Text size="xs" style={{ whiteSpace: "nowrap" }}> <Text size="sm" style={{ whiteSpace: "nowrap" }}>
{t("table.totalMemory", { memory: formatBytes(totals.memory) })} {t("table.totalMemory", { memory: formatBytes(totals.memory) })}
</Text> </Text>
)} )}
<Tooltip label={t("table.refresh.lastUpdated", { when: relativeTime })}> <Tooltip label={t("table.refresh.lastUpdated", { when: relativeTime })}>
<ActionIcon <ActionIcon
className={actionTargetClasses.root} className={actionTargetClasses.root}
size={footerRefreshButtonSize} size="sm"
variant="transparent" variant="transparent"
c="var(--mantine-color-text)" c="var(--mantine-color-text)"
loading={isFetching || refreshInventory.isPending} loading={isFetching || refreshInventory.isPending}
onClick={() => refreshInventory.mutate()} onClick={() => refreshInventory.mutate()}
aria-label={t("table.refresh.lastUpdated", { when: relativeTime })} aria-label={t("table.refresh.lastUpdated", { when: relativeTime })}
style={{ position: "relative", overflow: "visible" }}
> >
<IconRefresh <IconRefresh size="var(--mantine-font-size-md)" />
size={footerRefreshIconVisualSize}
style={{ position: "absolute", top: "50%", left: "50%", transform: "translate(-50%, -50%)" }}
/>
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
</Group> </Group>
@@ -518,18 +492,11 @@ function ContainerMenuButton({
className={actionTargetClasses.root} className={actionTargetClasses.root}
variant="subtle" variant="subtle"
color="gray" color="gray"
size={rowActionButtonSize} size="sm"
aria-label={t("title")} aria-label={t("title")}
onClick={(event) => event.stopPropagation()} onClick={(event) => event.stopPropagation()}
style={{ position: "relative", overflow: "visible" }}
> >
{/* Rendered larger than the button and pulled out of flow via absolute positioning, <IconDots size="var(--mantine-font-size-md)" />
so it looks properly sized without the button - and therefore the row - growing
to match (row height is set by the tallest cell, and this button repeats per row). */}
<IconDots
size={rowActionIconVisualSize}
style={{ position: "absolute", top: "50%", left: "50%", transform: "translate(-50%, -50%)" }}
/>
</ActionIcon> </ActionIcon>
</Menu.Target> </Menu.Target>
<Menu.Dropdown w={containerMenuWidth} miw={containerMenuWidth} maw={containerMenuWidth}> <Menu.Dropdown w={containerMenuWidth} miw={containerMenuWidth} maw={containerMenuWidth}>
-1
View File
@@ -26,7 +26,6 @@ const columnTranslationKeyMap = {
export const { definition, componentLoader } = createWidgetDefinition("dockerContainers", { export const { definition, componentLoader } = createWidgetDefinition("dockerContainers", {
icon: IconBrandDocker, icon: IconBrandDocker,
supportsAdvancedFocus: true,
queryKey: [["docker", "getContainers"]], queryKey: [["docker", "getContainers"]],
refetchInterval: 30, refetchInterval: 30,
createOptions() { createOptions() {
+13 -21
View File
@@ -793,9 +793,7 @@ export default function DownloadClientsWidget({
animateOpacity: true, animateOpacity: true,
transitionTimingFunction: "ease-out", transitionTimingFunction: "ease-out",
}, },
content: ({ record, collapse }) => ( content: ({ record, collapse }) => <ExpandedRow item={record} collapse={collapse} />,
<ExpandedRow item={record} collapse={collapse} />
),
}} }}
onScroll={() => { onScroll={() => {
if (contextMenu) closeContextMenu(); if (contextMenu) closeContextMenu();
@@ -871,13 +869,7 @@ function buildHoverTooltip(record: ExtendedDownloadClientItem, t: DownloadsT): R
); );
} }
function ExpandedRow({ function ExpandedRow({ item, collapse }: { item: ExtendedDownloadClientItem; collapse: () => void }) {
item,
collapse,
}: {
item: ExtendedDownloadClientItem;
collapse: () => void;
}) {
const t = useScopedI18n("widget.downloads"); const t = useScopedI18n("widget.downloads");
const locale = useCurrentIntlLocale(); const locale = useCurrentIntlLocale();
const progressPercent = Math.floor(item.progress * 100); const progressPercent = Math.floor(item.progress * 100);
@@ -899,13 +891,13 @@ function ExpandedRow({
thickness={5} thickness={5}
roundCaps roundCaps
sections={[{ value: progressPercent, color: progressColor(item.state, item.progress) }]} sections={[{ value: progressPercent, color: progressColor(item.state, item.progress) }]}
label={<Text size="xs" ta="center" fw={700}>{`${progressPercent}%`}</Text>} label={<Text ta="center" fw={700} style={{ fontSize: 10 }}>{`${progressPercent}%`}</Text>}
/> />
<Stack gap="xs" style={{ flex: 1, minWidth: 0 }}> <Stack gap={4} style={{ flex: 1 }}>
<Group gap="xs" wrap="nowrap" style={{ minWidth: 0 }}> <Group gap="xs" wrap="nowrap">
<Avatar size="var(--mantine-font-size-md)" radius={0} src={getIconUrl(item.integration.kind)} /> <Avatar size={16} radius={0} src={getIconUrl(item.integration.kind)} />
<Text size="sm" fw={600} truncate style={{ minWidth: 0 }}> <Text size="xs" fw={600} truncate>
{item.name} {item.name}
</Text> </Text>
<Badge size="xs" variant="light" color={stateColorMap[item.state]} ml="auto" style={{ flexShrink: 0 }}> <Badge size="xs" variant="light" color={stateColorMap[item.state]} ml="auto" style={{ flexShrink: 0 }}>
@@ -913,7 +905,7 @@ function ExpandedRow({
</Badge> </Badge>
</Group> </Group>
<SimpleGrid cols={3} spacing="xs" verticalSpacing={4} style={{ minWidth: 0 }}> <SimpleGrid cols={3} spacing={4} verticalSpacing={2}>
<DetailPair <DetailPair
label={t("items.size.detailsTitle")} label={t("items.size.detailsTitle")}
value={`${formatBytes(item.received)} / ${formatBytes(item.size)}`} value={`${formatBytes(item.received)} / ${formatBytes(item.size)}`}
@@ -965,17 +957,17 @@ function DetailPair({
color?: string; color?: string;
}) { }) {
return ( return (
<Stack gap={0} style={{ minWidth: 0, overflow: "hidden" }}> <Group gap={4} wrap="nowrap">
<Text size="xs" c="dimmed" truncate> <Text size="xs" c="dimmed" style={{ whiteSpace: "nowrap", fontSize: 10 }}>
{label}: {label}:
</Text> </Text>
<Group gap={2} wrap="nowrap" style={{ minWidth: 0 }}> <Group gap={2} wrap="nowrap">
{icon} {icon}
<Text size="sm" fw={500} c={color} truncate style={{ minWidth: 0 }}> <Text size="xs" fw={500} c={color} truncate style={{ fontSize: 10 }}>
{value} {value}
</Text> </Text>
</Group> </Group>
</Stack> </Group>
); );
} }
@@ -1,7 +1,7 @@
import { describe, expect, test } from "vitest"; import { describe, expect, test } from "vitest";
import { import {
ADVANCED_DOWNLOAD_COLUMN_ACCESSORS, DOWNLOAD_COLUMN_ACCESSORS,
filterDownloadItemsByStatus, filterDownloadItemsByStatus,
getAvailableDownloadStates, getAvailableDownloadStates,
getDownloadColumnAccessors, getDownloadColumnAccessors,
@@ -25,8 +25,8 @@ describe("downloads filters", () => {
}); });
describe("downloads advanced columns", () => { describe("downloads advanced columns", () => {
test("uses summary columns in advanced mode without changing the compact selection", () => { test("uses every column in advanced mode without changing the compact selection", () => {
expect(getDownloadColumnAccessors(["name"], true)).toEqual(ADVANCED_DOWNLOAD_COLUMN_ACCESSORS); expect(getDownloadColumnAccessors(["name"], true)).toEqual(DOWNLOAD_COLUMN_ACCESSORS);
expect(getDownloadColumnAccessors(["name"], false)).toEqual(["name"]); expect(getDownloadColumnAccessors(["name"], false)).toEqual(["name"]);
}); });
}); });
+1 -12
View File
@@ -20,17 +20,6 @@ export const DOWNLOAD_COLUMN_ACCESSORS = [
"type", "type",
] as const satisfies readonly (keyof ExtendedDownloadClientItem)[]; ] as const satisfies readonly (keyof ExtendedDownloadClientItem)[];
export const ADVANCED_DOWNLOAD_COLUMN_ACCESSORS = [
"name",
"progress",
"size",
"downSpeed",
"upSpeed",
"time",
"state",
"integration",
] as const satisfies readonly (typeof DOWNLOAD_COLUMN_ACCESSORS)[number][];
type DownloadColumnAccessor = (typeof DOWNLOAD_COLUMN_ACCESSORS)[number]; type DownloadColumnAccessor = (typeof DOWNLOAD_COLUMN_ACCESSORS)[number];
export function getDownloadsStatsDisplay(showCompactStats: boolean, isAdvanced: boolean) { export function getDownloadsStatsDisplay(showCompactStats: boolean, isAdvanced: boolean) {
@@ -44,7 +33,7 @@ export function getDownloadColumnAccessors(
configuredColumns: readonly DownloadColumnAccessor[], configuredColumns: readonly DownloadColumnAccessor[],
isAdvanced: boolean, isAdvanced: boolean,
): readonly DownloadColumnAccessor[] { ): readonly DownloadColumnAccessor[] {
return isAdvanced ? ADVANCED_DOWNLOAD_COLUMN_ACCESSORS : configuredColumns; return isAdvanced ? DOWNLOAD_COLUMN_ACCESSORS : configuredColumns;
} }
export function filterDownloadItemsByStatus<T extends { state: DownloadState }>( export function filterDownloadItemsByStatus<T extends { state: DownloadState }>(
-17
View File
@@ -1,17 +0,0 @@
diff --git a/dist/index.js b/dist/index.js
index 1ac8241b321236fb9f43feb9405151da1fd3d975..9fb5fff13b2bfd2d1db4a7d16003f1fa9e0fb699 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1,2 +1,2 @@
-"use strict";"use client";var pr=Object.create;var Dt=Object.defineProperty;var fr=Object.getOwnPropertyDescriptor;var br=Object.getOwnPropertyNames;var gr=Object.getPrototypeOf,Tr=Object.prototype.hasOwnProperty;var hr=(e,t)=>{for(var n in t)Dt(e,n,{get:t[n],enumerable:!0})},Rn=(e,t,n,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of br(t))!Tr.call(e,a)&&a!==n&&Dt(e,a,{get:()=>t[a],enumerable:!(o=fr(t,a))||o.enumerable});return e};var q=(e,t,n)=>(n=e!=null?pr(gr(e)):{},Rn(t||!e||!e.__esModule?Dt(n,"default",{value:e,enumerable:!0}):n,e)),Cr=e=>Rn(Dt({},"__esModule",{value:!0}),e);var xr={};hr(xr,{DataTable:()=>ra,DataTableDraggableRow:()=>sa,calculateColSpan:()=>it,differenceBy:()=>an,flattenColumns:()=>Xe,getGroupsAtDepth:()=>vt,getMaxGroupDepth:()=>xt,getRecordId:()=>F,getValueAtPath:()=>Rt,hasStringAccessor:()=>rt,humanize:()=>Ie,needsRightBorder:()=>rn,reorderRecords:()=>yr,sanitizeStoredArray:()=>pe,swapRecords:()=>Pr,uniqBy:()=>lt,useDataTableColumns:()=>ln});module.exports=Cr(xr);var Bt=require("@mantine/core"),Wt=require("@mantine/hooks"),Tn=q(require("clsx")),J=require("react");var xn=require("@mantine/core");function V(e,t,n){return e?(0,xn.parseThemeColor)({color:typeof e=="object"?e[n]:e,theme:t}).value:void 0}function vn({theme:e,c:t,backgroundColor:n,borderColor:o,rowBorderColor:a,stripedColor:r,highlightOnHoverColor:l}){return{"--mantine-datatable-color-light":V(t,e,"light"),"--mantine-datatable-color-dark":V(t,e,"dark"),"--mantine-datatable-background-color-light":V(n,e,"light"),"--mantine-datatable-background-color-dark":V(n,e,"dark"),"--mantine-datatable-border-color-light":V(o,e,"light"),"--mantine-datatable-border-color-dark":V(o,e,"dark"),"--mantine-datatable-row-border-color-light":V(a,e,"light"),"--mantine-datatable-row-border-color-dark":V(a,e,"dark"),"--mantine-datatable-striped-color-light":V(r,e,"light"),"--mantine-datatable-striped-color-dark":V(r,e,"dark"),"--mantine-datatable-highlight-on-hover-color-light":V(l,e,"light"),"--mantine-datatable-highlight-on-hover-color-dark":V(l,e,"dark")}}function wt({theme:e,paginationActiveTextColor:t,paginationActiveBackgroundColor:n}){return{"--mantine-datatable-pagination-active-text-color-light":V(t,e,"light"),"--mantine-datatable-pagination-active-text-color-dark":V(t,e,"dark"),"--mantine-datatable-pagination-active-background-color-light":V(n,e,"light"),"--mantine-datatable-pagination-active-background-color-dark":V(n,e,"dark")}}function Mn({theme:e,color:t,backgroundColor:n}){return{"--mantine-datatable-row-color-light":V(t,e,"light"),"--mantine-datatable-row-color-dark":V(t,e,"dark"),"--mantine-datatable-row-background-color-light":V(n,e,"light"),"--mantine-datatable-row-background-color-dark":V(n,e,"dark")}}var en=require("react");var kn=require("@mantine/core"),[En,$e]=(0,kn.createSafeContext)("useDataTableColumnsContext must be used within DataTableColumnProvider");var Ln=require("react/jsx-runtime"),tn=e=>{let{children:t,columnsOrder:n,setColumnsOrder:o,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S,pinnedMap:b}=e,[C,E]=(0,en.useState)(""),[D,L]=(0,en.useState)("");return(0,Ln.jsx)(En,{value:{sourceColumn:C,setSourceColumn:E,targetColumn:D,setTargetColumn:L,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,swapColumns:()=>{if(!n||!o||!C||!D)return;let f=b.get(C),h=b.get(D);if(f?.logicalSide!==h?.logicalSide)return;let w=n.indexOf(C),M=n.indexOf(D);if(w!==-1&&M!==-1){let g=[...n],[R]=g.splice(w,1);g.splice(M,0,R),o(g)}},resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S},children:t})};var nn=require("react/jsx-runtime");function In(){return(0,nn.jsx)("tr",{className:"mantine-datatable-empty-row",children:(0,nn.jsx)("td",{})})}var St=require("@mantine/core");var be=require("react/jsx-runtime");function Nn(){return(0,be.jsxs)("svg",{width:"24",height:"24",viewBox:"0 0 24 24",strokeWidth:"2",stroke:"currentColor",fill:"none",strokeLinecap:"round",strokeLinejoin:"round",children:[(0,be.jsx)("path",{stroke:"none",d:"M0 0h24v24H0z",fill:"none"}),(0,be.jsx)("path",{d:"M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74"}),(0,be.jsx)("path",{d:"M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6"}),(0,be.jsx)("path",{d:"M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4"}),(0,be.jsx)("path",{d:"M3 3l18 18"})]})}var me=require("react/jsx-runtime");function Hn({icon:e,text:t,active:n,children:o}){return(0,me.jsx)(St.Center,{className:"mantine-datatable-empty-state","data-active":n||void 0,children:o||(0,me.jsxs)(me.Fragment Line truncated
+"use strict";"use client";var pr=Object.create;var Dt=Object.defineProperty;var fr=Object.getOwnPropertyDescriptor;var br=Object.getOwnPropertyNames;var gr=Object.getPrototypeOf,Tr=Object.prototype.hasOwnProperty;var hr=(e,t)=>{for(var n in t)Dt(e,n,{get:t[n],enumerable:!0})},Rn=(e,t,n,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of br(t))!Tr.call(e,a)&&a!==n&&Dt(e,a,{get:()=>t[a],enumerable:!(o=fr(t,a))||o.enumerable});return e};var q=(e,t,n)=>(n=e!=null?pr(gr(e)):{},Rn(t||!e||!e.__esModule?Dt(n,"default",{value:e,enumerable:!0}):n,e)),Cr=e=>Rn(Dt({},"__esModule",{value:!0}),e);var xr={};hr(xr,{DataTable:()=>ra,DataTableDraggableRow:()=>sa,calculateColSpan:()=>it,differenceBy:()=>an,flattenColumns:()=>Xe,getGroupsAtDepth:()=>vt,getMaxGroupDepth:()=>xt,getRecordId:()=>F,getValueAtPath:()=>Rt,hasStringAccessor:()=>rt,humanize:()=>Ie,needsRightBorder:()=>rn,reorderRecords:()=>yr,sanitizeStoredArray:()=>pe,swapRecords:()=>Pr,uniqBy:()=>lt,useDataTableColumns:()=>ln});module.exports=Cr(xr);var Bt=require("@mantine/core"),Wt=require("@mantine/hooks"),Tn=q(require("clsx")),J=require("react");var xn=require("@mantine/core");function V(e,t,n){return e?(0,xn.parseThemeColor)({color:typeof e=="object"?e[n]:e,theme:t}).value:void 0}function vn({theme:e,c:t,backgroundColor:n,borderColor:o,rowBorderColor:a,stripedColor:r,highlightOnHoverColor:l}){return{"--mantine-datatable-color-light":V(t,e,"light"),"--mantine-datatable-color-dark":V(t,e,"dark"),"--mantine-datatable-background-color-light":V(n,e,"light"),"--mantine-datatable-background-color-dark":V(n,e,"dark"),"--mantine-datatable-border-color-light":V(o,e,"light"),"--mantine-datatable-border-color-dark":V(o,e,"dark"),"--mantine-datatable-row-border-color-light":V(a,e,"light"),"--mantine-datatable-row-border-color-dark":V(a,e,"dark"),"--mantine-datatable-striped-color-light":V(r,e,"light"),"--mantine-datatable-striped-color-dark":V(r,e,"dark"),"--mantine-datatable-highlight-on-hover-color-light":V(l,e,"light"),"--mantine-datatable-highlight-on-hover-color-dark":V(l,e,"dark")}}function wt({theme:e,paginationActiveTextColor:t,paginationActiveBackgroundColor:n}){return{"--mantine-datatable-pagination-active-text-color-light":V(t,e,"light"),"--mantine-datatable-pagination-active-text-color-dark":V(t,e,"dark"),"--mantine-datatable-pagination-active-background-color-light":V(n,e,"light"),"--mantine-datatable-pagination-active-background-color-dark":V(n,e,"dark")}}function Mn({theme:e,color:t,backgroundColor:n}){return{"--mantine-datatable-row-color-light":V(t,e,"light"),"--mantine-datatable-row-color-dark":V(t,e,"dark"),"--mantine-datatable-row-background-color-light":V(n,e,"light"),"--mantine-datatable-row-background-color-dark":V(n,e,"dark")}}var en=require("react");var kn=require("@mantine/core"),[En,$e]=(0,kn.createSafeContext)("useDataTableColumnsContext must be used within DataTableColumnProvider");var Ln=require("react/jsx-runtime"),tn=e=>{let{children:t,columnsOrder:n,setColumnsOrder:o,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S,pinnedMap:b}=e,[C,E]=(0,en.useState)(""),[D,L]=(0,en.useState)("");return(0,Ln.jsx)(En,{value:{sourceColumn:C,setSourceColumn:E,targetColumn:D,setTargetColumn:L,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,swapColumns:()=>{if(!n||!o||!C||!D)return;let f=b.get(C),h=b.get(D);if(f?.logicalSide!==h?.logicalSide)return;let w=n.indexOf(C),M=n.indexOf(D);if(w!==-1&&M!==-1){let g=[...n],[R]=g.splice(w,1);g.splice(M,0,R),o(g)}},resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S},children:t})};var nn=require("react/jsx-runtime");function In(){return(0,nn.jsx)("tr",{className:"mantine-datatable-empty-row",children:(0,nn.jsx)("td",{})})}var St=require("@mantine/core");var be=require("react/jsx-runtime");function Nn(){return(0,be.jsxs)("svg",{width:"24",height:"24",viewBox:"0 0 24 24",strokeWidth:"2",stroke:"currentColor",fill:"none",strokeLinecap:"round",strokeLinejoin:"round",children:[(0,be.jsx)("path",{stroke:"none",d:"M0 0h24v24H0z",fill:"none"}),(0,be.jsx)("path",{d:"M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74"}),(0,be.jsx)("path",{d:"M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6"}),(0,be.jsx)("path",{d:"M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4"}),(0,be.jsx)("path",{d:"M3 3l18 18"})]})}var me=require("react/jsx-runtime");function Hn({icon:e,text:t,active:n,children:o}){return(0,me.jsx)(St.Center,{className:"mantine-datatable-empty-state","data-active":n||void 0,children:o||(0,me.jsxs)(me.Fragment Line truncated
//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/dist/index.mjs b/dist/index.mjs
index bfbf1cdbdd176b5776f553075da709115855384a..9583f1c5db65568d77f2dc468ab2d9841175623b 100644
--- a/dist/index.mjs
+++ b/dist/index.mjs
@@ -1,2 +1,2 @@
-"use client";import{Box as Wl,Table as Bl}from"@mantine/core";import{useMergedRef as Ht}from"@mantine/hooks";import Co from"clsx";import{useCallback as At,useEffect as Vl,useLayoutEffect as Gl,useMemo as Fl,useRef as lt}from"react";import{parseThemeColor as Sa}from"@mantine/core";function W(e,t,n){return e?Sa({color:typeof e=="object"?e[n]:e,theme:t}).value:void 0}function Ft({theme:e,c:t,backgroundColor:n,borderColor:o,rowBorderColor:a,stripedColor:r,highlightOnHoverColor:l}){return{"--mantine-datatable-color-light":W(t,e,"light"),"--mantine-datatable-color-dark":W(t,e,"dark"),"--mantine-datatable-background-color-light":W(n,e,"light"),"--mantine-datatable-background-color-dark":W(n,e,"dark"),"--mantine-datatable-border-color-light":W(o,e,"light"),"--mantine-datatable-border-color-dark":W(o,e,"dark"),"--mantine-datatable-row-border-color-light":W(a,e,"light"),"--mantine-datatable-row-border-color-dark":W(a,e,"dark"),"--mantine-datatable-striped-color-light":W(r,e,"light"),"--mantine-datatable-striped-color-dark":W(r,e,"dark"),"--mantine-datatable-highlight-on-hover-color-light":W(l,e,"light"),"--mantine-datatable-highlight-on-hover-color-dark":W(l,e,"dark")}}function We({theme:e,paginationActiveTextColor:t,paginationActiveBackgroundColor:n}){return{"--mantine-datatable-pagination-active-text-color-light":W(t,e,"light"),"--mantine-datatable-pagination-active-text-color-dark":W(t,e,"dark"),"--mantine-datatable-pagination-active-background-color-light":W(n,e,"light"),"--mantine-datatable-pagination-active-background-color-dark":W(n,e,"dark")}}function $t({theme:e,color:t,backgroundColor:n}){return{"--mantine-datatable-row-color-light":W(t,e,"light"),"--mantine-datatable-row-color-dark":W(t,e,"dark"),"--mantine-datatable-row-background-color-light":W(n,e,"light"),"--mantine-datatable-row-background-color-dark":W(n,e,"dark")}}import{useState as Ut}from"react";import{createSafeContext as Ra}from"@mantine/core";var[Xt,Pe]=Ra("useDataTableColumnsContext must be used within DataTableColumnProvider");import{jsx as xa}from"react/jsx-runtime";var Ct=e=>{let{children:t,columnsOrder:n,setColumnsOrder:o,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S,pinnedMap:b}=e,[C,E]=Ut(""),[D,L]=Ut("");return xa(Xt,{value:{sourceColumn:C,setSourceColumn:E,targetColumn:D,setTargetColumn:L,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,swapColumns:()=>{if(!n||!o||!C||!D)return;let f=b.get(C),h=b.get(D);if(f?.logicalSide!==h?.logicalSide)return;let w=n.indexOf(C),M=n.indexOf(D);if(w!==-1&&M!==-1){let g=[...n],[R]=g.splice(w,1);g.splice(M,0,R),o(g)}},resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S},children:t})};import{jsx as Qt}from"react/jsx-runtime";function Kt(){return Qt("tr",{className:"mantine-datatable-empty-row",children:Qt("td",{})})}import{Center as Ma,Text as ka}from"@mantine/core";import{jsx as Le,jsxs as va}from"react/jsx-runtime";function jt(){return va("svg",{width:"24",height:"24",viewBox:"0 0 24 24",strokeWidth:"2",stroke:"currentColor",fill:"none",strokeLinecap:"round",strokeLinejoin:"round",children:[Le("path",{stroke:"none",d:"M0 0h24v24H0z",fill:"none"}),Le("path",{d:"M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74"}),Le("path",{d:"M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6"}),Le("path",{d:"M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4"}),Le("path",{d:"M3 3l18 18"})]})}import{Fragment as Ea,jsx as Be,jsxs as La}from"react/jsx-runtime";function Jt({icon:e,text:t,active:n,children:o}){return Be(Ma,{className:"mantine-datatable-empty-state","data-active":n||void 0,children:o||La(Ea,{children:[e||Be("div",{className:"mantine-datatable-empty-state-icon",children:Be(jt,{})}),Be(ka,{component:"div",size:"sm",c:"dimmed",children:t})]})})}import{TableTfoot as dr,TableTr as mr}from"@mantine/core";import pr from"clsx";import{TableTh as lr}from"@mantine/core";import ir from"clsx";import{useCallback as fi,useRef as bi,useState as gi}from"react";import{useLocalStorage as Ia}from"@mantine/hooks";import{useEffect as Na,useMemo as Yt}from"react";function De(e){let t=e.replace(/([a-z\d])([A-Z]+)/g,"$1 $2").replace(/\W|_/g," ").trim().toLowerCase();return`${t.charAt(0).toUpperCase()}${t.slice(1)}`}function Z(e,t,n){return!Array.isArray(e)||n&&!e.every(n)?t:e}function Ve(e){return typeof e=="object"&&e!==null&&typeof e.accessor=="string"}function qt(e,t,n){return e.filter(o=>!t.map(n).includes(n(o)))}function Ge(e,t){return e.filter((n,o,a)=>o===a.findIndex(r=>t(n)===t(r)))}function yt(e,t){return t?t.match(/ Line truncated
+"use client";import{Box as Wl,Table as Bl}from"@mantine/core";import{useMergedRef as Ht}from"@mantine/hooks";import Co from"clsx";import{useCallback as At,useEffect as Vl,useLayoutEffect as Gl,useMemo as Fl,useRef as lt}from"react";import{parseThemeColor as Sa}from"@mantine/core";function W(e,t,n){return e?Sa({color:typeof e=="object"?e[n]:e,theme:t}).value:void 0}function Ft({theme:e,c:t,backgroundColor:n,borderColor:o,rowBorderColor:a,stripedColor:r,highlightOnHoverColor:l}){return{"--mantine-datatable-color-light":W(t,e,"light"),"--mantine-datatable-color-dark":W(t,e,"dark"),"--mantine-datatable-background-color-light":W(n,e,"light"),"--mantine-datatable-background-color-dark":W(n,e,"dark"),"--mantine-datatable-border-color-light":W(o,e,"light"),"--mantine-datatable-border-color-dark":W(o,e,"dark"),"--mantine-datatable-row-border-color-light":W(a,e,"light"),"--mantine-datatable-row-border-color-dark":W(a,e,"dark"),"--mantine-datatable-striped-color-light":W(r,e,"light"),"--mantine-datatable-striped-color-dark":W(r,e,"dark"),"--mantine-datatable-highlight-on-hover-color-light":W(l,e,"light"),"--mantine-datatable-highlight-on-hover-color-dark":W(l,e,"dark")}}function We({theme:e,paginationActiveTextColor:t,paginationActiveBackgroundColor:n}){return{"--mantine-datatable-pagination-active-text-color-light":W(t,e,"light"),"--mantine-datatable-pagination-active-text-color-dark":W(t,e,"dark"),"--mantine-datatable-pagination-active-background-color-light":W(n,e,"light"),"--mantine-datatable-pagination-active-background-color-dark":W(n,e,"dark")}}function $t({theme:e,color:t,backgroundColor:n}){return{"--mantine-datatable-row-color-light":W(t,e,"light"),"--mantine-datatable-row-color-dark":W(t,e,"dark"),"--mantine-datatable-row-background-color-light":W(n,e,"light"),"--mantine-datatable-row-background-color-dark":W(n,e,"dark")}}import{useState as Ut}from"react";import{createSafeContext as Ra}from"@mantine/core";var[Xt,Pe]=Ra("useDataTableColumnsContext must be used within DataTableColumnProvider");import{jsx as xa}from"react/jsx-runtime";var Ct=e=>{let{children:t,columnsOrder:n,setColumnsOrder:o,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S,pinnedMap:b}=e,[C,E]=Ut(""),[D,L]=Ut("");return xa(Xt,{value:{sourceColumn:C,setSourceColumn:E,targetColumn:D,setTargetColumn:L,columnsToggle:a,setColumnsToggle:r,columnsPinning:l,setColumnsPinning:s,swapColumns:()=>{if(!n||!o||!C||!D)return;let f=b.get(C),h=b.get(D);if(f?.logicalSide!==h?.logicalSide)return;let w=n.indexOf(C),M=n.indexOf(D);if(w!==-1&&M!==-1){let g=[...n],[R]=g.splice(w,1);g.splice(M,0,R),o(g)}},resetColumnsOrder:c,resetColumnsToggle:m,resetColumnsPinning:i,setColumnWidth:u,setMultipleColumnWidths:p,resetColumnsWidth:T,beginResize:d,endResize:S},children:t})};import{jsx as Qt}from"react/jsx-runtime";function Kt(){return Qt("tr",{className:"mantine-datatable-empty-row",children:Qt("td",{})})}import{Center as Ma,Text as ka}from"@mantine/core";import{jsx as Le,jsxs as va}from"react/jsx-runtime";function jt(){return va("svg",{width:"24",height:"24",viewBox:"0 0 24 24",strokeWidth:"2",stroke:"currentColor",fill:"none",strokeLinecap:"round",strokeLinejoin:"round",children:[Le("path",{stroke:"none",d:"M0 0h24v24H0z",fill:"none"}),Le("path",{d:"M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74"}),Le("path",{d:"M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6"}),Le("path",{d:"M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4"}),Le("path",{d:"M3 3l18 18"})]})}import{Fragment as Ea,jsx as Be,jsxs as La}from"react/jsx-runtime";function Jt({icon:e,text:t,active:n,children:o}){return Be(Ma,{className:"mantine-datatable-empty-state","data-active":n||void 0,children:o||La(Ea,{children:[e||Be("div",{className:"mantine-datatable-empty-state-icon",children:Be(jt,{})}),Be(ka,{component:"div",size:"sm",c:"dimmed",children:t})]})})}import{TableTfoot as dr,TableTr as mr}from"@mantine/core";import pr from"clsx";import{TableTh as lr}from"@mantine/core";import ir from"clsx";import{useCallback as fi,useRef as bi,useState as gi}from"react";import{useLocalStorage as Ia}from"@mantine/hooks";import{useEffect as Na,useMemo as Yt}from"react";function De(e){let t=e.replace(/([a-z\d])([A-Z]+)/g,"$1 $2").replace(/\W|_/g," ").trim().toLowerCase();return`${t.charAt(0).toUpperCase()}${t.slice(1)}`}function Z(e,t,n){return!Array.isArray(e)||n&&!e.every(n)?t:e}function Ve(e){return typeof e=="object"&&e!==null&&typeof e.accessor=="string"}function qt(e,t,n){return e.filter(o=>!t.map(n).includes(n(o)))}function Ge(e,t){return e.filter((n,o,a)=>o===a.findIndex(r=>t(n)===t(r)))}function yt(e,t){return t?t.match(/ Line truncated
//# sourceMappingURL=index.mjs.map
+3 -4
View File
@@ -704,7 +704,6 @@ overrides:
patchedDependencies: patchedDependencies:
'@types/node-unifi': 5e6ae51e2a17a7f9729bfa30b0eb3d0842a5810ac6db47603ab4a6efa1ed84c5 '@types/node-unifi': 5e6ae51e2a17a7f9729bfa30b0eb3d0842a5810ac6db47603ab4a6efa1ed84c5
mantine-datatable@9.3.1: 8b83a773610215e619e3f5acbec2d26fb6f27b089852e2bc754d10d8515c1254
trpc-to-openapi: 2ca3c16af0fcca0c736697ad4fe553a14f794524fa9ce0d5c3e8ee4aea76090c trpc-to-openapi: 2ca3c16af0fcca0c736697ad4fe553a14f794524fa9ce0d5c3e8ee4aea76090c
importers: importers:
@@ -1210,7 +1209,7 @@ importers:
version: 3.10.1 version: 3.10.1
mantine-datatable: mantine-datatable:
specifier: 'catalog:' specifier: 'catalog:'
version: 9.3.1(patch_hash=8b83a773610215e619e3f5acbec2d26fb6f27b089852e2bc754d10d8515c1254)(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) version: 9.3.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
mantine-react-table: mantine-react-table:
specifier: 'catalog:' specifier: 'catalog:'
version: mantine-react-table-open@9.0.3(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/dates@9.4.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(@tabler/icons-react@3.44.0(react@19.2.7))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) version: mantine-react-table-open@9.0.3(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/dates@9.4.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(@tabler/icons-react@3.44.0(react@19.2.7))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
@@ -2985,7 +2984,7 @@ importers:
version: 1.24.0(react@19.2.7) version: 1.24.0(react@19.2.7)
mantine-datatable: mantine-datatable:
specifier: 'catalog:' specifier: 'catalog:'
version: 9.3.1(patch_hash=8b83a773610215e619e3f5acbec2d26fb6f27b089852e2bc754d10d8515c1254)(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) version: 9.3.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
mantine-react-table: mantine-react-table:
specifier: 'catalog:' specifier: 'catalog:'
version: mantine-react-table-open@9.0.3(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/dates@9.4.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(@tabler/icons-react@3.44.0(react@19.2.7))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) version: mantine-react-table-open@9.0.3(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/dates@9.4.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(@tabler/icons-react@3.44.0(react@19.2.7))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
@@ -28634,7 +28633,7 @@ snapshots:
dependencies: dependencies:
semver: 7.8.5 semver: 7.8.5
mantine-datatable@9.3.1(patch_hash=8b83a773610215e619e3f5acbec2d26fb6f27b089852e2bc754d10d8515c1254)(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7): mantine-datatable@9.3.1(@mantine/core@9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(@mantine/hooks@9.4.1(react@19.2.7))(clsx@2.1.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
dependencies: dependencies:
'@mantine/core': 9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) '@mantine/core': 9.4.1(@mantine/hooks@9.4.1(react@19.2.7))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
'@mantine/hooks': 9.4.1(react@19.2.7) '@mantine/hooks': 9.4.1(react@19.2.7)
-1
View File
@@ -280,7 +280,6 @@ overrides:
"vite@>=5.0.0 <=5.4.18": ">=8.1.4" "vite@>=5.0.0 <=5.4.18": ">=8.1.4"
patchedDependencies: patchedDependencies:
"@types/node-unifi": "patches/@types__node-unifi.patch" "@types/node-unifi": "patches/@types__node-unifi.patch"
mantine-datatable@9.3.1: patches/mantine-datatable@9.3.1.patch
"trpc-to-openapi": "patches/trpc-to-openapi.patch" "trpc-to-openapi": "patches/trpc-to-openapi.patch"
allowUnusedPatches: true allowUnusedPatches: true