@octaviaflow/core 3.1.0-beta.105 → 3.1.0-beta.107

package/dist/components/ExpressionField/ExpressionField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpressionField.d.ts","sourceRoot":"","sources":["../../../src/components/ExpressionField/ExpressionField.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAML,KAAK,aAAa,EAIlB,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAaf,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,IAAI,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CAChC;AAED,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACrD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,CAAC;IAC1D;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAWzD;AAyBD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAiBpE;AAuBD,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAW,EACX,UAAU,EACV,QAAgB,EAChB,IAAQ,EACR,EAAE,EACF,SAAS,EACT,KAAK,EACL,YAAY,EACZ,WAAW,EACX,cAAsB,EACtB,YAAY,EAAE,SAAS,GACxB,EAAE,oBAAoB,2CAiZtB;AAuND,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ExpressionField.d.ts","sourceRoot":"","sources":["../../../src/components/ExpressionField/ExpressionField.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAML,KAAK,aAAa,EAIlB,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAaf,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,IAAI,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CAChC;AAED,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACrD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,CAAC;IAC1D;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD,mEAAmE;AACnE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAWzD;AAyBD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAiBpE;AAuBD,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAW,EACX,UAAU,EACV,QAAgB,EAChB,IAAQ,EACR,EAAE,EACF,SAAS,EACT,KAAK,EACL,YAAY,EACZ,WAAW,EACX,cAAsB,EACtB,YAAY,EAAE,SAAS,GACxB,EAAE,oBAAoB,2CAuatB;AAoQD,eAAe,eAAe,CAAC"}

package/dist/index.cjs

