@qoretechnologies/reqraft 0.10.50 → 0.10.51-pr.115.g3e79f11

package/dist/components/form/engine/FormEngine.js

@@ -97,7 +97,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormEngine = exports.getTypeAndCanBeNull = exports.flattenOptions = exports.fixOptions = exports.OptionsContext = exports.hasRequiredOptions = exports.fixOperatorValue = exports.getType = void 0;
+exports.FormEngine = exports.getTypeAndCanBeNull = exports.flattenOptions = exports.shouldEmitLocalValue = exports.agreementFromRebuild = exports.isMirrorOfValue = exports.fixOptions = exports.OptionsContext = exports.hasRequiredOptions = exports.getOptionFieldStorageType = exports.fixOperatorValue = exports.getType = void 0;
 var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
 var reqore_1 = require("@qoretechnologies/reqore");
@@ -231,14 +231,55 @@ var getOptionSchemaStorageType = function (option, isRendererOnly) {
         : isRendererOnly(option === null || option === void 0 ? void 0 : option.ui_type) ? (option === null || option === void 0 ? void 0 : option.type) || (option === null || option === void 0 ? void 0 : option.ui_type)
             : (option === null || option === void 0 ? void 0 : option.ui_type) || (option === null || option === void 0 ? void 0 : option.type)) || 'any');
 };
-var getOptionFieldStorageType = function (optionName, fieldType, schema, operators, operatorData, isRendererOnly) {
+/**
+ * Whether an option currently holds an expression, in EITHER shape it comes in.
+ *
+ * At runtime the editor writes the flag onto the option itself
+ * (`{ type, is_expression: true, value }`), but a value loaded from a saved
+ * draft carries the envelope NESTED (`{ type, value: { is_expression: true,
+ * value } }`). Same thing, two shapes, and only the flat one was ever checked —
+ * so a freshly typed expression behaved while a reloaded one did not, which is
+ * exactly how this survived several fixes: every test used the runtime shape.
+ */
+var optionHoldsExpression = function (option) {
+    var _a;
+    var o = option;
+    return !!((o === null || o === void 0 ? void 0 : o.is_expression) || ((_a = o === null || o === void 0 ? void 0 : o.value) === null || _a === void 0 ? void 0 : _a.is_expression));
+};
+/**
+ * Which type an option resolves to — the schema's, or the one stored on the
+ * value.
+ *
+ * Exported because this single decision is what every option field is rendered
+ * with, and what an expression's return type is checked against. It deserves
+ * to be assertable without standing up a form.
+ */
+var getOptionFieldStorageType = function (optionName, fieldType, schema, operators, operatorData, isRendererOnly, 
+/** Whether the stored value is an expression — see below. */
+isExpression) {
     if (isRendererOnly === void 0) { isRendererOnly = rendererTypes_1.isRendererOnlyUiType; }
     var schemaOption = schema === null || schema === void 0 ? void 0 : schema[optionName];
-    var storedType = fieldType && !(fieldType === (schemaOption === null || schemaOption === void 0 ? void 0 : schemaOption.ui_type) && isRendererOnly(fieldType)) ?
+    /* A STORED type does not describe an expression.
+  
+       An expression value is `{ is_expression: true, value: {...} }`, so the type
+       recorded beside it describes that envelope — `hash` — and not what the
+       field holds. Letting it win means the SCHEMA's declared type is ignored and
+       the wrong answer is handed to the expression editor as the return type to
+       check against: `1 + 2` on a field declared `"type": "auto"` came back
+       "The expression returns int, and this field holds hash". A literal `1` was
+       fine, because a literal is stored as a plain value whose type matches.
+  
+       `auto`/`any` accept anything, which is exactly why nothing should be
+       checked against them; a concrete declared type still is. The schema is the
+       only party that knows what the field accepts. */
+    var storedType = !isExpression &&
+        fieldType &&
+        !(fieldType === (schemaOption === null || schemaOption === void 0 ? void 0 : schemaOption.ui_type) && isRendererOnly(fieldType)) ?
         fieldType
         : getOptionSchemaStorageType(schemaOption, isRendererOnly);
     return (0, exports.getType)(storedType, operators, operatorData);
 };
+exports.getOptionFieldStorageType = getOptionFieldStorageType;
 var hasRequiredOptions = function (options) {
     if (options === void 0) { options = {}; }
     return !!(0, lodash_1.findKey)(options, function (option) { return option.required; });
@@ -370,6 +411,64 @@ var normalizeEmptyFieldValues = function (fields) {
         return acc;
     }, {});
 };
