@qoretechnologies/reqraft 0.10.15 → 0.10.17

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

@@ -102,6 +102,9 @@ var react_1 = require("react");
 var jsx_runtime_1 = require("react/jsx-runtime");
 var reqore_1 = require("@qoretechnologies/reqore");
 var colors_1 = require("@qoretechnologies/reqore/dist/helpers/colors");
+var optionActions_1 = require("./optionActions");
+var rendererTypes_1 = require("./rendererTypes");
+var useMediaQuery_1 = require("../../../hooks/useMediaQuery");
 var lodash_1 = require("lodash");
 var isArray_1 = __importDefault(require("lodash/isArray"));
 var map_1 = __importDefault(require("lodash/map"));
@@ -200,7 +203,10 @@ var StyledCommitDock = styled_components_1.default.div(templateObject_2 || (temp
 });
 var getType = function (type, operators, operator) {
     var finalType = getTypeFromOperator(operators, (0, exports.fixOperatorValue)(operator)) || type;
-    return ((0, isArray_1.default)(finalType) ? finalType[0] : finalType);
+    var resolvedType = (0, isArray_1.default)(finalType) ? finalType[0] : finalType;
+    // A value can be received before its server-driven option schema. Keep the
+    // renderer type-safe during that transition without guessing a concrete type.
+    return (resolvedType || 'any');
 };
 exports.getType = getType;
 var getTypeFromOperator = function (operators, operatorData) {
@@ -214,15 +220,36 @@ var fixOperatorValue = function (operator) {
     return (0, isArray_1.default)(operator) ? operator : [operator];
 };
 exports.fixOperatorValue = fixOperatorValue;
+var getOptionSchemaStorageType = function (option, isRendererOnly) {
+    if (isRendererOnly === void 0) { isRendererOnly = rendererTypes_1.isRendererOnlyUiType; }
+    return ((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) {
+    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))
+        ? fieldType
+        : getOptionSchemaStorageType(schemaOption, isRendererOnly);
+    return (0, exports.getType)(storedType, operators, operatorData);
+};
 var hasRequiredOptions = function (options) {
     if (options === void 0) { options = {}; }
     return !!(0, lodash_1.findKey)(options, function (option) { return option.required; });
 };
 exports.hasRequiredOptions = hasRequiredOptions;
 exports.OptionsContext = (0, use_context_selector_1.createContext)({});
-var fixOptions = function (value, options, operators) {
+var fixOptions = function (value, options, operators, isRendererOnly) {
     if (value === void 0) { value = {}; }
+    if (isRendererOnly === void 0) { isRendererOnly = rendererTypes_1.isRendererOnlyUiType; }
     var fixedValue = (0, lodash_1.cloneDeep)(value);
+    // Server-driven schemas can arrive after the persisted value. Preserve that
+    // value verbatim until its schema is available instead of manufacturing
+    // partially typed form fields that can crash the following render.
+    if (!(0, size_1.default)(options)) {
+        return fixedValue;
+    }
     (0, lodash_1.forEach)(options, function (option, name) {
         var _a, _b, _c, _d, _f, _g, _h;
         if (option.value ||
@@ -230,7 +257,7 @@ var fixOptions = function (value, options, operators) {
             ((option.required || option.preselected) && !fixedValue[name]) ||
             ((option.required || option.preselected) && option.default_value && !option.value)) {
             var obj = void 0;
-            var type = (0, exports.getType)((option.ui_type || option.type), operators, (_a = fixedValue[name]) === null || _a === void 0 ? void 0 : _a.op);
+            var type = (0, exports.getType)(getOptionSchemaStorageType(option, isRendererOnly), operators, (_a = fixedValue[name]) === null || _a === void 0 ? void 0 : _a.op);
             if (((_b = option.default_value) === null || _b === void 0 ? void 0 : _b.is_expression) &&
                 ((_c = fixedValue[name]) === null || _c === void 0 ? void 0 : _c.value) === undefined) {
                 obj = option.default_value;
@@ -251,29 +278,32 @@ var fixOptions = function (value, options, operators) {
     });
     var res = (0, reduce_1.default)(fixedValue, function (newValue, option, optionName) {
         var _a;
-        var _b, _c, _d, _f, _g, _h, _j, _k, _l;
+        var _b, _c, _d, _f, _g, _h, _j, _k;
         var newOption = option;
         if (!(0, lodash_1.isPlainObject)(newOption) || !(newOption === null || newOption === void 0 ? void 0 : newOption.type)) {
-            var fixedOption = {
-                type: (0, exports.getType)((((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.ui_type) || ((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.type)), operators, newOption === null || newOption === void 0 ? void 0 : newOption.op),
-                value: newOption,
-            };
-            if (newOption === null || newOption === void 0 ? void 0 : newOption.is_expression) {
-                fixedOption.is_expression = true;
-            }
+            var isUntypedEnvelope = (0, lodash_1.isPlainObject)(newOption) && 'value' in newOption;
+            var untypedFieldValue = isUntypedEnvelope ? newOption.value : newOption;
+            // Spread the original envelope first so every key it carried survives —
+            // rebuilding from just {type, value} silently dropped `op`, `is_expression`
+            // and anything else a field needs to render, which emptied the card.
+            var fixedOption = __assign(__assign({}, ((0, lodash_1.isPlainObject)(newOption) ? newOption : {})), { type: (0, exports.getType)(getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[optionName], isRendererOnly), operators, newOption === null || newOption === void 0 ? void 0 : newOption.op), value: untypedFieldValue });
             newOption = fixedOption;
         }
+        else if (newOption.type === ((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.ui_type) &&
+            isRendererOnly(newOption.type)) {
+            newOption = __assign(__assign({}, newOption), { type: (0, exports.getType)(getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[optionName], isRendererOnly), operators, newOption.op) });
+        }
         if (newOption.value !== undefined &&
-            ((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.allowed_values) &&
-            !((_g = (_f = options === null || options === void 0 ? void 0 : options[optionName]) === null || _f === void 0 ? void 0 : _f.allowed_values) === null || _g === void 0 ? void 0 : _g.find(function (allowedValue) { var _a; return ((_a = allowedValue.value) === null || _a === void 0 ? void 0 : _a.value) === newOption.value || allowedValue.name === newOption.value; })) &&
+            ((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.allowed_values) &&
+            !((_f = (_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.allowed_values) === null || _f === void 0 ? void 0 : _f.find(function (allowedValue) { var _a; return ((_a = allowedValue.value) === null || _a === void 0 ? void 0 : _a.value) === newOption.value || allowedValue.name === newOption.value; })) &&
             !(0, TemplateField_1.isValueTemplate)(newOption.value) &&
-            !((_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.multiselect) &&
-            !((_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.allowed_values_creatable)) {
+            !((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.multiselect) &&
+            !((_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.allowed_values_creatable)) {
             newOption.value = undefined;
         }
         if (newOption.value &&
-            ((_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.readonly) &&
-            ((_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.default_value) &&
+            ((_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.readonly) &&
+            ((_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.default_value) &&
             (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]) !== newOption.value) {
             newOption.value = (0, common_1.getDefaultValue)(options[optionName]);
         }
@@ -332,44 +362,53 @@ var FormEngine = function (_a) {
     var _b, _c, _d, _f, _g;
     var name = _a.name, uniqueName = _a.uniqueName, value = _a.value, onChange = _a.onChange, onSingleOptionsChange = _a.onSingleOptionsChange, onDependableOptionChange = _a.onDependableOptionChange, placeholder = _a.placeholder, noValueString = _a.noValueString, // eslint-disable-line @typescript-eslint/no-unused-vars
     isValid = _a.isValid, // eslint-disable-line @typescript-eslint/no-unused-vars
-    url = _a.url, customUrl = _a.customUrl, operatorsUrl = _a.operatorsUrl, onOptionsLoaded = _a.onOptionsLoaded, recordRequiresSearchOptions = _a.recordRequiresSearchOptions, readOnly = _a.readOnly, _h = _a.allowTemplates, allowTemplates = _h === void 0 ? true : _h, interfaceContext = _a.interfaceContext, templateFieldProps = _a.templateFieldProps, _j = _a.showTypeToggle, showTypeToggle = _j === void 0 ? true : _j, compact = _a.compact, _k = _a.compactFlush, compactFlush = _k === void 0 ? false : _k, _l = _a.compactNested, compactNested = _l === void 0 ? false : _l, compactPanelProps = _a.compactPanelProps, _m = _a.commitMode, commitMode = _m === void 0 ? 'immediate' : _m, _o = _a.expandMode, expandMode = _o === void 0 ? 'single' : _o, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, componentOverrides = _a.componentOverrides, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "allowTemplates", "interfaceContext", "templateFieldProps", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactPanelProps", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "componentOverrides", "inheritedFromParent", "autoFocusFirstRequired"]);
-    var _p = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), options = _p[0], setOptions = _p[1];
+    url = _a.url, customUrl = _a.customUrl, operatorsUrl = _a.operatorsUrl, onOptionsLoaded = _a.onOptionsLoaded, recordRequiresSearchOptions = _a.recordRequiresSearchOptions, readOnly = _a.readOnly, _h = _a.allowTemplates, allowTemplates = _h === void 0 ? true : _h, interfaceContext = _a.interfaceContext, templateFieldProps = _a.templateFieldProps, _j = _a.showTypeToggle, showTypeToggle = _j === void 0 ? true : _j, compact = _a.compact, _k = _a.compactFlush, compactFlush = _k === void 0 ? false : _k, _l = _a.compactNested, compactNested = _l === void 0 ? false : _l, compactPanelProps = _a.compactPanelProps, _m = _a.commitMode, commitMode = _m === void 0 ? 'immediate' : _m, _o = _a.expandMode, expandMode = _o === void 0 ? 'single' : _o, onCommit = _a.onCommit, operatorsProp = _a.operators, groups = _a.groups, optionsLoader = _a.optionsLoader, onValidityChange = _a.onValidityChange, optionActions = _a.optionActions, _p = _a.optionActionsCollapse, optionActionsCollapse = _p === void 0 ? 'auto' : _p, componentOverrides = _a.componentOverrides, rendererOnlyUiTypes = _a.rendererOnlyUiTypes, inheritedFromParent = _a.inheritedFromParent, autoFocusFirstRequired = _a.autoFocusFirstRequired, initialExpandedOptions = _a.initialExpandedOptions, rest = __rest(_a, ["name", "uniqueName", "value", "onChange", "onSingleOptionsChange", "onDependableOptionChange", "placeholder", "noValueString", "isValid", "url", "customUrl", "operatorsUrl", "onOptionsLoaded", "recordRequiresSearchOptions", "readOnly", "allowTemplates", "interfaceContext", "templateFieldProps", "showTypeToggle", "compact", "compactFlush", "compactNested", "compactPanelProps", "commitMode", "expandMode", "onCommit", "operators", "groups", "optionsLoader", "onValidityChange", "optionActions", "optionActionsCollapse", "componentOverrides", "rendererOnlyUiTypes", "inheritedFromParent", "autoFocusFirstRequired", "initialExpandedOptions"]);
+    // 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)]);
+    // Resolved once here rather than per row — every CompactRow reads the answer
+    // off the context instead of opening its own matchMedia subscription.
+    var canHover = (0, useMediaQuery_1.useCanHover)();
+    var isNarrowViewport = (0, useMediaQuery_1.useIsNarrowViewport)();
+    var collapseOptionActions = optionActionsCollapse === 'always' ? true
+        : optionActionsCollapse === 'never' ? false
+            : !canHover || isNarrowViewport;
+    var _q = (0, react_2.useState)((rest === null || rest === void 0 ? void 0 : rest.options) || undefined), options = _q[0], setOptions = _q[1];
     // optionsLoader lifecycle: loading feeds the skeleton gate, error the banner.
-    var _q = (0, react_2.useState)(!!optionsLoader && !(rest === null || rest === void 0 ? void 0 : rest.options)), optionsLoading = _q[0], setOptionsLoading = _q[1];
-    var _r = (0, react_2.useState)(), optionsError = _r[0], setOptionsError = _r[1];
+    var _r = (0, react_2.useState)(!!optionsLoader && !(rest === null || rest === void 0 ? void 0 : rest.options)), optionsLoading = _r[0], setOptionsLoading = _r[1];
+    var _s = (0, react_2.useState)(), optionsError = _s[0], setOptionsError = _s[1];
     // Operators: prop-provided (compact) or fetched via operatorsUrl (dpql,
     // ported from IDE Options) — the fetch overrides the seeded prop value.
-    var _s = (0, react_2.useState)(operatorsProp), operators = _s[0], setOperators = _s[1];
+    var _t = (0, react_2.useState)(operatorsProp), operators = _t[0], setOperators = _t[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 _t = (0, react_2.useState)(!!(url || customUrl || operatorsUrl)), loading = _t[0], setLoading = _t[1];
+    var _u = (0, react_2.useState)(!!(url || customUrl || operatorsUrl)), loading = _u[0], setLoading = _u[1];
     var confirmAction = (0, reqore_1.useReqoreProperty)('confirmAction');
     var theme = (0, reqore_1.useReqoreTheme)();
-    var _u = (0, react_2.useState)(), focusedEditing = _u[0], setFocusedEditing = _u[1];
-    var _v = (0, react_2.useState)(false), showFieldTypes = _v[0], setShowFieldTypes = _v[1];
+    var _v = (0, react_2.useState)(), focusedEditing = _v[0], setFocusedEditing = _v[1];
+    var _w = (0, react_2.useState)(false), showFieldTypes = _w[0], setShowFieldTypes = _w[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 _w = (0, react_2.useState)(undefined), showAllDescriptions = _w[0], setShowAllDescriptions = _w[1];
-    var _x = (0, react_2.useState)(), showHelpForOption = _x[0], setShowHelpForOption = _x[1];
-    var _y = (0, react_2.useState)(false), showInvalidOptionsOnly = _y[0], setShowInvalidOptionsOnly = _y[1];
+    var _x = (0, react_2.useState)(undefined), showAllDescriptions = _x[0], setShowAllDescriptions = _x[1];
+    var _y = (0, react_2.useState)(), showHelpForOption = _y[0], setShowHelpForOption = _y[1];
+    var _z = (0, react_2.useState)(false), showInvalidOptionsOnly = _z[0], setShowInvalidOptionsOnly = _z[1];
     // Which options are expanded into their editor (several can be open at once).
-    var _z = (0, react_2.useState)([]), expandedOptions = _z[0], setExpandedOptions = _z[1];
+    var _0 = (0, react_2.useState)([]), expandedOptions = _0[0], setExpandedOptions = _0[1];
     // Remembers each row's last settled status box, so an actively-edited field
     // stays put when its status flips (e.g. becomes valid) instead of jumping to
     // another box mid-edit and stealing focus. Keyed by option name.
     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 _0 = (0, react_use_1.useMeasure)(), compactWrapRef = _0[0], compactWrapWidth = _0[1].width;
+    var _1 = (0, react_use_1.useMeasure)(), compactWrapRef = _1[0], compactWrapWidth = _1[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 _1 = (0, react_2.useState)(null), compactWrapNode = _1[0], setCompactWrapNode = _1[1];
+    var _2 = (0, react_2.useState)(null), compactWrapNode = _2[0], setCompactWrapNode = _2[1];
     var setCompactWrap = (0, react_2.useCallback)(function (node) {
         compactWrapRef(node);
         setCompactWrapNode(function (prev) { return (prev === node ? prev : node); });
@@ -406,8 +445,8 @@ var FormEngine = 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 _2 = (0, react_2.useState)([]), highlightedOptions = _2[0], setHighlightedOptions = _2[1];
-    var _3 = (0, react_2.useState)([]), flashedOptions = _3[0], setFlashedOptions = _3[1];
+    var _3 = (0, react_2.useState)([]), highlightedOptions = _3[0], setHighlightedOptions = _3[1];
+    var _4 = (0, react_2.useState)([]), flashedOptions = _4[0], setFlashedOptions = _4[1];
     var flashTimeout = (0, react_2.useRef)();
     var flashOptions = (0, react_2.useCallback)(function (optionNames, scrollToFirst) {
         if (scrollToFirst === void 0) { scrollToFirst = false; }
@@ -449,16 +488,16 @@ var FormEngine = function (_a) {
     });
     var compactNarrow = !!compactWrapWidth && compactWrapWidth < 480;
     // Info panels auto-open on Tier-1 content; the per-row user override sticks.
-    var _4 = (0, react_2.useState)({}), infoPanelOverrides = _4[0], setInfoPanelOverrides = _4[1];
+    var _5 = (0, react_2.useState)({}), infoPanelOverrides = _5[0], setInfoPanelOverrides = _5[1];
     // Toolbar filters affect the listed rows only — the meter reflects the full set.
-    var _5 = (0, react_2.useState)(false), requiredOnly = _5[0], setRequiredOnly = _5[1];
-    var _6 = (0, react_2.useState)(''), compactQuery = _6[0], setCompactQuery = _6[1];
+    var _6 = (0, react_2.useState)(false), requiredOnly = _6[0], setRequiredOnly = _6[1];
+    var _7 = (0, react_2.useState)(''), compactQuery = _7[0], setCompactQuery = _7[1];
     // Compact field sort (Fields menu → "Sort by"); 'schema' = declared order.
-    var _7 = (0, react_2.useState)('schema'), compactSort = _7[0], setCompactSort = _7[1];
-    var _8 = (0, react_2.useState)(function () { return ({
-        fields: (0, exports.fixOptions)(value, options || {}),
+    var _8 = (0, react_2.useState)('schema'), compactSort = _8[0], setCompactSort = _8[1];
+    var _9 = (0, react_2.useState)(function () { return ({
+        fields: (0, exports.fixOptions)(value, options || {}, undefined, isRendererOnly),
         meta: undefined,
-    }); }), localValue = _8[0], setLocalValue = _8[1];
+    }); }), localValue = _9[0], setLocalValue = _9[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)
@@ -467,7 +506,7 @@ var FormEngine = function (_a) {
         originalValue.current = localValue.fields;
     }
     var unavailableOptionsCount = (0, react_2.useRef)(0);
-    var _9 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _9.compactValue, typesLoading = _9.loading;
+    var _10 = (0, useQorusTypes_1.useQorusTypes)(), compactValue = _10.compactValue, typesLoading = _10.loading;
     var templates = (0, useTemplates_1.useTemplates)(allowTemplates, rest.stringTemplates, interfaceContext);
     (0, react_2.useEffect)(function () {
         if ((0, lodash_1.isEqual)(localValue.fields, value)) {
@@ -541,7 +580,7 @@ var FormEngine = function (_a) {
                                 setOptions({});
                                 return [2 /*return*/];
                             }
-                            setLocalValue({ fields: (0, exports.fixOptions)(value, data.data), meta: undefined });
+                            setLocalValue({ fields: (0, exports.fixOptions)(value, data.data, undefined, isRendererOnly), meta: undefined });
                             if (!operatorsUrl) {
                                 setLoading(false);
                             }
@@ -600,7 +639,7 @@ var FormEngine = function (_a) {
                             }
                             setOptions(data.data);
                             onOptionsLoaded === null || onOptionsLoaded === void 0 ? void 0 : onOptionsLoaded(data.data);
-                            setLocalValue({ fields: (0, exports.fixOptions)({}, data.data), meta: undefined });
+                            setLocalValue({ fields: (0, exports.fixOptions)({}, data.data, undefined, isRendererOnly), meta: undefined });
                             return [2 /*return*/];
                     }
                 });
@@ -633,7 +672,7 @@ var FormEngine = function (_a) {
         }
     }, [operatorsUrl]);
     (0, react_use_1.useUpdateEffect)(function () {
-        var fixedValue = (0, exports.fixOptions)(value, options || {});
+        var fixedValue = (0, exports.fixOptions)(value, options || {}, undefined, isRendererOnly);
         // When the value we're receiving is the one we just emitted AND fixOptions has nothing to
         // meaningfully add or change, skip the update. This breaks the controlled-component loop for
         // arg_schema fields while still allowing required/preselected options to be restored (in that
@@ -652,21 +691,23 @@ var FormEngine = function (_a) {
             originalValue.current = fixedValue;
         }
         setLocalValue === null || setLocalValue === void 0 ? void 0 : setLocalValue({ fields: fixedValue, meta: undefined });
-    }, [JSON.stringify(options), JSON.stringify(value)]);
+    }, [JSON.stringify(options), JSON.stringify(value), isRendererOnly]);
     var handleValueChange = (0, react_2.useCallback)(function (optionName, val, _type, isFunction) {
         setLocalValue(function (_a) {
             var _b, _c;
-            var _d, _f, _g, _h, _j, _k, _l, _m, _o;
-            var _p = _a.fields, fields = _p === void 0 ? {} : _p;
-            var schemaType = (((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.ui_type) ||
-                ((_f = options === null || options === void 0 ? void 0 : options[optionName]) === null || _f === void 0 ? void 0 : _f.type));
+            var _d, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+            var _q = _a.fields, fields = _q === void 0 ? {} : _q;
+            var schemaType = getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[optionName], isRendererOnly);
             var isAnyLike = schemaType === 'any' || schemaType === 'auto';
             // For any/auto schema types, preserve the user's chosen type stored in the field
-            var resolvedSchemaType = isAnyLike && ((_g = fields[optionName]) === null || _g === void 0 ? void 0 : _g.type) ?
-                fields[optionName].type
-                : schemaType || ((_h = fields[optionName]) === null || _h === void 0 ? void 0 : _h.type);
+            var resolvedSchemaType = isAnyLike && ((_d = fields[optionName]) === null || _d === void 0 ? void 0 : _d.type)
+                ? fields[optionName].type
+                : ((_f = fields[optionName]) === null || _f === void 0 ? void 0 : _f.type) === ((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.ui_type) &&
+                    isRendererOnly((_h = fields[optionName]) === null || _h === void 0 ? void 0 : _h.type)
+                    ? schemaType
+                    : schemaType || ((_j = fields[optionName]) === null || _j === void 0 ? void 0 : _j.type);
             var type = _type ||
-                (0, exports.getTypeAndCanBeNull)(resolvedSchemaType, (_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.allowed_values).type;
+                (0, exports.getTypeAndCanBeNull)(resolvedSchemaType, (_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.allowed_values).type;
             if (!fields[optionName]) {
                 var defaultOperators = (0, reduce_1.default)(operators || {}, function (filteredOperators, operator, operatorKey) {
                     if (operator.selected) {
@@ -695,9 +736,9 @@ var FormEngine = function (_a) {
                 delete updatedValue[optionName].is_expression;
             }
             var meta = {};
-            if (((_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.has_dependents) &&
+            if (((_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.has_dependents) &&
                 val !== undefined &&
-                val !== ((_l = fields[optionName]) === null || _l === void 0 ? void 0 : _l.value)) {
+                val !== ((_m = fields[optionName]) === null || _m === void 0 ? void 0 : _m.value)) {
                 (0, lodash_1.forEach)(options, function (option, depName) {
                     if (option.depends_on &&
                         (0, lodash_1.flatten)(option.depends_on).includes(optionName) &&
@@ -707,8 +748,8 @@ var FormEngine = function (_a) {
                 });
                 onDependableOptionChange === null || onDependableOptionChange === void 0 ? void 0 : onDependableOptionChange(optionName, val, updatedValue, options);
             }
-            if ((0, size_1.default)((_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.on_change)) {
-                meta.events = (_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.on_change;
+            if ((0, size_1.default)((_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.on_change)) {
+                meta.events = (_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.on_change;
             }
             onSingleOptionsChange === null || onSingleOptionsChange === void 0 ? void 0 : onSingleOptionsChange(optionName, updatedValue[optionName]);
             return {
@@ -719,6 +760,7 @@ var FormEngine = function (_a) {
     }, [
         onSingleOptionsChange,
         onDependableOptionChange,
+        isRendererOnly,
         JSON.stringify(options),
         JSON.stringify(operators),
     ]);
@@ -796,9 +838,8 @@ var FormEngine = function (_a) {
         setExpandedOptions(function (prev) { return prev.filter(function (name) { return name !== optionName; }); });
     }, []);
     var handleAddOptionalFieldChange = (0, react_2.useCallback)(function (_name, optionName) {
-        var _a, _b, _c;
-        handleValueChange(optionName, (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), (0, exports.getTypeAndCanBeNull)((((_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.ui_type) ||
-            ((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.type)), (_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.allowed_values).type);
+        var _a;
+        handleValueChange(optionName, (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), (0, exports.getTypeAndCanBeNull)(getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[optionName], isRendererOnly), (_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.allowed_values).type);
     }, [JSON.stringify(options), handleValueChange]);
     var availableOptions = (0, react_2.useMemo)(function () {
         if (!options) {
@@ -820,22 +861,18 @@ var FormEngine = function (_a) {
                 removeSelectedOption(optionName);
                 return newValue;
             }
-            var schemaType = (0, exports.getType)((options[optionName].ui_type || options[optionName].type), operators, option === null || option === void 0 ? void 0 : option.op);
+            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);
             if (!(0, lodash_1.isPlainObject)(option)) {
                 return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = {
-                    type: schemaType,
+                    type: storageType || rendererType,
                     value: option,
                 }, _a));
             }
-            // any/auto: preserve the user-picked type; otherwise normalize to the
-            // schema type (ui_type wins) so rendering and validation agree.
-            var isAnyLike = schemaType === 'any' || schemaType === 'auto';
-            var effectiveType = isAnyLike && (option === null || option === void 0 ? void 0 : option.type) ?
-                option.type
-                : schemaType;
-            return __assign(__assign({}, newValue), (_b = {}, _b[optionName] = __assign(__assign({}, option), { type: effectiveType }), _b));
+            return __assign(__assign({}, newValue), (_b = {}, _b[optionName] = __assign(__assign({}, option), { type: storageType || rendererType }), _b));
         }, {});
     }, [
+        isRendererOnly,
         JSON.stringify(fixedValue),
         JSON.stringify(options),
         unavailableOptionsCount.current,
@@ -904,13 +941,11 @@ var FormEngine = function (_a) {
     }, [JSON.stringify(options), JSON.stringify(availableOptions), JSON.stringify(localValue.fields)]);
     var getValidityData = (0, react_2.useCallback)(function () {
         var fields = (0, reduce_1.default)(availableOptions, function (result, option, optionName) {
-            var _a, _b, _c, _d;
-            var type = option.type ||
-                ((_a = options === null || options === void 0 ? void 0 : options[optionName]) === null || _a === void 0 ? void 0 : _a.ui_type) ||
-                ((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.type);
+            var _a, _b;
+            var type = getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly);
             var optionValue = option.value;
-            var isRequired = (_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.required;
-            var hasRequiredGroups = !!((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.required_groups);
+            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);
             var isEmpty = optionValue === undefined || optionValue === '';
             var validation;
             if (!isRequired && !hasRequiredGroups && isEmpty) {
@@ -936,8 +971,10 @@ var FormEngine = function (_a) {
             invalidFields: invalidFields,
         };
     }, [
+        isRendererOnly,
         JSON.stringify(availableOptions),
         JSON.stringify(options),
+        JSON.stringify(operators),
         JSON.stringify(localValue.fields),
     ]);
     var validityData = (0, react_2.useMemo)(function () { return getValidityData(); }, [getValidityData]);
@@ -948,15 +985,19 @@ var FormEngine = function (_a) {
     var shownOptions = (0, react_2.useMemo)(function () {
         return (0, reduce_1.default)(availableOptions, function (newValue, option, optionName) {
             var _a;
-            var _b, _c;
             if (showInvalidOptionsOnly &&
-                isOptionValid(optionName, ((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.ui_type) ||
-                    ((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.type), option.value)) {
+                isOptionValid(optionName, getOptionFieldStorageType(optionName, option.type, options, operators, option.op, isRendererOnly), option.value)) {
                 return newValue;
             }
             return __assign(__assign({}, newValue), (_a = {}, _a[optionName] = option, _a));
         }, {});
-    }, [showInvalidOptionsOnly, JSON.stringify(availableOptions)]);
+    }, [
+        showInvalidOptionsOnly,
+        isRendererOnly,
+        JSON.stringify(availableOptions),
+        JSON.stringify(options),
+        JSON.stringify(operators),
+    ]);
     // Read-first STATUS / BOX for one option — lifted to component scope so the
     // status boxes (renderCompact) and the header's "needs attention" count share
     // exactly one definition. One-of group members travel together (bucket by the
@@ -971,13 +1012,13 @@ var FormEngine = function (_a) {
         return undefined;
     }, [JSON.stringify(options)]);
     var getOptionStatus = (0, react_2.useCallback)(function (name, hidden) {
-        var _a;
+        var _a, _b, _c;
         if (hidden === void 0) { hidden = false; }
         if (hidden)
             return 'optional';
         var schema = options === null || options === void 0 ? void 0 : options[name];
-        var type = ((schema === null || schema === void 0 ? void 0 : schema.ui_type) || (schema === null || schema === void 0 ? void 0 : schema.type));
-        var value = (_a = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _a === void 0 ? void 0 : _a.value;
+        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 value = (_c = availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[name]) === null || _c === void 0 ? void 0 : _c.value;
         var empty = (0, readFirst_1.isOptionValueEmpty)(value);
         var reqGroups = (schema === null || schema === void 0 ? void 0 : schema.required_groups) || [];
         var required = !!((schema === null || schema === void 0 ? void 0 : schema.required) || reqGroups.length);
@@ -996,8 +1037,10 @@ var FormEngine = function (_a) {
             warned: msgIntent === 'warning',
         });
     }, [
+        isRendererOnly,
         JSON.stringify(options),
         JSON.stringify(availableOptions),
+        JSON.stringify(operators),
         isOptionValid,
         requiredGroupsInfo,
         schemaMsgIntent,
@@ -1074,6 +1117,31 @@ var FormEngine = function (_a) {
                     : __spreadArray(__spreadArray([], prev, true), [optionName], false);
         });
     }, [expandMode]);
+    // --- Caller-named starting rows (opt-in) ----------------------------------
+    // `initialExpandedOptions` lets a consumer name the rows that must already
+    // be open when the form first paints — the case where the expanded row is
+    // part of an address rather than a click (see the prop's docs).
+    //
+    // One-shot for the same reason autofocus is: it fires on the first render
+    // that actually has rows (so an async-loaded schema is covered) and then
+    // never again, so a row the user collapses afterwards stays collapsed and a
+    // later schema reload does not reopen it.
+    var hasAppliedInitialExpansionRef = (0, react_2.useRef)(false);
+    (0, react_2.useEffect)(function () {
+        if (!(initialExpandedOptions === null || initialExpandedOptions === void 0 ? void 0 : initialExpandedOptions.length) || !compact || hasAppliedInitialExpansionRef.current) {
+            return;
+        }
+        var names = Object.keys(availableOptions);
+        if (!names.length) {
+            return;
+        }
+        hasAppliedInitialExpansionRef.current = true;
+        var toExpand = initialExpandedOptions.filter(function (name) { return names.includes(name); });
+        if (!toExpand.length) {
+            return;
+        }
+        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) -----------------------------
     // With `autoFocusFirstRequired`, drop the user straight into the first field
     // they must fix. We reuse the engine's own ordering (`availableOptions`), the
@@ -1198,10 +1266,10 @@ var FormEngine = function (_a) {
                     next[optionName] = value;
                 }
             });
-            return { fields: (0, exports.fixOptions)(next, options || {}, operators), meta: undefined };
+            return { fields: (0, exports.fixOptions)(next, options || {}, operators, isRendererOnly), meta: undefined };
         });
         setRequiredOnly(false);
-    }, [JSON.stringify(options), JSON.stringify(operators)]);
+    }, [JSON.stringify(options), JSON.stringify(operators), isRendererOnly]);
     var getCustomMenuTemplateItems = (0, react_2.useCallback)(function (optionName) {
         return compactValue === null || compactValue === void 0 ? void 0 : compactValue.map(function (type) { return ({
             label: type.display_name,
@@ -1220,9 +1288,27 @@ var FormEngine = 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;
+        var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         var type = _a.type, other = __rest(_a, ["type"]);
         var operatorParts = (0, exports.fixOperatorValue)(other.op);
+        // The RENDERER type for this row — which editor mounts. Distinct from the
+        // storage type on the value envelope: a `richtext` field stores a string
+        // but must render the richtext editor, so `ui_type` wins here.
+        //
+        // The exception is an any-like `ui_type`. Those schemas say
+        // `ui_type: 'any'` precisely so the user can pick a concrete type, and
+        // that pick lives on the field's stored `type` — letting 'any' win would
+        // pin the row to the untyped editor forever.
+        //
+        // The trailing fallbacks keep the row rendering when a server-driven
+        // schema has not arrived yet (`type` undefined) instead of crashing.
+        var schemaUiType = (_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.ui_type;
+        var uiTypeIsAnyLike = schemaUiType === 'any' || schemaUiType === 'auto';
+        var resolvedType = (schemaUiType && !uiTypeIsAnyLike ? schemaUiType : undefined) ||
+            type ||
+            schemaUiType ||
+            ((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.type) ||
+            'any';
         return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(function () {
                     var _a;
                     var schemaMsgs = (suppressSchemaMessages ?
@@ -1257,7 +1343,7 @@ var FormEngine = function (_a) {
                                                 (0, jsx_runtime_1.jsx)(reqore_1.ReqoreButton, { disabled: readOnly, icon: 'DeleteBinLine', effect: NegativeColorEffect, fixed: true, onClick: function () { return handleRemoveOperator(optionName, fixedValue, index); } })
                                                 : null] }, index));
                                 }) }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 })] })
-                    : null, (0, react_1.createElement)(TemplateField_1.TemplateField, __assign({ fluid: true }, options === null || options === void 0 ? void 0 : options[optionName], resolveInheritProps((_b = options === null || options === void 0 ? void 0 : options[optionName]) === null || _b === void 0 ? void 0 : _b.inherit_props, availableOptions, inheritedFromParent), { 
+                    : null, (0, react_1.createElement)(TemplateField_1.TemplateField, __assign({ fluid: true }, options === null || options === void 0 ? void 0 : options[optionName], resolveInheritProps((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.inherit_props, availableOptions, inheritedFromParent), { 
                     // qorus#347-followup (scope forwarding): merge accumulated
                     // inheritance (`inheritedFromParent`) with THIS field's freshly
                     // resolved inherit_props, and pass down as a single bag so any
@@ -1269,26 +1355,30 @@ var FormEngine = function (_a) {
                     // `inherit_props: { language: 'language' }`, the list renderer
                     // forwards it into each row, and the row's body resolves against
                     // the accumulated bag.
-                    inheritedFromParent: __assign(__assign({}, inheritedFromParent), resolveInheritProps((_c = options === null || options === void 0 ? void 0 : options[optionName]) === null || _c === void 0 ? void 0 : _c.inherit_props, availableOptions, inheritedFromParent)), 
+                    inheritedFromParent: __assign(__assign({}, inheritedFromParent), resolveInheritProps((_f = options === null || options === void 0 ? void 0 : options[optionName]) === null || _f === void 0 ? void 0 : _f.inherit_props, availableOptions, inheritedFromParent)), 
                     // Propagate compact so an arg_schema field renders a COMPACT sub-form
                     // (consistent with the parent) rather than the classic FormEngine.
                     compact: compact, 
                     // SEAM: forwarded through TemplateField's rest-spread to AutoFormField,
                     // which renders consumer-injected editors by field type/ui_type.
-                    componentOverrides: componentOverrides, allowTemplates: !!(allowTemplates && ((_d = options === null || options === void 0 ? void 0 : options[optionName]) === null || _d === void 0 ? void 0 : _d.supports_templates)), allowFunctions: !!((_f = options === null || options === void 0 ? void 0 : options[optionName]) === null || _f === void 0 ? void 0 : _f.supports_expressions), 
+                    componentOverrides: componentOverrides, allowTemplates: !!(allowTemplates && ((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_templates)), allowFunctions: !!((_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.supports_expressions), 
                     // reqraft: form-level expression fields get the Visual/Text shell
                     // (DPQL text mode); opt out per-form via `templateFieldProps`.
-                    allowTextExpressions: true, allowCustomValues: ((_g = options === null || options === void 0 ? void 0 : options[optionName]) === null || _g === void 0 ? void 0 : _g.supports_custom_values) !== false && type !== 'any', templates: templates.value }, (0, exports.getTypeAndCanBeNull)(type, (_h = options === null || options === void 0 ? void 0 : options[optionName]) === null || _h === void 0 ? void 0 : _h.allowed_values, other.op), { ui_type: type, name: optionName, uniqueName: "".concat(uniqueName ? "".concat(uniqueName, ".") : "".concat(name ? "".concat(name, ".") : '')).concat(optionName), onChange: 
+                    allowTextExpressions: true, allowCustomValues: ((_j = options === null || options === void 0 ? void 0 : options[optionName]) === null || _j === void 0 ? void 0 : _j.supports_custom_values) !== false && resolvedType !== 'any', templates: 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, (_k = options === null || options === void 0 ? void 0 : options[optionName]) === null || _k === void 0 ? void 0 : _k.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, disabled: ((_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.disabled) ||
+                    handleValueChange, key: optionName, arg_schema: (_l = options === null || options === void 0 ? void 0 : options[optionName]) === null || _l === void 0 ? void 0 : _l.arg_schema, noSoft: !!(rest === null || rest === void 0 ? void 0 : rest.options), value: other.value, isFunction: other.is_expression, isDefaultFunction: ((_m = options === null || options === void 0 ? void 0 : options[optionName]) === null || _m === void 0 ? void 0 : _m.default_view) === 'expression', sensitive: (_o = options === null || options === void 0 ? void 0 : options[optionName]) === null || _o === void 0 ? void 0 : _o.sensitive, default_value: (0, common_1.getDefaultValue)(options === null || options === void 0 ? void 0 : options[optionName]), isDefaultTemplate: ((_p = options === null || options === void 0 ? void 0 : options[optionName]) === null || _p === void 0 ? void 0 : _p.default_view) === 'template', allowed_values: (_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.allowed_values, disabled: ((_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.disabled) ||
                         readOnly ||
-                        !(0, validations_1.hasAllDependenciesFullfilled)((_q = options === null || options === void 0 ? void 0 : options[optionName]) === null || _q === void 0 ? void 0 : _q.depends_on, availableOptions, options || {}), readOnly: readOnly, size: editorSize || rest.size, menuItems: ((_r = options === null || options === void 0 ? void 0 : options[optionName]) === null || _r === void 0 ? void 0 : _r.ui_type) === 'any' ?
+                        !(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' ?
                         getCustomMenuTemplateItems(optionName)
-                        : undefined }, templateFieldProps)), (0, jsx_runtime_1.jsx)(OptionFieldMessages_1.OptionFieldMessages, { schema: options || {}, allOptions: availableOptions, name: optionName, option: __assign({ type: type }, other), getType: getTypeForOption }), operators && (0, size_1.default)(operators) && (0, size_1.default)(other.op) ?
+                        : undefined }, templateFieldProps)), (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) ?
                     (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 ?
-                                                type === 'richtext' ?
+                                                resolvedType === 'richtext' ?
                                                     (0, common_1.richtextToString)(other.value)
                                                     : JSON.stringify(other.value)
                                                 : '' })] }) })] })
@@ -1369,6 +1459,8 @@ var FormEngine = function (_a) {
         getTypeForOption: getTypeForOption,
         isOptionValid: isOptionValid,
         confirmAction: confirmAction,
+        optionActions: optionActions,
+        collapseOptionActions: collapseOptionActions,
         renderOption: renderOption,
         theme: theme,
         cText: cText,
@@ -1413,6 +1505,8 @@ var FormEngine = function (_a) {
         getTypeForOption,
         isOptionValid,
         confirmAction,
+        optionActions,
+        collapseOptionActions,
         renderOption,
         theme,
         cText,
@@ -1535,7 +1629,7 @@ var FormEngine = 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, (((_a = options === null || options === void 0 ? void 0 : options[name]) === null || _a === void 0 ? void 0 : _a.ui_type) || ((_b = options === null || options === void 0 ? void 0 : options[name]) === null || _b === void 0 ? void 0 : _b.type)), (_c = shownOptions[name]) === null || _c === void 0 ? void 0 : _c.value);
+                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);
             };
             var comparator_1 = function (a, b) {
                 switch (compactSort) {
@@ -1623,15 +1717,12 @@ var FormEngine = function (_a) {
         // rows — no wrapper — so the value surface applies normally; the rail + nodes
         // are drawn per member). Narrow stacks fall back to flat rows.
         var renderGroupRows = function (names) {
-            var renderRow = function (entry, clustered, clusterFirst, clusterLast) {
-                var _a, _b;
-                return ((0, jsx_runtime_1.jsx)(CompactRow_1.CompactRow, { optionName: entry.name, optionField: entry.hidden ?
-                        {
-                            type: (((_a = options === null || options === void 0 ? void 0 : options[entry.name]) === null || _a === void 0 ? void 0 : _a.ui_type) || ((_b = options === null || options === void 0 ? void 0 : options[entry.name]) === null || _b === void 0 ? void 0 : _b.type)),
-                            value: undefined,
-                        }
-                        : shownOptions[entry.name], hidden: entry.hidden, clustered: clustered, clusterFirst: clusterFirst, clusterLast: clusterLast }, entry.name));
-            };
+            var renderRow = function (entry, clustered, clusterFirst, clusterLast) { return ((0, jsx_runtime_1.jsx)(CompactRow_1.CompactRow, { optionName: entry.name, optionField: entry.hidden ?
+                    {
+                        type: getOptionSchemaStorageType(options === null || options === void 0 ? void 0 : options[entry.name], isRendererOnly),
+                        value: undefined,
+                    }
+                    : shownOptions[entry.name], hidden: entry.hidden, clustered: clustered, clusterFirst: clusterFirst, clusterLast: clusterLast }, entry.name)); };
             // (Clustering runs in narrow mode too now — the "One of the below is
             // required" box wraps the members regardless of width; it no longer relies
             // on a contiguous rail.)
@@ -1797,13 +1888,11 @@ var FormEngine = function (_a) {
                                 options[optionName].stretch,
                             size: 'small',
                             floatingActions: true,
-                            actions: __spreadArray(__spreadArray([], (typeof optionActions === 'function' ?
-                                optionActions({
-                                    name: optionName,
-                                    schema: options[optionName],
-                                    value: availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[optionName],
-                                })
-                                : (optionActions !== null && optionActions !== void 0 ? optionActions : [])), true), [
+                            actions: __spreadArray(__spreadArray([], (0, optionActions_1.resolveOptionActions)(optionActions, {
+                                name: optionName,
+                                schema: options[optionName],
+                                value: availableOptions === null || availableOptions === void 0 ? void 0 : availableOptions[optionName],
+                            }), true), [
                                 {
                                     size: 'tiny',
                                     icon: 'FullscreenLine',