@lobb-js/studio 0.42.0 → 0.44.0

package/src/lib/components/drawer.svelte

@@ -4,6 +4,7 @@
     import { fade } from "svelte/transition";
     import { cubicOut } from "svelte/easing";
     import Portal from "svelte-portal";
+    import { getContext, setContext, onDestroy } from "svelte";
 
     interface Props {
         children?: Snippet<[]>;
@@ -13,6 +14,16 @@
 
     let { onHide, children, position = "side" }: Props = $props();
 
+    // Track nesting depth for stacking effect
+    const DEPTH_KEY = 'drawer-depth';
+    const parentDepth: number = getContext(DEPTH_KEY) ?? 0;
+    const depth = parentDepth + 1;
+    setContext(DEPTH_KEY, depth);
+
+    // Side drawers get narrower, bottom drawers get shorter — both offset by 48px per level
+    const sideWidth = $derived(calculateDrawerWidth() - (depth - 1) * 48);
+    const bottomOffset = $derived((depth - 1) * 48);
+
     function slide(_node: Element, { duration = 250, axis }: { duration?: number; axis: "x" | "y" }) {
         return {
             duration,
@@ -39,9 +50,11 @@
         role="dialog"
         transition:slide={{ axis: position === "bottom" ? "y" : "x" }}
         class={position === "bottom"
-            ? "fixed bottom-0 left-0 z-40 flex h-[60vh] w-full flex-col border-t bg-card"
+            ? "fixed bottom-0 left-0 z-40 flex w-full flex-col border-t bg-card"
             : "fixed right-0 top-0 z-40 flex h-full w-full flex-col border-l bg-card"}
-        style={position === "side" ? `max-width: ${calculateDrawerWidth()}px;` : ""}
+        style={position === "side"
+            ? `max-width: ${sideWidth}px;`
+            : `height: calc(60vh - ${bottomOffset}px);`}
     >
         {@render children?.()}
     </div>

package/src/lib/components/foreingKeyInput.svelte

@@ -2,20 +2,15 @@
     import { onMount } from "svelte";
     import Input from "./ui/input/input.svelte";
     import SelectRecord from "./selectRecord.svelte";
-    import UpdateDetailViewButton from "./detailView/update/updateDetailViewButton.svelte";
     import CreateDetailView from "./detailView/create/createDetailView.svelte";
-    import { getCollectionPrimaryField } from "./dataTable/utils";
-    import { getStudioContext } from "../context";
-    import { ExternalLink, Plus } from "lucide-svelte";
+    import { Plus } from "lucide-svelte";
     import Button from "./ui/button/button.svelte";
 
-    const { lobb, ctx } = getStudioContext();
-
     interface LocalProps {
         parentCollectionName: string;
         collectionName: string;
         fieldName: string;
-        value?: number | null;
+        value?: any;
         destructive?: boolean;
         entry: Record<string, any>;
     }
@@ -29,57 +24,39 @@
         entry,
     }: LocalProps = $props();
 
-    let displayName = $state<string | null>(null);
     let createDrawerOpen = $state(false);
+    let initialValue = $state<any>(undefined);
 
-    onMount(async () => {
-        if (value == null) return;
-        try {
-            const res = await lobb.findOne(collectionName, value);
-            const record = (await res.json()).data;
-            const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
-            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
-        } catch {
-            displayName = null;
-        }
-    });
+    onMount(() => { initialValue = value; });
 
-    $effect(() => {
-        if (value == null) displayName = null;
-    });
+    const isPendingCreate = $derived(value && typeof value === 'object' && value.create);
+    const hasRealId       = $derived(value != null && typeof value === 'number');
+    const isEmpty         = $derived(value == null || value === 0);
+    const isZeroPlaceholder = $derived(value === 0);
+    const isChanged       = $derived(initialValue !== undefined && value !== initialValue && !isPendingCreate);
 
-    function handleSelect(selectedEntry: any) {
-        const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
-        value = selectedEntry.id;
-        displayName = primaryFieldName ? String(selectedEntry[primaryFieldName]) : null;
-    }
+    const bgClass = $derived(
+        isPendingCreate ? '!bg-green-500/5 border-green-500/40' :
+        isChanged       ? '!bg-orange-500/5'                    :
+        ''
+    );
 
     async function handleCreated(record: any) {
-        const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
-        value = record.id;
-        displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        if (!record.id) {
+            value = { create: record };
+        } else {
+            value = record.id;
+        }
     }
 
-    const idIsZero = $derived(value === 0);
+    function handleSelect(selectedEntry: any) {
+        value = selectedEntry.id;
+    }
 </script>
 
-{#if !idIsZero}
+{#if !isZeroPlaceholder}
     <div class="relative">
-        <div class="flex gap-2 absolute right-0 top-0 mr-9 h-full items-center text-xs">
-            {#if value != null}
-                <UpdateDetailViewButton
-                    collectionName={collectionName}
-                    recordId={value}
-                    variant="ghost"
-                    class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
-                    Icon={ExternalLink}
-                ></UpdateDetailViewButton>
-            {/if}
-            {#if displayName}
-                <div class="flex items-center bg-background rounded-full border h-6 px-3 shadow-sm">
-                    {displayName}
-                </div>
-            {/if}
+        <div class="flex gap-1 absolute right-0 top-0 mr-9 h-full items-center text-xs">
             <Button
                 class="h-6 px-2 font-normal text-xs"
                 variant="outline"
@@ -95,30 +72,24 @@
                 {collectionName}
                 {fieldName}
                 onSelect={handleSelect}
-                text="Select"
+                text="Link"
                 {entry}
             />
         </div>
+
         <Input
-            placeholder={"NULL"}
+            placeholder={isPendingCreate ? "AUTO GENERATED" : isEmpty ? "NULL" : ""}
             type="number"
-            class="
-                bg-muted text-xs
-                {destructive ? 'border-destructive bg-destructive/10' : ''}
-            "
+            class="bg-muted text-xs {bgClass} {destructive ? '!bg-destructive/10 border-destructive' : ''}"
             bind:value={
-                () => value ?? "",
-                (v) => (value = (v === "" || v == null) ? null : Number(v))
+                () => hasRealId ? value : "",
+                (v) => { value = (v === "" || v == null) ? null : Number(v); }
             }
         />
     </div>
 {:else}
     <div class="relative z-10">
-        <Input
-            placeholder={"PARENT ID"}
-            class="bg-muted text-xs"
-            disabled={true}
-        />
+        <Input placeholder="PARENT ID" class="bg-muted text-xs" disabled={true} />
     </div>
 {/if}
 
@@ -126,6 +97,7 @@
     <CreateDetailView
         collectionName={collectionName}
         onCreated={handleCreated}
+        onChanges={() => {}}
         onCancel={async () => { createDrawerOpen = false; }}
     />
 {/if}

package/src/lib/components/polymorphicInput.svelte

@@ -4,16 +4,13 @@
     import DataTable from "./dataTable/dataTable.svelte";
     import Drawer from "./drawer.svelte";
     import * as Popover from "./ui/popover/index";
-    import { getCollectionPrimaryField } from "./dataTable/utils";
-    import { getStudioContext } from "../context";
     import { ArrowLeft, Link, ChevronDown, Plus } from "lucide-svelte";
     import CreateDetailView from "./detailView/create/createDetailView.svelte";
 
-    const { ctx, lobb } = getStudioContext();
-
     interface Props {
         collectionField: string;
         idField: string;
+        virtualField: string;
         targetCollections: string[];
         entry: Record<string, any>;
         destructive?: boolean;
@@ -22,64 +19,68 @@
     let {
         collectionField,
         idField,
+        virtualField,
         targetCollections,
         entry = $bindable(),
         destructive,
     }: Props = $props();
 
     const selectedCollection = $derived(entry[collectionField] ?? null);
-    const selectedId = $derived(entry[idField] ?? null);
+    const selectedId         = $derived(entry[idField] ?? null);
+    const virtualVal         = $derived(entry[virtualField] ?? null);
+
+    let initialId = $state<number | null | undefined>(undefined);
+    let initialCollection = $state<string | null | undefined>(undefined);
+    onMount(() => {
+        initialId = entry[idField] ?? null;
+        initialCollection = entry[collectionField] ?? null;
+    });
+
+    const isPendingCreate = $derived(virtualVal && typeof virtualVal === 'object' && virtualVal.create);
+    const isChanged       = $derived(
+        initialId !== undefined &&
+        !isPendingCreate &&
+        (selectedId !== initialId || selectedCollection !== initialCollection)
+    );
+
+    const bgClass = $derived(
+        isPendingCreate ? '!bg-green-500/5 border-green-500/40' :
+        isChanged       ? '!bg-orange-500/5'                    :
+        ''
+    );
 
-    let displayName = $state<string | null>(null);
     let collectionPopoverOpen = $state(false);
     let recordDrawerOpen = $state(false);
     let createDrawerOpen = $state(false);
 
-    onMount(async () => {
-        if (selectedCollection == null || selectedId == null) return;
-        try {
-            const res = await lobb.findOne(selectedCollection, selectedId);
-            const record = await res.json();
-            const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection);
-            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
-        } catch {
-            displayName = null;
-        }
-    });
-
-    $effect(() => {
-        if (entry[idField] == null) displayName = null;
-    });
-
     function onCollectionChange(col: string) {
         collectionPopoverOpen = false;
         if (entry[collectionField] !== col) {
-            entry = { ...entry, [collectionField]: col, [idField]: null };
+            entry = { ...entry, [collectionField]: col, [idField]: null, [virtualField]: undefined };
         }
     }
 
     function onIdChange(e: Event) {
         const raw = (e.target as HTMLInputElement).value;
         const id = raw === "" ? null : Number(raw);
-        entry = { ...entry, [idField]: id };
+        entry = { ...entry, [idField]: id, [virtualField]: undefined };
     }
 
     function onRecordSelect(record: any) {
-        const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection!);
-        entry = { ...entry, [idField]: record.id };
-        displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        entry = { ...entry, [idField]: record.id, [virtualField]: undefined };
         recordDrawerOpen = false;
     }
 
     async function onPolyCreated(record: any) {
-        const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection!);
-        entry = { ...entry, [idField]: record.id };
-        displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        if (!record.id) {
+            entry = { ...entry, [virtualField]: { collection: selectedCollection, create: record }, [collectionField]: selectedCollection, [idField]: null };
+        } else {
+            entry = { ...entry, [idField]: record.id, [virtualField]: undefined };
+        }
     }
 </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 {destructive ? 'border-destructive bg-destructive/10' : ''}">
-    <!-- Collection picker -->
+<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' : ''}">
     <Popover.Root bind:open={collectionPopoverOpen}>
         <Popover.Trigger>
             {#snippet child({ props })}
@@ -107,39 +108,22 @@
         </Popover.Content>
     </Popover.Root>
 
-    <!-- Transparent id input -->
     <input
-        placeholder="NULL"
+        placeholder={isPendingCreate ? "AUTO GENERATED" : "NULL"}
         type="number"
         class="min-w-0 flex-1 bg-transparent outline-none text-xs placeholder:text-muted-foreground"
         value={selectedId ?? ""}
         oninput={onIdChange}
     />
 
-    <!-- Primary field badge -->
-    {#if displayName}
-        <div class="flex shrink-0 items-center bg-background rounded-full border h-6 px-3 shadow-sm">
-            {displayName}
-        </div>
-    {/if}
-
-    <!-- Create / Select record buttons -->
     {#if selectedCollection}
-        <Button
-            class="h-6 shrink-0 px-2 font-normal text-xs"
-            variant="outline"
-            onclick={() => (createDrawerOpen = true)}
-        >
+        <Button class="h-6 shrink-0 px-2 font-normal text-xs" variant="outline" onclick={() => (createDrawerOpen = true)}>
             <Plus size="13" />
             Create
         </Button>
-        <Button
-            class="h-6 shrink-0 px-2 font-normal text-xs"
-            variant="outline"
-            onclick={() => (recordDrawerOpen = true)}
-        >
+        <Button class="h-6 shrink-0 px-2 font-normal text-xs" variant="outline" onclick={() => (recordDrawerOpen = true)}>
             <Link size="13" />
-            Select
+            Link
         </Button>
     {/if}
 </div>
@@ -147,26 +131,17 @@
 {#if recordDrawerOpen}
     <Drawer onHide={async () => { recordDrawerOpen = false }}>
         <div class="flex h-12 items-center gap-4 border-b px-4">
-            <Button
-                variant="outline"
-                onclick={() => (recordDrawerOpen = false)}
-                class="h-8 w-8 rounded-full text-xs font-normal"
-                Icon={ArrowLeft}
-            />
+            <Button variant="outline" onclick={() => (recordDrawerOpen = false)} class="h-8 w-8 rounded-full text-xs font-normal" Icon={ArrowLeft} />
             <div class="flex items-center gap-2">
                 <div class="text-sm">Select record from</div>
-                <span class="rounded-md border bg-muted px-2 py-0.5 text-sm">
-                    {selectedCollection}
-                </span>
+                <span class="rounded-md border bg-muted px-2 py-0.5 text-sm">{selectedCollection}</span>
             </div>
         </div>
         <div class="flex-1 overflow-y-auto bg-muted">
             <DataTable
                 collectionName={selectedCollection!}
-                tableProps={{
-                    showCheckboxes: false,
-                    select: { onSelect: onRecordSelect },
-                }}
+                filter={selectedId != null ? { id: { $ne: selectedId } } : undefined}
+                tableProps={{ showCheckboxes: false, select: { onSelect: onRecordSelect } }}
             />
         </div>
     </Drawer>
@@ -176,6 +151,7 @@
     <CreateDetailView
         collectionName={selectedCollection}
         onCreated={onPolyCreated}
+        onChanges={() => {}}
         onCancel={async () => { createDrawerOpen = false; }}
     />
 {/if}