Skip to content

Level pill: no ground-floor delete; hide compass in studio #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wass08 merged 1 commit into from
Aug 26, 2026
Merged

Level pill: no ground-floor delete; hide compass in studio #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/editor/src/components/editor/floorplan-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5092,6 +5092,9 @@ export function FloorplanPanel({
if (building?.type !== 'building') return false
return building.children.some((cid) => state.nodes[cid]?.type === 'level')
})
// The studio workspace (renders / materials / item builder) is a clean
// stage — editor viewport chrome, compass included, stays out of it.
const isStudioWorkspace = useEditor((s) => s.workspaceMode === 'studio')
const elevators = useScene(
useShallow((state) => {
const building = currentBuildingId ? state.nodes[currentBuildingId] : null
Expand Down Expand Up @@ -11136,7 +11139,8 @@ export function FloorplanPanel({
<FloorplanRegistryActionMenu />
<FloorplanGroupActionMenu />

{(levelNode?.type === 'level' || hasAmbientBuildingLevel) &&
{!isStudioWorkspace &&
(levelNode?.type === 'level' || hasAmbientBuildingLevel) &&
(compassHost ? (
createPortal(
<FloorplanCompassButton
Expand Down
7 changes: 6 additions & 1 deletion packages/editor/src/components/ui/floating-level-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ function LevelRow({
const storeyHeight = getStoredLevelHeight(level)
// toFixed(2) + strip one trailing zero: "2.50" → "2.5", "2.75" stays.
const storeyHeightLabel = `${toDisplay(storeyHeight).toFixed(2).replace(/0$/, '')} ${displayUnit}`
// Same rule as the site panel and command palette: the ordinal-0 ground
// floor is the vertical model's zero anchor and must never be deletable.
const canDeleteLevel = level.level !== 0

// Clean preset values per display system; imperial stores exact meters
// for whole-foot storey heights.
Expand Down Expand Up @@ -304,11 +307,13 @@ function LevelRow({
</button>
)}
<button
className="flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-muted-foreground text-xs transition-colors hover:bg-white/10 hover:text-red-400"
className="flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-muted-foreground text-xs transition-colors enabled:hover:bg-white/10 enabled:hover:text-red-400 disabled:cursor-not-allowed disabled:opacity-50"
disabled={!canDeleteLevel}
onClick={(e) => {
e.stopPropagation()
onRequestDelete()
}}
title={canDeleteLevel ? 'Delete level' : 'The ground level cannot be deleted'}
type="button"
>
<Trash2 className="h-3 w-3" />
Expand Down
Loading