Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Add panel size persistence on board save.
Mike Cao385bdd673423
diff --git a/src/app/(main)/boards/BoardProvider.tsx b/src/app/(main)/boards/BoardProvider.tsxindex 783f92eff..1d1331669 100644--- a/src/app/(main)/boards/BoardProvider.tsx+++ b/src/app/(main)/boards/BoardProvider.tsx@@ -1,15 +1,18 @@'use client';import { Loading, useToast } from '@umami/react-zen';-import { createContext, type ReactNode, useCallback, useEffect, useState } from 'react';+import { createContext, type ReactNode, useCallback, useEffect, useRef, useState } from 'react';import { useApi, useMessages, useModified, useNavigation } from '@/components/hooks';import { useBoardQuery } from '@/components/hooks/queries/useBoardQuery';-import type { Board } from '@/lib/types';+import type { Board, BoardParameters } from '@/lib/types';++export type LayoutGetter = () => Partial<BoardParameters> | null;export interface BoardContextValue {board: Partial<Board>;updateBoard: (data: Partial<Board>) => void;saveBoard: () => Promise<Board>;isPending: boolean;+ registerLayoutGetter: (getter: LayoutGetter) => void;}export const BoardContext = createContext<BoardContextValue>(null);@@ -29,6 +32,11 @@ export function BoardProvider({ boardId, children }: { boardId?: string; childreconst { router, renderUrl } = useNavigation();const [board, setBoard] = useState<Partial<Board>>(data ?? defaultBoard);+ const layoutGetterRef = useRef<LayoutGetter | null>(null);++ const registerLayoutGetter = useCallback((getter: LayoutGetter) => {+ layoutGetterRef.current = getter;+ }, []);useEffect(() => {if (data) {@@ -51,7 +59,18 @@ export function BoardProvider({ boardId, children }: { boardId?: string; childreconst saveBoard = useCallback(async () => {const defaultName = formatMessage(labels.untitled);- const result = await mutateAsync({ ...board, name: board.name || defaultName });++ // Get current layout sizes from BoardBody if registered+ const layoutData = layoutGetterRef.current?.();+ console.log('layoutData from getter:', layoutData);+ const parameters = layoutData ? { ...board.parameters, ...layoutData } : board.parameters;+ console.log('parameters to save:', parameters);++ const result = await mutateAsync({+ ...board,+ name: board.name || defaultName,+ parameters,+ });toast(formatMessage(messages.saved));touch('boards');@@ -80,7 +99,9 @@ export function BoardProvider({ boardId, children }: { boardId?: string; childre}return (- <BoardContext.Provider value={{ board, updateBoard, saveBoard, isPending }}>+ <BoardContext.Provider+ value={{ board, updateBoard, saveBoard, isPending, registerLayoutGetter }}+ >{children}</BoardContext.Provider>);diff --git a/src/app/(main)/boards/[boardId]/BoardBody.tsx b/src/app/(main)/boards/[boardId]/BoardBody.tsxindex 439219636..c85fbbac5 100644--- a/src/app/(main)/boards/[boardId]/BoardBody.tsx+++ b/src/app/(main)/boards/[boardId]/BoardBody.tsx@@ -1,7 +1,7 @@import { Box, Button, Column, Icon, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';import { produce } from 'immer';-import { Fragment, type ReactElement } from 'react';-import { Group, Panel, Separator } from 'react-resizable-panels';+import { Fragment, type ReactElement, useEffect, useRef } from 'react';+import { Group, type GroupImperativeHandle, Panel, Separator } from 'react-resizable-panels';import { v4 as uuid } from 'uuid';import { useBoard } from '@/components/hooks';import { ChevronDown, Minus, Plus, X } from '@/components/icons';@@ -21,7 +21,52 @@ const BUTTON_ROW_HEIGHT = 60;const MAX_COLUMNS = 4;export function BoardBody() {- const { board, updateBoard, saveBoard, isPending } = useBoard();+ const { board, updateBoard, saveBoard, isPending, registerLayoutGetter } = useBoard();+ const rowGroupRef = useRef<GroupImperativeHandle>(null);+ const columnGroupRefs = useRef<Map<string, GroupImperativeHandle>>(new Map());++ // Register a function to get current layout sizes on save+ useEffect(() => {+ registerLayoutGetter(() => {+ const rows = board?.parameters?.rows;+ console.log('Layout getter called, rows:', rows);+ console.log('rowGroupRef.current:', rowGroupRef.current);+ console.log('columnGroupRefs.current:', columnGroupRefs.current);++ if (!rows?.length) return null;++ const rowLayout = rowGroupRef.current?.getLayout();+ console.log('rowLayout:', rowLayout);++ const updatedRows = rows.map(row => {+ const columnGroupRef = columnGroupRefs.current.get(row.id);+ const columnLayout = columnGroupRef?.getLayout();+ console.log(`Row ${row.id} columnLayout:`, columnLayout);++ const updatedColumns = row.columns.map(col => ({+ ...col,+ size: columnLayout?.[col.id],+ }));++ return {+ ...row,+ size: rowLayout?.[row.id],+ columns: updatedColumns,+ };+ });++ console.log('updatedRows:', updatedRows);+ return { rows: updatedRows };+ });+ }, [registerLayoutGetter, board?.parameters?.rows]);++ const registerColumnGroupRef = (rowId: string, ref: GroupImperativeHandle | null) => {+ if (ref) {+ columnGroupRefs.current.set(rowId, ref);+ } else {+ columnGroupRefs.current.delete(rowId);+ }+ };console.log({ board });@@ -82,10 +127,15 @@ export function BoardBody() {const minHeight = (rows?.length || 1) * MAX_ROW_HEIGHT + BUTTON_ROW_HEIGHT;return (- <Group orientation="vertical" style={{ minHeight }}>+ <Group groupRef={rowGroupRef} orientation="vertical" style={{ minHeight }}>{rows.map((row, index) => (<Fragment key={row.id}>- <Panel minSize={MIN_ROW_HEIGHT} maxSize={MAX_ROW_HEIGHT}>+ <Panel+ id={row.id}+ minSize={MIN_ROW_HEIGHT}+ maxSize={MAX_ROW_HEIGHT}+ defaultSize={row.size}+ ><BoardRow{...row}rowId={row.id}@@ -94,6 +144,7 @@ export function BoardBody() {onRemove={handleRemoveRow}onMoveUp={handleMoveRowUp}onMoveDown={handleMoveRowDown}+ onRegisterRef={registerColumnGroupRef}/></Panel>{index < rows?.length - 1 && <Separator />}@@ -123,6 +174,7 @@ function BoardRow({onRemove,onMoveUp,onMoveDown,+ onRegisterRef,}: {rowId: string;rowIndex: number;@@ -131,9 +183,14 @@ function BoardRow({onRemove?: (id: string) => void;onMoveUp?: (id: string) => void;onMoveDown?: (id: string) => void;+ onRegisterRef?: (rowId: string, ref: GroupImperativeHandle | null) => void;}) {const { board, updateBoard } = useBoard();+ const handleGroupRef = (ref: GroupImperativeHandle | null) => {+ onRegisterRef?.(rowId, ref);+ };+const handleAddColumn = () => {updateBoard({parameters: produce(board.parameters, draft => {@@ -160,10 +217,10 @@ function BoardRow({};return (- <Group style={{ height: '100%' }}>+ <Group groupRef={handleGroupRef} style={{ height: '100%' }}>{columns?.map((column, index) => (<Fragment key={column.id}>- <Panel minSize={MIN_COLUMN_WIDTH}>+ <Panel id={column.id} minSize={MIN_COLUMN_WIDTH} defaultSize={column.size}><BoardColumn {...column} onRemove={handleRemoveColumn} /></Panel>{index < columns?.length - 1 && <Separator />}