@genesislcap/foundation-forms 15.22.2 → 15.23.1-alpha-b23a0275e.0

package/dist/custom-elements.json

@@ -3024,6 +3024,37 @@
       "kind": "javascript-module",
       "path": "src/jsonforms/renderers/ConnectedSelectControlRenderer.ts",
       "declarations": [
+        {
+          "kind": "function",
+          "name": "shouldReuseDisplayedValue",
+          "return": {
+            "type": {
+              "text": "boolean"
+            }
+          },
+          "parameters": [
+            {
+              "name": "currentValue",
+              "type": {
+                "text": "unknown"
+              }
+            },
+            {
+              "name": "previousRawValue",
+              "type": {
+                "text": "unknown"
+              }
+            },
+            {
+              "name": "displayedValue",
+              "type": {
+                "text": "string | undefined"
+              }
+            }
+          ],
+          "description": "Whether a freshly recomputed fallback should be discarded in favour of whatever the\ncombobox is already displaying.",
+          "privacy": "public"
+        },
         {
           "kind": "function",
           "name": "ConnectedSelectControlRendererTemplate",
@@ -3047,6 +3078,14 @@
         }
       ],
       "exports": [
+        {
+          "kind": "js",
+          "name": "shouldReuseDisplayedValue",
+          "declaration": {
+            "name": "shouldReuseDisplayedValue",
+            "module": "src/jsonforms/renderers/ConnectedSelectControlRenderer.ts"
+          }
+        },
         {
           "kind": "js",
           "name": "ConnectedSelectControlRendererTemplate",

package/dist/dts/jsonforms/renderers/ConnectedSelectControlRenderer.d.ts

@@ -1,4 +1,15 @@
 import { DispatchRenderer } from './dispatch-renderer';
+/**
+ * Whether a freshly recomputed fallback should be discarded in favour of whatever the
+ * combobox is already displaying.
+ * @remarks
+ * True only when the raw stored value hasn't changed since we last computed a value for
+ * this control *and* the combobox currently has something displayed - i.e. this is a
+ * re-render triggered by an unrelated field elsewhere in the form, not a genuine change to
+ * this control's own value.
+ * @public exported for testing
+ */
+export declare const shouldReuseDisplayedValue: (currentValue: unknown, previousRawValue: unknown, displayedValue: string | undefined) => boolean;
 export declare const ConnectedSelectControlRendererTemplate: (prefix?: string) => import("@microsoft/fast-element").ViewTemplate<DispatchRenderer, any>;
 export declare const ConnectedSelectControlRendererEntry: any;
 //# sourceMappingURL=ConnectedSelectControlRenderer.d.ts.map

package/dist/dts/jsonforms/renderers/ConnectedSelectControlRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectedSelectControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ConnectedSelectControlRenderer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAmBvD,eAAO,MAAM,sCAAsC,GACjD,SAAQ,MAAe,0EA6CxB,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,GAMjD,CAAC"}
+{"version":3,"file":"ConnectedSelectControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/ConnectedSelectControlRenderer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAKvD;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,GACpC,cAAc,OAAO,EACrB,kBAAkB,OAAO,EACzB,gBAAgB,MAAM,GAAG,SAAS,KACjC,OAAgE,CAAC;AAsCpE,eAAO,MAAM,sCAAsC,GACjD,SAAQ,MAAe,0EA6CxB,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,GAMjD,CAAC"}

package/dist/esm/jsonforms/renderers/ConnectedSelectControlRenderer.js

@@ -6,6 +6,18 @@ import { optionIs } from '../testers/optionIs';
 import { controlWrapperTemplate } from './ControlWrapperRenderer';
 import { SELECT_CONTROL_RANK } from './RenderersRanks';
 OptionsDatasource;
+/**
+ * Whether a freshly recomputed fallback should be discarded in favour of whatever the
+ * combobox is already displaying.
+ * @remarks
+ * True only when the raw stored value hasn't changed since we last computed a value for
+ * this control *and* the combobox currently has something displayed - i.e. this is a
+ * re-render triggered by an unrelated field elsewhere in the form, not a genuine change to
+ * this control's own value.
+ * @public exported for testing
+ */
+export const shouldReuseDisplayedValue = (currentValue, previousRawValue, displayedValue) => previousRawValue === currentValue && !!displayedValue;
+const lastRawValueByRenderer = new WeakMap();
 /**
  * Gets the display value for the connected select control
  * @param dispatchRenderer - The dispatch renderer instance
@@ -16,9 +28,25 @@ const getConnectedSelectDisplayValue = (dispatchRenderer) => {
     const currentValue = dispatchRenderer.control.data;
     if (!currentValue)
         return '';
-    const options = ((_a = dispatchRenderer.control.uischema.options) === null || _a === void 0 ? void 0 : _a.data) || [];
-    const option = options.find((opt) => opt.value === currentValue);
-    return String((option === null || option === void 0 ? void 0 : option.label) || currentValue);
+    const options = (_a = dispatchRenderer.control.uischema.options) === null || _a === void 0 ? void 0 : _a.data;
+    if (options) {
+        const option = options.find((opt) => opt.value === currentValue);
+        return String((option === null || option === void 0 ? void 0 : option.label) || currentValue);
+    }
+    // No static option list (e.g. allOptionsResourceName-backed controls): the sibling
+    // <options-datasource> resolves the display label asynchronously once its data loads
+    // (see OptionsDatasource.syncComponentData, which sets the combobox's value directly).
+    // This binding re-evaluates on every unrelated form field change - any JSONForms dispatch
+    // replaces `control` with a new object - which would otherwise stomp that resolved label
+    // back to the raw stored value on every such re-render, since nothing here previously
+    // guarded against it.
+    const previousRawValue = lastRawValueByRenderer.get(dispatchRenderer);
+    const combobox = dispatchRenderer.querySelector(`#${CSS.escape(dispatchRenderer.control.path)}`);
+    if (shouldReuseDisplayedValue(currentValue, previousRawValue, combobox === null || combobox === void 0 ? void 0 : combobox.value)) {
+        return combobox.value;
+    }
+    lastRawValueByRenderer.set(dispatchRenderer, currentValue);
+    return String(currentValue);
 };
 export const ConnectedSelectControlRendererTemplate = (prefix = 'zero') => html `
   <template>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "15.22.2",
+  "version": "15.23.1-alpha-b23a0275e.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -59,13 +59,13 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "15.22.2",
-    "@genesislcap/genx": "15.22.2",
-    "@genesislcap/rollup-builder": "15.22.2",
-    "@genesislcap/ts-builder": "15.22.2",
-    "@genesislcap/uvu-playwright-builder": "15.22.2",
-    "@genesislcap/vite-builder": "15.22.2",
-    "@genesislcap/webpack-builder": "15.22.2",
+    "@genesislcap/foundation-testing": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/genx": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/rollup-builder": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/ts-builder": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/uvu-playwright-builder": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/vite-builder": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/webpack-builder": "15.23.1-alpha-b23a0275e.0",
     "@types/json-schema": "^7.0.11",
     "@types/papaparse": "^5.3.14"
   },
@@ -82,12 +82,12 @@
     }
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "15.22.2",
-    "@genesislcap/foundation-criteria": "15.22.2",
-    "@genesislcap/foundation-logger": "15.22.2",
-    "@genesislcap/foundation-notifications": "15.22.2",
-    "@genesislcap/foundation-ui": "15.22.2",
-    "@genesislcap/foundation-utils": "15.22.2",
+    "@genesislcap/foundation-comms": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/foundation-criteria": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/foundation-logger": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/foundation-notifications": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/foundation-ui": "15.23.1-alpha-b23a0275e.0",
+    "@genesislcap/foundation-utils": "15.23.1-alpha-b23a0275e.0",
     "@json-schema-tools/dereferencer": "^1.6.1",
     "@jsonforms/core": "^3.2.1",
     "@microsoft/fast-components": "2.30.6",