diff --git a/shared/static/scripts/sx.js b/shared/static/scripts/sx.js index 83fa866..43e27c4 100644 --- a/shared/static/scripts/sx.js +++ b/shared/static/scripts/sx.js @@ -1110,10 +1110,18 @@ var i = 0; while (i < args.length) { if (isKw(args[i]) && i + 1 < args.length) { + // Evaluate kwarg values eagerly in the caller's env so expressions + // like (get t "src") resolve while lambda params are still bound. + // Render-only forms (HTML tags, <>, ~comp) go through renderStr. var v = args[i + 1]; - kwargs[args[i].name] = (typeof v === "string" || typeof v === "number" || - typeof v === "boolean" || isNil(v) || isKw(v)) - ? v : (isSym(v) ? sxEval(v, env) : v); + if (typeof v === "string" || typeof v === "number" || + typeof v === "boolean" || isNil(v)) { + kwargs[args[i].name] = v; + } else if (_isRenderExpr(v)) { + kwargs[args[i].name] = new RawHTML(renderStr(v, env)); + } else { + kwargs[args[i].name] = sxEval(v, env); + } i += 2; } else { children.push(args[i]); i++; } }