+/**
+ * Does this rebuild say anything the parent does not already hold?
+ *
+ * `false` means the rebuild is a MIRROR: `fixOptions` found no default to
+ * materialise, so the result repeats the `value` the parent handed down. The
+ * compare is empty-normalized because `fixOptions` round-trips a required-empty
+ * field between `{ value: '' }` and no `value` key, and that cosmetic
+ * difference would otherwise read as new information forever.
+ */
+var isMirrorOfValue = function (fixedValue, value) { return (0, lodash_1.isEqual)(normalizeEmptyFieldValues(fixedValue), normalizeEmptyFieldValues(value)); };
+exports.isMirrorOfValue = isMirrorOfValue;
+/**
+ * What this rebuild lets the form agree with the parent on, if anything.
+ *
+ * Returns the rebuild when it mirrors `value`, and `undefined` when it
+ * contributed something the parent has yet to learn.
+ *
+ * Adopting the parent's value IS agreement, and saying so matters as much as
+ * staying quiet about it. The sync-down skips only when the parent echoed what
+ * this form last sent; if adopting a value never updates that record, it points
+ * at an older state forever, the skip can never fire again, and the form
+ * rebuilds on every single change. Holding the mirror back WITHOUT recording
+ * the agreement was measured making the starvation worse, not better — 8 s
+ * became a 45 s timeout — which is why the two belong together.
+ */
+var agreementFromRebuild = function (fixedValue, value) {
+    return (0, exports.isMirrorOfValue)(fixedValue, value) ? fixedValue : undefined;
+};
+exports.agreementFromRebuild = agreementFromRebuild;
+/**
+ * Should the form report `localValue` to its parent as an answer?
+ *
+ * Extracted and pure because the situation it exists for cannot be reproduced
+ * through a rendered form: it needs the emit to be decided against a `value`
+ * NEWER than the `localValue` built from it, which only happens when two
+ * components' effects land in one React commit — and a test renderer flushes
+ * effects between updates, so the two never fall out of step. The states below
+ * were recorded from a live instrumented run instead, and this is what makes
+ * them assertable.
+ *
+ * Two ways the answer is no:
+ *
+ * 1. `localValue` is a mirror — a rebuild of the parent's own value that added
+ *    nothing. Repeating it back is not an answer. **Checked first**, because
+ *    the comparison in (2) reads whatever `value` has become by now, which,
+ *    when a nested engine shares the parent value, is already that engine's
+ *    newer write; comparing against it would find a difference this form never
+ *    made and emit the older mirror over the newer write. That is the loop.
+ * 2. `localValue` already equals `value` — there is nothing to report.
+ */
+var shouldEmitLocalValue = function (_a) {
+    var localValue = _a.localValue, value = _a.value, mirroredValue = _a.mirroredValue;
+    if (mirroredValue !== undefined && (0, lodash_1.isEqual)(localValue, mirroredValue)) {
+        return false;
+    }
+    return !(0, lodash_1.isEqual)(localValue, value);
+};
+exports.shouldEmitLocalValue = shouldEmitLocalValue;
 var flattenOptions = function (options) {
     return (0, reduce_1.default)(options, function (newOptions, option, optionName) {
         var _a;
@@ -415,12 +514,12 @@ var FormEngineImpl = function (_a) {
     // been a no-op. Removing it from the API is a separate, breaking change —
     // every consumer passing it today already gets the flush layout by default.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    compactFlush = _l === void 0 ? false : _l, _m = _a.compactNested, compactNested = _m === void 0 ? false : _m, _o = _a.compactScroll, compactScroll = _o === void 0 ? 'host' : _o, compactPanelProps = _a.compactPanelProps, _p = _a.compactCollapsedGroups, compactCollapsedGroups = _p === void 0 ? ['optional'] : _p, _q = _a.compactToolbar, compactToolbar = _q === void 0 ? true : _q, _r = _a.commitMode, commitMode = _r === void 0 ? 'immediate' : _r, _s = _a.expandMode, expandMode = _s === void 0 ? 'single' : _s, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, _t = _a.optionActionsCollapse, optionActionsCollapse = _t === void 0 ? 'auto' : _t, componentOverrides = _a.componentOverrides, codePreviewRenderer = _a.codePreviewRenderer, 
+    compactFlush = _l === void 0 ? false : _l, _m = _a.compactNested, compactNested = _m === void 0 ? false : _m, _o = _a.compactScroll, compactScroll = _o === void 0 ? 'host' : _o, compactPanelProps = _a.compactPanelProps, compactCollapsedGroupsProp = _a.compactCollapsedGroups, compactBoxLabels = _a.compactBoxLabels, _p = _a.compactToolbar, compactToolbar = _p === void 0 ? true : _p, _q = _a.commitMode, commitMode = _q === void 0 ? 'immediate' : _q, _r = _a.expandMode, expandMode = _r === void 0 ? 'single' : _r, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, _s = _a.optionActionsCollapse, optionActionsCollapse = _s === void 0 ? 'auto' : _s, componentOverrides = _a.componentOverrides, codePreviewRenderer = _a.codePreviewRenderer, 
     // consumed by the wrapper below, which publishes it to every description this
     // form draws; destructured here only so it cannot reach `rest` and be spread
     // onto a DOM node
     _markdownRenderer = _a.markdownRenderer, // eslint-disable-line @typescript-eslint/no-unused-vars
-    rendererOnlyUiTypes = _a.rendererOnlyUiTypes, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, expandFirstRequired = _a.expandFirstRequired, initialExpandedOptions = _a.initialExpandedOptions, maxFieldsShown = _a.maxFieldsShown, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "allowTemplates", "interfaceContext", "templateFieldProps", "forceDropdown", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactScroll", "compactPanelProps", "compactCollapsedGroups", "compactToolbar", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "optionActionsCollapse", "componentOverrides", "codePreviewRenderer", "markdownRenderer", "rendererOnlyUiTypes", "inheritedFromParent", "autoFocusFirstRequired", "expandFirstRequired", "initialExpandedOptions", "maxFieldsShown"]);
+    rendererOnlyUiTypes = _a.rendererOnlyUiTypes, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, expandFirstRequired = _a.expandFirstRequired, initialExpandedOptions = _a.initialExpandedOptions, maxFieldsShown = _a.maxFieldsShown, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "allowTemplates", "interfaceContext", "templateFieldProps", "forceDropdown", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactScroll", "compactPanelProps", "compactCollapsedGroups", "compactBoxLabels", "compactToolbar", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "optionActionsCollapse", "componentOverrides", "codePreviewRenderer", "markdownRenderer", "rendererOnlyUiTypes", "inheritedFromParent", "autoFocusFirstRequired", "expandFirstRequired", "initialExpandedOptions", "maxFieldsShown"]);
     // Built-ins + whatever the consumer declared for its own injected editors.
     var isRendererOnly = (0, react_2.useMemo)(function () { return (0, rendererTypes_1.createRendererOnlyUiTypeCheck)(rendererOnlyUiTypes); }, [JSON.stringify(rendererOnlyUiTypes)]);
     // Pointer CAPABILITY and viewport WIDTH are different questions and both
@@ -438,33 +537,33 @@ var FormEngineImpl = function (_a) {
     var collapseOptionActions = optionActionsCollapse === 'always' ? true
         : optionActionsCollapse === 'never' ? false
             : !isHoverCapable || !!isMobile;
-    var _u = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), options = _u[0], setOptions = _u[1];
+    var _t = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), options = _t[0], setOptions = _t[1];
     // optionsLoader lifecycle: loading feeds the skeleton gate, error the banner.
-    var _v = (0, react_2.useState)(!!optionsLoader && !(rest === null || rest === void 0 ? void 0 : rest.options)), optionsLoading = _v[0], setOptionsLoading = _v[1];
-    var _w = (0, react_2.useState)(), optionsError = _w[0], setOptionsError = _w[1];
+    var _u = (0, react_2.useState)(!!optionsLoader && !(rest === null || rest === void 0 ? void 0 : rest.options)), optionsLoading = _u[0], setOptionsLoading = _u[1];
+    var _v = (0, react_2.useState)(), optionsError = _v[0], setOptionsError = _v[1];
     // Operators: prop-provided (compact) or fetched via operatorsUrl (dpql,
     // ported from IDE Options) — the fetch overrides the seeded prop value.
-    var _x = (0, react_2.useState)(operatorsProp), operators = _x[0], setOperators = _x[1];
+    var _w = (0, react_2.useState)(operatorsProp), operators = _w[0], setOperators = _w[1];
     // Remote-fetch loading (ported from IDE Options); only relevant when one of
     // the fetch urls is set — schema-as-props consumers never see the skeleton.
-    var _y = (0, react_2.useState)(!!(url || customUrl || operatorsUrl)), loading = _y[0], setLoading = _y[1];
+    var _x = (0, react_2.useState)(!!(url || customUrl || operatorsUrl)), loading = _x[0], setLoading = _x[1];
     var confirmAction = (0, reqore_1.useReqoreProperty)('confirmAction');
     var theme = (0, reqore_1.useReqoreTheme)();
-    var _z = (0, react_2.useState)(), focusedEditing = _z[0], setFocusedEditing = _z[1];
-    var _0 = (0, react_2.useState)(false), showFieldTypes = _0[0], setShowFieldTypes = _0[1];
+    var _y = (0, react_2.useState)(), focusedEditing = _y[0], setFocusedEditing = _y[1];
+    var _z = (0, react_2.useState)(false), showFieldTypes = _z[0], setShowFieldTypes = _z[1];
     // Global toggle (toolbar ⓘ): reveal the short-description info panel on every
     // field that has a short_desc. Per-row ⓘ overrides still win over it.
     // Global field-info visibility, tri-state: `undefined` = default (critical
     // messages auto-open, the rest closed); `true` = show all; `false` = hide all
     // (even message fields). The toolbar ⓘ drives it.
-    var _1 = (0, react_2.useState)(undefined), showAllDescriptions = _1[0], setShowAllDescriptions = _1[1];
-    var _2 = (0, react_2.useState)(), showHelpForOption = _2[0], setShowHelpForOption = _2[1];
-    var _3 = (0, react_2.useState)(false), showInvalidOptionsOnly = _3[0], setShowInvalidOptionsOnly = _3[1];
+    var _0 = (0, react_2.useState)(undefined), showAllDescriptions = _0[0], setShowAllDescriptions = _0[1];
+    var _1 = (0, react_2.useState)(), showHelpForOption = _1[0], setShowHelpForOption = _1[1];
+    var _2 = (0, react_2.useState)(false), showInvalidOptionsOnly = _2[0], setShowInvalidOptionsOnly = _2[1];
     // Which options are expanded into their editor (several can be open at once).
-    var _4 = (0, react_2.useState)([]), expandedOptions = _4[0], setExpandedOptions = _4[1];
+    var _3 = (0, react_2.useState)([]), expandedOptions = _3[0], setExpandedOptions = _3[1];
     /** Status boxes whose "N more fields" control the reader has opened. Keyed by
         box so opening Optional does not also unfold Set. */
-    var _5 = (0, react_2.useState)([]), expandedMoreBoxes = _5[0], setExpandedMoreBoxes = _5[1];
+    var _4 = (0, react_2.useState)([]), expandedMoreBoxes = _4[0], setExpandedMoreBoxes = _4[1];
     // --- Reveal a status box's content when it is opened ----------------------
     //
     // The status boxes stack, so the last one ("Optional", which holds every
@@ -480,7 +579,7 @@ var FormEngineImpl = function (_a) {
     // box has not grown and there is nothing to scroll to. A layout effect runs
     // after the DOM is updated and before paint, which makes the reveal
     // deterministic instead of a guessed delay.
-    var _6 = (0, react_2.useState)(undefined), openedStatusBox = _6[0], setOpenedStatusBox = _6[1];
+    var _5 = (0, react_2.useState)(undefined), openedStatusBox = _5[0], setOpenedStatusBox = _5[1];
     var statusBoxRefs = (0, react_2.useRef)({});
     (0, react_2.useLayoutEffect)(function () {
         var _a, _b;
@@ -511,13 +610,13 @@ var FormEngineImpl = function (_a) {
     var settledBucket = (0, react_2.useRef)({});
     // Measured form width (not viewport — the form lives in drawers/panels of
     // arbitrary width) drives the stacked narrow layout.
-    var _7 = (0, react_use_1.useMeasure)(), compactWrapRef = _7[0], compactWrapWidth = _7[1].width;
+    var _6 = (0, react_use_1.useMeasure)(), compactWrapRef = _6[0], compactWrapWidth = _6[1].width;
     // Own handle on the scroll wrap (useMeasure's ref is a callback, no `.current`)
     // so the label-column measurement can publish its CSS var on the element. It's
     // STATE, not a ref: the wrap mounts only after the loading-skeleton gate
     // resolves, so the measurement effect must re-run when the node appears — a
     // ref wouldn't retrigger it.
-    var _8 = (0, react_2.useState)(null), compactWrapNode = _8[0], setCompactWrapNode = _8[1];
+    var _7 = (0, react_2.useState)(null), compactWrapNode = _7[0], setCompactWrapNode = _7[1];
     // Ref mirror of the wrap node for callbacks that must not re-create when it
     // mounts (flashOptions reads it inside a rAF).
     var compactWrapNodeRef = (0, react_2.useRef)(null);
@@ -571,8 +670,8 @@ var FormEngineImpl = function (_a) {
     var readRowHeights = (0, react_2.useRef)({});
     // Required-groups linkage: hovering a group chip highlights every member row;
     // clicking a sibling in the chip's popover scrolls to it and flashes it.
-    var _9 = (0, react_2.useState)([]), highlightedOptions = _9[0], setHighlightedOptions = _9[1];
-    var _10 = (0, react_2.useState)([]), flashedOptions = _10[0], setFlashedOptions = _10[1];
+    var _8 = (0, react_2.useState)([]), highlightedOptions = _8[0], setHighlightedOptions = _8[1];
+    var _9 = (0, react_2.useState)([]), flashedOptions = _9[0], setFlashedOptions = _9[1];
     var flashTimeout = (0, react_2.useRef)();
     var flashOptions = (0, react_2.useCallback)(function (optionNames, scrollToFirst) {
         if (scrollToFirst === void 0) { scrollToFirst = false; }
@@ -621,28 +720,58 @@ var FormEngineImpl = function (_a) {
     });
     var compactNarrow = !!compactWrapWidth && compactWrapWidth < 480;
     // Info panels auto-open on Tier-1 content; the per-row user override sticks.
-    var _11 = (0, react_2.useState)({}), infoPanelOverrides = _11[0], setInfoPanelOverrides = _11[1];
+    var _10 = (0, react_2.useState)({}), infoPanelOverrides = _10[0], setInfoPanelOverrides = _10[1];
     // Toolbar filters affect the listed rows only — the meter reflects the full set.
-    var _12 = (0, react_2.useState)(false), requiredOnly = _12[0], setRequiredOnly = _12[1];
-    var _13 = (0, react_2.useState)(''), compactQuery = _13[0], setCompactQuery = _13[1];
+    var _11 = (0, react_2.useState)(false), requiredOnly = _11[0], setRequiredOnly = _11[1];
+    var _12 = (0, react_2.useState)(''), compactQuery = _12[0], setCompactQuery = _12[1];
     // Compact field sort (Fields menu → "Sort by"); 'schema' = declared order.
-    var _14 = (0, react_2.useState)('schema'), compactSort = _14[0], setCompactSort = _14[1];
-    var _15 = (0, react_2.useState)(function () { return ({
+    var _13 = (0, react_2.useState)('schema'), compactSort = _13[0], setCompactSort = _13[1];
+    var _14 = (0, react_2.useState)(function () { return ({
         fields: (0, exports.fixOptions)(value, options || {}, undefined, isRendererOnly),
         meta: undefined,
-    }); }), localValue = _15[0], setLocalValue = _15[1];
+    }); }), localValue = _14[0], setLocalValue = _14[1];
     var originalValue = (0, react_2.useRef)();
     // Track the last value we emitted via onChange so we can skip re-applying fixOptions
     // when the parent echoes it back as the new value prop (controlled component loop prevention)
     var lastEmittedValue = (0, react_2.useRef)(value);
+    /**
+     * A `localValue` that is only a MIRROR of the incoming `value`, and so must
+     * never be emitted back as though this form had answered something.
+     *
+     * `localValue` is derived state: the sync-down effect below rebuilds it from
+     * the `value` prop. When that rebuild adds nothing (`fixOptions` had no
+     * default to materialise), the result says exactly what the parent already
+     * holds, and emitting it is not a change — it is this form repeating the
+     * parent's own words back at it.
+     *
+     * That repetition is harmless in a form that owns its state outright and
+     * fatal in one that shares a parent with a NESTED engine. The two write to
+     * the same parent value, so each sees the other's write arrive as an external
+     * change; `lastEmittedValue` is then always one step behind and its guard
+     * never fires. The engines alternate between two states forever, several
+     * times a second, and the newer write is repeatedly overwritten by the older
+     * one. Measured in the test editor: the row's summary flipped between two
+     * readings indefinitely and `setTimeout` was starved past a 45-second
+     * deadline.
+     *
+     * Only a mirror that CHANGES nothing is held back. A rebuild that restores a
+     * required or preselected field's default still emits, because that default
+     * is genuinely new information the parent has to be told about — which is the
+     * whole reason the sync-down runs `fixOptions` at all.
+     */
+    var mirroredValue = (0, react_2.useRef)(undefined);
     if (originalValue.current === undefined && (0, size_1.default)(value)) {
         originalValue.current = localValue.fields;
     }
     var unavailableOptionsCount = (0, react_2.useRef)(0);
-    var _16 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _16.compactValue, typesLoading = _16.loading;
+    var _15 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _15.compactValue, typesLoading = _15.loading;
     var templates = (0, useTemplates_1.useTemplates)(allowTemplates, rest.stringTemplates, interfaceContext);
     (0, react_2.useEffect)(function () {
-        if ((0, lodash_1.isEqual)(localValue.fields, value)) {
+        if (!(0, exports.shouldEmitLocalValue)({
+            localValue: localValue.fields,
+            value: value,
+            mirroredValue: mirroredValue.current,
+        })) {
             return;
         }
         var toEmit = (0, size_1.default)(localValue.fields) ? localValue.fields : undefined;
@@ -822,16 +951,45 @@ var FormEngineImpl = function (_a) {
         // Note: compare fixedValue against value, not localValue.fields — localValue may have been
         // updated by nested FormEngine emissions, so comparing against it would never skip.
         var normalizedValue = normalizeEmptyFieldValues(value);
+        /* What this rebuild lets us agree with the parent on — `undefined` when it
+           contributed something the parent has yet to learn. */
+        var agreed = (0, exports.agreementFromRebuild)(fixedValue, value);
         if ((0, lodash_1.isEqual)(normalizedValue, normalizeEmptyFieldValues(lastEmittedValue.current)) &&
-            (0, lodash_1.isEqual)(normalizeEmptyFieldValues(fixedValue), normalizedValue)) {
+            agreed !== undefined) {
             return;
         }
         if (!originalValue.current && (0, size_1.default)(fixedValue)) {
             originalValue.current = fixedValue;
         }
+        /* Remember a mirror so the emit effect can tell one from an answer, and
+           record the agreement it represents. A rebuild that DID add something
+           leaves both alone — the parent has to learn about it. */
+        mirroredValue.current = agreed;
+        if (agreed !== undefined) {
+            lastEmittedValue.current = agreed;
+        }
         setLocalValue === null || setLocalValue === void 0 ? void 0 : setLocalValue({ fields: fixedValue, meta: undefined });
     }, [JSON.stringify(options), JSON.stringify(value), isRendererOnly]);
+    /**
+     * Fields the reader has actually edited in this instance.
+     *
+     * "This field is required" is an ERROR message, and an error is a report that
+     * something went wrong. Under a field nobody has been in yet it reports
+     * nothing — the form is empty because it is new — while the requirement is
+     * already stated by the asterisk, by the Needs-attention box the row sits in,
+     * and by the completion meter. A form whose first act is to accuse the reader
+     * of a mistake they have not made teaches them to discount its warnings.
+     *
+     * So the message waits for a touch. Being IN the field and leaving it empty
+     * is a real gap, and that one shows. A ref, not state: every edit re-renders
+     * anyway, so the following render reads the current set with no second pass.
+     */
+    var touchedOptionsRef = (0, react_2.useRef)(new Set());
     var handleValueChange = (0, react_2.useCallback)(function (optionName, val, _type, isFunction) {
+        // Every route into this handler is a person acting: typing, picking from a
+        // menu, clearing the value, adding an optional field. Marked here rather
+        // than inside the updater below, which React may invoke twice.
+        touchedOptionsRef.current.add(optionName);
         setLocalValue(function (_a) {
             var _b, _c;
             var _d, _f, _g, _h, _j, _k, _l, _m, _o, _p;
@@ -1006,7 +1164,7 @@ var FormEngineImpl = function (_a) {
                 return newValue;
             }
             var rendererType = (0, exports.getType)((options[optionName].ui_type || options[optionName].type), operators, option === null || option === void 0 ? void 0 : option.op);
-            var storageType = getOptionFieldStorageType(optionName, option === null || option === void 0 ? void 0 : option.type, options, operators, option === null || option === void 0 ? void 0 : option.op, isRendererOnly);
+            var storageType = (0, exports.getOptionFieldStorageType)(optionName, option === null || option === void 0 ? void 0 : option.type, options, operators, option === null || option === void 0 ? void 0 : option.op, isRendererOnly, optionHoldsExpression(option));
             if (!(0, lodash_1.isPlainObject)(option)) {
                 return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = {
                     type: storageType || rendererType,
@@ -1107,7 +1265,7 @@ var FormEngineImpl = function (_a) {
     var getValidityData = (0, react_2.useCallback)(function () {
         var fields = (0, reduce_1.default)(availableOptions, function (result, option, optionName) {
             var _a, _b;
-            var type = getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly);
+            var type = (0, exports.getOptionFieldStorageType)(optionName, option.type, options, operators, option.op, isRendererOnly, optionHoldsExpression(option));
             var optionValue = option.value;
             var isRequired = (_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.required;
             var hasRequiredGroups = !!((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.required_groups);
@@ -1151,7 +1309,7 @@ var FormEngineImpl = function (_a) {
         return (0, reduce_1.default)(availableOptions, function (newValue, option, optionName) {
             var _a;
             if (showInvalidOptionsOnly &&
-                isOptionValid(optionName, getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly), option.value)) {
+                isOptionValid(optionName, (0, exports.getOptionFieldStorageType)(optionName, option.type, options, operators, option.op, isRendererOnly, optionHoldsExpression(option)), option.value)) {
                 return newValue;
             }
             return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = option, _a));
@@ -1185,7 +1343,7 @@ var FormEngineImpl = function (_a) {
         if (hidden)
             return 'optional';
         var schema = options === null || options === void 0 ? void 0 : options[name];
-        var type = getOptionFieldStorageType(name, (_a = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly);
+        var type = (0, exports.getOptionFieldStorageType)(name, (_a = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly, optionHoldsExpression(availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]));
         var value = (_c = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _c === void 0 ? void 0 : _c.value;
         // A schema-declared hash whose every entry is a materialised-but-unset
         // field holds nothing, so it is not "set" — without this the row showed a
@@ -1307,11 +1465,16 @@ var FormEngineImpl = function (_a) {
         if (!names.length) {
             return;
         }
-        hasAppliedInitialExpansionRef.current = true;
         var toExpand = initialExpandedOptions.filter(function (name) { return names.includes(name); });
         if (!toExpand.length) {
+            // Not "there is no such row" — "not YET". A server-driven schema arrives
+            // in pieces, and the row the caller named can be in a later one (a test's
+            // `cases` field materialises once its step-kind catalogue lands). Latching
+            // here would spend the one shot on a form that did not yet contain the
+            // field, and the address would never be applied at all.
             return;
         }
+        hasAppliedInitialExpansionRef.current = true;
         setExpandedOptions(function (prev) { return __spreadArray(__spreadArray([], prev, true), toExpand.filter(function (name) { return !prev.includes(name); }), true); });
     }, [initialExpandedOptions, compact, availableOptions]);
     // --- First-attention-field autofocus (opt-in) -----------------------------
@@ -1394,7 +1557,14 @@ var FormEngineImpl = function (_a) {
             }
             setExpandedOptions(function (prev) {
                 return prev.includes(target) ? prev
-                    : expandMode === 'multi' ? __spreadArray(__spreadArray([], prev, true), [target], false) : [target];
+                    : expandMode === 'multi' ? __spreadArray(__spreadArray([], prev, true), [target], false) 
+                    // `expandMode: 'single'` is a rule about what a CLICK does: opening a
+                    // row closes the one the reader last opened. It is not a licence to
+                    // close a row the HOST named through `initialExpandedOptions`. That
+                    // is an address — a statement about what the page is FOR, made before
+                    // the reader did anything — and this scan is a convenience layered on
+                    // top of it. Keep the named rows; replace only what a click could.
+                    : __spreadArray(__spreadArray([], prev.filter(function (name) { return initialExpandedOptions === null || initialExpandedOptions === void 0 ? void 0 : initialExpandedOptions.includes(name); }), true), [target], false);
             });
         }
     }, [
@@ -1407,10 +1577,13 @@ var FormEngineImpl = function (_a) {
         dependencyLockedNames,
         getOptionBucket,
         expandMode,
+        initialExpandedOptions,
     ]);
     // Read-first completion summary (how many shown options have a value set),
     // surfaced as a progress meter at the top of the compact form.
-    var readFirstCompletion = (0, react_2.useMemo)(function () { return (0, readFirst_1.getReadFirstCompletion)(availableOptions); }, [JSON.stringify(availableOptions)]);
+    var readFirstCompletion = (0, react_2.useMemo)(function () {
+        return (0, readFirst_1.getReadFirstCompletion)(availableOptions, function (name) { return getOptionBucket(name) === 'attention'; });
+    }, [JSON.stringify(availableOptions), getOptionBucket]);
     var optionalFields = (0, react_2.useMemo)(function () {
         return Object.keys(filteredOptions).map(function (option) {
             var _a, _b, _c, _d, _f, _g;
@@ -1477,7 +1650,7 @@ var FormEngineImpl = function (_a) {
     // The info panel below the row keeps showing schema messages while editing —
     // rendering them in the editor too would balloon a one-line edit.
     suppressSchemaMessages) {
-        var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         var type = _a.type, other = __rest(_a, ["type"]);
         var operatorParts = (0, common_1.fixOperatorValue)(other.op);
         // The RENDERER type for this row — which editor mounts. Distinct from the
@@ -1494,11 +1667,28 @@ var FormEngineImpl = function (_a) {
         var optionSchema = options === null || options === void 0 ? void 0 : options[optionName];
         var schemaUiType = optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.ui_type;
         var uiTypeIsAnyLike = schemaUiType === 'any' || schemaUiType === 'auto';
+        /* An EXPRESSION's stored type is skipped in this chain.
+  
+           The value is `{ is_expression: true, value: {...} }`, so the type saved
+           beside it describes that envelope — `hash` — not what the field holds.
+           With no `ui_type` to win first, that `hash` beat the schema's `auto`
+           and was handed to the expression editor as the return type to check
+           against: `1 + 2` on a field declared `auto` came back "This does not
+           fit. The expression returns int, and this field holds hash". A literal
+           `1` was fine, because a literal is stored as a plain value whose type
+           matches.
+  
+           Dropping the stored type here lets the schema decide, which is the
+           only party that knows what the field accepts. This is the row
+           renderer's OWN resolution and does not go through
+           `getOptionFieldStorageType`, so guarding that one alone left this
+           untouched. */
+        var storedRowType = optionHoldsExpression(other) ? undefined : type;
         var resolvedType = ((0, readFirst_1.isFixedCompactAllowedValueOption)(optionSchema) ?
             getOptionSchemaStorageType(optionSchema, isRendererOnly)
             : schemaUiType && !uiTypeIsAnyLike ? schemaUiType
                 : undefined) ||
-            type ||
+            storedRowType ||
             schemaUiType ||
             (optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.type) ||
             'any';
@@ -1567,25 +1757,42 @@ var FormEngineImpl = function (_a) {
                     // control groups. The allowed-values renderer itself enforces the
                     // fixed catalogue and never exposes free-form entry.
                     allowCustomValues: (0, readFirst_1.isFixedCompactAllowedValueOption)(optionSchema) ||
-                        (((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_custom_values) !== false && resolvedType !== 'any'), templates: templates.value }, (0, exports.getTypeAndCanBeNull)(
+                        (((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_custom_values) !== false && resolvedType !== 'any'), 
+                    // A field may declare a template list OF ITS OWN, and when it does
+                    // that list is the one to offer. The engine-wide `stringTemplates`
+                    // are the form's shared vocabulary - config items, system properties
+                    // - and every field draws on the same set. A per-field list answers a
+                    // question only that field asks: a test assertion's `$.` references
+                    // are the values ITS case captured, and no other field in the form
+                    // should be offering them.
+                    //
+                    // Passing the engine's list unconditionally overwrote the schema's,
+                    // so a field that declared templates had none by the time it
+                    // rendered. On a typed field that only cost the picker; on an
+                    // ANY-LIKE one it changed the question, because `TemplateField`
+                    // opens on the template selector only when there is something to
+                    // pick and otherwise falls back to the type picker. An untyped field
+                    // therefore asked the author to choose `string`/`int`/`hash` before
+                    // it would let them name a value they had already captured.
+                    templates: (_h = optionSchema === null || optionSchema === void 0 ? void 0 : optionSchema.templates) !== null && _h !== void 0 ? _h : templates.value }, (0, exports.getTypeAndCanBeNull)(
                 // The RENDERER type picks the editor — the storage type lives on
                 // the value envelope. Passing storage here rendered a `richtext`
                 // field as a plain string input.
-                resolvedType, (_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.allowed_values, other.op), { ui_type: resolvedType, name: optionName, uniqueName: "".concat(uniqueName ? "".concat(uniqueName, ".") : "".concat(name ? "".concat(name, ".") : '')).concat(optionName), onChange: 
+                resolvedType, (_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.allowed_values, other.op), { ui_type: resolvedType, name: optionName, uniqueName: "".concat(uniqueName ? "".concat(uniqueName, ".") : "".concat(name ? "".concat(name, ".") : '')).concat(optionName), onChange: 
                     // Identity-stable on purpose: the typed fields debounce on
                     // `[localValue, onChange]` — an inline lambda resets the pending emit
                     // every render and the typed value can starve.
-                    handleValueChange, key: optionName, arg_schema: (_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.arg_schema, noSoft: !!(rest === null || rest === void 0 ? void 0 : rest.options), value: other.value, isFunction: other.is_expression, isDefaultFunction: ((_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.default_view) === 'expression', sensitive: (_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.sensitive, default_value: (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), isDefaultTemplate: ((_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.default_view) === 'template', allowed_values: (_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.allowed_values, allowed_values_creatable: (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.allowed_values_creatable, disabled: ((_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.disabled) ||
+                    handleValueChange, key: optionName, arg_schema: (_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.arg_schema, noSoft: !!(rest === null || rest === void 0 ? void 0 : rest.options), value: other.value, isFunction: other.is_expression, isDefaultFunction: ((_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.default_view) === 'expression', sensitive: (_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.sensitive, default_value: (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), isDefaultTemplate: ((_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.default_view) === 'template', allowed_values: (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.allowed_values, allowed_values_creatable: (_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.allowed_values_creatable, disabled: ((_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.disabled) ||
                         (
                         // a system-owned field states that as `readonly`; only the older
                         // compat projection also sent `disabled`, so honouring only
                         // `disabled` rendered an editable control for a value the user
                         // cannot change (see CompactRow's `fieldReadonly`)
-                        (_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.readonly) ||
+                        (_s = options === null || options === void 0 ? void 0 : options[optionName]) === null || _s === void 0 ? void 0 : _s.readonly) ||
                         readOnly ||
-                        !(0, validations_1.hasAllDependenciesFullfilled)((_s = options === null || options === void 0 ? void 0 : options[optionName]) === null || _s === void 0 ? void 0 : _s.depends_on, availableOptions, options || {}), readOnly: readOnly, size: editorSize || rest.size, menuItems: ((_t = options === null || options === void 0 ? void 0 : options[optionName]) === null || _t === void 0 ? void 0 : _t.ui_type) === 'any' ?
+                        !(0, validations_1.hasAllDependenciesFullfilled)((_t = options === null || options === void 0 ? void 0 : options[optionName]) === null || _t === void 0 ? void 0 : _t.depends_on, availableOptions, options || {}), readOnly: readOnly, size: editorSize || rest.size, menuItems: ((_u = options === null || options === void 0 ? void 0 : options[optionName]) === null || _u === void 0 ? void 0 : _u.ui_type) === 'any' ?
                         getCustomMenuTemplateItems(optionName)
-                        : undefined }, templateFieldProps, { forceDropdown: effectiveForceDropdown })), (0, jsx_runtime_1.jsx)(OptionFieldMessages_1.OptionFieldMessages, { schema: options || {}, allOptions: availableOptions, name: optionName, option: __assign({ type: resolvedType }, other), getType: getTypeForOption }), operators && (0, size_1.default)(operators) && (0, size_1.default)(other.op) ?
+                        : undefined }, templateFieldProps, { forceDropdown: effectiveForceDropdown })), (0, jsx_runtime_1.jsx)(OptionFieldMessages_1.OptionFieldMessages, { schema: options || {}, allOptions: availableOptions, name: optionName, option: __assign({ type: resolvedType }, other), getType: getTypeForOption, untouched: !touchedOptionsRef.current.has(optionName) }), operators && (0, size_1.default)(operators) && (0, size_1.default)(other.op) ?
                     (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreTagGroup, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', labelKey: 'WHERE', label: optionName }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', labelKey: 'IS', label: operatorParts.join(' ') }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { size: 'small', intent: 'info', label: other.value ?
                                                 resolvedType === 'richtext' ?
                                                     (0, common_1.richtextToString)(other.value)
@@ -1807,6 +2014,7 @@ var FormEngineImpl = function (_a) {
     // removes it, and then the header carries just the consumer's own actions.
     var compactHeaderActions = (0, react_2.useMemo)(function () { return __spreadArray(__spreadArray([], (compactToolbarParts ? [{ as: CompactToolbar_1.CompactToolbar, responsive: false }] : []), true), ((compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.actions) || []), true); }, [compactPanelProps === null || compactPanelProps === void 0 ? void 0 : compactPanelProps.actions, compactToolbarParts]);
     var renderCompact = function () {
+        var _a, _b, _c;
         var headerBg = "".concat((0, colors_1.changeDarkness)((0, colors_1.getMainBackgroundColor)(theme), 0.02)).concat((0, colors_1.percentToHexAlpha)(88));
         // Toolbar filters narrow the listed rows; the meter reflects the full set.
         var query = compactQuery.trim().toLowerCase();
@@ -1899,7 +2107,7 @@ var FormEngineImpl = function (_a) {
             var isUnset_1 = function (name) { var _a; return (0, readFirst_1.isOptionValueEmpty)((_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.value); };
             var isFieldInvalid_1 = function (name) {
                 var _a, _b, _c;
-                return !isOptionValid(name, getOptionFieldStorageType(name, (_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = shownOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly), (_c = shownOptions[name]) === null || _c === void 0 ? void 0 : _c.value);
+                return !isOptionValid(name, (0, exports.getOptionFieldStorageType)(name, (_a = shownOptions[name]) === null || _a === void 0 ? void 0 : _a.type, options, operators, (_b = shownOptions[name]) === null || _b === void 0 ? void 0 : _b.op, isRendererOnly), (_c = shownOptions[name]) === null || _c === void 0 ? void 0 : _c.value);
             };
             var comparator_1 = function (a, b) {
                 switch (compactSort) {
@@ -1985,6 +2193,13 @@ var FormEngineImpl = function (_a) {
         var bucketCount = function (b) {
             return bucketGroups[b].reduce(function (n, g) { return n + buckets[b][g].length; }, 0);
         };
+        /* The default is to collapse the Optional box, and an explicit pass is
+           what waives the "never collapse the sole box" escape below. Resolving it
+           here rather than in the parameter list is what makes the two
+           distinguishable — `['optional']` as a default and `['optional']` from a
+           caller mean different things. */
+        var compactCollapsedGroups = compactCollapsedGroupsProp !== null && compactCollapsedGroupsProp !== void 0 ? compactCollapsedGroupsProp : ['optional'];
+        var collapsedGroupsRequested = compactCollapsedGroupsProp !== undefined;
         // "Is the Optional box the whole form?" — when nothing needs attention and
         // nothing is set, collapsing it leaves a card with no visible content at all.
         var onlyOptionalRows = bucketCount('optional') > 0 && bucketCount('attention') === 0 && bucketCount('set') === 0;
@@ -2025,9 +2240,18 @@ var FormEngineImpl = function (_a) {
                 bucketGroups[boxKey].some(function (groupName) { return groupHasPreselectedRow(boxKey, groupName); });
         };
         var STATUS_BOXES = [
-            { key: 'attention', label: 'Needs attention', intent: 'warning', icon: 'ErrorWarningLine' },
-            { key: 'set', label: 'Set', intent: 'success', icon: 'CheckLine' },
-            { key: 'optional', label: 'Optional', icon: 'CheckboxBlankCircleLine' },
+            {
+                key: 'attention',
+                label: (_a = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.attention) !== null && _a !== void 0 ? _a : 'Needs attention',
+                intent: 'warning',
+                icon: 'ErrorWarningLine',
+            },
+            { key: 'set', label: (_b = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.set) !== null && _b !== void 0 ? _b : 'Set', intent: 'success', icon: 'CheckLine' },
+            {
+                key: 'optional',
+                label: (_c = compactBoxLabels === null || compactBoxLabels === void 0 ? void 0 : compactBoxLabels.optional) !== null && _c !== void 0 ? _c : 'Optional',
+                icon: 'CheckboxBlankCircleLine',
+            },
         ];
         // Build the rows for one group: contiguous required-group members are pulled
         // together at the first member's slot and rendered as a connected rail (flat
@@ -2130,7 +2354,9 @@ var FormEngineImpl = function (_a) {
                                                     var hasPreselectedRows = boxHasPreselectedRows(box.key);
                                                     var wouldCollapse = compactCollapsedGroups.includes(box.key) &&
                                                         !query &&
-                                                        !(box.key === 'optional' && onlyOptionalRows);
+                                                        !(box.key === 'optional' &&
+                                                            onlyOptionalRows &&
+                                                            !collapsedGroupsRequested);
                                                     // Only a box that was opened SOLELY to reveal a preselected
                                                     // row splits its body; a box that renders open anyway shows
                                                     // all of its groups as before.