@pantheon-systems/puck-css 0.8.0 → 0.9.0

package/dist/p1/editor/hooks/api-hooks.js

@@ -1,8 +1,8 @@
 "use client";
 import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useRef, useState } from "react";
 import { useP1Router } from "../../router-context";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { useP1Auth } from "../../../auth/P1AuthProvider";
+import { useP1Auth, useOptionalP1Auth } from "../../../auth/P1AuthProvider";
 const DATASOURCES_KEY = "p1-datasources";
 const PREVIEW_KEY = "p1-preview";
 function useDebouncedValue(value, delayMs) {
@@ -144,12 +144,20 @@ export function useLoadPageData() {
 }
 /* ── progressive datasource context ── */
 const DATASOURCE_CONTEXT_KEY = "p1-datasource-context";
-export function useRemoteDatasourceContext(path, registry) {
+export function useRemoteDatasourceContext(path, registry, branchId) {
+    const auth = useOptionalP1Auth();
     const queries = useQueries({
         queries: registry.map((def) => ({
-            queryKey: [DATASOURCE_CONTEXT_KEY, path, def.id],
+            queryKey: [DATASOURCE_CONTEXT_KEY, path, def.id, branchId],
             queryFn: async () => {
-                const res = await fetch(`/p1/api/datasource-context?path=${encodeURIComponent(path)}&id=${encodeURIComponent(def.id)}`);
+                const token = auth ? await auth.getToken() : null;
+                const params = new URLSearchParams({ path, id: def.id });
+                if (branchId)
+                    params.set("branchId", branchId);
+                const url = `/p1/api/datasource-context?${params}`;
+                const res = token
+                    ? await fetch(url, { headers: { Authorization: `Bearer ${token}` } })
+                    : await fetch(url);
                 if (!res.ok)
                     return { id: def.id, data: {} };
                 return (await res.json());
@@ -161,31 +169,52 @@ export function useRemoteDatasourceContext(path, registry) {
     // manually: without it the context empties mid page-switch and consumers
     // flash empty states.
     const lastGoodRef = useRef({});
-    const result = useMemo(() => {
-        const context = {};
-        const loadingIds = new Set();
-        let isLoading = false;
-        for (let i = 0; i < registry.length; i++) {
-            const def = registry[i];
-            const query = queries[i];
-            if (!def || !query)
-                continue;
-            if (query.isLoading || query.isFetching) {
-                loadingIds.add(def.id);
-                isLoading = true;
-            }
-            if (query.data) {
-                context[def.id] = query.data.data;
+    const resultRef = useRef({ context: {}, loadingIds: new Set(), isLoading: false });
+    const context = {};
+    const newLoadingIds = [];
+    let isLoading = false;
+    for (let i = 0; i < registry.length; i++) {
+        const def = registry[i];
+        const query = queries[i];
+        if (!def || !query)
+            continue;
+        if (query.isLoading || query.isFetching) {
+            newLoadingIds.push(def.id);
+            isLoading = true;
+        }
+        if (query.data) {
+            context[def.id] = query.data.data;
+        }
+        else if (!query.isError && lastGoodRef.current[def.id]) {
+            context[def.id] = lastGoodRef.current[def.id];
+        }
+    }
+    const prev = resultRef.current;
+    let changed = isLoading !== prev.isLoading || newLoadingIds.length !== prev.loadingIds.size;
+    if (!changed) {
+        const contextKeys = Object.keys(context);
+        const prevContextKeys = Object.keys(prev.context);
+        changed = contextKeys.length !== prevContextKeys.length;
+        if (!changed) {
+            for (const key of contextKeys) {
+                if (context[key] !== prev.context[key]) {
+                    changed = true;
+                    break;
+                }
             }
-            else if (!query.isError && lastGoodRef.current[def.id]) {
-                context[def.id] = lastGoodRef.current[def.id];
+        }
+    }
+    if (!changed) {
+        for (const id of newLoadingIds) {
+            if (!prev.loadingIds.has(id)) {
+                changed = true;
+                break;
             }
         }
-        return { context, loadingIds, isLoading };
-    }, [registry, queries]);
-    // Written from a commit effect, not the memo factory above: useMemo is a
-    // memoization hint rather than a once-per-commit guarantee, so carrying state
-    // forward from inside it is a render-phase side effect.
+    }
+    if (changed) {
+        resultRef.current = { context, loadingIds: new Set(newLoadingIds), isLoading };
+    }
     useEffect(() => {
         for (let i = 0; i < registry.length; i++) {
             const def = registry[i];
@@ -196,12 +225,10 @@ export function useRemoteDatasourceContext(path, registry) {
                 lastGoodRef.current[def.id] = query.data.data;
             }
             else if (query.isError) {
-                // Settled failure: drop the carried-over entry rather than keep
-                // showing the previous path's data as if it belonged to this page.
                 delete lastGoodRef.current[def.id];
             }
         }
     }, [registry, queries]);
-    return result;
+    return resultRef.current;
 }
 //# sourceMappingURL=api-hooks.js.map

package/dist/p1/editor/hooks/api-hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-hooks.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/api-hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-hooks.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/api-hooks.ts"],"names":[],"mappings":"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"}

package/dist/p1/editor/hooks/useEditorContext.d.ts

@@ -8,6 +8,6 @@ interface EditorContextData {
     savedPreviewParams: Record<string, string>;
     remoteDatasourceRegistry: RemoteDatasourceDefinition[];
 }
-export declare function useEditorContext(path: string): import("@tanstack/react-query").UseQueryResult<EditorContextData, Error>;
+export declare function useEditorContext(path: string, branchId?: string): import("@tanstack/react-query").UseQueryResult<NoInfer<EditorContextData>, Error>;
 export {};
 //# sourceMappingURL=useEditorContext.d.ts.map

package/dist/p1/editor/hooks/useEditorContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useEditorContext.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useEditorContext.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6DAA6D,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,UAAU,iBAAiB;IACzB,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,0BAA0B,EAAE,CAAC;CACxD;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,4EAY5C"}
+{"version":3,"file":"useEditorContext.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useEditorContext.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6DAA6D,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGzD,UAAU,iBAAiB;IACzB,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,0BAA0B,EAAE,CAAC;CACxD;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,qFAiB/D"}

package/dist/p1/editor/hooks/useEditorContext.js

@@ -1,11 +1,20 @@
 "use client";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { useOptionalP1Auth } from "../../../auth/P1AuthProvider";
 const EDITOR_CONTEXT_KEY = "p1-editor-context";
-export function useEditorContext(path) {
+export function useEditorContext(path, branchId) {
+    const auth = useOptionalP1Auth();
     return useQuery({
-        queryKey: [EDITOR_CONTEXT_KEY, path],
+        queryKey: [EDITOR_CONTEXT_KEY, path, branchId],
         queryFn: async () => {
-            const res = await fetch(`/p1/api/editor-context?path=${encodeURIComponent(path)}`);
+            const token = auth ? await auth.getToken() : null;
+            const params = new URLSearchParams({ path });
+            if (branchId)
+                params.set("branchId", branchId);
+            const url = `/p1/api/editor-context?${params}`;
+            const res = token
+                ? await fetch(url, { headers: { Authorization: `Bearer ${token}` } })
+                : await fetch(url);
             if (!res.ok)
                 throw new Error("Failed to load editor context");
             return (await res.json());

package/dist/p1/editor/hooks/useEditorContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEditorContext.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useEditorContext.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAanE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,QAAQ,CAAoB;QACjC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC;QACpC,OAAO,EAAE,KAAK,IAAgC,EAAE;YAC9C,MAAM,GAAG,GAAG,MAAM,KAAK,CACrB,+BAA+B,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAC1D,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC9D,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,eAAe,EAAE,gBAAgB;KAClC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"useEditorContext.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useEditorContext.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAInE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAUjE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,QAAiB;IAC9D,MAAM,IAAI,GAAG,iBAAiB,EAAE,CAAC;IACjC,OAAO,QAAQ,CAAoB;QACjC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC9C,OAAO,EAAE,KAAK,IAAgC,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAClD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,IAAI,QAAQ;gBAAE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,GAAG,GAAG,0BAA0B,MAAM,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAG,KAAK;gBACf,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,EAAE,CAAC;gBACrE,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC9D,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,eAAe,EAAE,gBAAgB;KAClC,CAAC,CAAC;AACL,CAAC"}

package/dist/p1/editor/hooks/useP1Plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useP1Plugins.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useP1Plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAQvD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CA2BnE"}
+{"version":3,"file":"useP1Plugins.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useP1Plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AASvD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BnE"}

package/dist/p1/editor/hooks/useP1Plugins.js

@@ -2,11 +2,13 @@ import { useMemo } from "react";
 import { createPreviewResolvePlugin } from "../editor-preview-resolve";
 import { createRemoteDatasourceExplorerPlugin } from "../remote-datasources/remote-datasource-explorer-plugin";
 import { createFieldConnectPlugin } from "../connect/field-connect-plugin";
+import { useP1PuckOptional } from "../../../core/P1PuckContext";
 import { useEditorContext } from "./useEditorContext";
 import { useRemoteDatasourceContext } from "./api-hooks";
 export function useP1Plugins(path, config) {
-    const { data: ctx } = useEditorContext(path);
-    const { context: remoteDatasourceContext, loadingIds, isLoading: datasourcesLoading, } = useRemoteDatasourceContext(path, ctx?.remoteDatasourceRegistry ?? []);
+    const p1Puck = useP1PuckOptional();
+    const { data: ctx } = useEditorContext(path, p1Puck?.branchId);
+    const { context: remoteDatasourceContext, loadingIds, isLoading: datasourcesLoading, } = useRemoteDatasourceContext(path, ctx?.remoteDatasourceRegistry ?? [], p1Puck?.branchId);
     return useMemo(() => {
         if (!ctx)
             return [];

package/dist/p1/editor/hooks/useP1Plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"useP1Plugins.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useP1Plugins.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,oCAAoC,EAAE,MAAM,yDAAyD,CAAC;AAC/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc;IACvD,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,EACJ,OAAO,EAAE,uBAAuB,EAChC,UAAU,EACV,SAAS,EAAE,kBAAkB,GAC9B,GAAG,0BAA0B,CAAC,IAAI,EAAE,GAAG,EAAE,wBAAwB,IAAI,EAAE,CAAC,CAAC;IAE1E,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,0BAA0B,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;YACpF,oCAAoC,CAAC,uBAAuB,EAAE;gBAC5D,UAAU,EAAE,IAAI;gBAChB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;gBACxC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;gBAC1C,wBAAwB,EAAE,GAAG,CAAC,wBAAwB;gBACtD,UAAU;aACX,CAAC;YACF,wBAAwB,CAAC;gBACvB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM;gBACN,UAAU,EAAE,IAAI;gBAChB,wBAAwB,EAAE,GAAG,CAAC,wBAAwB;aACvD,CAAC;SACH,CAAC;IACJ,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,UAAU,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACnF,CAAC"}
+{"version":3,"file":"useP1Plugins.js","sourceRoot":"","sources":["../../../../src/p1/editor/hooks/useP1Plugins.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,oCAAoC,EAAE,MAAM,yDAAyD,CAAC;AAC/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc;IACvD,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/D,MAAM,EACJ,OAAO,EAAE,uBAAuB,EAChC,UAAU,EACV,SAAS,EAAE,kBAAkB,GAC9B,GAAG,0BAA0B,CAAC,IAAI,EAAE,GAAG,EAAE,wBAAwB,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE5F,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,0BAA0B,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;YACpF,oCAAoC,CAAC,uBAAuB,EAAE;gBAC5D,UAAU,EAAE,IAAI;gBAChB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;gBACxC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;gBAC1C,wBAAwB,EAAE,GAAG,CAAC,wBAAwB;gBACtD,UAAU;aACX,CAAC;YACF,wBAAwB,CAAC;gBACvB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM;gBACN,UAAU,EAAE,IAAI;gBAChB,wBAAwB,EAAE,GAAG,CAAC,wBAAwB;aACvD,CAAC;SACH,CAAC;IACJ,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,UAAU,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACnF,CAAC"}

package/dist/p1/editor/icons/button-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function ButtonBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function ButtonBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=button-block-icon.d.ts.map

package/dist/p1/editor/icons/button-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"button-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/button-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAanE"}
+{"version":3,"file":"button-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/button-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAanE"}

package/dist/p1/editor/icons/default-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function DefaultBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function DefaultBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=default-block-icon.d.ts.map

package/dist/p1/editor/icons/default-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/default-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAapE"}
+{"version":3,"file":"default-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/default-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAapE"}

package/dist/p1/editor/icons/divider-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function DividerBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function DividerBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=divider-block-icon.d.ts.map

package/dist/p1/editor/icons/divider-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"divider-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/divider-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAYpE"}
+{"version":3,"file":"divider-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/divider-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAYpE"}

package/dist/p1/editor/icons/grid-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function GridBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function GridBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=grid-block-icon.d.ts.map

package/dist/p1/editor/icons/grid-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/grid-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAYjE"}
+{"version":3,"file":"grid-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/grid-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAYjE"}

package/dist/p1/editor/icons/heading-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function HeadingBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function HeadingBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=heading-block-icon.d.ts.map

package/dist/p1/editor/icons/heading-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heading-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/heading-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAapE"}
+{"version":3,"file":"heading-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/heading-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAapE"}

package/dist/p1/editor/icons/image-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function ImageBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function ImageBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=image-block-icon.d.ts.map

package/dist/p1/editor/icons/image-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/image-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAalE"}
+{"version":3,"file":"image-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/image-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAalE"}

package/dist/p1/editor/icons/list-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function ListBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function ListBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=list-block-icon.d.ts.map

package/dist/p1/editor/icons/list-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/list-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAYjE"}
+{"version":3,"file":"list-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/list-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAYjE"}

package/dist/p1/editor/icons/paragraph-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function ParagraphBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function ParagraphBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=paragraph-block-icon.d.ts.map

package/dist/p1/editor/icons/paragraph-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paragraph-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/paragraph-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAYtE"}
+{"version":3,"file":"paragraph-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/paragraph-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAYtE"}

package/dist/p1/editor/icons/quote-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function QuoteBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function QuoteBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=quote-block-icon.d.ts.map

package/dist/p1/editor/icons/quote-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quote-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/quote-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAalE"}
+{"version":3,"file":"quote-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/quote-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAalE"}

package/dist/p1/editor/icons/spacer-block-icon.d.ts

@@ -1,2 +1,2 @@
-export declare function SpacerBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+export declare function SpacerBlockIcon(props: React.SVGProps<SVGSVGElement>): import("react").JSX.Element;
 //# sourceMappingURL=spacer-block-icon.d.ts.map

package/dist/p1/editor/icons/spacer-block-icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spacer-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/spacer-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,2CAYnE"}
+{"version":3,"file":"spacer-block-icon.d.ts","sourceRoot":"","sources":["../../../../src/p1/editor/icons/spacer-block-icon.tsx"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,+BAYnE"}

package/dist/p1/editor/index.d.ts

@@ -1,7 +1,7 @@
 export { Client as EditorClient } from "./client";
 export { createRemoteDatasourceExplorerPlugin } from "./remote-datasources/remote-datasource-explorer-plugin";
 export { createFieldConnectPlugin } from "./connect/field-connect-plugin";
-export { wrapConfigForEditorPreview, createPreviewResolvePlugin, } from "./editor-preview-resolve";
+export { wrapConfigForEditorPreview, createPreviewResolvePlugin, useResolvedPreviewState, } from "./editor-preview-resolve";
 export { buildConnectPreviewConfig, ConnectPreviewHitStyles, } from "./connect/connect-preview-config";
 export { ConnectFieldModal } from "./connect/connect-field-modal";
 export { TemplateAutocompleteLayer } from "./template-autocomplete-layer";

package/dist/p1/editor/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/p1/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,YAAY,GACb,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/p1/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,YAAY,GACb,MAAM,SAAS,CAAC"}

package/dist/p1/editor/index.js

@@ -1,7 +1,7 @@
 export { Client as EditorClient } from "./client";
 export { createRemoteDatasourceExplorerPlugin } from "./remote-datasources/remote-datasource-explorer-plugin";
 export { createFieldConnectPlugin } from "./connect/field-connect-plugin";
-export { wrapConfigForEditorPreview, createPreviewResolvePlugin, } from "./editor-preview-resolve";
+export { wrapConfigForEditorPreview, createPreviewResolvePlugin, useResolvedPreviewState, } from "./editor-preview-resolve";
 export { buildConnectPreviewConfig, ConnectPreviewHitStyles, } from "./connect/connect-preview-config";
 export { ConnectFieldModal } from "./connect/connect-field-modal";
 export { TemplateAutocompleteLayer } from "./template-autocomplete-layer";

package/dist/p1/editor/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/p1/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,YAAY,GACb,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/p1/editor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,gBAAgB,EAChB,YAAY,GACb,MAAM,SAAS,CAAC"}

package/dist/p1/editor/remote-datasources/remote-datasource-explorer-plugin.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useMemo } from "react";
 import { isCanonicalTemplatePath } from "../../../data/route-templates";
 import { card, mono, muted, sectionLabel, } from "../../../data/styles";
+import { PanelShell } from "../../../editor/components/PanelShell.js";
 import { RemoteDatasourceManager } from "./remote-datasource-manager";
 import { TemplatePreviewParamsToolbar } from "./template-preview-params-toolbar";
 const panelStyles = `
@@ -43,75 +44,72 @@ function DatasourceSkeleton() {
 const dbIconSvg = (_jsxs("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", children: [_jsx("path", { d: "M12 4c4.4 0 8 1.3 8 3s-3.6 3-8 3-8-1.3-8-3 3.6-3 8-3z" }), _jsx("path", { d: "M4 7v10c0 1.7 3.6 3 8 3s8-1.3 8-3V7" }), _jsx("path", { d: "M20 12c0 1.7-3.6 3-8 3s-8-1.3-8-3" })] }));
 function RemoteDatasourceExplorerPanel({ snapshot, editorPath, routeTemplateKeys, savedPreviewParams, remoteDatasourceRegistry, loadingIds, }) {
     const registry = useMemo(() => remoteDatasourceRegistry, [remoteDatasourceRegistry]);
-    return (_jsxs("div", { style: {
-            padding: 16,
-            display: "flex",
-            flexDirection: "column",
-            gap: 12,
-            fontSize: 13,
-            lineHeight: 1.45,
-            maxHeight: "100%",
-            overflow: "auto",
-        }, children: [_jsx("style", { children: panelStyles }), _jsx("p", { style: { ...muted, margin: 0 }, children: "Data sources enable you to organize your connected artifacts and integrate them into your page." }), _jsx(TemplatePreviewParamsToolbar, { editorPath: editorPath, routeTemplateKeys: routeTemplateKeys, savedPreviewParams: savedPreviewParams }), _jsx(RemoteDatasourceManager, { editorPath: editorPath }), _jsxs("p", { style: { ...muted, margin: 0 }, children: ["Use ", _jsx("code", { style: mono, children: `{{ source.field }}` }), " in text fields; after ", _jsx("code", { style: mono, children: `{{` }), ", matching datasource paths are suggested automatically. Nested keys use dots, e.g.", " ", _jsx("code", { style: mono, children: `{{ source.nested.key }}` }), ". You can also call allowlisted helpers, e.g.", " ", _jsx("code", { style: mono, children: `{{ toUpperCase(source.field) }}` }), ",", " ", _jsx("code", { style: mono, children: `{{ replace(source.field, " ", "-") }}` }), ", or", " ", _jsx("code", { style: mono, children: `{{ default(source.field, "fallback") }}` }), ". Bare", " ", _jsx("code", { style: mono, children: `{{ source }}` }), " does not print the object (only strings, numbers, and booleans resolve to text). For list datasources, use", " ", _jsx("code", { style: mono, children: `{{ my_list.markdownLinks "/path/{id}" }}` }), " ", "in a ", _jsx("strong", { children: "List" }), " block's items field \u2014 each line becomes a markdown link. For Puck", " ", _jsx("code", { style: mono, children: "array" }), " fields, use", " ", _jsx("code", { style: mono, children: `{{ my_list.items }}` }), " to map list rows directly, then reference per-item values like", " ", _jsx("code", { style: mono, children: `{{ item.name }}` }), " and", " ", _jsx("code", { style: mono, children: `{{ item.id }}` }), " in item templates."] }), registry.length > 0 && (_jsx("div", { style: { ...sectionLabel, padding: "4px 2px 6px" }, children: "Connected sources" })), registry.map((def, index) => {
-                const isLoading = loadingIds?.has(def.id) ?? false;
-                const live = (snapshot[def.id] ?? {});
-                const liveKeys = Object.keys(live);
-                const empty = liveKeys.length === 0;
-                const firstField = def.fields[0]?.path ?? liveKeys[0] ?? "field";
-                return (_jsxs("details", { open: index === 0, "data-p1-ds": "", style: { ...card, background: "var(--puck-color-white, #fff)", borderRadius: 12, marginBottom: 8 }, children: [_jsx("summary", { style: { cursor: "pointer", listStyle: "none", display: "block" }, children: _jsxs("div", { style: {
-                                    padding: "10px 12px",
-                                    fontWeight: 600,
-                                    display: "flex",
-                                    flexDirection: "row",
-                                    alignItems: "center",
-                                    gap: 10,
-                                }, children: [_jsx("span", { style: {
-                                            width: 34,
-                                            height: 34,
-                                            borderRadius: 9,
-                                            background: "var(--puck-color-azure-11, #eff6ff)",
-                                            display: "grid",
-                                            placeItems: "center",
-                                            color: "var(--puck-color-azure-04, #2563eb)",
-                                            flexShrink: 0,
-                                        }, children: dbIconSvg }), _jsxs("div", { style: { flex: 1, minWidth: 0 }, children: [_jsx("span", { style: { display: "block" }, children: def.label }), _jsxs("span", { style: {
+    return (_jsxs(PanelShell, { title: "Data sources", children: [_jsx("style", { children: panelStyles }), _jsxs("div", { style: {
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: 12,
+                    fontSize: 13,
+                    lineHeight: 1.45,
+                }, children: [_jsx("p", { style: { ...muted, margin: 0 }, children: "Data sources enable you to organize your connected artifacts and integrate them into your page." }), _jsx(TemplatePreviewParamsToolbar, { editorPath: editorPath, routeTemplateKeys: routeTemplateKeys, savedPreviewParams: savedPreviewParams }), _jsx(RemoteDatasourceManager, { editorPath: editorPath }), _jsxs("p", { style: { ...muted, margin: 0 }, children: ["Use ", _jsx("code", { style: mono, children: `{{ source.field }}` }), " in text fields; after ", _jsx("code", { style: mono, children: `{{` }), ", matching datasource paths are suggested automatically. Nested keys use dots, e.g.", " ", _jsx("code", { style: mono, children: `{{ source.nested.key }}` }), ". You can also call allowlisted helpers, e.g.", " ", _jsx("code", { style: mono, children: `{{ toUpperCase(source.field) }}` }), ",", " ", _jsx("code", { style: mono, children: `{{ replace(source.field, " ", "-") }}` }), ", or", " ", _jsx("code", { style: mono, children: `{{ default(source.field, "fallback") }}` }), ". Bare", " ", _jsx("code", { style: mono, children: `{{ source }}` }), " does not print the object (only strings, numbers, and booleans resolve to text). For list datasources, use", " ", _jsx("code", { style: mono, children: `{{ my_list.markdownLinks "/path/{id}" }}` }), " ", "in a ", _jsx("strong", { children: "List" }), " block's items field \u2014 each line becomes a markdown link. For Puck", " ", _jsx("code", { style: mono, children: "array" }), " fields, use", " ", _jsx("code", { style: mono, children: `{{ my_list.items }}` }), " to map list rows directly, then reference per-item values like", " ", _jsx("code", { style: mono, children: `{{ item.name }}` }), " and", " ", _jsx("code", { style: mono, children: `{{ item.id }}` }), " in item templates."] }), registry.length > 0 && (_jsx("div", { style: { ...sectionLabel, padding: "4px 2px 6px" }, children: "Connected sources" })), registry.map((def, index) => {
+                        const isLoading = loadingIds?.has(def.id) ?? false;
+                        const live = (snapshot[def.id] ?? {});
+                        const liveKeys = Object.keys(live);
+                        const empty = liveKeys.length === 0;
+                        const firstField = def.fields[0]?.path ?? liveKeys[0] ?? "field";
+                        return (_jsxs("details", { open: index === 0, "data-p1-ds": "", style: { ...card, background: "var(--puck-color-white, #fff)", borderRadius: 12, marginBottom: 8 }, children: [_jsx("summary", { style: { cursor: "pointer", listStyle: "none", display: "block" }, children: _jsxs("div", { style: {
+                                            padding: "10px 12px",
+                                            fontWeight: 600,
+                                            display: "flex",
+                                            flexDirection: "row",
+                                            alignItems: "center",
+                                            gap: 10,
+                                        }, children: [_jsx("span", { style: {
+                                                    width: 34,
+                                                    height: 34,
+                                                    borderRadius: 9,
+                                                    background: "var(--puck-color-azure-11, #eff6ff)",
+                                                    display: "grid",
+                                                    placeItems: "center",
+                                                    color: "var(--puck-color-azure-04, #2563eb)",
+                                                    flexShrink: 0,
+                                                }, children: dbIconSvg }), _jsxs("div", { style: { flex: 1, minWidth: 0 }, children: [_jsx("span", { style: { display: "block" }, children: def.label }), _jsxs("span", { style: {
+                                                            ...mono,
+                                                            display: "block",
+                                                            fontSize: 11,
+                                                            fontWeight: 400,
+                                                            color: "var(--puck-color-grey-04, #6b7280)",
+                                                        }, children: [def.id, !empty && ` · ${liveKeys.length} keys`] })] })] }) }), _jsxs("div", { style: { padding: "4px 12px 12px" }, children: [def.fields.length > 0 && (_jsx("div", { style: { display: "flex", flexWrap: "wrap", gap: 5, marginBottom: 10 }, children: def.fields.map((f) => (_jsx("code", { title: f.description, style: {
                                                     ...mono,
-                                                    display: "block",
                                                     fontSize: 11,
-                                                    fontWeight: 400,
-                                                    color: "var(--puck-color-grey-04, #6b7280)",
-                                                }, children: [def.id, !empty && ` · ${liveKeys.length} keys`] })] })] }) }), _jsxs("div", { style: { padding: "4px 12px 12px" }, children: [def.fields.length > 0 && (_jsx("div", { style: { display: "flex", flexWrap: "wrap", gap: 5, marginBottom: 10 }, children: def.fields.map((f) => (_jsx("code", { title: f.description, style: {
-                                            ...mono,
-                                            fontSize: 11,
-                                            fontWeight: 600,
-                                            color: "var(--puck-color-azure-04, #2563eb)",
-                                            background: "var(--puck-color-azure-11, #eff6ff)",
-                                            border: "1px solid var(--puck-color-grey-09, #bfdbfe)",
-                                            borderRadius: 6,
-                                            padding: "2px 7px",
-                                            cursor: "default",
-                                        }, children: f.path }, f.path))) })), isLoading ? (_jsx(DatasourceSkeleton, {})) : empty ? (_jsxs("p", { style: { margin: "0 0 10px", ...muted }, children: ["No data loaded. Open a concrete page instance or", " ", isCanonicalTemplatePath(editorPath, routeTemplateKeys) ? (_jsx(_Fragment, { children: "set preview values above." })) : (_jsx(_Fragment, { children: "edit a collection template row to set preview params." }))] })) : (_jsxs("div", { style: {
-                                        background: "var(--puck-color-grey-11, #f9fafb)",
-                                        border: "1px solid var(--puck-color-grey-09, #e5e7eb)",
-                                        borderRadius: 9,
-                                        padding: "6px 10px",
-                                        marginBottom: 10,
-                                    }, children: [liveKeys.slice(0, 3).map((key, i) => (_jsxs("div", { style: {
-                                                ...mono,
-                                                fontSize: 11.5,
-                                                color: "var(--pds-color-fg-default-secondary, #4a4a4a)",
-                                                padding: "4px 0",
-                                                borderTop: i > 0 ? "1px solid var(--puck-color-grey-10, #f0f0f0)" : "none",
-                                                whiteSpace: "nowrap",
-                                                overflow: "hidden",
-                                                textOverflow: "ellipsis",
-                                            }, children: [_jsxs("span", { style: { ...muted, fontSize: 11 }, children: [key, ":"] }), " ", formatPreviewValue(live[key])] }, key))), liveKeys.length > 3 && (_jsxs("div", { style: {
-                                                ...muted,
-                                                fontSize: 11,
-                                                padding: "4px 0 0",
-                                                borderTop: "1px solid var(--puck-color-grey-10, #f0f0f0)",
-                                            }, children: ["+", liveKeys.length - 3, " more"] }))] })), _jsx("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8 }, children: _jsxs("span", { style: { ...muted, fontSize: 11 }, children: ["Reference as", " ", _jsx("code", { style: { ...mono, fontWeight: 600, color: "var(--puck-color-azure-04, #2563eb)", fontSize: 11 }, children: `{{ ${def.id}.${firstField} }}` })] }) }), _jsxs("details", { style: { marginTop: 10 }, children: [_jsx("summary", { style: { ...sectionLabel, cursor: "pointer", fontSize: 10 }, children: "More info" }), _jsx("p", { style: { margin: "6px 0 4px", ...muted }, children: def.description }), _jsxs("p", { style: { margin: "0 0 6px", ...muted }, children: [_jsx("strong", { style: { color: "inherit" }, children: "Loads when:" }), " ", def.resolution] }), _jsx("ul", { style: { margin: 0, paddingLeft: 16, ...muted }, children: def.fields.map((f) => (_jsxs("li", { style: { marginBottom: 4 }, children: [_jsx("code", { style: mono, children: `${def.id}.${f.path}` }), " \u2014 ", f.description] }, f.path))) })] })] })] }, def.id));
-            })] }));
+                                                    fontWeight: 600,
+                                                    color: "var(--puck-color-azure-04, #2563eb)",
+                                                    background: "var(--puck-color-azure-11, #eff6ff)",
+                                                    border: "1px solid var(--puck-color-grey-09, #bfdbfe)",
+                                                    borderRadius: 6,
+                                                    padding: "2px 7px",
+                                                    cursor: "default",
+                                                }, children: f.path }, f.path))) })), isLoading ? (_jsx(DatasourceSkeleton, {})) : empty ? (_jsxs("p", { style: { margin: "0 0 10px", ...muted }, children: ["No data loaded. Open a concrete page instance or", " ", isCanonicalTemplatePath(editorPath, routeTemplateKeys) ? (_jsx(_Fragment, { children: "set preview values above." })) : (_jsx(_Fragment, { children: "edit a collection template row to set preview params." }))] })) : (_jsxs("div", { style: {
+                                                background: "var(--puck-color-grey-11, #f9fafb)",
+                                                border: "1px solid var(--puck-color-grey-09, #e5e7eb)",
+                                                borderRadius: 9,
+                                                padding: "6px 10px",
+                                                marginBottom: 10,
+                                            }, children: [liveKeys.slice(0, 3).map((key, i) => (_jsxs("div", { style: {
+                                                        ...mono,
+                                                        fontSize: 11.5,
+                                                        color: "var(--pds-color-fg-default-secondary, #4a4a4a)",
+                                                        padding: "4px 0",
+                                                        borderTop: i > 0 ? "1px solid var(--puck-color-grey-10, #f0f0f0)" : "none",
+                                                        whiteSpace: "nowrap",
+                                                        overflow: "hidden",
+                                                        textOverflow: "ellipsis",
+                                                    }, children: [_jsxs("span", { style: { ...muted, fontSize: 11 }, children: [key, ":"] }), " ", formatPreviewValue(live[key])] }, key))), liveKeys.length > 3 && (_jsxs("div", { style: {
+                                                        ...muted,
+                                                        fontSize: 11,
+                                                        padding: "4px 0 0",
+                                                        borderTop: "1px solid var(--puck-color-grey-10, #f0f0f0)",
+                                                    }, children: ["+", liveKeys.length - 3, " more"] }))] })), _jsx("div", { style: { display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8 }, children: _jsxs("span", { style: { ...muted, fontSize: 11 }, children: ["Reference as", " ", _jsx("code", { style: { ...mono, fontWeight: 600, color: "var(--puck-color-azure-04, #2563eb)", fontSize: 11 }, children: `{{ ${def.id}.${firstField} }}` })] }) }), _jsxs("details", { style: { marginTop: 10 }, children: [_jsx("summary", { style: { ...sectionLabel, cursor: "pointer", fontSize: 10 }, children: "More info" }), _jsx("p", { style: { margin: "6px 0 4px", ...muted }, children: def.description }), _jsxs("p", { style: { margin: "0 0 6px", ...muted }, children: [_jsx("strong", { style: { color: "inherit" }, children: "Loads when:" }), " ", def.resolution] }), _jsx("ul", { style: { margin: 0, paddingLeft: 16, ...muted }, children: def.fields.map((f) => (_jsxs("li", { style: { marginBottom: 4 }, children: [_jsx("code", { style: mono, children: `${def.id}.${f.path}` }), " \u2014 ", f.description] }, f.path))) })] })] })] }, def.id));
+                    })] })] }));
 }
 export function createRemoteDatasourceExplorerPlugin(snapshot, options) {
     return {