@coveo/headless 3.26.1 → 3.26.2-pre.497e1d73bf

package/dist/definitions/controllers/commerce/core/facets/category/headless-commerce-category-facet.d.ts

@@ -1,9 +1,9 @@
-import { CommerceEngine } from '../../../../../app/commerce-engine/commerce-engine.js';
-import { CategoryFacetValueRequest } from '../../../../../features/commerce/facets/facet-set/interfaces/request.js';
+import type { CommerceEngine } from '../../../../../app/commerce-engine/commerce-engine.js';
+import type { CategoryFacetRequest, CategoryFacetValueRequest } from '../../../../../features/commerce/facets/facet-set/interfaces/request.js';
 import { categoryFacetSearchStateSelector } from '../../../../../features/facets/facet-search-set/category/category-facet-search-state-selector.js';
-import { CategoryFacetValue, CoreCommerceFacet, CoreCommerceFacetOptions, CoreCommerceFacetState, FacetControllerType } from '../headless-core-commerce-facet.js';
-import { SearchableFacetOptions } from '../searchable/headless-commerce-searchable-facet.js';
-import { CategoryFacetSearch, CategoryFacetSearchState } from './headless-commerce-category-facet-search.js';
+import { type CategoryFacetValue, type CoreCommerceFacet, type CoreCommerceFacetOptions, type CoreCommerceFacetState, type FacetControllerType } from '../headless-core-commerce-facet.js';
+import type { SearchableFacetOptions } from '../searchable/headless-commerce-searchable-facet.js';
+import { type CategoryFacetSearch, type CategoryFacetSearchState } from './headless-commerce-category-facet-search.js';
 export type CategoryFacetOptions = Omit<CoreCommerceFacetOptions, 'toggleExcludeActionCreator' | 'toggleSelectActionCreator'> & SearchableFacetOptions;
 /**
  * The state of the `CategoryFacet` sub-controller.
@@ -44,4 +44,4 @@ export type CategoryFacet = Omit<CoreCommerceFacet<CategoryFacetValueRequest, Ca
  * @returns A `CategoryFacet` sub-controller instance.
  * */
 export declare function buildCategoryFacet(engine: CommerceEngine, options: CategoryFacetOptions): CategoryFacet;
-export declare const getCategoryFacetState: (coreState: CoreCommerceFacetState<CategoryFacetValue>, facetSearchSelector: ReturnType<typeof categoryFacetSearchStateSelector>) => CategoryFacetState;
+export declare const getCategoryFacetState: (coreState: CoreCommerceFacetState<CategoryFacetValue>, facetSearchSelector: ReturnType<typeof categoryFacetSearchStateSelector>, request: CategoryFacetRequest | undefined) => CategoryFacetState;

package/dist/definitions/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.ssr.d.ts

@@ -1,15 +1,15 @@
-import { BaseFacetSearchResult } from '../../../../../api/search/facet-search/base/base-facet-search-response.js';
-import { CategoryFacetSearchResult } from '../../../../../api/search/facet-search/category-facet-search/category-facet-search-response.js';
-import { CommerceEngine } from '../../../../../app/commerce-engine/commerce-engine.js';
-import { ControllerDefinitionOption, SolutionType, SubControllerDefinitionWithoutProps } from '../../../../../app/commerce-ssr-engine/types/common.js';
-import { LocationFacetValue, RegularFacetValue } from '../../../../../features/commerce/facets/facet-set/interfaces/response.js';
-import { CategoryFacet, CategoryFacetState } from '../category/headless-commerce-category-facet.js';
-import { DateFacet, DateFacetState, DateFacetValue } from '../date/headless-commerce-date-facet.js';
-import { CategoryFacetValue, FacetType, CoreCommerceFacet } from '../headless-core-commerce-facet.js';
-import { LocationFacet, LocationFacetState } from '../location/headless-commerce-location-facet.js';
-import { NumericFacet, NumericFacetValue, NumericFacetState } from '../numeric/headless-commerce-numeric-facet.js';
-import { RegularFacet, RegularFacetState } from '../regular/headless-commerce-regular-facet.js';
-import { FacetGenerator as CSRFacetGenerator, MappedGeneratedFacetController } from './headless-commerce-facet-generator.js';
+import type { BaseFacetSearchResult } from '../../../../../api/search/facet-search/base/base-facet-search-response.js';
+import type { CategoryFacetSearchResult } from '../../../../../api/search/facet-search/category-facet-search/category-facet-search-response.js';
+import type { CommerceEngine } from '../../../../../app/commerce-engine/commerce-engine.js';
+import { type ControllerDefinitionOption, SolutionType, type SubControllerDefinitionWithoutProps } from '../../../../../app/commerce-ssr-engine/types/common.js';
+import type { LocationFacetValue, RegularFacetValue } from '../../../../../features/commerce/facets/facet-set/interfaces/response.js';
+import type { CategoryFacet, CategoryFacetState } from '../category/headless-commerce-category-facet.js';
+import type { DateFacet, DateFacetState, DateFacetValue } from '../date/headless-commerce-date-facet.js';
+import type { CategoryFacetValue, FacetType, CoreCommerceFacet } from '../headless-core-commerce-facet.js';
+import type { LocationFacet, LocationFacetState } from '../location/headless-commerce-location-facet.js';
+import type { NumericFacet, NumericFacetValue, NumericFacetState } from '../numeric/headless-commerce-numeric-facet.js';
+import type { RegularFacet, RegularFacetState } from '../regular/headless-commerce-regular-facet.js';
+import type { FacetGenerator as CSRFacetGenerator, MappedGeneratedFacetController } from './headless-commerce-facet-generator.js';
 export type { BaseFacetSearchResult, CategoryFacet, CategoryFacetState, CategoryFacetValue, CategoryFacetSearchResult, CoreCommerceFacet, DateFacet, DateFacetValue, DateFacetState, NumericFacet, NumericFacetValue, NumericFacetState, RegularFacet, RegularFacetState, RegularFacetValue, LocationFacet, LocationFacetState, LocationFacetValue, MappedGeneratedFacetController, };
 export type FacetGeneratorState = MappedFacetStates;
 export type MappedFacetStates = Array<MappedFacetState[FacetType]>;

