@aglyn/besigner-ui 1.0.0-beta.221 → 1.0.0-beta.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aglyn/besigner-ui",
-  "version": "1.0.0-beta.221",
+  "version": "1.0.0-beta.222",
   "license": "Apache-2.0",
   "homepage": "https://aglyn.com",
   "repository": {
@@ -25,22 +25,22 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@aglyn/aglyn": "1.0.0-beta.221",
-    "@aglyn/aglyn-markdown-editor": "1.0.0-beta.221",
-    "@aglyn/aglyn-node-renderer": "1.0.0-beta.221",
-    "@aglyn/besigner": "1.0.0-beta.221",
-    "@aglyn/shared-data-enums": "1.0.0-beta.221",
-    "@aglyn/shared-data-mdi": "1.0.0-beta.221",
-    "@aglyn/shared-data-types": "1.0.0-beta.221",
-    "@aglyn/shared-svg-icons": "1.0.0-beta.221",
-    "@aglyn/shared-ui-json-editor": "1.0.0-beta.221",
-    "@aglyn/shared-ui-jsx": "1.0.0-beta.221",
-    "@aglyn/shared-ui-jsx-forms": "1.0.0-beta.221",
-    "@aglyn/shared-ui-snackstack": "1.0.0-beta.221",
-    "@aglyn/shared-ui-theme": "1.0.0-beta.221",
-    "@aglyn/shared-util-dom": "1.0.0-beta.221",
-    "@aglyn/shared-util-tools": "1.0.0-beta.221",
-    "@aglyn/shared-util-vendor": "1.0.0-beta.221",
+    "@aglyn/aglyn": "1.0.0-beta.222",
+    "@aglyn/aglyn-markdown-editor": "1.0.0-beta.222",
+    "@aglyn/aglyn-node-renderer": "1.0.0-beta.222",
+    "@aglyn/besigner": "1.0.0-beta.222",
+    "@aglyn/shared-data-enums": "1.0.0-beta.222",
+    "@aglyn/shared-data-mdi": "1.0.0-beta.222",
+    "@aglyn/shared-data-types": "1.0.0-beta.222",
+    "@aglyn/shared-svg-icons": "1.0.0-beta.222",
+    "@aglyn/shared-ui-json-editor": "1.0.0-beta.222",
+    "@aglyn/shared-ui-jsx": "1.0.0-beta.222",
+    "@aglyn/shared-ui-jsx-forms": "1.0.0-beta.222",
+    "@aglyn/shared-ui-snackstack": "1.0.0-beta.222",
+    "@aglyn/shared-ui-theme": "1.0.0-beta.222",
+    "@aglyn/shared-util-dom": "1.0.0-beta.222",
+    "@aglyn/shared-util-tools": "1.0.0-beta.222",
+    "@aglyn/shared-util-vendor": "1.0.0-beta.222",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/utilities": "^3.2.2",
     "@react-aria/utils": "^3.34.1",

package/src/lib/components/element-props-form.component.d.ts

@@ -440,21 +440,22 @@ export declare function buildRepeatFields(options: {
     resolveKeyField: (field: Record<string, unknown>) => Record<string, unknown>;
 }): Array<Record<string, unknown>>;
 /**
- * The list each entity picker DISPLAYS, keyed by the attribute type a
- * component schema declares.
- *
- * One table rather than two switches, because the demand signal and the
- * option list have to agree about which list a picker means. When they
- * disagreed the failure was silent and total: the panel would open a
- * listener on one collection and read its options out of another, and the
- * dropdown stayed empty on a site full of data.
- *
- * `DATASET_FIELD_SELECT` is deliberately absent. Its options are the model
- * fields of the dataset an ANCESTOR chose, so it needs the dataset list to
- * resolve against but is not itself a picker OF datasets — it asks for the
- * list below and renders its own options.
+ * The kind of entity an attribute type's picker DISPLAYS, or `undefined` for
+ * an attribute that is no picker.
+ *
+ * Read from the kinds the plugins declare (`plugin-entity-pickers`), the one
+ * table the provider reads too, because the demand signal and the option list
+ * have to agree about which list a picker means. When they disagreed the
+ * failure was silent and total: the panel would open a listener on one
+ * collection and read its options out of another, and the dropdown stayed
+ * empty on a site full of data.
+ *
+ * A field attribute — `DATASET_FIELD_SELECT` — is deliberately not a picker
+ * of its kind. Its options are the fields of the entity an ANCESTOR chose, so
+ * it needs that kind's list to resolve against but is not itself a picker OF
+ * it — it asks for the list below and renders its own options.
  */
-export declare const ENTITY_PICKER_KINDS: Readonly<Partial<Record<Aglyn.FieldComponentType, Aglyn.EntityPickerKind>>>;
+export declare function entityPickerKindOf(component: string | undefined): Aglyn.EntityPickerKind | undefined;
 /**
  * The label on an entity picker's empty first option.
  *
@@ -561,14 +562,14 @@ export declare function buildEntityPickerField<T extends Aglyn.AglynAttributeSch
  * editing sessions never open. This is the demand signal that replaced that:
  * a node whose schema declares the picker.
  *
- * `DATASET_FIELD_SELECT` asks for `datasets` and not for some list of its
- * own, which is the one mapping worth stating: its options are the model
- * fields of the dataset an ANCESTOR chose, so it cannot resolve one without
- * the dataset list to resolve it against.
+ * A field attribute (`DATASET_FIELD_SELECT`) asks for the kind whose fields it
+ * offers and not for some list of its own, which is the one mapping worth
+ * stating: its options are the fields of the entity an ANCESTOR chose, so it
+ * cannot resolve one without that kind's list to resolve it against.
  *
  * Exported for the test that pins the mapping — a picker silently missing
- * from {@link ENTITY_PICKER_KINDS} renders as a permanently empty dropdown,
- * which looks exactly like a site with no products.
+ * from the declarations renders as a permanently empty dropdown, which looks
+ * exactly like a site with no products.
  */
 export declare function entityKindsForAttributes(attributes: readonly Aglyn.AglynAttributeSchema[] | undefined): Aglyn.EntityPickerKind[];
 export declare const ElementPropsForm: import("react").ForwardRefExoticComponent<ElementPropsFormProps & import("react").RefAttributes<any>> & import("react").NamedExoticComponent<ElementPropsFormProps & import("react").RefAttributes<any>> & {

package/src/lib/components/element-props-form.component.js

@@ -17,11 +17,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ import PluginSettingsField, { PLUGIN_SETTINGS_FIELD_COMPONENT } from "./plugin-settings-field.component.js";
-import { ANIMATION_DEFAULT_DELAY_MS, ANIMATION_DEFAULT_DURATION_MS, ANIMATION_DEFAULT_EASE, ANIMATION_DEFAULT_STAGGER_STEP_MS, ANIMATION_DEFAULT_TRIGGER, ANIMATION_MAX_DURATION_MS, ANIMATION_MAX_STAGGER_STEP_MS, ANIMATION_NONE, ANIMATION_PRESETS, canvas, COMPONENT_PROP_NAME_PATTERN, components, displayBindingTokens, ENTITY_PICKER_BROWSE_LIMIT, entityListState, EntityPickerContext, entityValueNeedsResolution, FEATURE_FLAG, FieldComponentType, getKnownPluginInstalls, getKnownPluginInstallsVersion, hasBindings, inheritedMediaAlt, intrinsicMediaSize, linkTargetKind, VIDEO_COMPONENT_ID, videoMediaProps, MISSING_BINDING_LABEL, NODE_ANIMATION_DELAY_PROP, NODE_ANIMATION_DURATION_PROP, NODE_ANIMATION_EASE_PROP, NODE_ANIMATION_PROP, NODE_ANIMATION_REPEAT_PROP, NODE_ANIMATION_STAGGER_PROP, NODE_ANIMATION_STAGGER_STEP_PROP, NODE_ANIMATION_TRIGGER_PROP, NODE_HIDE_IF_PROP, isPlacedFormNode, NODE_HIDE_UNLESS_PROP, normalizeBindingTokens, readInstanceIconValue, readReusablePropValue, readYesNoValue, reusablePropConditionValue, reusablePropDefaultValue, reusablePropKind, reusablePropTakesSeveral, evaluateReusablePropRule, REUSABLE_INSTANCE_COMPONENT_ID, REUSABLE_INSTANCE_PROP_VALUES_KEY, ScreenLinkContext, screenLinkTargetOptions, subscribeKnownPluginInstalls, unresolvedScreenOption } from "@aglyn/aglyn";
+import { ANIMATION_DEFAULT_DELAY_MS, ANIMATION_DEFAULT_DURATION_MS, ANIMATION_DEFAULT_EASE, ANIMATION_DEFAULT_STAGGER_STEP_MS, ANIMATION_DEFAULT_TRIGGER, ANIMATION_MAX_DURATION_MS, ANIMATION_MAX_STAGGER_STEP_MS, ANIMATION_NONE, ANIMATION_PRESETS, canvas, COMPONENT_PROP_NAME_PATTERN, components, displayBindingTokens, ENTITY_PICKER_BROWSE_LIMIT, entityListState, EntityPickerContext, entityValueNeedsResolution, FEATURE_FLAG, FieldComponentType, getKnownPluginInstalls, getKnownPluginInstallsVersion, hasBindings, inheritedMediaAlt, intrinsicMediaSize, linkTargetKind, VIDEO_COMPONENT_ID, videoMediaProps, MISSING_BINDING_LABEL, NODE_ANIMATION_DELAY_PROP, NODE_ANIMATION_DURATION_PROP, NODE_ANIMATION_EASE_PROP, NODE_ANIMATION_PROP, NODE_ANIMATION_REPEAT_PROP, NODE_ANIMATION_STAGGER_PROP, NODE_ANIMATION_STAGGER_STEP_PROP, NODE_ANIMATION_TRIGGER_PROP, NODE_HIDE_IF_PROP, isPlacedFormNode, formPropsOnBind, FORM_COMPONENT_ID, NODE_HIDE_UNLESS_PROP, normalizeBindingTokens, readInstanceIconValue, readReusablePropValue, readYesNoValue, reusablePropConditionValue, reusablePropDefaultValue, reusablePropKind, reusablePropTakesSeveral, evaluateReusablePropRule, REUSABLE_INSTANCE_COMPONENT_ID, REUSABLE_INSTANCE_PROP_VALUES_KEY, ScreenLinkContext, screenLinkTargetOptions, subscribeKnownPluginInstalls, unresolvedScreenOption } from "@aglyn/aglyn";
 // By path, not the `@aglyn/aglyn` barrel: a repeat's bounds and the sources
 // an editor offers are editor business, and a published page must not pull
 // either in behind them.
 import { repeatScope } from "@aglyn/aglyn/app-utils/expand-repeatables";
+import { entityFieldsPickerForAttribute, entityPickerForAttribute, pluginEntityPicker } from "@aglyn/aglyn/plugin-manager/plugin-entity-pickers";
 import { REPEAT_NODE_CAPABILITY } from "@aglyn/aglyn/app-utils/node-capabilities";
 import { repeatSourceOf } from "@aglyn/aglyn/app-utils/repeat-sources";
 import { useAglynSiteTheme } from "@aglyn/aglyn-node-renderer";
@@ -798,12 +799,13 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
     }
     if (field.component === FieldComponentType.DATASET_FIELD_SELECT) {
         var _ref;
-        var _entityOptions_entityFields_datasets, _entityOptions_entityFields;
+        var _entityFieldsPickerForAttribute, _entityOptions_entityFields_fieldsKind, _entityOptions_entityFields;
         // Declared order, never alphabetized — it mirrors the schema dialog. A
         // field naming its own dataset (a Dataset field property) reads that
         // one; every other reads the nearest ancestor's.
         const boundId = typeof field['datasetId'] === 'string' && field['datasetId'] ? field['datasetId'] : ancestorDatasetId;
-        const modelFields = boundId ? (_ref = (_entityOptions_entityFields = entityOptions.entityFields) == null ? void 0 : (_entityOptions_entityFields_datasets = _entityOptions_entityFields.datasets) == null ? void 0 : _entityOptions_entityFields_datasets[boundId]) != null ? _ref : [] : [];
+        const fieldsKind = (_entityFieldsPickerForAttribute = entityFieldsPickerForAttribute(field.component)) == null ? void 0 : _entityFieldsPickerForAttribute.kind;
+        const modelFields = boundId && fieldsKind ? (_ref = (_entityOptions_entityFields = entityOptions.entityFields) == null ? void 0 : (_entityOptions_entityFields_fieldsKind = _entityOptions_entityFields[fieldsKind]) == null ? void 0 : _entityOptions_entityFields_fieldsKind[boundId]) != null ? _ref : [] : [];
         return _extends({}, field, {
             component: FieldComponentType.SELECT,
             options: [
@@ -824,7 +826,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
     // of one that is not there. The stored value travels with the field: a
     // selection outside the browse window is offered from its own keyed read,
     // so a bound element never renders as unbound.
-    const entityKind = ENTITY_PICKER_KINDS[field.component];
+    const entityKind = entityPickerKindOf(field.component);
     if (entityKind) {
         return buildEntityPickerField(field, entityKind, entityOptions, stored);
     }
@@ -1270,53 +1272,35 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
     ];
 }
 /**
- * The list each entity picker DISPLAYS, keyed by the attribute type a
- * component schema declares.
+ * The kind of entity an attribute type's picker DISPLAYS, or `undefined` for
+ * an attribute that is no picker.
  *
- * One table rather than two switches, because the demand signal and the
- * option list have to agree about which list a picker means. When they
- * disagreed the failure was silent and total: the panel would open a
- * listener on one collection and read its options out of another, and the
- * dropdown stayed empty on a site full of data.
+ * Read from the kinds the plugins declare (`plugin-entity-pickers`), the one
+ * table the provider reads too, because the demand signal and the option list
+ * have to agree about which list a picker means. When they disagreed the
+ * failure was silent and total: the panel would open a listener on one
+ * collection and read its options out of another, and the dropdown stayed
+ * empty on a site full of data.
  *
- * `DATASET_FIELD_SELECT` is deliberately absent. Its options are the model
- * fields of the dataset an ANCESTOR chose, so it needs the dataset list to
- * resolve against but is not itself a picker OF datasets — it asks for the
- * list below and renders its own options.
- */ export const ENTITY_PICKER_KINDS = {
-    [FieldComponentType.PRODUCT_SELECT]: 'products',
-    [FieldComponentType.COLLECTION_SELECT]: 'collections',
-    [FieldComponentType.CATEGORY_SELECT]: 'categories',
-    [FieldComponentType.DATASET_SELECT]: 'datasets',
-    [FieldComponentType.FORM_SELECT]: 'forms'
-};
-/** Where an author makes more of each kind, named in the empty picker. */ const ENTITY_PICKER_ORIGIN = {
-    products: {
-        singular: 'product',
-        plural: 'products',
-        page: 'the Products page'
-    },
-    collections: {
-        singular: 'collection',
-        plural: 'collections',
-        page: 'the Collections page'
-    },
-    categories: {
-        singular: 'category',
-        plural: 'categories',
-        page: 'the Categories page'
-    },
-    datasets: {
-        singular: 'dataset',
-        plural: 'datasets',
-        page: 'the Data page'
-    },
-    forms: {
-        singular: 'form',
-        plural: 'forms',
-        page: 'the Forms page'
-    }
-};
+ * A field attribute — `DATASET_FIELD_SELECT` — is deliberately not a picker
+ * of its kind. Its options are the fields of the entity an ANCESTOR chose, so
+ * it needs that kind's list to resolve against but is not itself a picker OF
+ * it — it asks for the list below and renders its own options.
+ */ export function entityPickerKindOf(component) {
+    var _entityPickerForAttribute;
+    return (_entityPickerForAttribute = entityPickerForAttribute(component)) == null ? void 0 : _entityPickerForAttribute.kind;
+}
+/**
+ * Where an author makes more of a kind, named in the empty picker — the words
+ * its plugin declares, or the kind itself for one no plugin here declares.
+ */ function entityPickerWords(kind) {
+    const declared = pluginEntityPicker(kind);
+    return declared != null ? declared : {
+        singular: kind,
+        plural: kind,
+        page: 'its page'
+    };
+}
 /**
  * The label on an entity picker's empty first option.
  *
@@ -1326,7 +1310,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  * settled one claims anything about the site.
  */ export function entityPickerPlaceholder(kind, state, count) {
     if (count > 0) return 'None';
-    const { plural, page } = ENTITY_PICKER_ORIGIN[kind];
+    const { plural, page } = entityPickerWords(kind);
     switch(state){
         case 'error':
             return `Could not load ${plural} — reopen this panel to try again`;
@@ -1354,7 +1338,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  */ export function entityPickerBrowseNotice(kind, context) {
     var _context_truncated, _context_searchable;
     if (!(context == null ? void 0 : (_context_truncated = context.truncated) == null ? void 0 : _context_truncated[kind])) return undefined;
-    const { plural } = ENTITY_PICKER_ORIGIN[kind];
+    const { plural } = entityPickerWords(kind);
     const first = `Showing the first ${ENTITY_PICKER_BROWSE_LIMIT} ${plural} — this site has more. `;
     return ((_context_searchable = context.searchable) == null ? void 0 : _context_searchable[kind]) ? `${first}Type to search all of them.` : `${first}Typing narrows these ${ENTITY_PICKER_BROWSE_LIMIT} only.`;
 }
@@ -1367,7 +1351,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  * and makes a second one.
  */ export function entityPickerNoMatchText(kind, context) {
     var _context_truncated, _context_searchable;
-    const { plural } = ENTITY_PICKER_ORIGIN[kind];
+    const { plural } = entityPickerWords(kind);
     if ((context == null ? void 0 : (_context_truncated = context.truncated) == null ? void 0 : _context_truncated[kind]) && !(context == null ? void 0 : (_context_searchable = context.searchable) == null ? void 0 : _context_searchable[kind])) {
         return `No match in the first ${ENTITY_PICKER_BROWSE_LIMIT} ${plural} — this site has more.`;
     }
@@ -1396,10 +1380,10 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  * a free-text caption stored where an id belongs looks like.
  */ export function entitySelectionOption(context, kind, value) {
     var _ref;
-    var _context_resolved_kind, _context_resolved;
+    var _context_options, _context_resolved_kind, _context_resolved;
     const id = typeof value === 'string' ? value.trim() : '';
     if (!id) return undefined;
-    if (((_ref = context == null ? void 0 : context[kind]) != null ? _ref : []).some((entity)=>entity.id === id)) {
+    if (((_ref = context == null ? void 0 : (_context_options = context.options) == null ? void 0 : _context_options[kind]) != null ? _ref : []).some((entity)=>entity.id === id)) {
         return undefined;
     }
     const resolved = context == null ? void 0 : (_context_resolved = context.resolved) == null ? void 0 : (_context_resolved_kind = _context_resolved[kind]) == null ? void 0 : _context_resolved_kind[id];
@@ -1407,7 +1391,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
         value: id,
         label: resolved.label
     };
-    const { singular } = ENTITY_PICKER_ORIGIN[kind];
+    const { singular } = entityPickerWords(kind);
     if (resolved === null) {
         return {
             value: id,
@@ -1447,7 +1431,8 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  * selection is a keyed read; this is where its answer is offered.
  */ export function buildEntityPickerField(field, kind, context, value) {
     var _ref;
-    const entities = (_ref = context == null ? void 0 : context[kind]) != null ? _ref : [];
+    var _context_options;
+    const entities = (_ref = context == null ? void 0 : (_context_options = context.options) == null ? void 0 : _context_options[kind]) != null ? _ref : [];
     const selected = entitySelectionOption(context, kind, value);
     const notice = entityPickerBrowseNotice(kind, context);
     const search = context == null ? void 0 : context.search;
@@ -1506,22 +1491,20 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
  * editing sessions never open. This is the demand signal that replaced that:
  * a node whose schema declares the picker.
  *
- * `DATASET_FIELD_SELECT` asks for `datasets` and not for some list of its
- * own, which is the one mapping worth stating: its options are the model
- * fields of the dataset an ANCESTOR chose, so it cannot resolve one without
- * the dataset list to resolve it against.
+ * A field attribute (`DATASET_FIELD_SELECT`) asks for the kind whose fields it
+ * offers and not for some list of its own, which is the one mapping worth
+ * stating: its options are the fields of the entity an ANCESTOR chose, so it
+ * cannot resolve one without that kind's list to resolve it against.
  *
  * Exported for the test that pins the mapping — a picker silently missing
- * from {@link ENTITY_PICKER_KINDS} renders as a permanently empty dropdown,
- * which looks exactly like a site with no products.
+ * from the declarations renders as a permanently empty dropdown, which looks
+ * exactly like a site with no products.
  */ export function entityKindsForAttributes(attributes) {
     const kinds = new Set();
     for (const field of attributes != null ? attributes : []){
-        if (field.component === FieldComponentType.DATASET_FIELD_SELECT) {
-            kinds.add('datasets');
-            continue;
-        }
-        const kind = ENTITY_PICKER_KINDS[field.component];
+        var _entityPickerKindOf;
+        var _entityFieldsPickerForAttribute;
+        const kind = (_entityPickerKindOf = entityPickerKindOf(field.component)) != null ? _entityPickerKindOf : (_entityFieldsPickerForAttribute = entityFieldsPickerForAttribute(field.component)) == null ? void 0 : _entityFieldsPickerForAttribute.kind;
         if (kind) kinds.add(kind);
     }
     return [
@@ -1530,7 +1513,7 @@ export const elementPropsComponentMapper = _extends({}, simpleComponentMapper, {
 }
 const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
     var _ref, _ref1, _interactions_automations, _interactions_sectionExperiments;
-    var _schema_flags, _shownNode_props;
+    var _entityFieldsPickerForAttribute, _entityOptions_options, _schema_flags, _shownNode_props;
     const { node } = props, rest = _object_without_properties_loose(props, [
         "node"
     ]);
@@ -1612,7 +1595,7 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
     useEffect(()=>{
         if (!resolveEntity) return;
         for (const field of demandAttributes){
-            const kind = ENTITY_PICKER_KINDS[field.component];
+            const kind = entityPickerKindOf(field.component);
             if (!kind) continue;
             const id = entityValueNeedsResolution(entityOptions, kind, readAttributeFieldValue(nodeProps, field.name));
             if (id) resolveEntity(kind, id);
@@ -1637,7 +1620,7 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
         const repeat = repeatSourceOf({
             props: nodeProps
         });
-        const kind = repeat && ENTITY_PICKER_KINDS[repeat.source.keyAttribute.component];
+        const kind = repeat && entityPickerKindOf(repeat.source.keyAttribute.component);
         if (!kind) return;
         const id = entityValueNeedsResolution(entityOptions, kind, repeat == null ? void 0 : repeat.key);
         if (id) resolveEntity(kind, id);
@@ -1675,6 +1658,9 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
     // ancestor persists the dataset id; legacy nodes carrying only a name
     // resolve it by matching the current display labels.
     const hasDatasetFieldSelect = demandAttributes.some((field)=>field.component === FieldComponentType.DATASET_FIELD_SELECT);
+    // The kind those fields come from, whose list a legacy name is matched in.
+    const fieldsKind = (_entityFieldsPickerForAttribute = entityFieldsPickerForAttribute(FieldComponentType.DATASET_FIELD_SELECT)) == null ? void 0 : _entityFieldsPickerForAttribute.kind;
+    const fieldsKindOptions = fieldsKind ? (_entityOptions_options = entityOptions.options) == null ? void 0 : _entityOptions_options[fieldsKind] : undefined;
     const ancestorDatasetId = useMemo(()=>{
         if (!hasDatasetFieldSelect || !(node == null ? void 0 : node.$id)) return undefined;
         const nodes = canvas.toJSON().nodes;
@@ -1686,8 +1672,7 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
                 return props.datasetId;
             }
             if (typeof props.datasetName === 'string' && props.datasetName) {
-                var _entityOptions_datasets;
-                const byLabel = ((_entityOptions_datasets = entityOptions.datasets) != null ? _entityOptions_datasets : []).find((dataset)=>dataset.label === props.datasetName);
+                const byLabel = (fieldsKindOptions != null ? fieldsKindOptions : []).find((dataset)=>dataset.label === props.datasetName);
                 if (byLabel) return byLabel.id;
             }
             current = current.parentId ? nodes[current.parentId] : undefined;
@@ -1697,7 +1682,7 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
     }, [
         hasDatasetFieldSelect,
         node,
-        entityOptions.datasets
+        fieldsKindOptions
     ]);
     // Insert-picker options + pill display-name inputs (AGL-583/586),
     // assembled from this node's ancestor context — shared with the
@@ -1888,7 +1873,7 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
         // The key as an author knows it, when the source's control is a picker
         // that can name it. A source drawn with anything else — and a picker
         // whose list has not answered — is named by the stored key itself.
-        const kind = ENTITY_PICKER_KINDS[repeat.source.keyAttribute.component];
+        const kind = entityPickerKindOf(repeat.source.keyAttribute.component);
         const label = (_ref = kind ? (_entitySelectionOption = entitySelectionOption(entityOptions, kind, repeat.key)) == null ? void 0 : _entitySelectionOption.label : undefined) != null ? _ref : repeat.key;
         return repeatScope({
             props: nodeProps,
@@ -2202,7 +2187,10 @@ const ElementPropsFormRaw = /*#__PURE__*/ forwardRef((props, ref)=>{
         // Denormalize each picked icon's SVG path next to its id (AGL-1212) —
         // see `iconPathsForSave` for why a miss does not always clear it.
         Object.assign(normalized, iconPathsForSave(node == null ? void 0 : (_node_componentSchema = node.componentSchema) == null ? void 0 : _node_componentSchema.attributes, normalized, node == null ? void 0 : node.props));
-        canvas.updateNodeProps(node, normalized);
+        // Picking a saved form drops what the page's form node started with
+        // (AGL-3494) — a preset's button text kept here would mask the form's
+        // own for good. See `formPropsOnBind`.
+        canvas.updateNodeProps(node, (node == null ? void 0 : node.componentId) === FORM_COMPONENT_ID ? formPropsOnBind(node == null ? void 0 : node.props, normalized) : normalized);
     }, [
         node,
         bindingVariables,