Edit the whole dashboard, and let the grid follow its canvas
The editor only ever arranged the first section, so the demo's Home dashboard lost 16 of its 25 widgets the moment it was edited. A page's sections are now read as one arrangement — each pushed below the one before it — and written back as one, which is the shape a dashboard was already heading for: one dashboard, one canvas, and the panel rail for the several-dashboards story. The page tabs that story made dead are gone; PageDef/SectionDef stay in the schema and a page the editor does not show round-trips untouched. The row height derives from the canvas as the column width already did, so the same arrangement is the same picture on a 7" panel as on a 4K one. The uPlot rules move beside UplotChart, where a chart on Health is styled without a dashboard having been visited first, and the bar's readout travels on one property instead of jumping sides at 30%. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018tULRZJUkZsw7rMJ3h4xvu
This commit is contained in:
@@ -42,7 +42,6 @@ import {
|
||||
PopoverTrigger,
|
||||
} from "@/components/ui/popover"
|
||||
import { Separator } from "@/components/ui/separator"
|
||||
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs"
|
||||
import {
|
||||
Tooltip,
|
||||
TooltipContent,
|
||||
@@ -60,11 +59,12 @@ import {
|
||||
columnsOf,
|
||||
type Dashboard,
|
||||
DashboardView,
|
||||
flatWidgets,
|
||||
GRID_GAP,
|
||||
isPlaced,
|
||||
pagesOf,
|
||||
placement,
|
||||
ROW_HEIGHT,
|
||||
rowHeightOf,
|
||||
rowsOf,
|
||||
sectionsOf,
|
||||
widgetsOf,
|
||||
@@ -208,9 +208,6 @@ export function DashboardEditor({
|
||||
const [draft, setDraft] = useState<Dashboard>(dashboard)
|
||||
const [selected, setSelected] = useState<string | null>(null)
|
||||
const [settingsOpen, setSettingsOpen] = useState(false)
|
||||
const [pageId, setPageId] = useState<string | undefined>(
|
||||
() => pagesOf(dashboard)[0]?.id,
|
||||
)
|
||||
// A phone reads the dashboard rather than arranges it, so the grid library
|
||||
// never mounts there. See DESIGN-GUIDELINES.md → Responsive.
|
||||
const stacked = useIsMobile()
|
||||
@@ -283,26 +280,32 @@ export function DashboardEditor({
|
||||
// a save in flight is still "no unpublished changes" until it lands.
|
||||
const hasDraft = Boolean(dashboard.has_draft)
|
||||
const columns = columnsOf(draft)
|
||||
const pages = pagesOf(draft)
|
||||
const page = pages.find((candidate) => candidate.id === pageId) ?? pages[0]
|
||||
const section = page ? sectionsOf(page)[0] : undefined
|
||||
const widgets = section ? widgetsOf(section) : []
|
||||
const page = pagesOf(draft)[0]
|
||||
// Every widget the panel shows, not just the first section's — a document
|
||||
// written with several sections is one arrangement here, as it is there.
|
||||
const widgets = page ? flatWidgets(page) : []
|
||||
const canvas = canvasOf(draft)
|
||||
|
||||
const updateWidgets = (next: WidgetDef[]) => {
|
||||
if (!page || !section) return
|
||||
if (!page) return
|
||||
commit({
|
||||
...draft,
|
||||
// Only this page is rewritten: a document carrying pages the editor
|
||||
// does not show round-trips them untouched.
|
||||
pages: pagesOf(draft).map((candidate) =>
|
||||
candidate.id !== page.id
|
||||
? candidate
|
||||
: {
|
||||
...candidate,
|
||||
sections: sectionsOf(candidate).map((existing) =>
|
||||
existing.id !== section.id
|
||||
? existing
|
||||
: { ...existing, widgets: next },
|
||||
),
|
||||
// One canvas, one grid: what several sections were read as is
|
||||
// written back as one, which is also what keeps their row
|
||||
// offsets from being applied a second time on the next read.
|
||||
sections: [
|
||||
{
|
||||
...(sectionsOf(candidate)[0] ?? { id: "main" }),
|
||||
widgets: next,
|
||||
},
|
||||
],
|
||||
},
|
||||
),
|
||||
})
|
||||
@@ -444,7 +447,6 @@ export function DashboardEditor({
|
||||
<div className="h-full overflow-y-auto">
|
||||
<DashboardView
|
||||
dashboard={draft}
|
||||
pageId={page.id}
|
||||
stacked
|
||||
renderWidget={edit ? pickable : undefined}
|
||||
/>
|
||||
@@ -453,7 +455,7 @@ export function DashboardEditor({
|
||||
<CanvasSurface dashboard={draft} dots={edit}>
|
||||
{(scale) =>
|
||||
!edit ? (
|
||||
<DashboardView dashboard={draft} pageId={page.id} />
|
||||
<DashboardView dashboard={draft} />
|
||||
) : (
|
||||
<GridLayout
|
||||
width={canvas.width}
|
||||
@@ -462,7 +464,7 @@ export function DashboardEditor({
|
||||
positionStrategy={scaledStrategy(scale)}
|
||||
gridConfig={{
|
||||
cols: columns,
|
||||
rowHeight: ROW_HEIGHT,
|
||||
rowHeight: rowHeightOf(draft),
|
||||
margin: [GRID_GAP, GRID_GAP],
|
||||
containerPadding: [0, 0],
|
||||
// The canvas is the constraint: nothing may be dragged off the
|
||||
@@ -524,17 +526,6 @@ export function DashboardEditor({
|
||||
<span className="truncate px-3 py-1.5 text-sm font-medium">
|
||||
{draft.title || draft.name}
|
||||
</span>
|
||||
{pages.length > 1 ? (
|
||||
<Tabs value={page?.id} onValueChange={setPageId}>
|
||||
<TabsList>
|
||||
{pages.map((candidate) => (
|
||||
<TabsTrigger key={candidate.id} value={candidate.id}>
|
||||
{candidate.title || candidate.id}
|
||||
</TabsTrigger>
|
||||
))}
|
||||
</TabsList>
|
||||
</Tabs>
|
||||
) : null}
|
||||
</CanvasTitle>
|
||||
|
||||
<motion.div
|
||||
|
||||
Reference in New Issue
Block a user