package/dist/definitions/controllers/commerce/core/facets/headless-core-commerce-facet.d.ts

@@ -1,14 +1,14 @@
-import { CommerceEngine } from '../../../../app/commerce-engine/commerce-engine.js';
+import type { CommerceEngine } from '../../../../app/commerce-engine/commerce-engine.js';
 import { stateKey } from '../../../../app/state-key.js';
-import { FacetType } from '../../../../features/commerce/facets/facet-set/interfaces/common.js';
-import { AnyFacetRequest, CategoryFacetValueRequest, LocationFacetValueRequest } from '../../../../features/commerce/facets/facet-set/interfaces/request.js';
-import { AnyFacetResponse, AnyFacetValueResponse, BaseFacetValue, CategoryFacetValue, DateFacetValue, LocationFacetValue, NumericFacetValue, RegularFacetValue } from '../../../../features/commerce/facets/facet-set/interfaces/response.js';
-import { FacetValueRequest } from '../../../../features/facets/facet-set/interfaces/request.js';
-import { AnyFacetValueRequest } from '../../../../features/facets/generic/interfaces/generic-facet-request.js';
-import { CoreFacet as HeadlessCoreFacet, CoreFacetState } from '../../../core/facets/facet/headless-core-facet.js';
-import { DateRangeRequest } from '../../../core/facets/range-facet/date-facet/headless-core-date-facet.js';
-import { NumericRangeRequest } from '../../../core/facets/range-facet/numeric-facet/headless-core-numeric-facet.js';
-import { FetchProductsActionCreator, ToggleActionCreator } from '../common.js';
+import type { FacetType } from '../../../../features/commerce/facets/facet-set/interfaces/common.js';
+import type { AnyFacetRequest, CategoryFacetValueRequest, LocationFacetValueRequest } from '../../../../features/commerce/facets/facet-set/interfaces/request.js';
+import type { AnyFacetResponse, AnyFacetValueResponse, BaseFacetValue, CategoryFacetValue, DateFacetValue, LocationFacetValue, NumericFacetValue, RegularFacetValue } from '../../../../features/commerce/facets/facet-set/interfaces/response.js';
+import type { FacetValueRequest } from '../../../../features/facets/facet-set/interfaces/request.js';
+import type { AnyFacetValueRequest } from '../../../../features/facets/generic/interfaces/generic-facet-request.js';
+import type { CoreFacet as HeadlessCoreFacet, CoreFacetState } from '../../../core/facets/facet/headless-core-facet.js';
+import type { DateRangeRequest } from '../../../core/facets/range-facet/date-facet/headless-core-date-facet.js';
+import type { NumericRangeRequest } from '../../../core/facets/range-facet/numeric-facet/headless-core-numeric-facet.js';
+import type { FetchProductsActionCreator, ToggleActionCreator } from '../common.js';
 export type { FacetType, FacetValueRequest, RegularFacetValue, LocationFacetValueRequest, LocationFacetValue, NumericRangeRequest, NumericFacetValue, DateRangeRequest, DateFacetValue, CategoryFacetValueRequest, CategoryFacetValue, BaseFacetValue, };
 export interface FacetControllerType<T extends FacetType> {
     type: T;

package/dist/definitions/features/commerce/facets/category-facet/category-facet-actions.d.ts

@@ -1,5 +1,12 @@
-import { ToggleSelectCategoryFacetValueActionCreatorPayload, UpdateCategoryFacetNumberOfValuesActionCreatorPayload } from '../../../facets/category-facet-set/category-facet-set-actions.js';
+import type { ToggleSelectCategoryFacetValueActionCreatorPayload, UpdateCategoryFacetNumberOfValuesActionCreatorPayload } from '../../../facets/category-facet-set/category-facet-set-actions.js';
 export type UpdateCategoryFacetNumberOfValuesPayload = UpdateCategoryFacetNumberOfValuesActionCreatorPayload;
 export declare const updateCategoryFacetNumberOfValues: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: UpdateCategoryFacetNumberOfValuesActionCreatorPayload], UpdateCategoryFacetNumberOfValuesActionCreatorPayload, "commerce/facets/categoryFacet/updateNumberOfValues", never, never>;
