@wildwinter/expr-editor 0.2.0 → 0.4.0

package/README.md

@@ -39,6 +39,17 @@ Notable options beyond the basics:
   host can suppress its own validation display mid-edit.
 - `messages: false` — hide the editor's internal validation list when the host
   renders its own.
+- `popoverContainer` — where the popover micro-editors mount (default
+  `document.body`). Pass a container inside a focus-trapping dialog (Radix,
+  etc.) so opening a pill's popover counts as "inside" that layer and does not
+  dismiss the dialog; the popover is then positioned relative to that container.
+- `requireNonEmpty` — block a delete that would empty the whole expression
+  (single-value fields that must always hold a term). Conditions leave it off
+  (an empty condition is the valid "always" state).
+- `valueEnumValues` + `valueField` — flat single-value editing for an
+  outcome-style value cell: `valueEnumValues` offers a target's enum values on
+  the root literal, and `valueField` makes an empty value render one editable
+  "set a value…" pill instead of the condition clause-menu empty state.
 - `setText(on)` — the host's raw-text toggle (`</>`); unparseable input falls
   back to raw text automatically.
 

package/dist/index.cjs

@@ -312,7 +312,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 = () => {
@@ -321,7 +322,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;
@@ -334,15 +335,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);
@@ -483,11 +490,14 @@ function numberEditor(ctx, path, value, anchor) {
 function stringEditor(ctx, path, node, anchor) {
   const peer = findEnumPeer(ctx.getAst(), path);
   const enumEntry = peer ? lookup(ctx.catalogue, peer.scope, peer.name) : null;
+  const rootValueEnums = path.length === 0 && ctx.valueEnumValues?.length ? ctx.valueEnumValues : null;
+  const enumValues = enumEntry?.enumValues?.length ? enumEntry.enumValues : rootValueEnums;
+  const enumHeadLabel = enumEntry ? `${displayName(enumEntry, ctx.defaultScope)} value` : "Value";
   ctx.openPopover(anchor, (close) => {
-    if (enumEntry?.enumValues?.length) {
+    if (enumValues?.length) {
       const wrap = el("div", "exed-menu");
-      wrap.append(el("div", "exed-menu-head", [`${displayName(enumEntry, ctx.defaultScope)} value`]));
-      for (const v of enumEntry.enumValues) {
+      wrap.append(el("div", "exed-menu-head", [enumHeadLabel]));
+      for (const v of enumValues) {
         wrap.append(button(`exed-opt${v === node.value ? " sel" : ""}`, v, () => {
           replace(ctx, path, strLit(v));
           close();
@@ -559,6 +569,7 @@ function flagEditor(ctx, path, node, anchor) {
     return wrap;
   });
 }
+var canDelete = (ctx, path) => !(ctx.requireNonEmpty && path.length === 0);
 function callEditor(ctx, path, node, anchor) {
   ctx.openPopover(anchor, (close) => {
     const wrap = el("div", "exed-menu");
@@ -570,10 +581,12 @@ function callEditor(ctx, path, node, anchor) {
         close();
       }));
     }
-    wrap.append(button("exed-opt danger", "Delete", () => {
-      ctx.apply(deleteAt(ctx.getAst(), path));
-      close();
-    }));
+    if (canDelete(ctx, path)) {
+      wrap.append(button("exed-opt danger", "Delete", () => {
+        ctx.apply(deleteAt(ctx.getAst(), path));
+        close();
+      }));
+    }
     return wrap;
   });
 }
@@ -584,10 +597,10 @@ function variableEditor(ctx, path, node, anchor) {
       replace(ctx, path, scopedVar(entry.scope, entry.name));
       close();
     },
-    footer: button("exed-opt danger", "Delete", () => {
+    ...canDelete(ctx, path) ? { footer: button("exed-opt danger", "Delete", () => {
       ctx.apply(deleteAt(ctx.getAst(), path));
       close();
-    })
+    }) } : {}
   }));
 }
 function propertyPicker(ctx, opts) {
@@ -1039,9 +1052,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);
@@ -1049,6 +1065,8 @@ function mountExpressionEditor(host, opts) {
       requestFocus: (p) => {
         pendingFocus = p;
       },
+      ...opts.requireNonEmpty ? { requireNonEmpty: true } : {},
+      ...opts.valueEnumValues ? { valueEnumValues: opts.valueEnumValues } : {},
       ...opts.pickNode ? { pickNode: opts.pickNode } : {},
       ...opts.nodeLabel ? { nodeLabel: opts.nodeLabel } : {}
     };
@@ -1060,7 +1078,7 @@ function mountExpressionEditor(host, opts) {
     if (raw || v.unparseable) {
       host.append(rawArea());
     } else if (!src.trim() || !v.ast) {
-      host.append(emptyState());
+      host.append(opts.valueField ? valueEmptyState() : emptyState());
     } else {
       const ctx = buildCtx(v.ast);
       const body = el("div", "exed-body");
@@ -1104,6 +1122,10 @@ function mountExpressionEditor(host, opts) {
     }));
     return wrap;
   }
+  function valueEmptyState() {
+    const ctx = buildCtx(strLit(""));
+    return el("div", "exed-flat", [renderNode(strLit(""), [], ctx)]);
+  }
   function addTermControl(ctx) {
     const boolean = opts.addTerm === "boolean";
     const ops = boolean ? ["and", "or"] : ARITHMETIC_OPS;
@@ -1333,7 +1355,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) => {
@@ -1348,6 +1370,7 @@ function mountEffectsEditor(host, opts) {
       functions: opts.functions,
       mode: "flat",
       ...addTerm ? { addTerm } : {},
+      ...opts.popoverContainer ? { popoverContainer: opts.popoverContainer } : {},
       text: textMode,
       onChange
     }));
@@ -1387,7 +1410,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) {
@@ -1460,7 +1483,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");