@@ -41593,13 +41593,19 @@ function ExpressionField({
   const fieldId = id ?? generatedId;
   const helperId = `${fieldId}-helper`;
   const [editing, setEditing] = (0, import_react188.useState)(null);
+  const resolveLabelRef = (0, import_react188.useRef)(resolveLabel);
+  const resolveCallRef = (0, import_react188.useRef)(resolveCall);
+  const pillEveryTokenRef = (0, import_react188.useRef)(pillEveryToken);
+  resolveLabelRef.current = resolveLabel;
+  resolveCallRef.current = resolveCall;
+  pillEveryTokenRef.current = pillEveryToken;
   const labelFor = (0, import_react188.useCallback)(
-    (token) => resolveLabel?.(token) ?? shortReferenceLabel(token),
-    [resolveLabel]
+    (token) => resolveLabelRef.current?.(token) ?? shortReferenceLabel(token),
+    []
   );
   const callLabel = (0, import_react188.useCallback)(
-    (name) => resolveCall?.(name)?.label ?? (name.startsWith("user.") ? name.slice(5) : name),
-    [resolveCall]
+    (name) => resolveCallRef.current?.(name)?.label ?? (name.startsWith("user.") ? name.slice(5) : name),
+    []
   );
   const chipText = (0, import_react188.useCallback)(
     (name, args) => {
@@ -41645,7 +41651,7 @@ function ExpressionField({
       if (!el) return;
       el.innerHTML = "";
       if (!raw) return;
-      for (const segment of parseExpression(raw, pillEveryToken)) {
+      for (const segment of parseExpression(raw, pillEveryTokenRef.current)) {
         if (segment.kind === "text") {
           el.appendChild(document.createTextNode(segment.raw));
           continue;
@@ -41657,7 +41663,7 @@ function ExpressionField({
         }
       }
     },
-    [pillEveryToken, makeToken]
+    [makeToken]
   );
   (0, import_react188.useEffect)(() => {
     if (fromSelf.current) {
@@ -41768,6 +41774,10 @@ function ExpressionField({
     },
     [editing, chipText, commit]
   );
+  const handleMouseDown = (0, import_react188.useCallback)((e) => {
+    const token = e.target.closest(`.${PILL}, .${CHIP}`);
+    if (token) e.preventDefault();
+  }, []);
   const handleClick = (0, import_react188.useCallback)(
     (e) => {
       const node = e.target;
@@ -41882,6 +41892,7 @@ function ExpressionField({
           style: { minHeight: `${Math.max(1, rows) * 1.5 + 1}rem` },
           onInput: commit,
           onBlur: handleBlur,
+          onMouseDown: handleMouseDown,
           onClick: handleClick,
           onKeyDown: handleKeyDown,
           onCopy: handleCopy,
@@ -41896,6 +41907,7 @@ function ExpressionField({
         CallEditor,
         {
           raw: editing.raw,
+          anchor: editing.el,
           rect: editing.rect,
           nameOf: callLabel,
           labelFor,
@@ -41910,6 +41922,7 @@ function ExpressionField({
 }
 function CallEditor({
   raw,
+  anchor,
   rect,
   nameOf,
   labelFor,
@@ -41921,13 +41934,27 @@ function CallEditor({
   const [path, setPath] = (0, import_react188.useState)([]);
   const [rawMode, setRawMode] = (0, import_react188.useState)(false);
   const panelRef = (0, import_react188.useRef)(null);
+  const onApplyRef = (0, import_react188.useRef)(onApply);
+  onApplyRef.current = onApply;
+  const draftRef = (0, import_react188.useRef)(draft);
+  draftRef.current = draft;
   (0, import_react188.useEffect)(() => {
     const onKey = (e) => {
       if (e.key === "Escape") onCancel();
     };
+    const onPointerDown = (e) => {
+      const target = e.target;
+      if (panelRef.current?.contains(target)) return;
+      if (anchor.contains(target)) return;
+      onApplyRef.current(draftRef.current);
+    };
     document.addEventListener("keydown", onKey);
-    return () => document.removeEventListener("keydown", onKey);
-  }, [onCancel]);
+    document.addEventListener("mousedown", onPointerDown, true);
+    return () => {
+      document.removeEventListener("keydown", onKey);
+      document.removeEventListener("mousedown", onPointerDown, true);
+    };
+  }, [anchor, onCancel]);
   const current = callAt(draft, path);
   const signature = current ? resolveCall?.(current.name) : void 0;
   const names = signature?.args ?? [];
@@ -41938,6 +41965,13 @@ function CallEditor({
     if (at) crumbs.push({ label: nameOf(at.name), path: path.slice(0, i) });
   }
   const setArg = (index, next) => setDraft((d) => replaceArgument(d, [...path, index], next));
+  const removeArg = (index) => setDraft((d) => {
+    const at = callAt(d, path);
+    if (!at) return d;
+    const next = at.args.filter((_, i) => i !== index);
+    const rebuilt = path.length === 0 ? formatCall(at.name, next) : `${at.name}(${next.join(", ")})`;
+    return path.length === 0 ? rebuilt : replaceArgument(d, path, rebuilt);
+  });
   const dropInto = (index) => (e) => {
     const dropped = e.dataTransfer.getData("application/x-fx-insert");
     if (!dropped) return;
@@ -41997,7 +42031,20 @@ function CallEditor({
             return (
               // eslint-disable-next-line react/no-array-index-key
               /* @__PURE__ */ (0, import_jsx_runtime174.jsxs)("div", { className: "ods-expression-field__editor-row", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime174.jsx)("span", { id: `arg-${index}-label`, children: rowLabel }),
+                /* @__PURE__ */ (0, import_jsx_runtime174.jsxs)("span", { className: "ods-expression-field__editor-row-head", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime174.jsx)("span", { id: `arg-${index}-label`, children: rowLabel }),
+                  /* @__PURE__ */ (0, import_jsx_runtime174.jsx)(
+                    "button",
+                    {
+                      type: "button",
+                      className: "ods-expression-field__editor-remove",
+                      "aria-label": `Remove ${rowLabel}`,
+                      title: "Remove this argument",
+                      onClick: () => removeArg(index),
+                      children: "\u2715"
+                    }
+                  )
+                ] }),
                 nested ? /* @__PURE__ */ (0, import_jsx_runtime174.jsxs)(
                   "div",
                   {
@@ -42060,14 +42107,14 @@ function CallEditor({
             "button",
             {
               type: "button",
-              className: "ods-expression-field__editor-link",
+              className: "ods-expression-field__editor-add",
               onClick: () => setDraft((d) => {
                 const at = callAt(d, path);
                 if (!at) return d;
                 const next = [...at.args, '""'];
                 return path.length === 0 ? formatCall(at.name, next) : replaceArgument(d, path, `${at.name}(${next.join(", ")})`);
               }),
-              children: "+ argument"
+              children: "+ Add argument"
             }
           )
         ] }),