-export type ToggleSelectCategoryFacetValuePayload = ToggleSelectCategoryFacetValueActionCreatorPayload;
-export declare const toggleSelectCategoryFacetValue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: ToggleSelectCategoryFacetValueActionCreatorPayload], ToggleSelectCategoryFacetValueActionCreatorPayload, "commerce/facets/categoryFacet/toggleSelectValue", import("@reduxjs/toolkit").SerializedError | null, never>;
+export type ToggleSelectCategoryFacetValuePayload = Omit<ToggleSelectCategoryFacetValueActionCreatorPayload, 'retrieveCount'> & {
+    /**
+     * The number of child values to display.
+     *
+     * @deprecated This property is no longer used in the commerce category facet and will be removed in the next major version of headless.
+     */
+    retrieveCount?: number;
+};
+export declare const toggleSelectCategoryFacetValue: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: ToggleSelectCategoryFacetValuePayload], ToggleSelectCategoryFacetValuePayload, "commerce/facets/categoryFacet/toggleSelectValue", import("@reduxjs/toolkit").SerializedError | null, never>;

package/dist/definitions/features/commerce/facets/facet-set/facet-set-reducers.d.ts

@@ -1,6 +1,6 @@
-import { Parameters } from '../../parameters/parameters-actions.js';
-import { CommerceFacetSetState } from './facet-set-state.js';
-import { CategoryFacetRequest, CategoryFacetValueRequest } from './interfaces/request.js';
+import type { Parameters } from '../../parameters/parameters-actions.js';
+import type { CommerceFacetSetState } from './facet-set-state.js';
+import type { CategoryFacetRequest, CategoryFacetValueRequest } from './interfaces/request.js';
 export declare function restoreFromParameters(state: CommerceFacetSetState, action: {
     payload: Parameters;
 }): void;
@@ -8,6 +8,6 @@ export declare function buildSelectedFacetValueRequest(rawValue: string): {
     state: string;
     value: string;
 };
-export declare function selectPath(request: CategoryFacetRequest, path: string[], initialNumberOfValues: number): void;
-export declare function buildCurrentValuesFromPath(path: string[], retrieveCount: number): CategoryFacetValueRequest[];
-export declare function buildCategoryFacetValueRequest(value: string, retrieveCount: number): CategoryFacetValueRequest;
+export declare function selectPath(request: CategoryFacetRequest, path: string[], initialNumberOfValues?: number): void;
+export declare function buildCurrentValuesFromPath(path: string[]): CategoryFacetValueRequest[];
+export declare function buildCategoryFacetValueRequest(value: string): CategoryFacetValueRequest;

package/dist/definitions/features/commerce/facets/facet-set/facet-set-slice.d.ts

@@ -1,8 +1,7 @@
-import { CategoryFacetValueRequest } from '../../../../controllers/commerce/core/facets/headless-core-commerce-facet.js';
-import '../category-facet/category-facet-actions.js';
-import { CommerceFacetSetState } from './facet-set-state.js';
-import { LocationFacetValueRequest } from './interfaces/request.js';
-import { CategoryFacetValue, LocationFacetValue } from './interfaces/response.js';
+import type { CategoryFacetValueRequest } from '../../../../controllers/commerce/core/facets/headless-core-commerce-facet.js';
+import { type CommerceFacetSetState } from './facet-set-state.js';
+import type { LocationFacetValueRequest } from './interfaces/request.js';
+import type { CategoryFacetValue, LocationFacetValue } from './interfaces/response.js';
 export declare const commerceFacetSetReducer: import("redux").Reducer<CommerceFacetSetState> & {
     getInitialState: () => CommerceFacetSetState;
 };

