@lobb-js/studio 0.47.0 → 0.49.0

package/src/lib/components/detailView/fields/PolymorphicField.svelte

@@ -0,0 +1,51 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+    import PolymorphicInput from "../../polymorphicInput.svelte";
+    import FieldWrapper from "./FieldWrapper.svelte";
+
+    interface Props {
+        collectionField: string;
+        idField: string;
+        virtualField: string;
+        targetCollections: string[];
+        entry: Record<string, any>;
+        destructive?: boolean;
+        isDisabled?: boolean;
+        errorMessages?: any;
+        header?: any;
+        clearBtn?: Snippet<[]>;
+    }
+
+    let {
+        collectionField,
+        idField,
+        virtualField,
+        targetCollections,
+        entry = $bindable(),
+        destructive = false,
+        isDisabled = false,
+        errorMessages = [],
+        header,
+        clearBtn,
+    }: Props = $props();
+</script>
+
+<FieldWrapper span={2} {isDisabled} {errorMessages} {header}>
+    {#snippet children()}
+        <div class="relative">
+            {#if clearBtn}
+                <div class="absolute right-1 inset-y-0 z-10 flex items-center">
+                    {@render clearBtn()}
+                </div>
+            {/if}
+            <PolymorphicInput
+                {collectionField}
+                {idField}
+                {virtualField}
+                {targetCollections}
+                bind:entry
+                {destructive}
+            />
+        </div>
+    {/snippet}
+</FieldWrapper>

package/src/lib/components/detailView/fields/RichTextField.svelte

@@ -0,0 +1,30 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+    import RichTextEditor from "../../richTextEditor.svelte";
+    import FieldWrapper from "./FieldWrapper.svelte";
+
+    interface Props {
+        value?: any;
+        field: any;
+        destructive?: boolean;
+        isDisabled?: boolean;
+        errorMessages?: any;
+        header?: any;
+        clearBtn?: Snippet<[]>;
+    }
+
+    let { value = $bindable(), field, destructive = false, isDisabled = false, errorMessages = [], header, clearBtn }: Props = $props();
+</script>
+
+<FieldWrapper span={2} {isDisabled} {errorMessages} {header}>
+    {#snippet children()}
+        <div class="relative {destructive ? 'rounded-md ring-1 ring-destructive' : ''}">
+            {#if clearBtn}
+                <div class="absolute right-1 top-1 z-10">
+                    {@render clearBtn()}
+                </div>
+            {/if}
+            <RichTextEditor name={field.key} bind:value />
+        </div>
+    {/snippet}
+</FieldWrapper>

package/src/lib/components/detailView/fields/StringField.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+    import Input from "../../ui/input/input.svelte";
+    import FieldWrapper from "./FieldWrapper.svelte";
+
+    interface Props {
+        value?: any;
+        placeholder?: string;
+        destructive?: boolean;
+        changedClass?: string;
+        isDisabled?: boolean;
+        errorMessages?: any;
+        header?: any;
+        clearBtn?: Snippet<[]>;
+    }
+    let { value = $bindable(), placeholder = "NULL", destructive = false, changedClass = '', isDisabled = false, errorMessages = [], header, clearBtn }: Props = $props();
+</script>
+
+<FieldWrapper span={1} {isDisabled} {errorMessages} {header}>
+    {#snippet children()}
+        <div class="relative">
+            {#if clearBtn}
+                <div class="absolute right-1 inset-y-0 z-10 flex items-center">
+                    {@render clearBtn()}
+                </div>
+            {/if}
+            <Input
+                {placeholder}
+                type="text"
+                class="bg-muted text-xs pr-9 {changedClass} {destructive ? 'border-destructive' : ''}"
+                bind:value
+            />
+        </div>
+    {/snippet}
+</FieldWrapper>

package/src/lib/components/detailView/fields/TextField.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+    import Textarea from "../../ui/textarea/textarea.svelte";
+    import FieldWrapper from "./FieldWrapper.svelte";
+
+    interface Props {
+        value?: any;
+        placeholder?: string;
+        destructive?: boolean;
+        changedClass?: string;
+        isDisabled?: boolean;
+        errorMessages?: any;
+        header?: any;
+        clearBtn?: Snippet<[]>;
+    }
+    let { value = $bindable(), placeholder = "NULL", destructive = false, changedClass = '', isDisabled = false, errorMessages = [], header, clearBtn }: Props = $props();
+</script>
+
+<FieldWrapper span={2} {isDisabled} {errorMessages} {header}>
+    {#snippet children()}
+        <div class="relative">
+            {#if clearBtn}
+                <div class="absolute right-1 top-1 z-10">
+                    {@render clearBtn()}
+                </div>
+            {/if}
+            <Textarea
+                {placeholder}
+                rows={5}
+                class="bg-muted text-xs pr-9 {changedClass} {destructive ? 'border-destructive' : ''}"
+                bind:value
+            />
+        </div>
+    {/snippet}
+</FieldWrapper>

package/src/lib/components/foreingKeyInput.svelte

@@ -80,7 +80,7 @@
         <Input
             placeholder={isPendingCreate ? "AUTO GENERATED" : isEmpty ? "NULL" : ""}
             type="number"
-            class="bg-muted text-xs {bgClass} {destructive ? '!bg-destructive/10 border-destructive' : ''}"
+            class="bg-muted text-xs {bgClass} {destructive ? 'border-destructive' : ''}"
             bind:value={
                 () => hasRealId ? value : "",
                 (v) => { value = (v === "" || v == null) ? null : Number(v); }

package/src/lib/components/polymorphicInput.svelte

@@ -80,7 +80,7 @@
     }
 </script>
 
-<div class="flex h-9 w-full items-center gap-1.5 rounded-md border pl-1.5 pr-9 text-xs bg-muted {bgClass} {destructive ? '!bg-destructive/10 border-destructive' : ''}">
+<div class="flex h-9 w-full items-center gap-1.5 rounded-md border pl-1.5 pr-9 text-xs bg-muted {bgClass} {destructive ? 'border-destructive' : ''}">
     <Popover.Root bind:open={collectionPopoverOpen}>
         <Popover.Trigger>
             {#snippet child({ props })}

package/src/lib/components/popup/popup.svelte

@@ -6,7 +6,7 @@
 	// `openPopup` mounts this; specialised popup helpers like
 	// `openDataTablePopup` are thin wrappers that supply the body
 	// component + props.
-	import { X } from "lucide-svelte";
+	import { ArrowLeft, X } from "lucide-svelte";
 	import { fade, scale } from "svelte/transition";
 	import { cubicOut } from "svelte/easing";
 	import Portal from "svelte-portal";
@@ -28,6 +28,12 @@
 		// Use when the body brings its own header.
 		hideHeader?: boolean;
 		onClose?: () => void;
+		// Set by the action layer when there's a popup-history entry to
+		// pop. The chrome renders a back arrow in the title bar; bodies
+		// that `hideHeader: true` get `canGoBack` + `onBack` forwarded
+		// so they can render their own back affordance.
+		canGoBack?: boolean;
+		onBack?: () => void;
 	}
 
 	let {
@@ -37,6 +43,8 @@
 		size = "default",
 		hideHeader = false,
 		onClose,
+		canGoBack = false,
+		onBack,
 	}: Props = $props();
 </script>
 
@@ -54,8 +62,19 @@
 			{size === 'sm' ? 'max-h-[calc(100vh-6rem)] max-w-2xl' : 'h-[85vh] max-w-7xl'}"
 	>
 		{#if !hideHeader}
-			<div class="flex h-12 shrink-0 items-center justify-between gap-4 border-b px-4">
-				<div class="text-sm font-medium">{title ?? ""}</div>
+			<div class="flex h-12 shrink-0 items-center justify-between gap-2 border-b px-4">
+				<div class="flex min-w-0 items-center gap-2">
+					{#if canGoBack}
+						<Button
+							variant="ghost"
+							size="icon"
+							onclick={() => onBack?.()}
+							class="h-8 w-8 rounded-full text-muted-foreground"
+							Icon={ArrowLeft}
+						/>
+					{/if}
+					<div class="truncate text-sm font-medium">{title ?? ""}</div>
+				</div>
 				<Button
 					variant="ghost"
 					size="icon"
@@ -73,7 +92,7 @@
 		     percentages, which don't resolve when the popup uses
 		     `max-h` (size="sm") instead of a fixed `h`. -->
 		<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
-			<Body {...componentProps} {onClose} />
+			<Body {...componentProps} {onClose} {canGoBack} {onBack} />
 		</div>
 	</div>
 </Portal>

package/src/lib/extensions/extension.types.ts

@@ -17,13 +17,15 @@ import type RangeCalendarButton from "../components/rangeCalendarButton.svelte";
 import type DataTable from "../components/dataTable/dataTable.svelte";
 import type Drawer from "../components/drawer.svelte";
 import type SelectRecord from "../components/selectRecord.svelte";
+import type FieldWrapper from "../components/detailView/fields/FieldWrapper.svelte";
 import * as Popover from "../components/ui/popover";
 import * as intlDate from "@internationalized/date";
 import * as Icons from "lucide-svelte"
 import { ContextMenu } from "bits-ui";
 import * as Tooltip from "../components/ui/tooltip";
 import * as Breadcrumb from "../components/ui/breadcrumb";
-import { showDialog, type OpenDataTableDrawerProps, type OpenDataTablePopupProps, type OpenPopupProps } from "../actions";
+import { showDialog, type OpenDataTableDrawerProps } from "../actions";
+import type { OpenDataTablePopupProps, OpenPopupProps } from "../popup";
 import { toast } from "svelte-sonner";
 import type Drawer from "../components/drawer.svelte";
 import { Switch } from "../components/ui/switch";
@@ -50,6 +52,7 @@ export interface Components {
     Drawer: typeof Drawer;
     SelectRecord: typeof SelectRecord,
     Switch: typeof Switch,
+    FieldWrapper: typeof FieldWrapper,
 }
 
 export interface ExtensionUtils {
@@ -136,7 +139,6 @@ export type ExtensionComponentKey =
     | `pages.${string}`
     | `publicPages.${string}`
     | "studio.listView"
-    | `dvFields.topRight.${string}.${string}`
     | `detailView.update.subRecords.${string}`
     | `detailView.create.subRecords.${string}`
     | `detailView.fields.topRight.${string}.${string}`

package/src/lib/extensions/extensionUtils.ts

@@ -7,7 +7,8 @@ import type {
 import type { LobbClient } from "@lobb-js/sdk";
 import type { CTX } from "../store.types";
 import { toast } from "svelte-sonner";
-import { showDialog, openDataTableDrawer, openDataTablePopup, openPopup } from "../actions";
+import { showDialog, openDataTableDrawer } from "../actions";
+import { openDataTablePopup, openPopup } from "../popup";
 import { emitEvent } from "../eventSystem";
 import { Button } from "../components/ui/button";
 import { Input } from "../components/ui/input";
@@ -32,6 +33,7 @@ import RangeCalendarButton from "../components/rangeCalendarButton.svelte";
 import DataTable from "../components/dataTable/dataTable.svelte";
 import Drawer from "../components/drawer.svelte";
 import SelectRecord from "../components/selectRecord.svelte";
+import FieldWrapper from "../components/detailView/fields/FieldWrapper.svelte";
 import { Switch } from "../components/ui/switch";
 
 export function getComponents(): Components {
@@ -56,6 +58,7 @@ export function getComponents(): Components {
     Drawer: Drawer,
     SelectRecord: SelectRecord,
     Switch: Switch,
+    FieldWrapper: FieldWrapper,
   };
 }
 

package/src/lib/popup.ts

@@ -0,0 +1,147 @@
+import { mount, unmount } from "svelte";
+import DataTable from "./components/dataTable/dataTable.svelte";
+import Popup from "./components/popup/popup.svelte";
+import { createStudioContextMap, type StudioContext } from "./context";
+import type { CollectionTab } from "./store.types";
+
+export interface OpenPopupProps {
+    // Component rendered inside the popup. It receives `componentProps`
+    // spread onto it plus `onClose` so it can close the popup itself.
+    component: any;
+    componentProps?: Record<string, any>;
+    title?: string;
+    // `default` is the wide data-table popup (max-w-7xl, fixed 85vh).
+    // `sm` is the narrow detail-view variant (max-w-2xl, content-height).
+    size?: "default" | "sm";
+    // When true, the popup renders no chrome at all (no title bar, no
+    // close button). The body uses the `onClose` prop the popup passes
+    // it to render its own close affordance.
+    hideHeader?: boolean;
+    // Close the previously-opened popup before mounting this one —
+    // drill-down semantics. Only popups participate; drawers don't.
+    replaceLast?: boolean;
+}
+
+export interface OpenDataTablePopupProps {
+    collectionName: string;
+    filter?: Record<string, any>;
+    sort?: Record<string, "asc" | "desc">;
+    limit?: number;
+    title?: string;
+    showHeader?: boolean;
+    showFooter?: boolean;
+    showFilter?: boolean;
+    tabs?: CollectionTab[];
+    view?: { id: string; [key: string]: any };
+    replaceLast?: boolean;
+    size?: "default" | "sm";
+    hideHeader?: boolean;
+}
+
+let activePopup: any = null;
+// Props that produced the currently-mounted popup. Tracked so we can
+// push them onto `popupHistory` when this popup is swapped out by a
+// `replaceLast: true` opener, enabling back navigation.
+let activePopupProps: OpenPopupProps | null = null;
+// Stack of popup-props that were swapped out via `replaceLast: true`.
+// The back arrow re-opens the top of the stack; closing via X or the
+// backdrop wipes the whole stack (a deliberate full-reset, not back).
+const popupHistory: OpenPopupProps[] = [];
+
+// Internal mount path used by both `openPopup` (user-initiated) and
+// `goBackPopup` (history-driven). The `fromBack` flag suppresses
+// pushing the outgoing popup onto the history stack — when the user
+// hits Back, the popup they're leaving shouldn't reappear if they hit
+// Back again.
+function mountPopup(
+    studioContext: StudioContext,
+    props: OpenPopupProps,
+    opts: { fromBack?: boolean } = {},
+) {
+    const targetElement = document.querySelector("main");
+    if (!targetElement) throw new Error("main html element doesn't exist");
+
+    if (props.replaceLast && activePopup) {
+        // Swap: archive the outgoing popup's props (unless this open is
+        // itself a back-navigation) and unmount it. Outro plays in
+        // parallel with the new popup's intro.
+        if (!opts.fromBack && activePopupProps) {
+            popupHistory.push(activePopupProps);
+        }
+        const toUnmount = activePopup;
+        activePopup = null;
+        activePopupProps = null;
+        unmount(toUnmount, { outro: true });
+    } else if (!props.replaceLast) {
+        // A fresh, non-stacking popup starts a new context — drop any
+        // accumulated back history from the previous chain.
+        popupHistory.length = 0;
+    }
+
+    const canGoBack = popupHistory.length > 0;
+
+    const mounted = mount(Popup, {
+        target: targetElement,
+        context: createStudioContextMap(studioContext),
+        props: {
+            component: props.component,
+            componentProps: props.componentProps,
+            title: props.title,
+            size: props.size,
+            hideHeader: props.hideHeader,
+            canGoBack,
+            onBack: () => goBackPopup(studioContext),
+            onClose: async () => {
+                if (activePopup === mounted) {
+                    activePopup = null;
+                    activePopupProps = null;
+                    // X / backdrop is a full reset — nuke the back
+                    // stack so reopening anything starts fresh.
+                    popupHistory.length = 0;
+                }
+                await unmount(mounted, { outro: true });
+            },
+        },
+    });
+    activePopup = mounted;
+    activePopupProps = props;
+}
+
+export function openPopup(studioContext: StudioContext, props: OpenPopupProps) {
+    mountPopup(studioContext, props);
+}
+
+export function goBackPopup(studioContext: StudioContext) {
+    const prev = popupHistory.pop();
+    if (!prev) return;
+    // Force `replaceLast: true` so the swap+outro path runs, and tell
+    // `mountPopup` not to push the current popup onto history.
+    mountPopup(studioContext, { ...prev, replaceLast: true }, { fromBack: true });
+}
+
+export function openDataTablePopup(studioContext: StudioContext, props: OpenDataTablePopupProps) {
+    // DataTable reads `searchParams` once during its initial $state setup,
+    // so sort/limit need to be folded into the searchParams object before
+    // we mount. Built here in plain TS — no Svelte reactivity to escape.
+    const searchParams: Record<string, any> = {};
+    if (props.sort) searchParams.sort = props.sort;
+    if (props.limit != null) searchParams.limit = String(props.limit);
+
+    openPopup(studioContext, {
+        component: DataTable,
+        componentProps: {
+            collectionName: props.collectionName,
+            filter: props.filter,
+            searchParams,
+            showHeader: props.showHeader,
+            showFooter: props.showFooter,
+            showFilter: props.showFilter ?? false,
+            tabs: props.tabs,
+            view: props.view,
+        },
+        title: props.title ?? props.collectionName,
+        size: props.size,
+        hideHeader: props.hideHeader,
+        replaceLast: props.replaceLast,
+    });
+}