Skip to content

The VS Code of video editing, built for agents.

TypeScript

Enhance FloatingInspector components with onClose functionality

konstantin-paulus81ab54fed19c
diff --git a/apps/web/src/components/sidebar-right/inspector/animations.tsx b/apps/web/src/components/sidebar-right/inspector/animations.tsx
index 59380100..d42f8b0c 100644
--- a/apps/web/src/components/sidebar-right/inspector/animations.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/animations.tsx
@@ -246,7 +246,7 @@ function AnimationInspector(props: AnimationInspectorProps) {
};
return (
- <FloatingInspector open anchorRef={props.anchorRef} width={248}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={248} onClose={props.onClose}>
<FloatingInspectorHeader class="items-center justify-between px-2">
<Select<AnimationOption, AnimationGroup>
value={option()}
diff --git a/apps/web/src/components/sidebar-right/inspector/background.tsx b/apps/web/src/components/sidebar-right/inspector/background.tsx
index 92582308..66b642cb 100644
--- a/apps/web/src/components/sidebar-right/inspector/background.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/background.tsx
@@ -50,6 +50,7 @@ export function BackgroundSettings() {
<FloatingInspector
open={isPickerOpen}
anchorRef={anchorRef}
+ onClose={() => setIsPickerOpen(false)}
>
<FloatingInspectorHeader>
<FloatingInspectorTitle>Color</FloatingInspectorTitle>
diff --git a/apps/web/src/components/sidebar-right/inspector/caption-settings.tsx b/apps/web/src/components/sidebar-right/inspector/caption-settings.tsx
index 659c7a69..fe28875e 100644
--- a/apps/web/src/components/sidebar-right/inspector/caption-settings.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/caption-settings.tsx
@@ -128,7 +128,7 @@ export function CaptionSettings(props: CaptionSettingsProps) {
</For>
<Show when={openSlot() !== null}>
- <FloatingInspector open anchorRef={anchorRef}>
+ <FloatingInspector open anchorRef={anchorRef} onClose={() => setOpenSlot(null)}>
<FloatingInspectorHeader>
<FloatingInspectorTitle>
{slots()[openSlot()!]?.label ?? "Color"}
diff --git a/apps/web/src/components/sidebar-right/inspector/effects-inspector.tsx b/apps/web/src/components/sidebar-right/inspector/effects-inspector.tsx
index 1da718c9..1f3a76bf 100644
--- a/apps/web/src/components/sidebar-right/inspector/effects-inspector.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/effects-inspector.tsx
@@ -116,7 +116,7 @@ export function EffectsInspector(props: EffectsInspectorProps) {
};
return (
- <FloatingInspector open anchorRef={props.anchorRef} width={248}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={248} onClose={props.onClose}>
<FloatingInspectorHeader class="items-center justify-between px-2">
<Select<EffectOption>
value={option()}
diff --git a/apps/web/src/components/sidebar-right/inspector/export.tsx b/apps/web/src/components/sidebar-right/inspector/export.tsx
index 76dcb346..fc9b092f 100644
--- a/apps/web/src/components/sidebar-right/inspector/export.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/export.tsx
@@ -326,7 +326,7 @@ function ExportInspector(props: ExportInspectorProps) {
const write = props.onPatch;
return (
- <FloatingInspector open anchorRef={props.anchorRef} width={272}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={272} onClose={props.onClose}>
<FloatingInspectorHeader class="items-center justify-between px-2">
<Select
value={templateId()}
diff --git a/apps/web/src/components/sidebar-right/inspector/fill-picker.tsx b/apps/web/src/components/sidebar-right/inspector/fill-picker.tsx
index 77e2a86a..d454ec02 100644
--- a/apps/web/src/components/sidebar-right/inspector/fill-picker.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/fill-picker.tsx
@@ -224,7 +224,12 @@ export function FillPicker(props: FillPickerProps) {
});
return (
- <FloatingInspector open anchorRef={props.anchorRef}>
+ <FloatingInspector
+ open
+ anchorRef={props.anchorRef}
+ onClose={props.onClose}
+ locked={currentTab() === "gradient"}
+ >
<FloatingInspectorHeader>
<FloatingInspectorTitle>
{TABS.find((mode) => mode.value === currentTab())?.label}
diff --git a/apps/web/src/components/sidebar-right/inspector/gradient-picker.tsx b/apps/web/src/components/sidebar-right/inspector/gradient-picker.tsx
index 8920527a..8ddbd3e8 100644
--- a/apps/web/src/components/sidebar-right/inspector/gradient-picker.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/gradient-picker.tsx
@@ -568,6 +568,7 @@ export function GradientFillPicker(props: GradientPickerProps) {
<FloatingInspector
open={colorPickerStop() !== null}
anchorRef={rootRef}
+ onClose={() => setColorPickerStop(null)}
>
<FloatingInspectorHeader>
<FloatingInspectorTitle class="flex-1">Stop color</FloatingInspectorTitle>
diff --git a/apps/web/src/components/sidebar-right/inspector/object-mask.tsx b/apps/web/src/components/sidebar-right/inspector/object-mask.tsx
index eaf2db66..d88f151a 100644
--- a/apps/web/src/components/sidebar-right/inspector/object-mask.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/object-mask.tsx
@@ -132,7 +132,7 @@ export function ObjectMaskInspector(props: ObjectMaskInspectorProps) {
};
return (
- <FloatingInspector open anchorRef={props.anchorRef} width={248}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={248} onClose={props.onClose}>
<FloatingInspectorHeader class="items-center justify-between px-2">
<Select<ObjectMaskSource, ObjectMaskGroup>
value={source()}
diff --git a/apps/web/src/components/sidebar-right/inspector/shadow-inspector.tsx b/apps/web/src/components/sidebar-right/inspector/shadow-inspector.tsx
index 826a9842..9577e5f7 100644
--- a/apps/web/src/components/sidebar-right/inspector/shadow-inspector.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/shadow-inspector.tsx
@@ -86,7 +86,7 @@ export function ShadowInspector(props: ShadowInspectorProps) {
return (
<>
- <FloatingInspector open anchorRef={props.anchorRef} width={248}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={248} onClose={handleClose}>
<FloatingInspectorHeader class="items-center justify-between">
<FloatingInspectorTitle>Drop Shadow</FloatingInspectorTitle>
<Tooltip>
@@ -159,7 +159,7 @@ export function ShadowInspector(props: ShadowInspectorProps) {
</FloatingInspectorContent>
</FloatingInspector>
- <FloatingInspector open={pickingColor} anchorRef={() => colorRowRef} offset={26}>
+ <FloatingInspector open={pickingColor} anchorRef={() => colorRowRef} offset={26} onClose={() => setPickingColor(false)}>
<FloatingInspectorHeader>
<FloatingInspectorTitle>Color</FloatingInspectorTitle>
<div class="ml-auto">
diff --git a/apps/web/src/components/sidebar-right/inspector/source.tsx b/apps/web/src/components/sidebar-right/inspector/source.tsx
index 2bd2df8c..d7311448 100644
--- a/apps/web/src/components/sidebar-right/inspector/source.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/source.tsx
@@ -163,7 +163,7 @@ export function SourceRows(props: SourceRowsProps) {
</Show>
<Show when={picking() === "media"}>
- <FloatingInspector open anchorRef={props.anchorRef}>
+ <FloatingInspector open anchorRef={props.anchorRef} onClose={() => setPicking(undefined)}>
<FloatingInspectorHeader>
<FloatingInspectorTitle>Source</FloatingInspectorTitle>
<div class="ml-auto flex items-center gap-1">
@@ -307,7 +307,7 @@ function SolidFillRow(props: SolidFillRowProps) {
</div>
<Show when={props.picking}>
- <FloatingInspector open anchorRef={props.anchorRef}>
+ <FloatingInspector open anchorRef={props.anchorRef} onClose={() => props.onPickingChange(false)}>
<FloatingInspectorHeader>
<FloatingInspectorTitle>Solid</FloatingInspectorTitle>
<div class="ml-auto flex items-center gap-1">
diff --git a/apps/web/src/components/sidebar-right/inspector/stroke-inspector.tsx b/apps/web/src/components/sidebar-right/inspector/stroke-inspector.tsx
index a4634e69..9ce0c64e 100644
--- a/apps/web/src/components/sidebar-right/inspector/stroke-inspector.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/stroke-inspector.tsx
@@ -117,7 +117,7 @@ export function StrokeInspector(props: StrokeInspectorProps) {
return (
<>
- <FloatingInspector open anchorRef={props.anchorRef} width={248} ref={inspectorRef}>
+ <FloatingInspector open anchorRef={props.anchorRef} width={248} ref={inspectorRef} onClose={handleClose}>
<FloatingInspectorHeader class="items-center justify-between">
<FloatingInspectorTitle>Stroke</FloatingInspectorTitle>
<Tooltip>
diff --git a/apps/web/src/components/sidebar-right/inspector/transition.tsx b/apps/web/src/components/sidebar-right/inspector/transition.tsx
index 491b2f2c..661f2ea8 100644
--- a/apps/web/src/components/sidebar-right/inspector/transition.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/transition.tsx
@@ -140,7 +140,7 @@ export function TransitionSettings(props: TransitionSettingsProps) {
</PanelSection>
<Show when={open() && has()}>
- <FloatingInspector open anchorRef={anchorRef} width={248}>
+ <FloatingInspector open anchorRef={anchorRef} width={248} onClose={() => setOpen(false)}>
<FloatingInspectorHeader class="items-center justify-between px-2">
<Select<TransitionOption>
value={option()}
diff --git a/apps/web/src/components/sidebar-right/inspector/variables.tsx b/apps/web/src/components/sidebar-right/inspector/variables.tsx
index 80e59976..c5c53388 100644
--- a/apps/web/src/components/sidebar-right/inspector/variables.tsx
+++ b/apps/web/src/components/sidebar-right/inspector/variables.tsx
@@ -199,7 +199,7 @@ function ColorControl(props: { entry: InspectEntry; onCommit: (value: InspectVal
onClick={() => setIsPickerOpen(true)}
/>
- <FloatingInspector open={isPickerOpen} anchorRef={anchorRef}>
+ <FloatingInspector open={isPickerOpen} anchorRef={anchorRef} onClose={() => setIsPickerOpen(false)}>
<FloatingInspectorHeader>
<FloatingInspectorTitle>{props.entry.label}</FloatingInspectorTitle>
<div class="ml-auto">
diff --git a/apps/web/src/components/ui/floating-inspector.tsx b/apps/web/src/components/ui/floating-inspector.tsx
index cd7f92d1..d29abd36 100644
--- a/apps/web/src/components/ui/floating-inspector.tsx
+++ b/apps/web/src/components/ui/floating-inspector.tsx
@@ -58,11 +58,65 @@ const getAvailableTop = (preferredTop: number, inspectorHeight: number): number
return clamp(preferredTop, VIEWPORT_PADDING, maxTop)
}
+// ── Closing on a press outside ─────────────────────────────────────────
+
+/** An open inspector, as the press-outside handling sees it. */
+type OpenInspector = {
+ locked: () => boolean
+ close: () => void
+}
+
+/**
+ * Where a press keeps every inspector open: inside any of them, or in a
+ * menu, select or tooltip, which render portaled out of the inspector that
+ * opened them.
+ */
+const INSIDE_SELECTOR = "[data-slot='floating-inspector'], [data-popper-positioner]"
+
+const openInspectors = new Set<OpenInspector>()
+let listening = false
+
+/**
+ * Closes every open inspector when a press lands outside all of them, unless
+ * one is locked: a locked inspector keeps them all open, since closing a
+ * parent would take a locked child with it. Runs in the capture phase, ahead
+ * of whatever the press lands on, so the inspectors are gone before a click
+ * elsewhere opens the next one.
+ */
+const onPressCapture = (event: PointerEvent) => {
+ if (openInspectors.size === 0) return
+
+ const target = event.target
+ if (target instanceof Element && target.closest(INSIDE_SELECTOR)) return
+ for (const inspector of openInspectors) {
+ if (inspector.locked()) return
+ }
+
+ // A field being typed in commits on blur, which it would never get once
+ // its inspector is gone: the press closes it before focus moves.
+ const focused = document.activeElement
+ if (focused instanceof HTMLElement && focused.closest(INSIDE_SELECTOR)) focused.blur()
+
+ // Closing unregisters, so walk a copy.
+ for (const inspector of [...openInspectors]) inspector.close()
+}
+
+const registerOpenInspector = (inspector: OpenInspector): (() => void) => {
+ if (!listening) {
+ document.addEventListener("pointerdown", onPressCapture, true)
+ listening = true
+ }
+ openInspectors.add(inspector)
+ return () => openInspectors.delete(inspector)
+}
+
export type FloatingInspectorProps = ComponentProps<"div"> & {
anchorRef: MaybeAccessor<HTMLElement | null | undefined>
width?: number
offset?: MaybeAccessor<number>
open?: MaybeAccessor<boolean>
+ onClose: () => void
+ locked?: MaybeAccessor<boolean>
}
export const FloatingInspector = (props: FloatingInspectorProps) => {
@@ -82,6 +136,8 @@ export const FloatingInspector = (props: FloatingInspectorProps) => {
"offset",
"open",
"children",
+ "onClose",
+ "locked",
])
const parentTopContext = useContext(FloatingInspectorTopContext)
@@ -214,6 +270,16 @@ export const FloatingInspector = (props: FloatingInspectorProps) => {
}
}
+ createEffect(() => {
+ if (!isOpen()) return
+
+ const unregister = registerOpenInspector({
+ locked: () => Boolean(toValue(local.locked)),
+ close: () => local.onClose(),
+ })
+ onCleanup(unregister)
+ })
+
createEffect(() => {
if (!isOpen()) return
toValue(local.anchorRef)