package/dist/definitions/features/commerce/facets/facet-set/interfaces/request.d.ts

@@ -6,11 +6,12 @@ export type FreezableFacetRequestProperties = {
     preventAutoSelect: boolean;
     freezeCurrentValues?: boolean;
 };
-export type CategoryFacetRequest = BaseCommerceFacetRequest<CategoryFacetValueRequest, 'hierarchical'> & CategoryFacetDelimitingCharacter & FreezableFacetRequestProperties;
+export type CategoryFacetRequest = BaseCommerceFacetRequest<CategoryFacetValueRequest, 'hierarchical'> & CategoryFacetDelimitingCharacter & FreezableFacetRequestProperties & {
+    retrieveCount?: number;
+};
 export interface CategoryFacetValueRequest extends BaseFacetValueRequest {
     children: CategoryFacetValueRequest[];
     value: string;
-    retrieveCount?: number;
 }
 export type DateFacetRequest = BaseCommerceFacetRequest<DateRangeRequest, 'dateRange'> & FreezableFacetRequestProperties;
 export type NumericFacetRequest = BaseCommerceFacetRequest<NumericRangeRequest, 'numericalRange'> & NumericFacetExtraProperties & FreezableFacetRequestProperties;
@@ -21,7 +22,7 @@ export type BaseCommerceFacetRequest<Value, Type extends FacetType> = Pick<Facet
     displayName?: string;
     type: Type;
     values: Value[];
-    initialNumberOfValues: number;
+    initialNumberOfValues?: number;
     numberOfValues?: number;
 };
 export type AnyFacetValueRequest = FacetValueRequest | LocationFacetValueRequest | CategoryFacetValueRequest | NumericRangeRequest | DateRangeRequest;

package/dist/esm/controllers/commerce/core/facets/category/headless-commerce-category-facet.js

@@ -1,6 +1,6 @@
 import { stateKey } from '../../../../../app/state-key.js';
 import { toggleSelectCategoryFacetValue, updateCategoryFacetNumberOfValues, } from '../../../../../features/commerce/facets/category-facet/category-facet-actions.js';
-import { defaultNumberOfValuesIncrement } from '../../../../../features/facets/category-facet-set/category-facet-set-actions.js';
+import { facetRequestSelector } from '../../../../../features/commerce/facets/facet-set/facet-set-selector.js';
 import { findActiveValueAncestry } from '../../../../../features/facets/category-facet-set/category-facet-utils.js';
 import { categoryFacetSearchStateSelector } from '../../../../../features/facets/facet-search-set/category/category-facet-search-state-selector.js';
 import { buildCoreCommerceFacet, } from '../headless-core-commerce-facet.js';
@@ -26,53 +26,63 @@ export function buildCategoryFacet(engine, options) {
     });
     const { deselectAll, isValueSelected, subscribe, toggleSelect } = coreController;
     const { dispatch } = engine;
-    const getFacetId = () => coreController.state.facetId;
+    const { facetId } = options;
     const facetSearch = buildCategoryFacetSearch(engine, {
-        options: { facetId: getFacetId(), ...options.facetSearch },
+        options: { facetId, ...options.facetSearch },
         select: () => {
             dispatch(options.fetchProductsActionCreator());
         },
         isForFieldSuggestions: false,
     });
+    const getRequest = () => facetRequestSelector(engine[stateKey], facetId);
     return {
         deselectAll,
         isValueSelected,
         subscribe,
         toggleSelect,
         showMoreValues() {
-            const { facetId } = options;
-            const { activeValue, values } = this.state;
-            const numberOfValues = (activeValue?.children.length ?? values.length) +
-                defaultNumberOfValuesIncrement;
-            dispatch(updateCategoryFacetNumberOfValues({ facetId, numberOfValues }));
+            const { initialNumberOfValues, values, numberOfValues } = getRequest();
+            if (!initialNumberOfValues && !numberOfValues) {
+                return;
+            }
+            const newNumberOfValues = values.length + (initialNumberOfValues ?? numberOfValues);
+            dispatch(updateCategoryFacetNumberOfValues({
+                facetId,
+                numberOfValues: newNumberOfValues,
+            }));
             dispatch(options.fetchProductsActionCreator());
         },
         showLessValues() {
-            const { facetId } = options;
+            const request = getRequest();
+            const numberOfValues = request.initialNumberOfValues ?? 1;
             dispatch(updateCategoryFacetNumberOfValues({
                 facetId,
-                numberOfValues: defaultNumberOfValuesIncrement,
+                numberOfValues,
             }));
             dispatch(options.fetchProductsActionCreator());
         },
         facetSearch,
         get state() {
-            return getCategoryFacetState(coreController.state, categoryFacetSearchStateSelector(engine[stateKey], getFacetId()));
+            return getCategoryFacetState(coreController.state, categoryFacetSearchStateSelector(engine[stateKey], facetId), getRequest());
         },
         type: 'hierarchical',
     };
 }
