@genesislcap/foundation-ui 15.45.0 → 15.46.0-canary.17

package/dist/dts/number-field/number-field.d.ts

@@ -28,7 +28,17 @@ export declare class NumberField extends NumberField_base {
     stepUp(): void;
     stepDown(): void;
     hasSeparatorWithoutDecimals(): RegExp;
+    /**
+     * Writes text the user is editing back to the control, keeping the caret next to the same
+     * value characters instead of letting the assignment move it to the end.
+     */
+    private writeControlValue;
     private restoreControlToCommittedValue;
+    /**
+     * Backspace/Delete next to a group separator would only delete the separator, which
+     * reformatting puts straight back. Step the caret over it so the key deletes the digit.
+     */
+    private skipGroupSeparator;
     handleKeyDown(e: KeyboardEvent): boolean;
     handleTextInput(): void;
     valueChanged(previous: any, next: any): void;

package/dist/dts/number-field/number-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"number-field.d.ts","sourceRoot":"","sources":["../../../src/number-field/number-field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;AAqBrE;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,gBAA2B;IACpD,YAAY,EAAE,MAAM,CAAS;IACnC,OAAO,CAAC,mBAAmB;IAKA,QAAQ,EAAE,OAAO,CAAS;IAQrD,KAAK,EAAE,MAAM,CAAM;IACQ,cAAc,EAAE,OAAO,CAAS;IACrD,MAAM,EAAE,MAAM,CAAW;IACJ,iBAAiB,EAAE,OAAO,CAAS;IACxD,qBAAqB,EAAE,MAAM,CAAuB;IAE1D,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAG/B;IAEF,MAAM,IAAI,IAAI;IAuCd,QAAQ,IAAI,IAAI;IA0ChB,2BAA2B;IAK3B,OAAO,CAAC,8BAA8B;IAetC,aAAa,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;IAOxC,eAAe,IAAI,IAAI;IA+DvB,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAsC5C,UAAU,IAAI,IAAI;CA4BnB;AAED,eAAO,MAAM,kCAAkC,EAAE,cAGhD,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;CAWpC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,oTAMhC,CAAC"}
+{"version":3,"file":"number-field.d.ts","sourceRoot":"","sources":["../../../src/number-field/number-field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;AAuBrE;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,gBAA2B;IACpD,YAAY,EAAE,MAAM,CAAS;IACnC,OAAO,CAAC,mBAAmB;IAKA,QAAQ,EAAE,OAAO,CAAS;IAQrD,KAAK,EAAE,MAAM,CAAM;IACQ,cAAc,EAAE,OAAO,CAAS;IACrD,MAAM,EAAE,MAAM,CAAW;IACJ,iBAAiB,EAAE,OAAO,CAAS;IACxD,qBAAqB,EAAE,MAAM,CAAuB;IAE1D,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAG/B;IAEF,MAAM,IAAI,IAAI;IAuCd,QAAQ,IAAI,IAAI;IA0ChB,2BAA2B;IAK3B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAwBzB,OAAO,CAAC,8BAA8B;IAatC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAe1B,aAAa,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;IAUxC,eAAe,IAAI,IAAI;IA+DvB,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAsC5C,UAAU,IAAI,IAAI;CA4BnB;AAED,eAAO,MAAM,kCAAkC,EAAE,cAGhD,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;CAWpC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,oTAMhC,CAAC"}

package/dist/dts/number-field/utils.d.ts

@@ -1,6 +1,13 @@
 export declare const getSeparatorsFromParser: (value: string, locale: string) => {
     decimalSeparator: string;
+    groupSeparator: string;
 };
+/**
+ * Maps a caret position in `oldValue` (the raw control text) to the equivalent position in
+ * `newValue` (the text after formatting or restoring), keeping the caret next to the same
+ * value characters.
+ */
+export declare const calculateCursorPosition: (oldValue: string, newValue: string, oldCursor: number, locale: string) => number;
 /**
  * Strips locale grouping and normalizes the decimal separator to `.` without using `Number`
  * (so integers beyond `Number.MAX_SAFE_INTEGER` keep every digit).

package/dist/dts/number-field/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/number-field/utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,uBAAuB,GAClC,OAAO,MAAM,EACb,QAAQ,MAAM,KACb;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAI5B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,MAY9E,CAAC;AAEF,6FAA6F;AAC7F,eAAO,MAAM,4BAA4B,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,MAU5E,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,OAC5B,CAAC;AAElD,uGAAuG;AACvG,eAAO,MAAM,gCAAgC,GAC3C,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,WAAW,MAAM,KAChB,OAMF,CAAC;AAEF,yFAAyF;AACzF,eAAO,MAAM,uCAAuC,GAClD,gBAAgB,MAAM,EACtB,aAAa,MAAM,EACnB,QAAQ,MAAM,EACd,WAAW,MAAM,KAChB,OAEoD,CAAC;AAqFxD,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,MAWlE,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,MAOnE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,SAAS,IAAI,CAAC,mBAAmB,KAChC,MAQF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GACtC,OAAO,MAAM,EACb,SAAS,IAAI,CAAC,mBAAmB,KAChC,MAyCF,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAC1C,OAAO,MAAM,EACb,aAAa,MAAM,EACnB,QAAQ,MAAM,KACb,MA+BF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,GAAG,MAAM,EACtB,QAAQ,MAAM,EACd,wBAAqB,EACrB,YAAY,MAAM,KACjB,MAkEF,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,YAAY,MAAM,EAClB,iBAAiB,MAAM,KACtB,MAaF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,uBAAqB,EACrB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,YAAY,MAAM,KACjB,MAyBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,KAAG,MAyBvD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,KAAG,MAyB5D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MAgDnF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MA+CnF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GAAI,OAAO,MAAM,GAAG,MAAM,KAAG,MA8BnE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/number-field/utils.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,uBAAuB,GAClC,OAAO,MAAM,EACb,QAAQ,MAAM,KACb;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAGpD,CAAC;AAiCF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAClC,UAAU,MAAM,EAChB,UAAU,MAAM,EAChB,WAAW,MAAM,EACjB,QAAQ,MAAM,KACb,MA+CF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,MAW9E,CAAC;AAEF,6FAA6F;AAC7F,eAAO,MAAM,4BAA4B,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,MAS5E,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,OAC5B,CAAC;AAElD,uGAAuG;AACvG,eAAO,MAAM,gCAAgC,GAC3C,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,WAAW,MAAM,KAChB,OAMF,CAAC;AAEF,yFAAyF;AACzF,eAAO,MAAM,uCAAuC,GAClD,gBAAgB,MAAM,EACtB,aAAa,MAAM,EACnB,QAAQ,MAAM,EACd,WAAW,MAAM,KAChB,OAEoD,CAAC;AAkFxD,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,MAWlE,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,MAOnE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,SAAS,IAAI,CAAC,mBAAmB,KAChC,MAQF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GACtC,OAAO,MAAM,EACb,SAAS,IAAI,CAAC,mBAAmB,KAChC,MAyCF,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAC1C,OAAO,MAAM,EACb,aAAa,MAAM,EACnB,QAAQ,MAAM,KACb,MA+BF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,GAAG,MAAM,EACtB,QAAQ,MAAM,EACd,wBAAqB,EACrB,YAAY,MAAM,KACjB,MAkEF,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,YAAY,MAAM,EAClB,iBAAiB,MAAM,KACtB,MAaF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,uBAAqB,EACrB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,YAAY,MAAM,KACjB,MAyBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,KAAG,MAyBvD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,KAAG,MAyB5D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MAgDnF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,aAAa,MAAM,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MA+CnF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GAAI,OAAO,MAAM,GAAG,MAAM,KAAG,MA8BnE,CAAC"}

package/dist/dts/react.d.ts

@@ -133,14 +133,14 @@ interface HTMLWCProps extends React.AriaAttributes {
   onInput?(e: Event): void;
 }
 
-export declare const AccordionItem: React.ForwardRefExoticComponent<
+export declare const Accordion: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
-    Omit<PublicOf<AccordionItemWC>, 'children' | 'style'> &
+    Omit<PublicOf<AccordionWC>, 'children' | 'style'> &
     HTMLWCProps & {
     }
-  > & React.RefAttributes<AccordionItemWC>
+  > & React.RefAttributes<AccordionWC>
 >;
-export type AccordionItemRef = AccordionItemWC;
+export type AccordionRef = AccordionWC;
 
 export declare const ActionsMenu: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
@@ -171,14 +171,14 @@ export declare const AiIndicator: React.ForwardRefExoticComponent<
 >;
 export type AiIndicatorRef = AiIndicatorWC;
 
-export declare const Accordion: React.ForwardRefExoticComponent<
+export declare const AccordionItem: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
-    Omit<PublicOf<AccordionWC>, 'children' | 'style'> &
+    Omit<PublicOf<AccordionItemWC>, 'children' | 'style'> &
     HTMLWCProps & {
     }
-  > & React.RefAttributes<AccordionWC>
+  > & React.RefAttributes<AccordionItemWC>
 >;
-export type AccordionRef = AccordionWC;
+export type AccordionItemRef = AccordionItemWC;
 
 export declare const Anchor: React.ForwardRefExoticComponent<
   React.PropsWithChildren<

package/dist/esm/number-field/number-field.js

@@ -2,11 +2,11 @@ import { __decorate } from "tslib";
 import { NumberParser } from '@genesislcap/foundation-utils';
 import { NumberField as FASTNumberField } from '@microsoft/fast-components';
 import { DOM, attr } from '@microsoft/fast-element';
-import { keyEnter } from '@microsoft/fast-web-utilities';
+import { keyBackspace, keyDelete, keyEnter } from '@microsoft/fast-web-utilities';
 import { AffixMixin } from '../_common';
 import { foundationNumberFieldStyles as styles } from './number-field.styles';
 import { foundationNumberFieldTemplate as template } from './number-field.template';
-import { applyDecimalPrecisionLimits, calculateAutoStepPrecision, decrementWithPrecision, formatControlValue, incrementWithPrecision, toIntlNumberFormat, validateInput, validateMinMax, hasMultipleDecimalSeparators, rejectsDecimalAtMaximumIntegerPrecision, } from './utils';
+import { applyDecimalPrecisionLimits, calculateAutoStepPrecision, calculateCursorPosition, decrementWithPrecision, formatControlValue, getSeparatorsFromParser, incrementWithPrecision, toIntlNumberFormat, validateInput, validateMinMax, hasMultipleDecimalSeparators, rejectsDecimalAtMaximumIntegerPrecision, } from './utils';
 const MAX_DECIMAL_PLACES = 3;
 const MAX_INPUT_PRECISION = 12;
 /**
@@ -95,25 +95,67 @@ export class NumberField extends AffixMixin(FASTNumberField) {
         const regexString = `[.]$`;
         return new RegExp(regexString);
     }
+    /**
+     * Writes text the user is editing back to the control, keeping the caret next to the same
+     * value characters instead of letting the assignment move it to the end.
+     */
+    writeControlValue(next) {
+        const control = this.control;
+        const previous = control.value;
+        if (previous === next)
+            return;
+        const { selectionStart, selectionEnd } = control;
+        control.value = next;
+        // Only move the caret of a focused field: setting selection can focus it in WebKit, and
+        // programmatic stepUp()/stepDown() or a callback running after blur must not do that.
+        if (selectionStart === null ||
+            control.getRootNode().activeElement !== control) {
+            return;
+        }
+        const start = calculateCursorPosition(previous, next, selectionStart, this.locale);
+        const end = selectionEnd === null || selectionEnd === selectionStart
+            ? start
+            : calculateCursorPosition(previous, next, selectionEnd, this.locale);
+        control.setSelectionRange(start, end);
+    }
     restoreControlToCommittedValue() {
         if (!this.control)
             return;
         const previousValue = this.value;
-        if (!previousValue) {
-            this.control.value = '';
-            this['isUserInput'] = false;
-            return;
-        }
-        this.control.value =
-            this.withFormatting && previousValue
+        this.writeControlValue(!previousValue
+            ? ''
+            : this.withFormatting
                 ? toIntlNumberFormat(previousValue, this.locale, this.options)
-                : formatControlValue(String(previousValue), this.locale);
+                : formatControlValue(String(previousValue), this.locale));
         this['isUserInput'] = false;
     }
+    /**
+     * Backspace/Delete next to a group separator would only delete the separator, which
+     * reformatting puts straight back. Step the caret over it so the key deletes the digit.
+     */
+    skipGroupSeparator(e) {
+        if (!this.withFormatting || e.ctrlKey || e.metaKey || e.altKey)
+            return;
+        const { value, selectionStart, selectionEnd } = this.control;
+        if (selectionStart === null || selectionStart !== selectionEnd)
+            return;
+        const { groupSeparator } = getSeparatorsFromParser(value, this.locale);
+        if (!groupSeparator)
+            return;
+        if (e.key === keyBackspace && value[selectionStart - 1] === groupSeparator) {
+            this.control.setSelectionRange(selectionStart - 1, selectionStart - 1);
+        }
+        else if (e.key === keyDelete && value[selectionStart] === groupSeparator) {
+            this.control.setSelectionRange(selectionStart + 1, selectionStart + 1);
+        }
+    }
     handleKeyDown(e) {
         if (e.key === keyEnter) {
             this['isUserInput'] = false;
         }
+        if (this.control && (e.key === keyBackspace || e.key === keyDelete)) {
+            this.skipGroupSeparator(e);
+        }
         return super.handleKeyDown(e);
     }
     handleTextInput() {
@@ -142,7 +184,7 @@ export class NumberField extends AffixMixin(FASTNumberField) {
                     const displayValue = this.withFormatting && validValue !== ''
                         ? toIntlNumberFormat(validValue, this.locale, this.options)
                         : formatControlValue(validValue, this.locale);
-                    this.control.value = applyDecimalPrecisionLimits(displayValue, this.options);
+                    this.writeControlValue(applyDecimalPrecisionLimits(displayValue, this.options));
                 }
                 this.value = applyDecimalPrecisionLimits(validValue, this.options);
                 this.$emit('input');
@@ -153,7 +195,7 @@ export class NumberField extends AffixMixin(FASTNumberField) {
             DOM.queueUpdate(() => {
                 var _a;
                 if (this.control) {
-                    this.control.value = this.control.value.replace(/[^0-9\-+e.]/g, '');
+                    this.writeControlValue(this.control.value.replace(/[^0-9\-+e.]/g, ''));
                 }
                 this.value = ((_a = this.control) === null || _a === void 0 ? void 0 : _a.value) || '';
                 this.$emit('input');

package/dist/esm/number-field/utils.js

@@ -3,21 +3,113 @@ const formattedInputPrecision = 12;
 const FORMAT_TEST_NUMBER = 12345.6;
 const DECIMAL_BASE = 10;
 const MAX_DIGIT = DECIMAL_BASE - 1;
-export const getSeparatorsFromParser = (value, locale) => {
-    var _a;
+const DIGIT_PROBE = 9876543210;
+const localeSymbolsCache = new Map();
+/** Separators and digits for a locale; cached because it runs several times per keystroke. */
+const getLocaleNumberSymbols = (locale) => {
+    var _a, _b;
+    const cached = localeSymbolsCache.get(locale);
+    if (cached) {
+        return cached;
+    }
     const parts = new Intl.NumberFormat(locale).formatToParts(FORMAT_TEST_NUMBER);
-    const decimalSeparator = ((_a = parts.find((d) => d.type === 'decimal')) === null || _a === void 0 ? void 0 : _a.value) || '.';
-    return { decimalSeparator };
+    const localeDigits = [
+        ...new Intl.NumberFormat(locale, { useGrouping: false }).format(DIGIT_PROBE),
+    ];
+    const symbols = {
+        decimalSeparator: ((_a = parts.find((d) => d.type === 'decimal')) === null || _a === void 0 ? void 0 : _a.value) || '.',
+        groupSeparator: ((_b = parts.find((d) => d.type === 'group')) === null || _b === void 0 ? void 0 : _b.value) || '',
+        digits: new Set([...'0123456789', ...localeDigits]),
+        zeroDigits: new Set(['0', localeDigits[localeDigits.length - 1]]),
+    };
+    localeSymbolsCache.set(locale, symbols);
+    return symbols;
+};
+export const getSeparatorsFromParser = (value, locale) => {
+    const { decimalSeparator, groupSeparator } = getLocaleNumberSymbols(locale);
+    return { decimalSeparator, groupSeparator };
+};
+/** Matches the `k`/`m`/`b` suffixes `NumberParser` expands (e.g. `12k` to `12,000`). */
+const SHORTCUT_SUFFIX = /[kmb]\s*$/i;
+/**
+ * Returns a predicate for the characters that carry a number's value: digits, the decimal
+ * separator and minus signs. Group separators, currency/percent symbols, bidi marks and
+ * leading integer zeros (which formatting adds or strips) are ignored.
+ */
+const valueCharMatcher = (value, locale) => {
+    const { decimalSeparator, digits, zeroDigits } = getLocaleNumberSymbols(locale);
+    let inLeadingZeros = true;
+    return (index) => {
+        const ch = value[index];
+        if (ch === decimalSeparator) {
+            inLeadingZeros = false;
+            return true;
+        }
+        if (ch === '-' || ch === '\u2212') {
+            return true;
+        }
+        if (!digits.has(ch)) {
+            return false;
+        }
+        if (inLeadingZeros && zeroDigits.has(ch)) {
+            return false;
+        }
+        inLeadingZeros = false;
+        return true;
+    };
+};
+/**
+ * Maps a caret position in `oldValue` (the raw control text) to the equivalent position in
+ * `newValue` (the text after formatting or restoring), keeping the caret next to the same
+ * value characters.
+ */
+export const calculateCursorPosition = (oldValue, newValue, oldCursor, locale) => {
+    const cursor = Math.min(Math.max(oldCursor, 0), oldValue.length);
+    // The characters just typed were rejected or dropped (letter, second decimal separator,
+    // leading zero): put the caret back where it was before they were typed.
+    const removed = oldValue.length - newValue.length;
+    if (removed > 0 &&
+        removed <= cursor &&
+        oldValue.slice(0, cursor - removed) + oldValue.slice(cursor) === newValue) {
+        return cursor - removed;
+    }
+    if (cursor === oldValue.length && SHORTCUT_SUFFIX.test(oldValue)) {
+        return newValue.length;
+    }
+    const isOldValueChar = valueCharMatcher(oldValue, locale);
+    let valueCharsBefore = 0;
+    for (let i = 0; i < cursor; i += 1) {
+        if (isOldValueChar(i)) {
+            valueCharsBefore += 1;
+        }
+    }
+    const isNewValueChar = valueCharMatcher(newValue, locale);
+    if (valueCharsBefore === 0) {
+        // Caret before the number: place it before the first value character, past any prefix.
+        for (let i = 0; i < newValue.length; i += 1) {
+            if (isNewValueChar(i)) {
+                return i;
+            }
+        }
+        return cursor === oldValue.length ? newValue.length : 0;
+    }
+    let seen = 0;
+    for (let i = 0; i < newValue.length; i += 1) {
+        if (isNewValueChar(i)) {
+            seen += 1;
+            if (seen === valueCharsBefore) {
+                return i + 1;
+            }
+        }
+    }
+    return newValue.length;
 };
 /**
  * Strips locale grouping and normalizes the decimal separator to `.` without using `Number`
  * (so integers beyond `Number.MAX_SAFE_INTEGER` keep every digit).
  */
 export const normalizeLocaleNumberString = (inputVal, locale) => {
-    var _a, _b, _c;
-    const parts = new Intl.NumberFormat(locale).formatToParts(FORMAT_TEST_NUMBER);
-    const groupChar = (_a = parts.find((d) => d.type === 'group')) === null || _a === void 0 ? void 0 : _a.value;
-    const decimalChar = (_c = (_b = parts.find((d) => d.type === 'decimal')) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : '.';
+    const { groupSeparator: groupChar, decimalSeparator: decimalChar } = getLocaleNumberSymbols(locale);
     let normalized = inputVal.trim();
     if (groupChar) {
         normalized = normalized.split(groupChar).join('');
@@ -29,9 +121,7 @@ export const normalizeLocaleNumberString = (inputVal, locale) => {
 };
 /** Counts locale decimal separator characters in the raw control text (ignores grouping). */
 export const countLocaleDecimalSeparators = (input, locale) => {
-    var _a, _b;
-    const parts = new Intl.NumberFormat(locale).formatToParts(FORMAT_TEST_NUMBER);
-    const decimalChar = (_b = (_a = parts.find((d) => d.type === 'decimal')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '.';
+    const { decimalSeparator: decimalChar } = getLocaleNumberSymbols(locale);
     let count = 0;
     for (const ch of input) {
         if (ch === decimalChar) {
@@ -53,15 +143,11 @@ export const isIntegerAtMaximumInputPrecision = (value, locale, precision) => {
 export const rejectsDecimalAtMaximumIntegerPrecision = (committedValue, controlText, locale, precision) => isIntegerAtMaximumInputPrecision(committedValue, locale, precision) &&
     countLocaleDecimalSeparators(controlText, locale) > 0;
 const SAFE_INTEGER_DIGIT_COUNT = 15;
-/** Sample integer used only to read locale grouping separator from Intl. */
-const LOCALE_GROUPING_PROBE = 1234567;
 const DIGITS_PER_GROUP = 3;
 const formatLargeIntegerString = (value, locale) => {
-    var _a, _b;
     const negative = value.startsWith('-');
     const digits = negative ? value.slice(1) : value;
-    const parts = new Intl.NumberFormat(locale).formatToParts(LOCALE_GROUPING_PROBE);
-    const group = (_b = (_a = parts.find((p) => p.type === 'group')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ',';
+    const group = getLocaleNumberSymbols(locale).groupSeparator || ',';
     const groups = [];
     let rest = digits;
     while (rest.length > DIGITS_PER_GROUP) {

package/dist/foundation-ui.d.ts

@@ -5874,7 +5874,17 @@ export declare class NumberField extends NumberField_base {
     stepUp(): void;
     stepDown(): void;
     hasSeparatorWithoutDecimals(): RegExp;
+    /**
+     * Writes text the user is editing back to the control, keeping the caret next to the same
+     * value characters instead of letting the assignment move it to the end.
+     */
+    private writeControlValue;
     private restoreControlToCommittedValue;
+    /**
+     * Backspace/Delete next to a group separator would only delete the separator, which
+     * reformatting puts straight back. Step the caret over it so the key deletes the digit.
+     */
+    private skipGroupSeparator;
     handleKeyDown(e: KeyboardEvent): boolean;
     handleTextInput(): void;
     valueChanged(previous: any, next: any): void;

package/dist/react.cjs

@@ -113,9 +113,9 @@ function _mergeRefs(...refs) {
   };
 }
 
-const AccordionItem = React.forwardRef(function AccordionItem(props, ref) {
+const Accordion = React.forwardRef(function Accordion(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionItemWC) ?? '%%prefix%%-accordion-item', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
 });
 
 const ActionsMenu = React.forwardRef(function ActionsMenu(props, ref) {
@@ -150,9 +150,9 @@ const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
   return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
 });
 
-const Accordion = React.forwardRef(function Accordion(props, ref) {
+const AccordionItem = React.forwardRef(function AccordionItem(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionItemWC) ?? '%%prefix%%-accordion-item', { ...rest, ref }, children);
 });
 
 const Anchor = React.forwardRef(function Anchor(props, ref) {
@@ -1143,11 +1143,11 @@ const WeeklyRecurrence = React.forwardRef(function WeeklyRecurrence(props, ref)
 });
 
 module.exports = {
-  AccordionItem,
+  Accordion,
   ActionsMenu,
   AiCriteriaSearch,
   AiIndicator,
-  Accordion,
+  AccordionItem,
   Anchor,
   AnchoredRegion,
   Avatar,

package/dist/react.mjs

@@ -111,9 +111,9 @@ function _mergeRefs(...refs) {
   };
 }
 
-export const AccordionItem = React.forwardRef(function AccordionItem(props, ref) {
+export const Accordion = React.forwardRef(function Accordion(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionItemWC) ?? '%%prefix%%-accordion-item', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
 });
 
 export const ActionsMenu = React.forwardRef(function ActionsMenu(props, ref) {
@@ -148,9 +148,9 @@ export const AiIndicator = React.forwardRef(function AiIndicator(props, ref) {
   return React.createElement(customElements.getName(AiIndicatorWC) ?? '%%prefix%%-ai-indicator', { ...rest, ref }, children);
 });
 
-export const Accordion = React.forwardRef(function Accordion(props, ref) {
+export const AccordionItem = React.forwardRef(function AccordionItem(props, ref) {
   const { children, ...rest } = props;
-  return React.createElement(customElements.getName(AccordionWC) ?? '%%prefix%%-accordion', { ...rest, ref }, children);
+  return React.createElement(customElements.getName(AccordionItemWC) ?? '%%prefix%%-accordion-item', { ...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.45.0",
+  "version": "15.46.0-canary.17",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -51,15 +51,12 @@
   },
   "scripts": {
     "build": "npm run build:copy-ms-manifest && genx build -b ts",
-    "build:rollup": "genx build -b rollup",
-    "build:rollup:stats": "genx analyze -b rollup",
     "build:webpack": "genx build",
     "build:webpack:stats": "genx analyze",
     "build:copy-ms-manifest": "copyfiles -u 1 ms-fast-components/custom-elements.json ../../../node_modules/@microsoft/fast-components/dist/",
     "circular": "npx -y madge --extensions ts --circular ./src",
     "clean": "rimraf dist temp tsconfig.tsbuildinfo",
     "dev": "npm run dev:tsc",
-    "dev:rollup": "genx dev -b rollup",
     "dev:tsc": "genx dev -b ts",
     "dev:webpack": "genx dev -b webpack",
     "serve": "genx serve",
@@ -85,13 +82,12 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "15.45.0",
-    "@genesislcap/genx": "15.45.0",
-    "@genesislcap/rollup-builder": "15.45.0",
-    "@genesislcap/ts-builder": "15.45.0",
-    "@genesislcap/uvu-playwright-builder": "15.45.0",
-    "@genesislcap/vite-builder": "15.45.0",
-    "@genesislcap/webpack-builder": "15.45.0",
+    "@genesislcap/foundation-testing": "15.46.0-canary.17",
+    "@genesislcap/genx": "15.46.0-canary.17",
+    "@genesislcap/ts-builder": "15.46.0-canary.17",
+    "@genesislcap/uvu-playwright-builder": "15.46.0-canary.17",
+    "@genesislcap/vite-builder": "15.46.0-canary.17",
+    "@genesislcap/webpack-builder": "15.46.0-canary.17",
     "copyfiles": "^2.4.1"
   },
   "dependencies": {
@@ -100,16 +96,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.45.0",
-    "@genesislcap/foundation-ai": "15.45.0",
-    "@genesislcap/foundation-comms": "15.45.0",
-    "@genesislcap/foundation-criteria": "15.45.0",
-    "@genesislcap/foundation-errors": "15.45.0",
-    "@genesislcap/foundation-events": "15.45.0",
-    "@genesislcap/foundation-logger": "15.45.0",
-    "@genesislcap/foundation-notifications": "15.45.0",
-    "@genesislcap/foundation-user": "15.45.0",
-    "@genesislcap/foundation-utils": "15.45.0",
+    "@genesislcap/expression-builder": "15.46.0-canary.17",
+    "@genesislcap/foundation-ai": "15.46.0-canary.17",
+    "@genesislcap/foundation-comms": "15.46.0-canary.17",
+    "@genesislcap/foundation-criteria": "15.46.0-canary.17",
+    "@genesislcap/foundation-errors": "15.46.0-canary.17",
+    "@genesislcap/foundation-events": "15.46.0-canary.17",
+    "@genesislcap/foundation-logger": "15.46.0-canary.17",
+    "@genesislcap/foundation-notifications": "15.46.0-canary.17",
+    "@genesislcap/foundation-user": "15.46.0-canary.17",
+    "@genesislcap/foundation-utils": "15.46.0-canary.17",
     "@microsoft/fast-colors": "5.3.1",
     "@microsoft/fast-components": "2.30.6",
     "@microsoft/fast-element": "1.14.0",