@wildwinter/expr-editor 0.2.0 → 0.3.0

package/dist/index.d.cts

@@ -254,6 +254,10 @@ interface ExpressionEditorOptions {
     /** Render the editor's own validation message list under the pills (default true).
      *  Hosts that display their own validation messages pass false to avoid doubling up. */
     messages?: boolean;
+    /** Where to append the popover micro-editors (default document.body). Pass a
+     *  container inside a focus-trapping dialog (Radix, etc.) so opening a pill's
+     *  popover does not dismiss the surrounding dialog. */
+    popoverContainer?: HTMLElement;
     /** Emitted on every edit (name-form; "" when cleared). */
     onChange: (src: string) => void;
     /** Notified when the author starts (true) / stops (false) editing inside a popover
@@ -296,6 +300,10 @@ interface EffectsEditorOptions {
     allowEmit?: boolean;
     /** Start each inline value editor in raw-text mode (host's global "show as text" toggle drives this). */
     text?: boolean;
+    /** Where to append popover micro-editors (default document.body). Pass a container
+     *  inside a focus-trapping dialog so popovers do not dismiss it. Threaded to the
+     *  target/event pickers here and to every inline value editor. */
+    popoverContainer?: HTMLElement;
     /** Emitted on every structural / value edit with the whole new list. */
     onChange: (effects: EditorEffect[]) => void;
 }

package/dist/index.d.ts

@@ -254,6 +254,10 @@ interface ExpressionEditorOptions {
     /** Render the editor's own validation message list under the pills (default true).
      *  Hosts that display their own validation messages pass false to avoid doubling up. */
     messages?: boolean;
+    /** Where to append the popover micro-editors (default document.body). Pass a
+     *  container inside a focus-trapping dialog (Radix, etc.) so opening a pill's
+     *  popover does not dismiss the surrounding dialog. */
+    popoverContainer?: HTMLElement;
     /** Emitted on every edit (name-form; "" when cleared). */
     onChange: (src: string) => void;
     /** Notified when the author starts (true) / stops (false) editing inside a popover
@@ -296,6 +300,10 @@ interface EffectsEditorOptions {
     allowEmit?: boolean;
     /** Start each inline value editor in raw-text mode (host's global "show as text" toggle drives this). */
     text?: boolean;
+    /** Where to append popover micro-editors (default document.body). Pass a container
+     *  inside a focus-trapping dialog so popovers do not dismiss it. Threaded to the
+     *  target/event pickers here and to every inline value editor. */
+    popoverContainer?: HTMLElement;
     /** Emitted on every structural / value edit with the whole new list. */
     onChange: (effects: EditorEffect[]) => void;
 }

package/dist/index.js

@@ -310,7 +310,8 @@ function button(cls, label, onClick, title) {
   b.addEventListener("click", onClick);
   return b;
 }
-function openPopover(anchor, render, onClose) {
+function openPopover(anchor, render, opts = {}) {
+  const container = opts.container ?? document.body;
   const pop = el("div", "exed-pop");
   let closed = false;
   const close = () => {
@@ -319,7 +320,7 @@ function openPopover(anchor, render, onClose) {
     document.removeEventListener("pointerdown", onDown, true);
     document.removeEventListener("keydown", onKey, true);
     pop.remove();
-    onClose?.();
+    opts.onClose?.();
   };
   const onDown = (e) => {
     const t = e.target;
@@ -332,15 +333,21 @@ function openPopover(anchor, render, onClose) {
     }
   };
   pop.append(render(close));
-  document.body.append(pop);
+  container.append(pop);
   const a = anchor.getBoundingClientRect();
   const ph = pop.getBoundingClientRect();
   let top = a.bottom + 4;
   if (top + ph.height > window.innerHeight - 8 && a.top - ph.height - 4 > 8) top = a.top - ph.height - 4;
   let left = a.left;
   if (left + ph.width > window.innerWidth - 8) left = Math.max(8, window.innerWidth - 8 - ph.width);
-  pop.style.top = `${Math.round(top + window.scrollY)}px`;
-  pop.style.left = `${Math.round(left + window.scrollX)}px`;
+  if (container === document.body) {
+    pop.style.top = `${Math.round(top + window.scrollY)}px`;
+    pop.style.left = `${Math.round(left + window.scrollX)}px`;
+  } else {
+    const cr = container.getBoundingClientRect();
+    pop.style.top = `${Math.round(top - cr.top + container.scrollTop)}px`;
+    pop.style.left = `${Math.round(left - cr.left + container.scrollLeft)}px`;
+  }
   setTimeout(() => {
     document.addEventListener("pointerdown", onDown, true);
     document.addEventListener("keydown", onKey, true);
@@ -1037,9 +1044,12 @@ function mountExpressionEditor(host, opts) {
       apply: (next) => emit(toSrc(next)),
       openPopover: (anchor, r) => {
         closePopover();
-        const pop = openPopover(anchor, r, () => {
-          if (activePopover === pop) activePopover = null;
-          setEditing(false);
+        const pop = openPopover(anchor, r, {
+          container: opts.popoverContainer,
+          onClose: () => {
+            if (activePopover === pop) activePopover = null;
+            setEditing(false);
+          }
         });
         activePopover = pop;
         setEditing(true);
@@ -1331,7 +1341,7 @@ function mountEffectsEditor(host, opts) {
         close();
       },
       onCancel: close
-    }));
+    }), { container: opts.popoverContainer });
   };
   const targetType = (target) => opts.catalogue.find((e) => refOf(e, defaultScope) === target)?.type;
   const valueDisplay = (value, onChange, type) => {
@@ -1346,6 +1356,7 @@ function mountEffectsEditor(host, opts) {
       functions: opts.functions,
       mode: "flat",
       ...addTerm ? { addTerm } : {},
+      ...opts.popoverContainer ? { popoverContainer: opts.popoverContainer } : {},
       text: textMode,
       onChange
     }));
@@ -1385,7 +1396,7 @@ function mountEffectsEditor(host, opts) {
       wrap.append(search, list);
       setTimeout(() => search.focus(), 0);
       return wrap;
-    });
+    }, { container: opts.popoverContainer });
   };
   const iconBtn = (glyph, title, onClick, danger = false) => button(`exed-eff-icon${danger ? " danger" : ""}`, glyph, onClick, title);
   function setRow(eff, i) {
@@ -1458,7 +1469,7 @@ function mountEffectsEditor(host, opts) {
       wrap.append(button("exed-btn primary", "Apply", apply));
       setTimeout(() => input.focus(), 0);
       return wrap;
-    });
+    }, { container: opts.popoverContainer });
   };
   const rowActions2 = (i) => {
     const acts = el("div", "exed-effect-acts");