@genesislcap/foundation-ui 15.22.0 → 15.22.1-FUI-0.5

package/dist/dts/options-datasource/options-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options-datasource.d.ts","sourceRoot":"","sources":["../../../src/options-datasource/options-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,+BAA+B,CAAC;AAY/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EACL,cAAc,EAKf,MAAM,UAAU,CAAC;AAElB;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,qBAGa,iBAAkB,SAAQ,cAAc;IACjC,SAAS,EAAG,gBAAgB,CAAC;IAEX,UAAU,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAyB;IAC1B,kBAAkB,UAAS;IAEzF;;;;;;;;;;;;OAYG;IACsD,cAAc,UAAS;IAEhF;;OAEG;IAEH,QAAQ,SAAqC;IACjC,cAAc,MAAC;IACf,iBAAiB,EAAE,CAAC,GAAG,KAAA,KAAK,MAAM,CAAC;IAEnC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAClD,2BAA2B,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IAY9C,8BAA8B,EAAE,OAAO,CAAS;IAEhD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAQ;IAElC,SAAS,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAM;IAEjC,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAM;IAC7C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAM;IACnD,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,oBAAoB,CAAK;IACjC,OAAO,CAAC,qBAAqB,CAAM;IACnC,OAAO,CAAC,eAAe,CAAkC;IAEnD,iBAAiB;IAgCvB,oBAAoB;IAYpB;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB,CAM7B;IAEF;;;;OAIG;YACW,4BAA4B;IAU1C,OAAO,CAAC,2BAA2B;IAmBnC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,oBAAoB,CAO1B;YAEY,YAAY;IAoB1B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,sBAAsB,CAI5B;IAEF,mBAAmB,GAAI,MAAC,UAQtB;IAEF,SAAS;IAcH,sBAAsB;IAa5B,SAAS,IAAI,IAAI;IAmBjB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,qBAAqB;IAO7B,iBAAiB,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE;IA6DtC,eAAe;IAIf,OAAO,CAAC,kBAAkB;IAS1B,aAAa;IAMb;;;OAGG;IACH,mBAAmB,CAAC,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI;IA4B9C;;;;;;OAMG;IACH,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,IAAI;IAI7C;;;OAGG;IACH,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,IAAI;CAG9C"}
+{"version":3,"file":"options-datasource.d.ts","sourceRoot":"","sources":["../../../src/options-datasource/options-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,+BAA+B,CAAC;AAY/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EACL,cAAc,EAKf,MAAM,UAAU,CAAC;AAElB;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,qBAGa,iBAAkB,SAAQ,cAAc;IACjC,SAAS,EAAG,gBAAgB,CAAC;IAEX,UAAU,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAyB;IAC1B,kBAAkB,UAAS;IAEzF;;;;;;;;;;;;OAYG;IACsD,cAAc,UAAS;IAEhF;;OAEG;IAEH,QAAQ,SAAqC;IACjC,cAAc,MAAC;IACf,iBAAiB,EAAE,CAAC,GAAG,KAAA,KAAK,MAAM,CAAC;IAEnC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAClD,2BAA2B,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA;IA4B9C,8BAA8B,EAAE,OAAO,CAAS;IAEhD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAQ;IAElC,SAAS,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAM;IAEjC,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAM;IAC7C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAM;IACnD,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,oBAAoB,CAAK;IACjC,OAAO,CAAC,qBAAqB,CAAM;IACnC,OAAO,CAAC,eAAe,CAAkC;IAEnD,iBAAiB;IAgCvB,oBAAoB;IAYpB;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB,CAM7B;IAEF;;;;OAIG;YACW,4BAA4B;IAU1C,OAAO,CAAC,2BAA2B;IAmBnC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,oBAAoB,CAO1B;YAEY,YAAY;IAoB1B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,sBAAsB,CAI5B;IAEF,mBAAmB,GAAI,MAAC,UAQtB;IAEF,SAAS;IAcH,sBAAsB;IAe5B,SAAS,IAAI,IAAI;IAmBjB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,qBAAqB;IAO7B,iBAAiB,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE;IA6DtC,eAAe;IAIf,OAAO,CAAC,kBAAkB;IAS1B,aAAa;IAMb;;;OAGG;IACH,mBAAmB,CAAC,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI;IA4B9C;;;;;;OAMG;IACH,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,IAAI;IAI7C;;;OAGG;IACH,mBAAmB,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,IAAI;CAG9C"}

package/dist/dts/react.d.ts

@@ -162,23 +162,23 @@ export declare const AiCriteriaSearch: React.ForwardRefExoticComponent<
 >;
 export type AiCriteriaSearchRef = AiCriteriaSearchWC;
 
-export declare const AiIndicator: React.ForwardRefExoticComponent<
+export declare const Accordion: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
-    Omit<PublicOf<AiIndicatorWC>, 'children' | 'style'> &
+    Omit<PublicOf<AccordionWC>, 'children' | 'style'> &
     HTMLWCProps & {
     }
-  > & React.RefAttributes<AiIndicatorWC>
+  > & React.RefAttributes<AccordionWC>
 >;
-export type AiIndicatorRef = AiIndicatorWC;
+export type AccordionRef = AccordionWC;
 
-export declare const Accordion: React.ForwardRefExoticComponent<
+export declare const AiIndicator: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
-    Omit<PublicOf<AccordionWC>, 'children' | 'style'> &
+    Omit<PublicOf<AiIndicatorWC>, 'children' | 'style'> &
     HTMLWCProps & {
     }
-  > & React.RefAttributes<AccordionWC>
+  > & React.RefAttributes<AiIndicatorWC>
 >;
-export type AccordionRef = AccordionWC;
+export type AiIndicatorRef = AiIndicatorWC;
 
 export declare const Anchor: React.ForwardRefExoticComponent<
   React.PropsWithChildren<

package/dist/dts/utils/options-datasource-utils.d.ts

@@ -1,4 +1,12 @@
 import type { MultiselectDatasource, OptionsDatasource } from '../options-datasource';
 export declare function dataserverCriteriaBuilder(datasource: OptionsDatasource | MultiselectDatasource, value: string | number): void;
+/**
+ * Resolves a known field value (e.g. a bound `initialSelectedValue`) by exact match on
+ * `valueField`, as opposed to {@link dataserverCriteriaBuilder}, which treats `value` as
+ * typed search text and matches it against `labelField`. Using the label-based search to
+ * resolve an initial value only works by coincidence: an id like `"CP123"` will not be found
+ * by searching a `NAME`/label column for that same string.
+ */
+export declare function resolveByValueCriteriaBuilder(datasource: OptionsDatasource | MultiselectDatasource, value: string | number): void;
 export declare function requestServerCriteriaBuilder(datasource: OptionsDatasource | MultiselectDatasource, value: string | number): void;
 //# sourceMappingURL=options-datasource-utils.d.ts.map

package/dist/dts/utils/options-datasource-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options-datasource-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/options-datasource-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEtF,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,iBAAiB,GAAG,qBAAqB,EACrD,KAAK,EAAE,MAAM,GAAG,MAAM,QAgBvB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,iBAAiB,GAAG,qBAAqB,EACrD,KAAK,EAAE,MAAM,GAAG,MAAM,QAOvB"}
+{"version":3,"file":"options-datasource-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/options-datasource-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEtF,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,iBAAiB,GAAG,qBAAqB,EACrD,KAAK,EAAE,MAAM,GAAG,MAAM,QAgBvB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,iBAAiB,GAAG,qBAAqB,EACrD,KAAK,EAAE,MAAM,GAAG,MAAM,QAgBvB;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,iBAAiB,GAAG,qBAAqB,EACrD,KAAK,EAAE,MAAM,GAAG,MAAM,QAOvB"}

package/dist/esm/options-datasource/options-datasource.js

@@ -3,7 +3,7 @@ import { __awaiter, __decorate } from "tslib";
 import { GenesisResources, ResourceType } from '@genesislcap/foundation-comms';
 import { Combobox as FASTComboBox, } from '@microsoft/fast-components';
 import { attr, customElement, DOM, nullableNumberConverter, observable, } from '@microsoft/fast-element';
-import { BaseDatasource, getPrefix, logger, dataserverCriteriaBuilder as criteriaMatchBuilder, } from '../utils';
+import { BaseDatasource, getPrefix, logger, resolveByValueCriteriaBuilder, } from '../utils';
 /**
  * Datasource element for select/combobox option loading.
  * @public
@@ -84,8 +84,24 @@ let OptionsDatasource = OptionsDatasource_1 = class OptionsDatasource extends Ba
         };
     }
     initialSelectedValueChanged(oldValue, newValue) {
-        if (!newValue || newValue === oldValue)
+        if (newValue === oldValue)
             return;
+        if (!newValue) {
+            // The bound value was cleared (e.g. a dependent field like counterparty changed,
+            // clearing the trader that no longer applies) - reset the datasource so the combobox
+            // doesn't keep displaying the previous selection's stale text. clearData() drops the
+            // stale options/rows; resetCombobox() clears the combobox's own selectedIndex/
+            // selectedOptions/value, which slottedOptionsChanged would otherwise re-derive back to
+            // the removed selection once the child-removal mutation is observed. A separate
+            // `request`/`datasourceConfig` change (if any) re-scopes and refetches the option list
+            // on its own via `requestChanged`.
+            if (this.select) {
+                this.initalSelectedValueInitialized = false;
+                this.clearData();
+                this.resetCombobox();
+            }
+            return;
+        }
         // Skip reset when already displaying this value (avoids clearing user selections
         // when parent re-passes the value, e.g. ConnectedSelectControlRenderer)
         if (this.select && this.getDisplayForValue(newValue) === String(this.select.value || '')) {
@@ -247,7 +263,9 @@ let OptionsDatasource = OptionsDatasource_1 = class OptionsDatasource extends Ba
                 });
                 return;
             }
-            criteriaMatchBuilder(this, this.initialSelectedValue);
+            // Resolve by value-field equality, not by searching label text for the raw value —
+            // the two are never the same string except by coincidence (see resolveByValueCriteriaBuilder).
+            resolveByValueCriteriaBuilder(this, this.initialSelectedValue);
         });
     }
     clearData() {

package/dist/esm/utils/options-datasource-utils.js

@@ -14,6 +14,27 @@ export function dataserverCriteriaBuilder(datasource, value) {
         datasource.criteria = criteriaBuilder.build();
     }
 }
+/**
+ * Resolves a known field value (e.g. a bound `initialSelectedValue`) by exact match on
+ * `valueField`, as opposed to {@link dataserverCriteriaBuilder}, which treats `value` as
+ * typed search text and matches it against `labelField`. Using the label-based search to
+ * resolve an initial value only works by coincidence: an id like `"CP123"` will not be found
+ * by searching a `NAME`/label column for that same string.
+ */
+export function resolveByValueCriteriaBuilder(datasource, value) {
+    const criteriaBuilder = new CriteriaBuilder();
+    criteriaBuilder.withExpression(new ExpressionBuilder()
+        .withField(datasource.valueField)
+        .withValue(value)
+        .withSerialiser(Serialisers.equals)
+        .build());
+    if (datasource.baseCriteria) {
+        datasource.criteria = `${datasource.baseCriteria} && ${criteriaBuilder.build()}`;
+    }
+    else {
+        datasource.criteria = criteriaBuilder.build();
+    }
+}
 export function requestServerCriteriaBuilder(datasource, value) {
     var _a;
     const requestFieldName = (_a = datasource.labelField) !== null && _a !== void 0 ? _a : datasource.valueField;

package/dist/react.cjs

@@ -145,14 +145,14 @@ const AiCriteriaSearch = React.forwardRef(function AiCriteriaSearch(props, ref)
   return React.createElement(customElements.getName(AiCriteriaSearchWC) ?? '%%prefix%%-ai-criteria-search', { ...rest, ref: _mergeRefs(_innerRef, ref) }, children);
 });
 
-const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
+const Accordion = React.forwardRef(function Accordion(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
 });
 
-const Accordion = React.forwardRef(function Accordion(props, ref) {
+const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
 });
 
 const Anchor = React.forwardRef(function Anchor(props, ref) {
@@ -1146,8 +1146,8 @@ module.exports = {
   AccordionItem,
   ActionsMenu,
   AiCriteriaSearch,
-  AiIndicator,
   Accordion,
+  AiIndicator,
   Anchor,
   AnchoredRegion,
   Avatar,

package/dist/react.mjs

@@ -143,14 +143,14 @@ export const AiCriteriaSearch = React.forwardRef(function AiCriteriaSearch(props
   return React.createElement(customElements.getName(AiCriteriaSearchWC) ?? '%%prefix%%-ai-criteria-search', { ...rest, ref: _mergeRefs(_innerRef, ref) }, children);
 });
 
-export const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
+export const Accordion = React.forwardRef(function Accordion(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
 });
 
-export const Accordion = React.forwardRef(function Accordion(props, ref) {
+export const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
 });
 
 export const Anchor = React.forwardRef(function Anchor(props, ref) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-ui",
   "description": "Genesis Foundation UI",
-  "version": "15.22.0",
+  "version": "15.22.1-FUI-0.5",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -85,13 +85,13 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "15.22.0",
-    "@genesislcap/genx": "15.22.0",
-    "@genesislcap/rollup-builder": "15.22.0",
-    "@genesislcap/ts-builder": "15.22.0",
-    "@genesislcap/uvu-playwright-builder": "15.22.0",
-    "@genesislcap/vite-builder": "15.22.0",
-    "@genesislcap/webpack-builder": "15.22.0",
+    "@genesislcap/foundation-testing": "15.22.1-FUI-0.5",
+    "@genesislcap/genx": "15.22.1-FUI-0.5",
+    "@genesislcap/rollup-builder": "15.22.1-FUI-0.5",
+    "@genesislcap/ts-builder": "15.22.1-FUI-0.5",
+    "@genesislcap/uvu-playwright-builder": "15.22.1-FUI-0.5",
+    "@genesislcap/vite-builder": "15.22.1-FUI-0.5",
+    "@genesislcap/webpack-builder": "15.22.1-FUI-0.5",
     "copyfiles": "^2.4.1"
   },
   "dependencies": {
@@ -100,16 +100,16 @@
     "@fortawesome/free-regular-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@genesiscommunitysuccess/analyzer-import-alias-plugin": "^5.0.3",
-    "@genesislcap/expression-builder": "15.22.0",
-    "@genesislcap/foundation-ai": "15.22.0",
-    "@genesislcap/foundation-comms": "15.22.0",
-    "@genesislcap/foundation-criteria": "15.22.0",
-    "@genesislcap/foundation-errors": "15.22.0",
-    "@genesislcap/foundation-events": "15.22.0",
-    "@genesislcap/foundation-logger": "15.22.0",
-    "@genesislcap/foundation-notifications": "15.22.0",
-    "@genesislcap/foundation-user": "15.22.0",
-    "@genesislcap/foundation-utils": "15.22.0",
+    "@genesislcap/expression-builder": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-ai": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-comms": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-criteria": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-errors": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-events": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-logger": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-notifications": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-user": "15.22.1-FUI-0.5",
+    "@genesislcap/foundation-utils": "15.22.1-FUI-0.5",
     "@microsoft/fast-colors": "5.3.1",
     "@microsoft/fast-components": "2.30.6",
     "@microsoft/fast-element": "1.14.0",