@einblick/sdk 0.5.3 → 0.6.0

package/dist/react/runtime.js

@@ -1,98 +1,33 @@
-import { EINBLICK_AUTH_SOURCE, EINBLICK_BRIDGE_SOURCE, EINBLICK_EDITOR_SOURCE, EINBLICK_PARENT_SOURCE, formatValueForText, isEditSessionExpired, readBindingFromElement, resolveAppOrigin, serializeBindingValue, shouldUseInlineEditor, } from './shared.js';
+import { EINBLICK_AUTH_SOURCE, EINBLICK_BRIDGE_SOURCE, EINBLICK_EDITOR_SOURCE, EINBLICK_PARENT_SOURCE, formatValueForText, isMediaEditableBinding, isEditSessionExpired, readBindingFromElement, resolveAppOrigin, serializeBindingValue, shouldUseInlineEditor, } from './shared.js';
 import { getEinblickSdkMessages, resolveEinblickSdkLocale, } from './i18n.js';
+function normalizeResourceHints(hints) {
+    const normalized = [];
+    const seen = new Set();
+    for (const hint of hints ?? []) {
+        const resourceSlug = hint.resourceSlug?.trim();
+        if (!resourceSlug)
+            continue;
+        const sourceType = hint.sourceType ?? 'cms';
+        const key = `${sourceType}:${resourceSlug}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        normalized.push({
+            sourceType,
+            resourceSlug,
+            label: hint.label?.trim() || undefined,
+            mode: hint.mode,
+            recordIds: hint.recordIds?.filter((id) => id.trim().length > 0),
+            showInBottomBar: hint.showInBottomBar,
+        });
+    }
+    return normalized;
+}
 const RUNTIME_STYLE_ID = 'einblick-edit-runtime-styles';
-const RELATIVE_POSITION_SENTINEL = '__einblick_runtime_original_static__';
 const EINBLICK_ACCENT_RGB = '250, 105, 62';
 const EINBLICK_ACCENT_COLOR = `rgb(${EINBLICK_ACCENT_RGB})`;
 const EINBLICK_ACCENT_BORDER = `rgba(${EINBLICK_ACCENT_RGB}, 0.92)`;
 const CONTROL_BAR_HEIGHT = 44;
-const INLINE_EDITOR_SHADOW_STYLES = `
-  :host {
-    display: block;
-    width: 100%;
-    color: rgb(15, 23, 42);
-    font-family: system-ui, sans-serif;
-  }
-
-  *, *::before, *::after {
-    box-sizing: border-box;
-  }
-
-  [data-einblick-inline-shell] {
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-    width: 100%;
-    color: rgb(15, 23, 42);
-    font-family: system-ui, sans-serif;
-  }
-
-  [data-einblick-inline-control],
-  [data-einblick-inline-textarea],
-  [data-einblick-inline-select] {
-    appearance: none;
-    width: 100%;
-    min-width: 0;
-    margin: 0;
-    border-radius: 0.9rem;
-    border: 1px solid rgba(148, 163, 184, 0.6);
-    background: rgb(255, 255, 255);
-    padding: 0.75rem 0.9rem;
-    font: 400 0.95rem/1.5 system-ui, sans-serif;
-    color: rgb(15, 23, 42);
-    box-shadow: none;
-    letter-spacing: normal;
-    text-transform: none;
-    text-indent: 0;
-  }
-
-  [data-einblick-inline-control]:focus,
-  [data-einblick-inline-textarea]:focus,
-  [data-einblick-inline-select]:focus {
-    outline: 2px solid rgba(${EINBLICK_ACCENT_RGB}, 0.3);
-    outline-offset: 2px;
-    border-color: ${EINBLICK_ACCENT_COLOR};
-  }
-
-  [data-einblick-inline-textarea] {
-    min-height: 8rem;
-    resize: vertical;
-  }
-
-  [data-einblick-inline-actions] {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-end;
-    gap: 0.5rem;
-  }
-
-  [data-einblick-edit-action] {
-    appearance: none;
-    border: 1px solid rgba(148, 163, 184, 0.6);
-    background: rgb(255, 255, 255);
-    color: rgb(15, 23, 42);
-    border-radius: 999px;
-    padding: 0.65rem 1rem;
-    font: 600 0.9rem/1 system-ui, sans-serif;
-    cursor: pointer;
-  }
-
-  [data-einblick-edit-action]:disabled {
-    cursor: wait;
-    opacity: 0.72;
-  }
-
-  [data-einblick-edit-action="primary"] {
-    border-color: ${EINBLICK_ACCENT_COLOR};
-    background: ${EINBLICK_ACCENT_COLOR};
-    color: rgb(255, 255, 255);
-  }
-
-  [data-einblick-inline-error] {
-    font: 400 0.85rem/1.5 system-ui, sans-serif;
-    color: rgb(185, 28, 28);
-  }
-`;
 function getBrandBadgeSvg(size) {
     return `
     <svg viewBox="0 0 40 40" width="${size}" height="${size}" aria-hidden="true" focusable="false">
@@ -135,6 +70,32 @@ function createRandomId() {
     }
     return Math.random().toString(36).slice(2);
 }
+function stopEvent(event) {
+    event.preventDefault();
+    event.stopPropagation();
+}
+function clamp(value, min, max) {
+    return Math.min(Math.max(value, min), max);
+}
+function isTextInputEvent(event) {
+    return (event.key.length === 1 ||
+        event.key === 'Enter' ||
+        event.key === 'Backspace' ||
+        event.key === 'Delete');
+}
+function fieldTypeAllowsMultiline(binding) {
+    return binding.fieldType === 'text' || binding.fieldType === 'markdown';
+}
+function getMediaAcceptValue(binding) {
+    return binding.fieldType === 'image' || binding.fieldType === 'images'
+        ? 'image/*'
+        : '';
+}
+function getMediaActionLabel(binding, messages) {
+    return binding.fieldType === 'image' || binding.fieldType === 'images'
+        ? messages.actions.replaceImage
+        : messages.actions.replaceFile;
+}
 function injectRuntimeStyles() {
     if (typeof document === 'undefined') {
         return;
@@ -149,15 +110,27 @@ function injectRuntimeStyles() {
       scroll-margin-top: 96px;
     }
 
-    [data-einblick-editable-active="true"] {
-      outline: 2px solid ${EINBLICK_ACCENT_BORDER};
-      outline-offset: 4px;
+    [data-einblick-edit-outline],
+    [data-einblick-edit-field-outline] {
+      position: fixed;
+      z-index: 2147483643;
+      box-sizing: border-box;
+      pointer-events: none;
+      border-radius: var(--einblick-overlay-radius, 0.35rem);
+    }
+
+    [data-einblick-edit-outline] {
+      border: 1px solid ${EINBLICK_ACCENT_BORDER};
+      box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.7);
+    }
+
+    [data-einblick-edit-field-outline] {
+      border: 1px dashed rgba(${EINBLICK_ACCENT_RGB}, 0.78);
+      background: rgba(${EINBLICK_ACCENT_RGB}, 0.04);
     }
 
     [data-einblick-edit-controls] {
-      position: absolute;
-      top: 0.5rem;
-      right: 0.5rem;
+      position: fixed;
       z-index: 2147483644;
       display: inline-flex;
       align-items: center;
@@ -165,7 +138,8 @@ function injectRuntimeStyles() {
     }
 
     [data-einblick-edit-button],
-    [data-einblick-create-button] {
+    [data-einblick-create-button],
+    [data-einblick-field-button] {
       border: 1px solid ${EINBLICK_ACCENT_COLOR};
       border-radius: 999px;
       padding: 0.3rem 0.7rem;
@@ -175,22 +149,46 @@ function injectRuntimeStyles() {
       box-shadow: 0 8px 20px rgba(15, 23, 42, 0.16);
     }
 
-    [data-einblick-edit-button] {
+    [data-einblick-edit-button],
+    [data-einblick-field-button="media"] {
       background: ${EINBLICK_ACCENT_COLOR};
       color: rgb(255, 255, 255);
     }
 
-    [data-einblick-create-button] {
+    [data-einblick-edit-button] {
+      padding: 0.42rem 0.85rem;
+      font-size: 13px;
+    }
+
+    [data-einblick-create-button],
+    [data-einblick-field-button="text"] {
       background: rgb(255, 255, 255);
       color: ${EINBLICK_ACCENT_COLOR};
     }
 
     [data-einblick-edit-button]:hover,
-    [data-einblick-create-button]:hover {
+    [data-einblick-create-button]:hover,
+    [data-einblick-field-button]:hover {
       background: rgb(255, 255, 255);
       color: ${EINBLICK_ACCENT_COLOR};
     }
 
+    [data-einblick-field-overlays] {
+      position: fixed;
+      inset: 0;
+      z-index: 2147483644;
+      pointer-events: none;
+    }
+
+    [data-einblick-field-button] {
+      position: fixed;
+      z-index: 2147483644;
+      pointer-events: auto;
+      padding: 0.24rem 0.58rem;
+      font-size: 11px;
+      box-shadow: 0 8px 18px rgba(15, 23, 42, 0.12);
+    }
+
     [data-einblick-brand-badge] {
       position: fixed;
       right: 1rem;
@@ -340,64 +338,11 @@ function injectRuntimeStyles() {
     }
 
     [data-einblick-inline-editing="true"] {
-      outline: 2px solid ${EINBLICK_ACCENT_BORDER};
-      outline-offset: 4px;
-      border-radius: 1rem;
-      background: rgba(${EINBLICK_ACCENT_RGB}, 0.08);
-      padding: 0.8rem;
-    }
-
-    [data-einblick-inline-shell] {
-      display: flex;
-      flex-direction: column;
-      gap: 0.75rem;
-      width: 100%;
-    }
-
-    [data-einblick-inline-control],
-    [data-einblick-inline-textarea],
-    [data-einblick-inline-select] {
-      width: 100%;
-      min-width: 0;
-      border-radius: 0.9rem;
-      border: 1px solid rgba(148, 163, 184, 0.6);
-      background: rgb(255, 255, 255);
-      padding: 0.75rem 0.9rem;
-      font: 400 0.95rem/1.5 system-ui, sans-serif;
-      color: inherit;
-      box-sizing: border-box;
-    }
-
-    [data-einblick-inline-textarea] {
-      min-height: 8rem;
-      resize: vertical;
-    }
-
-    [data-einblick-inline-actions] {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-end;
-      gap: 0.5rem;
+      cursor: text;
     }
 
-    [data-einblick-edit-action] {
-      border-radius: 999px;
-      border: 1px solid rgba(148, 163, 184, 0.6);
-      background: rgb(255, 255, 255);
-      padding: 0.65rem 1rem;
-      font: 600 0.9rem/1 system-ui, sans-serif;
-      cursor: pointer;
-    }
-
-    [data-einblick-edit-action="primary"] {
-      border-color: ${EINBLICK_ACCENT_COLOR};
-      background: ${EINBLICK_ACCENT_COLOR};
-      color: rgb(255, 255, 255);
-    }
-
-    [data-einblick-inline-error] {
-      font: 400 0.85rem/1.5 system-ui, sans-serif;
-      color: rgb(185, 28, 28);
+    [data-einblick-inline-editing="true"]:focus {
+      outline: none;
     }
 
     [data-einblick-editor-backdrop] {
@@ -472,6 +417,7 @@ class EinblickEditRuntime {
     callbacks;
     chrome;
     reserveBottomSpace;
+    resourceHints;
     locale;
     messages;
     bridgeNonce = createRandomId();
@@ -485,9 +431,12 @@ class EinblickEditRuntime {
     bridgeFrame = null;
     bridgePingInterval = null;
     activeElement = null;
+    activeOutline = null;
     hoverButtonContainer = null;
     hoverButton = null;
     hoverCreateButton = null;
+    quickFieldOverlayContainer = null;
+    quickFieldOverlays = [];
     brandBadge = null;
     brandPopover = null;
     brandPopoverSiteName = null;
@@ -497,7 +446,7 @@ class EinblickEditRuntime {
     brandPopoverLogoutButton = null;
     bottomBarHost = null;
     bottomBarSiteName = null;
-    bottomBarCmsButton = null;
+    bottomBarResourceList = null;
     bottomBarMoreButton = null;
     bottomBarMoreMenu = null;
     bottomBarOpenAppButton = null;
@@ -510,6 +459,7 @@ class EinblickEditRuntime {
     currentInlineTarget = null;
     currentInlineBinding = null;
     currentInlineRestoreState = null;
+    inlineSaveInFlight = null;
     editorBackdrop = null;
     editorNonce = null;
     editorTarget = null;
@@ -518,14 +468,18 @@ class EinblickEditRuntime {
     navigatorFrame = null;
     navigatorNonce = null;
     navigatorOpen = false;
+    navigatorFilter = null;
     pendingInlineSaves = new Map();
+    pendingInlineMediaSaves = new Map();
     pendingLogin = null;
+    pendingLogout = null;
     constructor(options) {
         this.siteKey = options.siteKey;
         this.appOrigin = resolveAppOrigin(options.appOrigin, options.appUrl);
         this.chrome = options.chrome ?? 'bar';
         this.reserveBottomSpace =
             options.reserveBottomSpace ?? this.chrome === 'bar';
+        this.resourceHints = normalizeResourceHints(options.resourceHints);
         this.locale = resolveEinblickSdkLocale(options.locale);
         this.messages = getEinblickSdkMessages(this.locale);
         this.session =
@@ -548,6 +502,10 @@ class EinblickEditRuntime {
         this.messages = getEinblickSdkMessages(nextLocale);
         this.refreshLocalizedUi();
     }
+    setResourceHints(hints) {
+        this.resourceHints = normalizeResourceHints(hints);
+        this.updateBottomBarResources();
+    }
     start() {
         if (this.started ||
             typeof window === 'undefined' ||
@@ -580,6 +538,7 @@ class EinblickEditRuntime {
             if (this.currentInlineTarget && !this.currentInlineTarget.isConnected) {
                 this.closeInlineEditor();
             }
+            this.updateBottomBarResources();
         });
         this.mutationObserver.observe(document.body, {
             childList: true,
@@ -603,15 +562,23 @@ class EinblickEditRuntime {
         this.mutationObserver?.disconnect();
         this.mutationObserver = null;
         this.clearBridgePing();
+        if (this.pendingLogout) {
+            window.clearTimeout(this.pendingLogout.timeoutId);
+            this.pendingLogout.resolve(false);
+            this.pendingLogout = null;
+        }
         this.bridgeFrame?.remove();
         this.bridgeFrame = null;
         this.setActiveElement(null);
+        this.activeOutline?.remove();
+        this.activeOutline = null;
         this.hoverButtonContainer?.remove();
         this.hoverButtonContainer = null;
         this.hoverButton?.remove();
         this.hoverButton = null;
         this.hoverCreateButton?.remove();
         this.hoverCreateButton = null;
+        this.clearQuickFieldOverlays();
         this.brandBadge?.remove();
         this.brandBadge = null;
         this.brandPopover?.remove();
@@ -624,7 +591,7 @@ class EinblickEditRuntime {
         this.bottomBarHost?.remove();
         this.bottomBarHost = null;
         this.bottomBarSiteName = null;
-        this.bottomBarCmsButton = null;
+        this.bottomBarResourceList = null;
         this.bottomBarMoreButton = null;
         this.bottomBarMoreMenu = null;
         this.bottomBarOpenAppButton = null;
@@ -645,6 +612,11 @@ class EinblickEditRuntime {
             pending.reject(new Error(this.messages.errors.editingInterrupted));
         }
         this.pendingInlineSaves.clear();
+        for (const pending of this.pendingInlineMediaSaves.values()) {
+            window.clearTimeout(pending.timeoutId);
+            pending.reject(new Error(this.messages.errors.editingInterrupted));
+        }
+        this.pendingInlineMediaSaves.clear();
         this.setState({
             enabled: true,
             active: false,
@@ -656,7 +628,7 @@ class EinblickEditRuntime {
     }
     refreshLocalizedUi() {
         if (this.hoverButton) {
-            this.hoverButton.textContent = this.messages.actions.edit;
+            this.updateHoverButtonLabel();
         }
         if (this.hoverCreateButton) {
             this.hoverCreateButton.textContent = this.messages.actions.addRecord;
@@ -677,6 +649,7 @@ class EinblickEditRuntime {
         }
         this.updateBrandPopover();
         this.updateBottomBar();
+        this.updateHoverChrome();
     }
     async login(options) {
         if (typeof window === 'undefined') {
@@ -738,13 +711,24 @@ class EinblickEditRuntime {
             this.setActiveElement(null);
             return;
         }
+        if (this.isSdkChromeTarget(event.target)) {
+            this.updateHoverChrome();
+            return;
+        }
         const target = this.findEditableTarget(event.target);
         this.setActiveElement(target);
     };
     handleViewportChange = () => {
+        if (this.currentInlineTarget?.isConnected) {
+            this.ensureActiveOutline();
+            this.positionOutline(this.activeOutline, this.currentInlineTarget);
+            return;
+        }
         if (this.activeElement && !this.activeElement.isConnected) {
             this.setActiveElement(null);
+            return;
         }
+        this.updateHoverChrome();
     };
     handleWindowBlur = () => {
         this.setBrandPopoverOpen(false);
@@ -785,8 +769,7 @@ class EinblickEditRuntime {
         this.setActiveElement(null);
     };
     handleHoverButtonClick = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
+        stopEvent(event);
         if (!this.activeElement) {
             return;
         }
@@ -794,11 +777,14 @@ class EinblickEditRuntime {
         if (!binding) {
             return;
         }
+        if (binding.fieldKey && isMediaEditableBinding(binding)) {
+            this.openMediaPicker(this.activeElement, binding, this.hoverButton);
+            return;
+        }
         this.openEditor(binding, this.activeElement);
     };
     handleCreateButtonClick = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
+        stopEvent(event);
         if (!this.activeElement) {
             return;
         }
@@ -815,6 +801,16 @@ class EinblickEditRuntime {
             this.setBottomBarMenuOpen(false);
             return;
         }
+        if (this.currentInlineTarget) {
+            if (this.currentInlineTarget.contains(target) ||
+                this.isSdkChromeTarget(target)) {
+                return;
+            }
+            event.preventDefault();
+            event.stopImmediatePropagation();
+            void this.commitInlineEditor();
+            return;
+        }
         if (this.isBrandPopoverOpen() &&
             !this.brandBadge?.contains(target) &&
             !this.brandPopover?.contains(target)) {
@@ -889,6 +885,35 @@ class EinblickEditRuntime {
             }
             return;
         }
+        if (message.type === 'logout-result') {
+            const pending = this.pendingLogout;
+            if (!pending || pending.requestId !== message.requestId) {
+                return;
+            }
+            window.clearTimeout(pending.timeoutId);
+            this.pendingLogout = null;
+            if (!message.ok && message.message) {
+                this.callbacks.onError?.(message.message);
+            }
+            pending.resolve(message.ok);
+            return;
+        }
+        if (message.type === 'inline-media-result') {
+            const pending = this.pendingInlineMediaSaves.get(message.requestId);
+            if (!pending) {
+                return;
+            }
+            this.pendingInlineMediaSaves.delete(message.requestId);
+            window.clearTimeout(pending.timeoutId);
+            if (message.ok) {
+                pending.resolve({ fileId: message.fileId, value: message.value });
+                return;
+            }
+            const error = new Error(message.error || this.messages.errors.saveFieldFailed);
+            pending.reject(error);
+            this.callbacks.onError?.(error.message);
+            return;
+        }
         const pending = this.pendingInlineSaves.get(message.requestId);
         if (!pending) {
             return;
@@ -948,6 +973,7 @@ class EinblickEditRuntime {
                     collectionId: message.collectionId,
                     intent: message.intent,
                     recordId: message.recordId,
+                    sourceType: message.sourceType,
                     resourceSlug: message.resourceSlug,
                 });
                 return;
@@ -956,6 +982,7 @@ class EinblickEditRuntime {
                 if (message.resourceSlug) {
                     void this.callbacks.onSave?.({
                         binding: {
+                            sourceType: message.sourceType ?? 'cms',
                             resourceSlug: message.resourceSlug,
                             recordId: message.recordId ?? '',
                             resourceMode: 'collection',
@@ -963,6 +990,7 @@ class EinblickEditRuntime {
                         },
                         value: {
                             action: message.action,
+                            sourceType: message.sourceType ?? 'cms',
                             recordId: message.recordId,
                             collectionId: message.collectionId,
                         },
@@ -994,6 +1022,7 @@ class EinblickEditRuntime {
             else if (this.editorBinding) {
                 const nextBinding = {
                     ...this.editorBinding,
+                    sourceType: message.sourceType ?? this.editorBinding.sourceType ?? 'cms',
                     recordId: message.recordId ?? this.editorBinding.recordId,
                 };
                 void this.callbacks.onSave?.({
@@ -1009,6 +1038,7 @@ class EinblickEditRuntime {
             if (this.editorBinding) {
                 const nextBinding = {
                     ...this.editorBinding,
+                    sourceType: message.sourceType ?? this.editorBinding.sourceType ?? 'cms',
                     resourceSlug: message.resourceSlug ?? this.editorBinding.resourceSlug,
                     recordId: message.recordId,
                 };
@@ -1060,16 +1090,23 @@ class EinblickEditRuntime {
         container.hidden = true;
         const editButton = document.createElement('button');
         editButton.type = 'button';
-        editButton.textContent = this.messages.actions.edit;
+        editButton.textContent = this.messages.actions.editElement;
         editButton.setAttribute('data-einblick-edit-button', 'true');
+        editButton.addEventListener('pointerdown', (event) => {
+            event.stopPropagation();
+        });
         editButton.addEventListener('click', this.handleHoverButtonClick);
         const createButton = document.createElement('button');
         createButton.type = 'button';
         createButton.textContent = this.messages.actions.addRecord;
         createButton.hidden = true;
         createButton.setAttribute('data-einblick-create-button', 'true');
+        createButton.addEventListener('pointerdown', (event) => {
+            event.stopPropagation();
+        });
         createButton.addEventListener('click', this.handleCreateButtonClick);
         container.append(editButton, createButton);
+        document.body.append(container);
         this.hoverButtonContainer = container;
         this.hoverButton = editButton;
         this.hoverCreateButton = createButton;
@@ -1189,8 +1226,6 @@ class EinblickEditRuntime {
         height: ${CONTROL_BAR_HEIGHT}px;
         padding: 0 0.75rem;
         background: ${EINBLICK_ACCENT_COLOR};
-        border-top: 1px solid rgba(255, 255, 255, 0.24);
-        box-shadow: 0 -8px 24px rgba(15, 23, 42, 0.18);
       }
 
       .brand,
@@ -1220,6 +1255,25 @@ class EinblickEditRuntime {
         font: 700 0.84rem/1.1 system-ui, sans-serif;
       }
 
+      .resources {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.35rem;
+        min-width: 0;
+        max-width: min(48rem, 54vw);
+        overflow-x: auto;
+        scrollbar-width: none;
+      }
+
+      .resources::-webkit-scrollbar {
+        display: none;
+      }
+
+      .resource-button {
+        flex: 0 0 auto;
+        max-width: 12rem;
+      }
+
       button {
         appearance: none;
         display: inline-flex;
@@ -1229,10 +1283,9 @@ class EinblickEditRuntime {
         min-width: 0;
         height: 2rem;
         margin: 0;
-        border: 1px solid rgba(255, 255, 255, 0.36);
         border-radius: 0.35rem;
-        background: rgba(255, 255, 255, 0.13);
-        color: rgb(255, 255, 255);
+        background: #ffffff;
+        color: #fa693e;
         padding: 0 0.7rem;
         font: 700 0.78rem/1 system-ui, sans-serif;
         letter-spacing: 0;
@@ -1251,11 +1304,11 @@ class EinblickEditRuntime {
 
       button:hover,
       button[aria-expanded="true"] {
-        background: rgba(255, 255, 255, 0.23);
+        opacity: 0.8;
       }
 
       button:focus-visible {
-        outline: 2px solid rgba(255, 255, 255, 0.72);
+        outline: 2px solid #ffffff;
         outline-offset: 2px;
       }
 
@@ -1341,14 +1394,8 @@ class EinblickEditRuntime {
         brand.append(mark, siteName);
         const actions = document.createElement('div');
         actions.className = 'actions';
-        const cmsButton = document.createElement('button');
-        cmsButton.type = 'button';
-        cmsButton.addEventListener('click', (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            this.setBottomBarMenuOpen(false);
-            this.setNavigatorOpen(!this.isNavigatorOpen());
-        });
+        const resourceList = document.createElement('div');
+        resourceList.className = 'resources';
         const moreButton = document.createElement('button');
         moreButton.type = 'button';
         moreButton.className = 'secondary icon-button';
@@ -1386,13 +1433,13 @@ class EinblickEditRuntime {
             void this.logoutFromEinblick();
         });
         moreMenu.append(openAppButton, logoutButton);
-        actions.append(cmsButton, moreButton);
+        actions.append(resourceList, moreButton);
         bar.append(brand, actions, moreMenu);
         shadowRoot.append(style, bar);
         document.body.append(host);
         this.bottomBarHost = host;
         this.bottomBarSiteName = siteName;
-        this.bottomBarCmsButton = cmsButton;
+        this.bottomBarResourceList = resourceList;
         this.bottomBarMoreButton = moreButton;
         this.bottomBarMoreMenu = moreMenu;
         this.bottomBarOpenAppButton = openAppButton;
@@ -1429,6 +1476,79 @@ class EinblickEditRuntime {
             ? this.messages.brand.authenticatedHint
             : this.messages.brand.unauthenticatedHint;
     }
+    collectBottomBarResources() {
+        const resources = new Map();
+        for (const hint of this.resourceHints) {
+            const key = `${hint.sourceType}:${hint.resourceSlug}`;
+            if (hint.showInBottomBar === false) {
+                resources.delete(key);
+                continue;
+            }
+            resources.set(key, hint);
+        }
+        if (typeof document !== 'undefined') {
+            const elements = document.querySelectorAll('[data-einblick-editable="true"][data-einblick-resource]');
+            elements.forEach((element) => {
+                const binding = readBindingFromElement(element);
+                if (!binding?.resourceSlug)
+                    return;
+                const sourceType = binding.sourceType ?? 'cms';
+                const key = `${sourceType}:${binding.resourceSlug}`;
+                if (resources.has(key)) {
+                    const current = resources.get(key);
+                    if (binding.recordId &&
+                        !current.recordIds?.includes(binding.recordId)) {
+                        current.recordIds = [...(current.recordIds ?? []), binding.recordId];
+                    }
+                    return;
+                }
+                resources.set(key, {
+                    sourceType,
+                    resourceSlug: binding.resourceSlug,
+                    label: binding.label,
+                    mode: binding.resourceMode,
+                    recordIds: binding.recordId ? [binding.recordId] : undefined,
+                });
+            });
+        }
+        return [...resources.values()];
+    }
+    updateBottomBarResources() {
+        if (!this.bottomBarResourceList) {
+            return;
+        }
+        this.bottomBarResourceList.replaceChildren();
+        const resources = this.collectBottomBarResources();
+        if (resources.length === 0) {
+            const button = document.createElement('button');
+            button.type = 'button';
+            button.className = 'resource-button';
+            button.textContent = this.messages.actions.cmsCollections;
+            button.setAttribute('aria-expanded', this.isNavigatorOpen() ? 'true' : 'false');
+            button.addEventListener('click', (event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                this.setBottomBarMenuOpen(false);
+                this.setNavigatorOpen(!this.isNavigatorOpen());
+            });
+            this.bottomBarResourceList.append(button);
+            return;
+        }
+        for (const resource of resources) {
+            const button = document.createElement('button');
+            button.type = 'button';
+            button.className = 'resource-button';
+            button.textContent = resource.label ?? resource.resourceSlug;
+            button.title = button.textContent;
+            button.addEventListener('click', (event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                this.setBottomBarMenuOpen(false);
+                this.openNavigator(resource);
+            });
+            this.bottomBarResourceList.append(button);
+        }
+    }
     updateBottomBar() {
         if (!this.bottomBarHost) {
             this.applyBottomLayout(false);
@@ -1448,10 +1568,7 @@ class EinblickEditRuntime {
                 this.state.siteName?.trim() || this.messages.brand.connectedSite;
             this.bottomBarSiteName.title = this.bottomBarSiteName.textContent;
         }
-        if (this.bottomBarCmsButton) {
-            this.bottomBarCmsButton.textContent = this.messages.actions.cmsCollections;
-            this.bottomBarCmsButton.setAttribute('aria-expanded', this.isNavigatorOpen() ? 'true' : 'false');
-        }
+        this.updateBottomBarResources();
         if (this.bottomBarMoreButton) {
             this.bottomBarMoreButton.setAttribute('aria-label', this.messages.actions.moreActions);
             this.bottomBarMoreButton.setAttribute('aria-expanded', this.isBottomBarMenuOpen() ? 'true' : 'false');
@@ -1463,7 +1580,7 @@ class EinblickEditRuntime {
         if (this.bottomBarLogoutButton) {
             this.bottomBarLogoutButton.textContent = this.messages.actions.logout;
         }
-        this.ensureNavigatorPanel();
+        this.ensureNavigatorPanel(false, this.navigatorFilter);
         if (this.navigatorFrame) {
             this.navigatorFrame.title = this.messages.actions.cmsCollections;
         }
@@ -1527,7 +1644,7 @@ class EinblickEditRuntime {
     isNavigatorOpen() {
         return this.navigatorOpen && !!this.navigatorPanel;
     }
-    ensureNavigatorPanel(reportErrors = false) {
+    ensureNavigatorPanel(reportErrors = false, filter) {
         if (this.navigatorPanel) {
             return true;
         }
@@ -1537,7 +1654,7 @@ class EinblickEditRuntime {
         let navigatorUrl;
         const nonce = createRandomId();
         try {
-            navigatorUrl = this.buildNavigatorUrl(nonce);
+            navigatorUrl = this.buildNavigatorUrl(nonce, filter);
         }
         catch (error) {
             if (reportErrors) {
@@ -1564,18 +1681,22 @@ class EinblickEditRuntime {
         this.navigatorPanel = panel;
         this.navigatorFrame = iframe;
         this.navigatorNonce = nonce;
+        this.navigatorFilter = filter ?? null;
         return true;
     }
-    openNavigator() {
+    openNavigator(filter) {
         if (!this.state.isAuthenticated) {
             this.callbacks.onError?.(this.messages.errors.signInToEditContent);
             return;
         }
-        if (this.isNavigatorOpen()) {
+        if (this.isNavigatorOpen() && !filter) {
             return;
         }
+        if (this.isNavigatorOpen() && filter) {
+            this.removeNavigatorPanel(false);
+        }
         this.setBottomBarMenuOpen(false);
-        if (!this.ensureNavigatorPanel(true) || !this.navigatorPanel) {
+        if (!this.ensureNavigatorPanel(true, filter) || !this.navigatorPanel) {
             return;
         }
         this.navigatorOpen = true;
@@ -1602,6 +1723,7 @@ class EinblickEditRuntime {
         this.navigatorPanel = null;
         this.navigatorFrame = null;
         this.navigatorNonce = null;
+        this.navigatorFilter = null;
         this.navigatorOpen = false;
         if (hadNavigator && updateBottomBar) {
             this.updateBottomBar();
@@ -1621,6 +1743,48 @@ class EinblickEditRuntime {
             siteName: this.state.siteName,
             errorMessage: undefined,
         });
+        const loggedOutViaBridge = await this.requestBridgeLogout();
+        if (!loggedOutViaBridge) {
+            await this.logoutViaPopup(sessionToken);
+        }
+        this.reloadBridge();
+    }
+    requestBridgeLogout() {
+        if (typeof window === 'undefined' || this.pendingLogout) {
+            return Promise.resolve(false);
+        }
+        const target = this.bridgeFrame?.contentWindow;
+        if (!target) {
+            return Promise.resolve(false);
+        }
+        const requestId = createRandomId();
+        return new Promise((resolve) => {
+            const timeoutId = window.setTimeout(() => {
+                if (this.pendingLogout?.requestId !== requestId) {
+                    return;
+                }
+                this.pendingLogout = null;
+                resolve(false);
+            }, 2500);
+            this.pendingLogout = { requestId, resolve, timeoutId };
+            try {
+                target.postMessage({
+                    source: EINBLICK_PARENT_SOURCE,
+                    type: 'logout',
+                    nonce: this.bridgeNonce,
+                    requestId,
+                }, this.appOrigin);
+            }
+            catch {
+                window.clearTimeout(timeoutId);
+                if (this.pendingLogout?.requestId === requestId) {
+                    this.pendingLogout = null;
+                }
+                resolve(false);
+            }
+        });
+    }
+    async logoutViaPopup(sessionToken) {
         const logoutUrl = this.buildBridgeUrl({
             mode: 'logout',
             nonce: createRandomId(),
@@ -1647,28 +1811,11 @@ class EinblickEditRuntime {
                 }
             }, 400);
         });
-        this.reloadBridge();
     }
     setActiveElement(element) {
         if (this.activeElement === element) {
-            if (this.hoverButtonContainer &&
-                element &&
-                !element.contains(this.hoverButtonContainer)) {
-                element.append(this.hoverButtonContainer);
-            }
-            this.updateHoverButtonVisibility(element);
-            return;
-        }
-        if (this.activeElement) {
-            this.activeElement.removeAttribute('data-einblick-editable-active');
-            const originalPosition = this.activeElement.dataset.einblickRuntimeOriginalPosition;
-            if (originalPosition !== undefined) {
-                this.activeElement.style.position =
-                    originalPosition === RELATIVE_POSITION_SENTINEL
-                        ? ''
-                        : originalPosition;
-                delete this.activeElement.dataset.einblickRuntimeOriginalPosition;
-            }
+            this.updateHoverChrome();
+            return;
         }
         this.activeElement = element;
         if (!element ||
@@ -1677,22 +1824,176 @@ class EinblickEditRuntime {
             !this.state.isAuthenticated) {
             if (this.hoverButtonContainer) {
                 this.hoverButtonContainer.hidden = true;
-                this.hoverButtonContainer.remove();
             }
+            this.activeOutline?.remove();
+            this.activeOutline = null;
+            this.clearQuickFieldOverlays();
             if (this.hoverCreateButton) {
                 this.hoverCreateButton.hidden = true;
             }
             return;
         }
-        element.setAttribute('data-einblick-editable-active', 'true');
-        if (window.getComputedStyle(element).position === 'static') {
-            element.dataset.einblickRuntimeOriginalPosition =
-                element.style.position || RELATIVE_POSITION_SENTINEL;
-            element.style.position = 'relative';
-        }
+        this.ensureActiveOutline();
+        this.hoverButtonContainer.hidden = false;
+        this.updateHoverButtonLabel();
         this.updateHoverButtonVisibility(element);
+        this.renderQuickFieldOverlays(element);
+        this.updateHoverChrome();
+    }
+    ensureActiveOutline() {
+        if (this.activeOutline || typeof document === 'undefined') {
+            return;
+        }
+        const outline = document.createElement('div');
+        outline.setAttribute('data-einblick-edit-outline', 'true');
+        document.body.append(outline);
+        this.activeOutline = outline;
+    }
+    updateHoverChrome() {
+        if (!this.activeElement || !this.state.isAuthenticated) {
+            this.activeOutline?.remove();
+            this.activeOutline = null;
+            if (this.hoverButtonContainer) {
+                this.hoverButtonContainer.hidden = true;
+            }
+            this.clearQuickFieldOverlays();
+            return;
+        }
+        if (!this.activeElement.isConnected) {
+            this.setActiveElement(null);
+            return;
+        }
+        this.ensureActiveOutline();
+        const rect = this.activeElement.getBoundingClientRect();
+        const isVisible = this.positionOutline(this.activeOutline, this.activeElement);
+        if (!isVisible || rect.width <= 0 || rect.height <= 0) {
+            if (this.hoverButtonContainer) {
+                this.hoverButtonContainer.hidden = true;
+            }
+            this.clearQuickFieldOverlays();
+            return;
+        }
+        this.updateHoverButtonLabel();
+        this.updateHoverButtonVisibility(this.activeElement);
+        this.positionHoverControls(rect);
+        this.updateQuickFieldOverlayPositions();
+    }
+    positionOutline(outline, target) {
+        if (!outline) {
+            return false;
+        }
+        const rect = target.getBoundingClientRect();
+        if (rect.width <= 0 || rect.height <= 0) {
+            outline.hidden = true;
+            return false;
+        }
+        const style = window.getComputedStyle(target);
+        outline.hidden = false;
+        outline.style.setProperty('--einblick-overlay-radius', style.borderRadius || '0.35rem');
+        outline.style.left = `${Math.round(rect.left)}px`;
+        outline.style.top = `${Math.round(rect.top)}px`;
+        outline.style.width = `${Math.round(rect.width)}px`;
+        outline.style.height = `${Math.round(rect.height)}px`;
+        return true;
+    }
+    positionHoverControls(rect) {
+        if (!this.hoverButtonContainer) {
+            return;
+        }
         this.hoverButtonContainer.hidden = false;
-        element.append(this.hoverButtonContainer);
+        const margin = 8;
+        const width = this.hoverButtonContainer.offsetWidth || 180;
+        const height = this.hoverButtonContainer.offsetHeight || 32;
+        const left = clamp(rect.right - width - margin, margin, Math.max(margin, window.innerWidth - width - margin));
+        const top = clamp(rect.top + margin, margin, Math.max(margin, window.innerHeight - height - margin));
+        this.hoverButtonContainer.style.left = `${Math.round(left)}px`;
+        this.hoverButtonContainer.style.top = `${Math.round(top)}px`;
+    }
+    clearQuickFieldOverlays() {
+        this.quickFieldOverlayContainer?.remove();
+        this.quickFieldOverlayContainer = null;
+        this.quickFieldOverlays = [];
+    }
+    renderQuickFieldOverlays(element) {
+        this.clearQuickFieldOverlays();
+        const targets = this.getQuickEditableTargets(element);
+        if (targets.length === 0 || typeof document === 'undefined') {
+            return;
+        }
+        const container = document.createElement('div');
+        container.setAttribute('data-einblick-field-overlays', 'true');
+        this.quickFieldOverlays = targets.map((target) => {
+            const binding = readBindingFromElement(target);
+            const outline = document.createElement('div');
+            outline.setAttribute('data-einblick-edit-field-outline', 'true');
+            const button = document.createElement('button');
+            button.type = 'button';
+            button.setAttribute('data-einblick-field-button', binding && isMediaEditableBinding(binding) ? 'media' : 'text');
+            button.textContent =
+                binding && isMediaEditableBinding(binding)
+                    ? getMediaActionLabel(binding, this.messages)
+                    : this.messages.actions.editText;
+            button.addEventListener('pointerdown', (event) => {
+                event.stopPropagation();
+            });
+            button.addEventListener('click', (event) => {
+                stopEvent(event);
+                const nextBinding = readBindingFromElement(target);
+                if (!nextBinding) {
+                    return;
+                }
+                if (isMediaEditableBinding(nextBinding)) {
+                    this.openMediaPicker(target, nextBinding, button);
+                    return;
+                }
+                this.openInlineEditor(target, nextBinding);
+            });
+            container.append(outline, button);
+            return { target, outline, button };
+        });
+        document.body.append(container);
+        this.quickFieldOverlayContainer = container;
+        this.updateQuickFieldOverlayPositions();
+    }
+    updateQuickFieldOverlayPositions() {
+        if (!this.quickFieldOverlayContainer) {
+            return;
+        }
+        for (const overlay of this.quickFieldOverlays) {
+            if (!overlay.target.isConnected) {
+                overlay.outline.hidden = true;
+                overlay.button.hidden = true;
+                continue;
+            }
+            const rect = overlay.target.getBoundingClientRect();
+            const isVisible = this.positionOutline(overlay.outline, overlay.target);
+            overlay.button.hidden = !isVisible;
+            if (!isVisible) {
+                continue;
+            }
+            const margin = 4;
+            const width = overlay.button.offsetWidth || 96;
+            const height = overlay.button.offsetHeight || 26;
+            const left = clamp(rect.left + margin, margin, Math.max(margin, window.innerWidth - width - margin));
+            const top = clamp(rect.top + margin, margin, Math.max(margin, window.innerHeight - height - margin));
+            overlay.button.style.left = `${Math.round(left)}px`;
+            overlay.button.style.top = `${Math.round(top)}px`;
+        }
+    }
+    updateHoverButtonLabel() {
+        if (!this.hoverButton || !this.activeElement) {
+            return;
+        }
+        const binding = readBindingFromElement(this.activeElement);
+        if (!binding?.fieldKey) {
+            this.hoverButton.textContent = this.messages.actions.editElement;
+            return;
+        }
+        this.hoverButton.textContent = isMediaEditableBinding(binding)
+            ? getMediaActionLabel(binding, this.messages)
+            : shouldUseInlineEditor(binding)
+                ? this.messages.actions.editText
+                : this.messages.actions.edit;
     }
     reloadBridge() {
         this.clearBridgePing();
@@ -1765,6 +2066,7 @@ class EinblickEditRuntime {
         url.searchParams.set('nonce', nonce);
         url.searchParams.set('sessionToken', sessionToken);
         url.searchParams.set('returnTo', window.location.href);
+        url.searchParams.set('sourceType', binding.sourceType ?? 'cms');
         url.searchParams.set('resourceSlug', binding.resourceSlug);
         url.searchParams.set('recordId', binding.recordId);
         if (intent === 'create') {
@@ -1775,7 +2077,7 @@ class EinblickEditRuntime {
         }
         return url.toString();
     }
-    buildNavigatorUrl(nonce) {
+    buildNavigatorUrl(nonce, filter) {
         const sessionToken = this.getActiveSessionToken();
         if (!sessionToken) {
             throw new Error(this.messages.errors.editSessionExpired);
@@ -1784,6 +2086,15 @@ class EinblickEditRuntime {
         url.searchParams.set('origin', window.location.origin);
         url.searchParams.set('nonce', nonce);
         url.searchParams.set('sessionToken', sessionToken);
+        if (filter?.sourceType) {
+            url.searchParams.set('sourceType', filter.sourceType);
+        }
+        if (filter?.resourceSlug) {
+            url.searchParams.set('resourceSlug', filter.resourceSlug);
+        }
+        if (filter?.recordIds && filter.recordIds.length > 0) {
+            url.searchParams.set('recordIds', filter.recordIds.join(','));
+        }
         return url.toString();
     }
     buildCollectionEditorUrl(args) {
@@ -1796,7 +2107,11 @@ class EinblickEditRuntime {
         url.searchParams.set('nonce', args.nonce);
         url.searchParams.set('sessionToken', sessionToken);
         url.searchParams.set('returnTo', window.location.href);
+        url.searchParams.set('sourceType', args.sourceType ?? 'cms');
         url.searchParams.set('collectionId', args.collectionId);
+        if (args.resourceSlug) {
+            url.searchParams.set('resourceSlug', args.resourceSlug);
+        }
         url.searchParams.set('intent', args.intent);
         if (args.recordId) {
             url.searchParams.set('recordId', args.recordId);
@@ -1828,6 +2143,7 @@ class EinblickEditRuntime {
         }
         const selector = [
             '[data-einblick-editable="true"]',
+            `[data-einblick-source-type="${CSS.escape(binding.sourceType ?? 'cms')}"]`,
             `[data-einblick-resource="${CSS.escape(binding.resourceSlug)}"]`,
         ].join('');
         const elements = document.querySelectorAll(selector);
@@ -1845,11 +2161,74 @@ class EinblickEditRuntime {
             return null;
         }
         const editableTarget = target.closest('[data-einblick-editable="true"]');
-        return editableTarget ?? null;
+        if (!editableTarget) {
+            return null;
+        }
+        const binding = readBindingFromElement(editableTarget);
+        if (!binding?.fieldKey) {
+            return editableTarget;
+        }
+        const entryTarget = this.findEntryTargetForField(editableTarget, binding);
+        return entryTarget ?? editableTarget;
+    }
+    findEntryTargetForField(fieldElement, binding) {
+        let parent = fieldElement.parentElement;
+        while (parent) {
+            const parentBinding = readBindingFromElement(parent);
+            if (parentBinding &&
+                !parentBinding.fieldKey &&
+                (parentBinding.sourceType ?? 'cms') === (binding.sourceType ?? 'cms') &&
+                parentBinding.resourceSlug === binding.resourceSlug &&
+                parentBinding.recordId === binding.recordId) {
+                return parent;
+            }
+            parent = parent.parentElement;
+        }
+        return null;
+    }
+    getQuickEditableTargets(element) {
+        const binding = readBindingFromElement(element);
+        if (!binding) {
+            return [];
+        }
+        if (binding.fieldKey) {
+            return shouldUseInlineEditor(binding) || isMediaEditableBinding(binding)
+                ? [element]
+                : [];
+        }
+        const selector = [
+            '[data-einblick-editable="true"]',
+            `[data-einblick-source-type="${CSS.escape(binding.sourceType ?? 'cms')}"]`,
+            `[data-einblick-resource="${CSS.escape(binding.resourceSlug)}"]`,
+            `[data-einblick-record-id="${CSS.escape(binding.recordId)}"]`,
+            '[data-einblick-field-key]',
+        ].join('');
+        const fields = Array.from(element.querySelectorAll(selector));
+        return fields
+            .filter((candidate) => {
+            const candidateBinding = readBindingFromElement(candidate);
+            return (!!candidateBinding &&
+                (shouldUseInlineEditor(candidateBinding) ||
+                    isMediaEditableBinding(candidateBinding)));
+        })
+            .slice(0, 24);
+    }
+    isSdkChromeTarget(target) {
+        if (!(target instanceof Node)) {
+            return false;
+        }
+        return (!!this.hoverButtonContainer?.contains(target) ||
+            !!this.quickFieldOverlayContainer?.contains(target) ||
+            !!this.activeOutline?.contains(target) ||
+            !!this.brandBadge?.contains(target) ||
+            !!this.brandPopover?.contains(target) ||
+            !!this.bottomBarHost?.contains(target) ||
+            !!this.bottomBarMoreMenu?.contains(target));
     }
     findElementForBinding(binding) {
         const selector = [
             '[data-einblick-editable="true"]',
+            `[data-einblick-source-type="${CSS.escape(binding.sourceType ?? 'cms')}"]`,
             `[data-einblick-resource="${CSS.escape(binding.resourceSlug)}"]`,
             `[data-einblick-record-id="${CSS.escape(binding.recordId)}"]`,
             binding.fieldKey
@@ -1874,216 +2253,343 @@ class EinblickEditRuntime {
         this.closeDrawer();
         this.closeInlineEditor();
         this.setActiveElement(null);
-        const computedDisplay = window.getComputedStyle(target).display;
-        const isInlineLayout = computedDisplay === 'inline' ||
-            computedDisplay === 'inline-block' ||
-            computedDisplay === 'inline-flex' ||
-            computedDisplay === 'contents';
-        const targetRect = target.getBoundingClientRect();
-        this.currentInlineRestoreState = {
-            childNodes: Array.from(target.childNodes),
-            display: target.style.display,
-            flexDirection: target.style.flexDirection,
-            alignItems: target.style.alignItems,
-            gap: target.style.gap,
-            minWidth: target.style.minWidth,
+        const restoreState = {
+            childNodes: Array.from(target.childNodes).map((node) => node.cloneNode(true)),
+            contentEditable: target.getAttribute('contenteditable'),
+            spellcheck: target.getAttribute('spellcheck'),
+            tabIndex: target.tabIndex,
+            hadTabIndex: target.hasAttribute('tabindex'),
+            role: target.getAttribute('role'),
+            ariaMultiline: target.getAttribute('aria-multiline'),
+            title: target.getAttribute('title'),
+            value: binding.value,
+            cleanup: [],
         };
+        this.currentInlineRestoreState = restoreState;
         target.dataset.einblickInlineEditing = 'true';
-        target.style.display = isInlineLayout ? 'inline-flex' : 'flex';
-        target.style.flexDirection = 'column';
-        target.style.alignItems = 'stretch';
-        target.style.gap = '0.75rem';
-        target.style.minWidth = isInlineLayout
-            ? `${Math.min(Math.max(Math.round(targetRect.width), 220), Math.max(window.innerWidth - 32, 220))}px`
-            : target.style.minWidth;
-        const shellHost = document.createElement('div');
-        const shadowRoot = shellHost.attachShadow({ mode: 'open' });
-        const shadowStyle = document.createElement('style');
-        shadowStyle.textContent = INLINE_EDITOR_SHADOW_STYLES;
-        const shell = document.createElement('div');
-        shell.setAttribute('data-einblick-inline-shell', 'true');
-        const control = this.createInlineControl(binding, target);
-        this.setControlValue(control, binding, binding.value);
-        const errorMessage = document.createElement('div');
-        errorMessage.setAttribute('data-einblick-inline-error', 'true');
-        errorMessage.hidden = true;
-        const actions = document.createElement('div');
-        actions.setAttribute('data-einblick-inline-actions', 'true');
-        const cancelButton = document.createElement('button');
-        cancelButton.type = 'button';
-        cancelButton.textContent = this.messages.actions.cancel;
-        cancelButton.setAttribute('data-einblick-edit-action', 'secondary');
-        cancelButton.addEventListener('click', () => this.closeInlineEditor());
-        const saveButton = document.createElement('button');
-        saveButton.type = 'button';
-        saveButton.textContent = this.messages.actions.save;
-        saveButton.setAttribute('data-einblick-edit-action', 'primary');
-        const runSave = async () => {
-            errorMessage.hidden = true;
-            errorMessage.textContent = '';
-            saveButton.disabled = true;
-            saveButton.textContent = this.messages.actions.saving;
-            cancelButton.disabled = true;
-            try {
-                const nextValue = this.getControlValue(control, binding);
-                const savedValue = await this.saveInlineField(binding, nextValue);
-                this.closeInlineEditor();
-                this.applyValueToElement(target, binding, savedValue);
-                await this.callbacks.onSave?.({
-                    binding,
-                    value: savedValue,
-                    source: 'inline',
-                });
-            }
-            catch (error) {
-                errorMessage.hidden = false;
-                errorMessage.textContent =
-                    error instanceof Error
-                        ? error.message
-                        : this.messages.errors.saveFieldFailed;
-                saveButton.disabled = false;
-                saveButton.textContent = this.messages.actions.save;
-                cancelButton.disabled = false;
-            }
+        target.setAttribute('contenteditable', 'plaintext-only');
+        target.setAttribute('spellcheck', 'true');
+        target.setAttribute('role', 'textbox');
+        target.setAttribute('aria-multiline', fieldTypeAllowsMultiline(binding) ? 'true' : 'false');
+        if (!target.hasAttribute('tabindex')) {
+            target.tabIndex = 0;
+        }
+        if ((target.textContent ?? '').trim().length === 0 &&
+            binding.value !== undefined &&
+            binding.value !== null) {
+            target.textContent = formatValueForText(binding.value);
+        }
+        const handleClick = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
         };
-        saveButton.addEventListener('click', () => {
-            void runSave();
-        });
-        control.addEventListener('keydown', (event) => {
-            const keyboardEvent = event;
+        const handleKeyDown = (keyboardEvent) => {
             if (keyboardEvent.key === 'Escape') {
                 keyboardEvent.preventDefault();
+                keyboardEvent.stopPropagation();
                 this.closeInlineEditor();
                 return;
             }
             if (keyboardEvent.key === 'Enter' &&
-                (!(control instanceof HTMLTextAreaElement) ||
+                (!fieldTypeAllowsMultiline(binding) ||
                     keyboardEvent.metaKey ||
                     keyboardEvent.ctrlKey)) {
                 keyboardEvent.preventDefault();
-                void runSave();
+                keyboardEvent.stopPropagation();
+                void this.commitInlineEditor();
+                return;
             }
-        });
-        actions.append(cancelButton, saveButton);
-        shell.append(control, errorMessage, actions);
-        shadowRoot.append(shadowStyle, shell);
-        target.replaceChildren(shellHost);
+            if (isTextInputEvent(keyboardEvent)) {
+                keyboardEvent.stopPropagation();
+            }
+        };
+        const handlePaste = (event) => {
+            const text = event.clipboardData?.getData('text/plain');
+            if (text === undefined) {
+                return;
+            }
+            event.preventDefault();
+            event.stopPropagation();
+            this.insertPlainTextAtSelection(text);
+        };
+        const handleBlur = () => {
+            window.setTimeout(() => {
+                if (this.currentInlineTarget === target) {
+                    void this.commitInlineEditor();
+                }
+            }, 0);
+        };
+        target.addEventListener('click', handleClick, true);
+        target.addEventListener('keydown', handleKeyDown, true);
+        target.addEventListener('paste', handlePaste, true);
+        target.addEventListener('blur', handleBlur, true);
+        restoreState.cleanup.push(() => target.removeEventListener('click', handleClick, true), () => target.removeEventListener('keydown', handleKeyDown, true), () => target.removeEventListener('paste', handlePaste, true), () => target.removeEventListener('blur', handleBlur, true));
         this.currentInlineTarget = target;
         this.currentInlineBinding = binding;
+        this.ensureActiveOutline();
+        this.activeOutline?.setAttribute('data-einblick-inline-active', 'true');
+        this.positionOutline(this.activeOutline, target);
         window.setTimeout(() => {
-            if ('focus' in control && typeof control.focus === 'function') {
-                control.focus();
-            }
+            target.focus({ preventScroll: true });
+            this.placeCaretAtEnd(target);
         }, 0);
     }
-    closeInlineEditor() {
+    closeInlineEditor(options = {}) {
+        const restore = options.restore ?? true;
         if (this.currentInlineTarget && this.currentInlineRestoreState) {
-            this.currentInlineTarget.replaceChildren(...this.currentInlineRestoreState.childNodes);
-            this.currentInlineTarget.style.display =
-                this.currentInlineRestoreState.display;
-            this.currentInlineTarget.style.flexDirection =
-                this.currentInlineRestoreState.flexDirection;
-            this.currentInlineTarget.style.alignItems =
-                this.currentInlineRestoreState.alignItems;
-            this.currentInlineTarget.style.gap = this.currentInlineRestoreState.gap;
-            this.currentInlineTarget.style.minWidth =
-                this.currentInlineRestoreState.minWidth;
+            for (const cleanup of this.currentInlineRestoreState.cleanup) {
+                cleanup();
+            }
+            if (restore) {
+                this.currentInlineTarget.replaceChildren(...this.currentInlineRestoreState.childNodes.map((node) => node.cloneNode(true)));
+                this.currentInlineTarget.dataset.einblickValue =
+                    serializeBindingValue(this.currentInlineRestoreState.value) ?? '';
+            }
+            this.restoreInlineTargetAttributes(this.currentInlineTarget, this.currentInlineRestoreState);
             delete this.currentInlineTarget.dataset.einblickInlineEditing;
+            delete this.currentInlineTarget.dataset.einblickInlineState;
+            this.currentInlineTarget.removeAttribute('aria-busy');
         }
         this.currentInlineRestoreState = null;
         this.currentInlineTarget = null;
         this.currentInlineBinding = null;
-    }
-    createInlineControl(binding, target) {
-        switch (binding.fieldType) {
-            case 'text':
-            case 'markdown': {
-                const textarea = document.createElement('textarea');
-                textarea.setAttribute('data-einblick-inline-textarea', 'true');
-                return textarea;
-            }
-            case 'boolean': {
-                const select = document.createElement('select');
-                select.setAttribute('data-einblick-inline-select', 'true');
-                const trueOption = document.createElement('option');
-                trueOption.value = 'true';
-                trueOption.textContent = this.messages.values.true;
-                const falseOption = document.createElement('option');
-                falseOption.value = 'false';
-                falseOption.textContent = this.messages.values.false;
-                select.append(trueOption, falseOption);
-                return select;
-            }
-            default: {
-                const textValue = typeof binding.value === 'string'
-                    ? binding.value
-                    : (target?.textContent ?? '');
-                if (binding.fieldType === 'string' &&
-                    typeof textValue === 'string' &&
-                    textValue.includes('\n')) {
-                    const textarea = document.createElement('textarea');
-                    textarea.setAttribute('data-einblick-inline-textarea', 'true');
-                    return textarea;
-                }
-                const input = document.createElement('input');
-                input.setAttribute('data-einblick-inline-control', 'true');
-                if (binding.fieldType === 'number') {
-                    input.type = 'number';
-                }
-                else if (binding.fieldType === 'date') {
-                    input.type = 'date';
-                }
-                else {
-                    input.type = 'text';
-                }
-                return input;
-            }
+        this.inlineSaveInFlight = null;
+        this.activeOutline?.removeAttribute('data-einblick-inline-active');
+        if (!this.activeElement) {
+            this.activeOutline?.remove();
+            this.activeOutline = null;
         }
     }
-    setControlValue(control, binding, value) {
-        const currentValue = value ?? binding.value;
-        if (control instanceof HTMLSelectElement) {
-            control.value = currentValue === true ? 'true' : 'false';
-            return;
+    restoreInlineTargetAttributes(target, restoreState) {
+        if (restoreState.contentEditable === null) {
+            target.removeAttribute('contenteditable');
         }
-        if (binding.fieldType === 'tags') {
-            control.value = Array.isArray(currentValue)
-                ? currentValue
-                    .map((entry) => (typeof entry === 'string' ? entry : String(entry)))
-                    .join(', ')
-                : currentValue === undefined || currentValue === null
-                    ? ''
-                    : String(currentValue);
-            return;
+        else {
+            target.setAttribute('contenteditable', restoreState.contentEditable);
         }
-        if (binding.fieldType === 'date') {
-            control.value =
-                typeof currentValue === 'string' ? normalizeDateValue(currentValue) : '';
-            return;
+        if (restoreState.spellcheck === null) {
+            target.removeAttribute('spellcheck');
+        }
+        else {
+            target.setAttribute('spellcheck', restoreState.spellcheck);
+        }
+        if (restoreState.role === null) {
+            target.removeAttribute('role');
+        }
+        else {
+            target.setAttribute('role', restoreState.role);
+        }
+        if (restoreState.ariaMultiline === null) {
+            target.removeAttribute('aria-multiline');
+        }
+        else {
+            target.setAttribute('aria-multiline', restoreState.ariaMultiline);
+        }
+        if (restoreState.title === null) {
+            target.removeAttribute('title');
+        }
+        else {
+            target.setAttribute('title', restoreState.title);
+        }
+        if (restoreState.hadTabIndex) {
+            target.tabIndex = restoreState.tabIndex;
+        }
+        else {
+            target.removeAttribute('tabindex');
         }
-        control.value =
-            currentValue === undefined || currentValue === null
-                ? ''
-                : typeof currentValue === 'string'
-                    ? currentValue
-                    : String(currentValue);
     }
-    getControlValue(control, binding) {
-        const rawValue = control.value;
+    getInlineEditableValue(target, binding) {
+        const rawValue = fieldTypeAllowsMultiline(binding)
+            ? target.innerText.replace(/\n$/, '')
+            : (target.textContent ?? '').replace(/\s+/g, ' ').trim();
         switch (binding.fieldType) {
             case 'number':
                 return rawValue.trim().length === 0 ? null : Number(rawValue);
-            case 'boolean':
-                return rawValue === 'true';
             case 'tags':
                 return rawValue
                     .split(',')
                     .map((entry) => entry.trim())
                     .filter(Boolean);
+            case 'date':
+                return normalizeDateValue(rawValue.trim());
             default:
                 return rawValue;
         }
     }
+    async commitInlineEditor() {
+        if (this.inlineSaveInFlight) {
+            return await this.inlineSaveInFlight;
+        }
+        const target = this.currentInlineTarget;
+        const binding = this.currentInlineBinding;
+        if (!target || !binding) {
+            return;
+        }
+        this.inlineSaveInFlight = (async () => {
+            target.setAttribute('aria-busy', 'true');
+            target.dataset.einblickInlineState = 'saving';
+            try {
+                const nextValue = this.getInlineEditableValue(target, binding);
+                const savedValue = await this.saveInlineField(binding, nextValue);
+                this.closeInlineEditor({ restore: false });
+                this.applyValueToElement(target, binding, savedValue);
+                await this.callbacks.onSave?.({
+                    binding,
+                    value: savedValue,
+                    source: 'inline',
+                });
+            }
+            catch (error) {
+                target.dataset.einblickInlineState = 'error';
+                target.removeAttribute('aria-busy');
+                this.inlineSaveInFlight = null;
+                const message = error instanceof Error
+                    ? error.message
+                    : this.messages.errors.saveFieldFailed;
+                target.title = message;
+                this.callbacks.onError?.(message);
+            }
+        })();
+        await this.inlineSaveInFlight;
+    }
+    insertPlainTextAtSelection(text) {
+        const selection = window.getSelection();
+        if (!selection || selection.rangeCount === 0) {
+            return;
+        }
+        selection.deleteFromDocument();
+        selection.getRangeAt(0).insertNode(document.createTextNode(text));
+        selection.collapseToEnd();
+    }
+    placeCaretAtEnd(target) {
+        const selection = window.getSelection();
+        if (!selection) {
+            return;
+        }
+        const range = document.createRange();
+        range.selectNodeContents(target);
+        range.collapse(false);
+        selection.removeAllRanges();
+        selection.addRange(range);
+    }
+    openMediaPicker(target, binding, button) {
+        if (!this.state.isAuthenticated) {
+            this.callbacks.onError?.(this.messages.errors.signInToEditField);
+            return;
+        }
+        if (!binding.fieldKey) {
+            this.callbacks.onError?.(this.messages.errors.fieldBindingRequired);
+            return;
+        }
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.accept = getMediaAcceptValue(binding);
+        input.style.position = 'fixed';
+        input.style.left = '-9999px';
+        input.style.top = '0';
+        const previousText = button?.textContent ?? '';
+        const resetButton = () => {
+            if (button) {
+                button.disabled = false;
+                button.textContent =
+                    previousText || getMediaActionLabel(binding, this.messages);
+            }
+        };
+        input.addEventListener('change', () => {
+            const file = input.files?.[0];
+            input.remove();
+            if (!file) {
+                return;
+            }
+            if (button) {
+                button.disabled = true;
+                button.textContent = this.messages.actions.uploading;
+            }
+            void (async () => {
+                try {
+                    const result = await this.saveInlineMediaField(binding, file);
+                    this.applyMediaPreviewToElement(target, file);
+                    await this.callbacks.onSave?.({
+                        binding,
+                        value: result.value,
+                        source: 'inline',
+                    });
+                }
+                catch (error) {
+                    const message = error instanceof Error
+                        ? error.message
+                        : this.messages.errors.saveFieldFailed;
+                    this.callbacks.onError?.(message);
+                }
+                finally {
+                    resetButton();
+                }
+            })();
+        });
+        input.addEventListener('cancel', () => {
+            input.remove();
+        });
+        document.body.append(input);
+        input.click();
+    }
+    async saveInlineMediaField(binding, file) {
+        if (!this.bridgeFrame?.contentWindow) {
+            throw new Error(this.messages.errors.bridgeNotConnected);
+        }
+        if (!this.state.isAuthenticated) {
+            throw new Error(this.messages.errors.signInToEditField);
+        }
+        if (!binding.fieldKey) {
+            throw new Error(this.messages.errors.fieldBindingRequired);
+        }
+        const requestId = createRandomId();
+        const promise = new Promise((resolve, reject) => {
+            const timeoutId = window.setTimeout(() => {
+                this.pendingInlineMediaSaves.delete(requestId);
+                reject(new Error(this.messages.errors.savingTimedOut));
+            }, 60000);
+            this.pendingInlineMediaSaves.set(requestId, {
+                resolve,
+                reject,
+                timeoutId,
+            });
+        });
+        this.bridgeFrame.contentWindow.postMessage({
+            source: EINBLICK_PARENT_SOURCE,
+            type: 'replace-inline-media',
+            nonce: this.bridgeNonce,
+            requestId,
+            payload: {
+                sourceType: binding.sourceType ?? 'cms',
+                resourceSlug: binding.resourceSlug,
+                recordId: binding.recordId,
+                fieldKey: binding.fieldKey,
+                file,
+            },
+        }, this.appOrigin);
+        return await promise;
+    }
+    applyMediaPreviewToElement(element, file) {
+        if (!file.type.startsWith('image/')) {
+            return;
+        }
+        const image = element instanceof HTMLImageElement
+            ? element
+            : element.querySelector('img');
+        if (!image) {
+            return;
+        }
+        const objectUrl = URL.createObjectURL(file);
+        const previousUrl = image.src;
+        image.addEventListener('load', () => {
+            URL.revokeObjectURL(objectUrl);
+        }, { once: true });
+        image.addEventListener('error', () => {
+            image.src = previousUrl;
+            URL.revokeObjectURL(objectUrl);
+        }, { once: true });
+        image.src = objectUrl;
+    }
     async saveInlineField(binding, value) {
         if (!this.bridgeFrame?.contentWindow) {
             throw new Error(this.messages.errors.bridgeNotConnected);
@@ -2108,6 +2614,7 @@ class EinblickEditRuntime {
             nonce: this.bridgeNonce,
             requestId,
             payload: {
+                sourceType: binding.sourceType ?? 'cms',
                 resourceSlug: binding.resourceSlug,
                 recordId: binding.recordId,
                 fieldKey: binding.fieldKey,
@@ -2176,6 +2683,8 @@ class EinblickEditRuntime {
                 nonce,
                 intent: args.intent,
                 recordId: args.recordId,
+                sourceType: args.sourceType,
+                resourceSlug: args.resourceSlug,
             });
         }
         catch (error) {
@@ -2188,6 +2697,7 @@ class EinblickEditRuntime {
         this.editorTarget = null;
         this.editorBinding = args.resourceSlug
             ? {
+                sourceType: args.sourceType ?? 'cms',
                 resourceSlug: args.resourceSlug,
                 recordId: args.recordId ?? '',
                 resourceMode: 'collection',
@@ -2259,6 +2769,7 @@ export function createEinblickEditRuntime(options) {
         login: (loginOptions) => runtime.login(loginOptions),
         openEditor: (binding, element) => runtime.openEditor(binding, element),
         setLocale: (locale) => runtime.setLocale(locale),
+        setResourceHints: (hints) => runtime.setResourceHints(hints),
     };
 }
 //# sourceMappingURL=runtime.js.map