-export const getCategoryFacetState = (coreState, facetSearchSelector) => {
+export const getCategoryFacetState = (coreState, facetSearchSelector, request) => {
     const { values } = coreState;
     const selectedValueAncestry = findActiveValueAncestry(values);
     const activeValue = selectedValueAncestry.length
         ? selectedValueAncestry[selectedValueAncestry.length - 1]
         : undefined;
-    const canShowLessValues = activeValue
-        ? activeValue.children.length > defaultNumberOfValuesIncrement
-        : false;
-    const canShowMoreValues = activeValue?.moreValuesAvailable ?? coreState.canShowMoreValues ?? false;
-    const hasActiveValues = !!activeValue;
+    const initialNumberOfValues = request?.initialNumberOfValues;
+    const canShowLessValues = !!initialNumberOfValues &&
+        (activeValue
+            ? initialNumberOfValues < activeValue.children.length
+            : initialNumberOfValues <
+                (request.numberOfValues ?? coreState.values.length));
+    const canShowMoreValues = activeValue
+        ? activeValue.moreValuesAvailable
+        : coreState.canShowMoreValues;
     return {
         ...coreState,
         activeValue,
@@ -84,7 +94,7 @@ export const getCategoryFacetState = (coreState, facetSearchSelector) => {
             query: facetSearchSelector?.options.query ?? '',
             values: facetSearchSelector?.response.values ?? [],
         },
-        hasActiveValues,
+        hasActiveValues: !!activeValue,
         selectedValueAncestry,
         type: 'hierarchical',
         values,

package/dist/esm/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.ssr.js

@@ -11,12 +11,12 @@ import { isFacetLoadingResponseSelector as listingIsFacetLoadingResponseSelector
 import { buildProductListing } from '../../../product-listing/headless-product-listing.js';
 import { isFacetLoadingResponseSelector as searchIsFacetLoadingResponseSelector, facetResponseSelector as searchFacetResponseSelector, } from '../../../search/facets/headless-search-facet-options.js';
 import { buildSearch } from '../../../search/headless-search.js';
-import { getCategoryFacetState, } from '../category/headless-commerce-category-facet.js';
-import { getDateFacetState, } from '../date/headless-commerce-date-facet.js';
-import { getCoreFacetState, } from '../headless-core-commerce-facet.js';
-import { getLocationFacetState, } from '../location/headless-commerce-location-facet.js';
-import { getNumericFacetState, } from '../numeric/headless-commerce-numeric-facet.js';
-import { getRegularFacetState, } from '../regular/headless-commerce-regular-facet.js';
+import { getCategoryFacetState } from '../category/headless-commerce-category-facet.js';
+import { getDateFacetState } from '../date/headless-commerce-date-facet.js';
+import { getCoreFacetState } from '../headless-core-commerce-facet.js';
+import { getLocationFacetState } from '../location/headless-commerce-location-facet.js';
+import { getNumericFacetState } from '../numeric/headless-commerce-numeric-facet.js';
+import { getRegularFacetState } from '../regular/headless-commerce-regular-facet.js';
 /**
  * @group Definers
  */
@@ -73,7 +73,7 @@ export function buildFacetGenerator(engine, options) {
                 const facetId = facetResponseSelector.facetId;
                 switch (facetResponseSelector.type) {
                     case 'hierarchical':
-                        return getCategoryFacetState(createFacetState(facetResponseSelector), categoryFacetSearchStateSelector(getEngineState(), facetId));
+                        return getCategoryFacetState(createFacetState(facetResponseSelector), categoryFacetSearchStateSelector(getEngineState(), facetId), facetRequestSelector(getEngineState(), facetId));
                     case 'dateRange':
                         return getDateFacetState(createFacetState(facetResponseSelector));
                     case 'numericalRange':

package/dist/esm/controllers/commerce/core/facets/headless-core-commerce-facet.js

@@ -24,9 +24,6 @@ export function buildCoreCommerceFacet(engine, props) {
             dispatch(props.options.toggleSelectActionCreator({
                 selection,
                 facetId,
-                ...('retrieveCount' in selection
-                    ? { retrieveCount: selection.retrieveCount }
-                    : {}),
             }));
             dispatch(props.options.fetchProductsActionCreator());
         },

package/dist/esm/features/commerce/facets/facet-set/facet-set-reducers.js

@@ -98,9 +98,15 @@ function restoreCategoryFacets(state, parameterFacets) {
                 // eslint-disable-next-line @cspell/spellchecker
                 // TODO CAPI-966: Remove delimitingCharacter
                 delimitingCharacter: '|',
+                // In the CAPI, the default retrieveCount is 5, while the default
+                // numberOfValues is 8. We explicitly set retrieveCount to 8 when
+                // restoring category facets to ensure a consistent show more / show
+                // less behavior, given that the retrieveCount is not returned in the
+                // API response.
+                retrieveCount: 8,
             },
         };
-        selectPath(state[facetId].request, path, 10);
+        selectPath(state[facetId].request, path);
     }
 }
 function restoreFacet(facetId) {
@@ -111,7 +117,6 @@ function restoreFacet(facetId) {
         field: facetId,
         isFieldExpanded: false,
         preventAutoSelect: false,
-        initialNumberOfValues: 10,
     };
 }
 function restoreFacetValue() {
@@ -121,7 +126,6 @@ function restoreFacetValue() {
         state: 'selected',
         isAutoSelected: false,
         isSuggested: false,
-        numberOfResults: 10,
         moreValuesAvailable: true,
     };
 }
@@ -129,30 +133,29 @@ export function buildSelectedFacetValueRequest(rawValue) {
     return { state: 'selected', value: rawValue };
 }
 export function selectPath(request, path, initialNumberOfValues) {
-    request.values = buildCurrentValuesFromPath(path, initialNumberOfValues);
-    request.numberOfValues = path.length ? 1 : initialNumberOfValues;
+    request.values = buildCurrentValuesFromPath(path);
+    request.numberOfValues = initialNumberOfValues;
     request.preventAutoSelect = true;
 }
-export function buildCurrentValuesFromPath(path, retrieveCount) {
+export function buildCurrentValuesFromPath(path) {
     if (!path.length) {
         return [];
     }
-    const root = buildCategoryFacetValueRequest(path[0], retrieveCount);
+    const root = buildCategoryFacetValueRequest(path[0]);
     let curr = root;
     const [_first, ...rest] = path;
     for (const segment of rest) {
-        const next = buildCategoryFacetValueRequest(segment, retrieveCount);
+        const next = buildCategoryFacetValueRequest(segment);
         curr.children.push(next);
         curr = next;
     }
     curr.state = 'selected';
     return [root];
 }
-export function buildCategoryFacetValueRequest(value, retrieveCount) {
+export function buildCategoryFacetValueRequest(value) {
     return {
         children: [],
         state: 'idle',
         value,
-        retrieveCount,
     };
 }

package/dist/esm/features/commerce/facets/facet-set/facet-set-slice.js

@@ -1,9 +1,7 @@
 import { createReducer } from '@reduxjs/toolkit';
-import { defaultNumberOfValuesIncrement } from '../../../facets/category-facet-set/category-facet-set-actions.js';
 import { selectCategoryFacetSearchResult } from '../../../facets/facet-search-set/category/category-facet-search-actions.js';
 import { excludeFacetSearchResult, selectFacetSearchResult, } from '../../../facets/facet-search-set/specific/specific-facet-search-actions.js';
 import { convertFacetValueToRequest } from '../../../facets/facet-set/facet-set-slice.js';
-import { handleFacetUpdateNumberOfValues } from '../../../facets/generic/facet-reducer-helpers.js';
 import { convertToDateRangeRequests } from '../../../facets/range-facets/date-facet-set/date-facet-set-slice.js';
 import { findExactRangeValue } from '../../../facets/range-facets/generic/range-facet-reducers.js';
 import { convertToNumericRangeRequests } from '../../../facets/range-facets/numeric-facet-set/numeric-facet-set-slice.js';
@@ -13,7 +11,6 @@ import { fetchProductListing } from '../../product-listing/product-listing-actio
 import { fetchQuerySuggestions } from '../../query-suggest/query-suggest-actions.js';
 import { restoreSearchParameters } from '../../search-parameters/search-parameters-actions.js';
 import { executeSearch } from '../../search/search-actions.js';
-import '../category-facet/category-facet-actions.js';
 import { toggleSelectCategoryFacetValue, updateCategoryFacetNumberOfValues, } from '../category-facet/category-facet-actions.js';
 import { deselectAllValuesInCoreFacet, updateCoreFacetFreezeCurrentValues, updateCoreFacetIsFieldExpanded, updateCoreFacetNumberOfValues, updateAutoSelectionForAllCoreFacets, clearAllCoreFacets, deleteAllCoreFacets, } from '../core-facet/core-facet-actions.js';
 import { toggleExcludeDateFacetValue, toggleSelectDateFacetValue, updateDateFacetValues, } from '../date-facet/date-facet-actions.js';
@@ -21,7 +18,6 @@ import { executeCommerceFieldSuggest, getFacetIdWithCommerceFieldSuggestionNames
 import { toggleSelectLocationFacetValue } from '../location-facet/location-facet-actions.js';
 import { toggleExcludeNumericFacetValue, toggleSelectNumericFacetValue, updateManualNumericFacetRange, updateNumericFacetValues, } from '../numeric-facet/numeric-facet-actions.js';
 import { toggleExcludeFacetValue, toggleSelectFacetValue, } from '../regular-facet/regular-facet-actions.js';
-import { handleCategoryFacetNestedNumberOfValuesUpdate } from './facet-set-reducer-helpers.js';
 import { buildCategoryFacetValueRequest, buildSelectedFacetValueRequest, restoreFromParameters, selectPath, } from './facet-set-reducers.js';
 import { getCommerceFacetSetInitialState, } from './facet-set-state.js';
 export const commerceFacetSetReducer = createReducer(getCommerceFacetSetInitialState(), (builder) => {
@@ -99,24 +95,25 @@ export const commerceFacetSetReducer = createReducer(getCommerceFacetSetInitialS
         updateExistingFacetValueState(existingValue, 'select');
     })
         .addCase(toggleSelectCategoryFacetValue, (state, action) => {
-        const { facetId, selection, retrieveCount } = action.payload;
+        const { facetId, selection } = action.payload;
         const request = state[facetId]?.request;
-        if (!request || !ensureCategoryFacetRequest(request)) {
+        if (!ensureCategoryFacetRequest(request)) {
             return;
         }
         const { path } = selection;
         const pathToSelection = path.slice(0, path.length - 1);
-        const children = ensurePathAndReturnChildren(request, pathToSelection, retrieveCount);
-        if (children.length) {
-            const lastSelectedParent = children[0];
-            lastSelectedParent.state = 'selected';
-            lastSelectedParent.children = [];
-            return;
+        const children = ensurePathAndReturnChildren(request, pathToSelection);
+        let selectedValue = children.find((value) => value.value === selection.value);
+        if (!selectedValue) {
+            selectedValue = buildCategoryFacetValueRequest(selection.value);
+            children.push(selectedValue);
+        }
+        selectedValue.state =
+            selectedValue.state === 'idle' ? 'selected' : 'idle';
+        if (selectedValue.state === 'selected') {
+            request.numberOfValues = request.initialNumberOfValues;
+            request.retrieveCount = request.initialNumberOfValues;
         }
-        const newParent = buildCategoryFacetValueRequest(selection.value, retrieveCount);
-        newParent.state = 'selected';
-        children.push(newParent);
-        request.numberOfValues = 1;
     })
         .addCase(toggleExcludeFacetValue, (state, action) => {
         const { facetId, selection } = action.payload;
@@ -169,13 +166,10 @@ export const commerceFacetSetReducer = createReducer(getCommerceFacetSetInitialS
         .addCase(updateCategoryFacetNumberOfValues, (state, action) => {
         const { facetId, numberOfValues } = action.payload;
         const request = state[facetId]?.request;
-        if (!request) {
+        if (!ensureCategoryFacetRequest(request)) {
             return;
         }
-        if (!request.values.length) {
-            return handleFacetUpdateNumberOfValues(request, numberOfValues);
-        }
-        handleCategoryFacetNestedNumberOfValuesUpdate(state, action.payload);
+        handleCategoryFacetUpdateNumberOfValues(request, numberOfValues);
     })
         .addCase(selectFacetSearchResult, (state, action) => {
         const { facetId, value } = action.payload;
@@ -202,8 +196,7 @@ export const commerceFacetSetReducer = createReducer(getCommerceFacetSetInitialS
         const { rawValue } = value;
         facetRequest.freezeCurrentValues = true;
         facetRequest.preventAutoSelect = true;
-        const existingValue = facetRequest.values.find((v) => v.value ===
-            rawValue);
+        const existingValue = facetRequest.values.find((v) => v.value === rawValue);
         if (!existingValue) {
             insertNewValue(facetRequest, { state: 'excluded', value: rawValue });
             return;
@@ -212,13 +205,12 @@ export const commerceFacetSetReducer = createReducer(getCommerceFacetSetInitialS
     })
         .addCase(selectCategoryFacetSearchResult, (state, action) => {
         const { facetId, value } = action.payload;
-        const facetRequest = state[facetId];
-        if (!facetRequest ||
-            !ensureCategoryFacetRequest(facetRequest?.request)) {
+        const request = state[facetId]?.request;
+        if (!ensureCategoryFacetRequest(request)) {
             return;
         }
         const path = [...value.path, value.rawValue];
-        selectPath(facetRequest.request, path, facetRequest.request.initialNumberOfValues);
+        selectPath(request, path, request.initialNumberOfValues);
     })
         .addCase(updateNumericFacetValues, (state, action) => {
         const { facetId, values } = action.payload;
@@ -301,7 +293,7 @@ function ensureDateFacetRequest(facetRequest) {
     return facetRequest.type === 'dateRange';
 }
 function ensureCategoryFacetRequest(facetRequest) {
-    return facetRequest.type === 'hierarchical';
+    return facetRequest?.type === 'hierarchical';
 }
 function handleQueryFulfilled(state, action) {
     const existingFacets = new Set(Object.keys(state));
@@ -324,7 +316,8 @@ function handleFieldSuggestionsFulfilled(state, facetId) {
 }
 function handleDeselectAllFacetValues(request) {
     if (request.type === 'hierarchical') {
-        request.numberOfValues = request.initialNumberOfValues;
+        request.initialNumberOfValues = undefined;
+        request.numberOfValues = undefined;
         request.values = [];
         request.preventAutoSelect = true;
     }
@@ -332,13 +325,21 @@ function handleDeselectAllFacetValues(request) {
         request.values.forEach((value) => (value.state = 'idle'));
     }
 }
-function ensurePathAndReturnChildren(request, path, retrieveCount) {
+/**
+ * Traverses the request values and validates the path, building new values for
+ * missing path segments if needed, then returns the children of the last
+ * visited value.
+ *
+ * Used to navigate to a specific level in the category tree before manipulating
+ * values.
+ */
+function ensurePathAndReturnChildren(request, path) {
     let children = request.values;
     for (const segment of path) {
         let parent = children[0];
         const missingParent = !parent;
         if (missingParent || segment !== parent.value) {
-            parent = buildCategoryFacetValueRequest(segment, retrieveCount);
+            parent = buildCategoryFacetValueRequest(segment);
             children.length = 0;
             children.push(parent);
         }
@@ -371,11 +372,13 @@ function updateStateFromFacetResponse(state, facetResponse, facetsToRemove) {
     if (!facetRequest) {
         state[facetId] = { request: {} };
         facetRequest = state[facetId].request;
-        facetRequest.initialNumberOfValues = facetResponse.numberOfValues;
     }
     else {
         facetsToRemove.delete(facetId);
     }
+    if (facetRequest.initialNumberOfValues === undefined) {
+        facetRequest.initialNumberOfValues = facetResponse.numberOfValues;
+    }
     facetRequest.facetId = facetId;
     facetRequest.displayName = facetResponse.displayName;
     facetRequest.numberOfValues = facetResponse.numberOfValues;
@@ -407,9 +410,7 @@ function getFacetRequestValuesFromFacetResponse(facetResponse) {
         case 'dateRange':
             return convertToDateRangeRequests(facetResponse.values);
         case 'hierarchical':
-            return facetResponse.values.every((f) => f.state === 'idle' && f.children.length === 0)
-                ? []
-                : facetResponse.values.map(convertCategoryFacetValueToRequest);
+            return facetResponse.values.map(convertCategoryFacetValueToRequest);
         case 'regular':
             return facetResponse.values.map(convertFacetValueToRequest);
         case 'location':
@@ -419,15 +420,12 @@ function getFacetRequestValuesFromFacetResponse(facetResponse) {
     }
 }
 export function convertCategoryFacetValueToRequest(responseValue) {
-    const children = responseValue.children.every((c) => c.state === 'idle' && c.children.length === 0)
-        ? []
-        : responseValue.children.map(convertCategoryFacetValueToRequest);
+    const children = responseValue.children.map(convertCategoryFacetValueToRequest);
     const { state, value } = responseValue;
     return {
         children,
         state,
         value,
-        retrieveCount: defaultNumberOfValuesIncrement,
     };
 }
 export function convertLocationFacetValueToRequest(facetValue) {
@@ -452,3 +450,7 @@ function clearAllFacetValues(state) {
         facet.request.values = [];
     });
 }
+function handleCategoryFacetUpdateNumberOfValues(facetRequest, numberOfValues) {
+    facetRequest.numberOfValues = numberOfValues;
+    facetRequest.retrieveCount = numberOfValues;
+}

package/dist/esm/utils/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "3.26.1" || 'Test version';
+export const VERSION = "3.26.2-pre.497e1d73bf" || 'Test version';
 export const COVEO_FRAMEWORK = ['@coveo/atomic', '@coveo/quantic'];