@athoscommerce/snap-preact 1.5.1-beta.112 → 1.5.1-beta.116

package/dist/cjs/components/src/components/Organisms/Chat/Chat.js

@@ -83,7 +83,7 @@ var ChatInspirationResultMessage_1 = require("../../Molecules/ChatInspirationRes
 var ChatProductComparisonMessage_1 = require("../../Molecules/ChatProductComparisonMessage/ChatProductComparisonMessage");
 var ChatProductQueryMessage_1 = require("../../Molecules/ChatProductQueryMessage/ChatProductQueryMessage");
 exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     var globalTheme = (0, providers_1.useTheme)();
     var globalTreePath = (0, providers_1.useTreePath)();
     var isMobile = (0, __1.useMediaQuery)('(max-width: 767px)');
@@ -92,7 +92,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
         logo: 'https://cdn.athoscommerce.net/snap/images/Athos%20Commerce_Icon_white.svg',
         title: 'Athos Conversational Assistant',
         subtitle: 'Your Guided Discovery Expert',
-        multiselectFacets: true,
+        multiselectFacets: false,
         disableBubbleSuggestedQuestions: isMobile ? true : false,
         primaryColorBg: '#253B80',
         primaryColorFg: '#fff',
@@ -174,33 +174,37 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
     var chatRef = (0, hooks_1.useRef)(null);
     // Ref for the mobile secondary panel — needed for swipe-to-dismiss measurements
     var secondaryRef = (0, hooks_1.useRef)(null);
-    var _y = (0, hooks_1.useState)(false), mobileProductInfoOpen = _y[0], setMobileProductInfoOpen = _y[1];
-    var _z = (0, hooks_1.useState)(0), footerHeight = _z[0], setFooterHeight = _z[1];
+    var _0 = (0, hooks_1.useState)(false), mobileProductInfoOpen = _0[0], setMobileProductInfoOpen = _0[1];
+    var _1 = (0, hooks_1.useState)(0), footerHeight = _1[0], setFooterHeight = _1[1];
     var dropEnabled = store.features.imageSearch.enabled && !store.loading && !store.blocked && !((_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.sessionLimitReached);
-    var _0 = (0, useChatFileUpload_1.useChatFileUpload)({
+    var _2 = (0, useChatFileUpload_1.useChatFileUpload)({
         enabled: !!dropEnabled,
         onUpload: function (files) { return controller.upload(files); },
-    }), fileInputRef = _0.fileInputRef, isDraggingFile = _0.isDraggingFile, dragHandlers = _0.dragHandlers;
+    }), fileInputRef = _2.fileInputRef, isDraggingFile = _2.isDraggingFile, dragHandlers = _2.dragHandlers;
     // productQuery messages are filtered out of the main chat render (they only drive the side-chat panel),
     // so don't auto-scroll when one is added — otherwise clicking a product in the side chat scrolls the main thread.
     var visibleChat = (((_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.chat) || []).filter(function (m) { return m.messageType !== 'productQuery'; });
     var visibleChatLength = visibleChat.length;
     var lastVisibleMessage = visibleChat[visibleChat.length - 1];
-    var _1 = (0, useChatOverflow_1.useChatOverflow)({
+    var _3 = (0, useChatOverflow_1.useChatOverflow)({
         messagesContainerRef: messagesContainerRef,
         headerRef: headerRef,
         open: store.open,
         loading: store.loading,
         visibleChatLength: visibleChatLength,
         lastVisibleMessage: lastVisibleMessage,
-    }), showNewMessages = _1.showNewMessages, setShowNewMessages = _1.setShowNewMessages, messagesOverflow = _1.messagesOverflow, scrollToBottom = _1.scrollToBottom, scrollToBottomIfNear = _1.scrollToBottomIfNear;
+    }), showNewMessages = _3.showNewMessages, setShowNewMessages = _3.setShowNewMessages, messagesOverflow = _3.messagesOverflow, scrollToBottom = _3.scrollToBottom, scrollToBottomIfNear = _3.scrollToBottomIfNear;
     // Re-focus the chat input on desktop after a search completes.
     // The input is disabled while loading, which causes the browser to drop focus.
     // On mobile we intentionally skip this so the virtual keyboard dismisses.
+    // Only fire on the loading true → false transition — running on mount steals
+    // focus away from the Storybook controls whenever the story re-renders.
+    var prevLoadingRef = (0, hooks_1.useRef)(store.loading);
     (0, hooks_1.useEffect)(function () {
-        if (!store.loading && !isMobile && store.open) {
+        if (prevLoadingRef.current && !store.loading && !isMobile && store.open) {
             controller.focusInput();
         }
+        prevLoadingRef.current = store.loading;
     }, [store.loading]);
     // const subProps: ChatSubProps = {};
     var activeMessage = (_c = store.currentChat) === null || _c === void 0 ? void 0 : _c.activeMessage;
@@ -221,19 +225,34 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
     var sideChatTypes = isMobile
         ? __spreadArray(__spreadArray(['inspirationResult'], (isFirstMobileComparison ? ['productComparison'] : []), true), (mobileProductInfoOpen ? ['productQuery'] : []), true) : ['inspirationResult', 'productComparison', 'productQuery'];
     var shouldShowSideChat = activeMessage && sideChatTypes.includes(activeMessage === null || activeMessage === void 0 ? void 0 : activeMessage.messageType) && ((_d = store.currentChat) === null || _d === void 0 ? void 0 : _d.dismissedSideChatMessageId) !== activeMessage.id;
-    var styling = (0, utilities_1.mergeStyles)({
-        mobile: isMobile,
-        offset: offset,
-        hasSideChat: !!shouldShowSideChat,
-        footerHeight: footerHeight,
-        primaryColorBg: colorPrimary,
-        primaryColorFg: colorPrimaryText,
-        primaryAccentColorBg: colorPrimaryAccent,
-        primaryAccentColorFg: colorPrimaryAccentText,
-        secondaryAccentColorBg: colorSecondaryAccent,
-        secondaryAccentColorFg: colorSecondaryAccentText,
-        position: chatPosition,
-    }, Chat_styles_1.chatDefaultStyles);
+    var hasSideChat = !!shouldShowSideChat;
+    var styling = (0, hooks_1.useMemo)(function () {
+        return (0, utilities_1.mergeStyles)({
+            mobile: isMobile,
+            offset: offset,
+            hasSideChat: hasSideChat,
+            footerHeight: footerHeight,
+            primaryColorBg: colorPrimary,
+            primaryColorFg: colorPrimaryText,
+            primaryAccentColorBg: colorPrimaryAccent,
+            primaryAccentColorFg: colorPrimaryAccentText,
+            secondaryAccentColorBg: colorSecondaryAccent,
+            secondaryAccentColorFg: colorSecondaryAccentText,
+            position: chatPosition,
+        }, Chat_styles_1.chatDefaultStyles);
+    }, [
+        isMobile,
+        offset,
+        hasSideChat,
+        footerHeight,
+        colorPrimary,
+        colorPrimaryText,
+        colorPrimaryAccent,
+        colorPrimaryAccentText,
+        colorSecondaryAccent,
+        colorSecondaryAccentText,
+        chatPosition,
+    ]);
     // Lock body scroll while chat is open so touch/wheel scrolls don't leak to the page behind
     (0, hooks_1.useEffect)(function () {
         if (!store.open)
@@ -281,6 +300,117 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
         observer.observe(el);
         return function () { return observer.disconnect(); };
     }, [store.open, (_e = store.currentChat) === null || _e === void 0 ? void 0 : _e.isExpired]);
+    // Prevent the background page from scrolling while the chat is open on touch
+    // devices. iOS Safari (real iPad/iPhone) rubber-band-scrolls the body when a
+    // touchmove inside `.ss__chat__messages` reaches the top/bottom — and
+    // `overscroll-behavior: contain` is ignored there.
+    //
+    // We don't touch body styles (locking via `position: fixed` on `<body>` leaves
+    // iPad Safari in a stuck viewport state where the page can't scroll after the
+    // lock is released). Instead we install a `touchmove` handler that:
+    //   - allows the touchmove if it's inside a scrollable region of the chat
+    //     and that region isn't at its scroll edge in the swipe direction;
+    //   - calls `preventDefault()` otherwise — which is what blocks both
+    //     background scrolling and iOS rubber-band overscroll.
+    // Cleanup just removes the listeners, so nothing can leak into the page.
+    (0, hooks_1.useEffect)(function () {
+        if (!store.open)
+            return;
+        if (typeof document === 'undefined')
+            return;
+        var startX = 0;
+        var startY = 0;
+        var scrollEl = null;
+        // Walk up from the touch target to find the first ancestor inside the chat
+        // that is actually scrollable in either axis. Stop at the chat root so we
+        // never consider elements outside the chat.
+        var findScrollableInChat = function (start) {
+            var chatRoot = chatRef.current;
+            if (!chatRoot)
+                return null;
+            var el = start;
+            while (el && chatRoot.contains(el)) {
+                var style = getComputedStyle(el);
+                var scrollableY = (style.overflowY === 'auto' || style.overflowY === 'scroll') && el.scrollHeight > el.clientHeight;
+                var scrollableX = (style.overflowX === 'auto' || style.overflowX === 'scroll') && el.scrollWidth > el.clientWidth;
+                if (scrollableY || scrollableX) {
+                    return el;
+                }
+                if (el === chatRoot)
+                    break;
+                el = el.parentElement;
+            }
+            return null;
+        };
+        var onTouchStart = function (e) {
+            if (!e.touches[0])
+                return;
+            startX = e.touches[0].clientX;
+            startY = e.touches[0].clientY;
+            scrollEl = findScrollableInChat(e.target);
+        };
+        var onTouchMove = function (e) {
+            var _a, _b, _c, _d;
+            var target = e.target;
+            var chatRoot = chatRef.current;
+            var inChat = !!(chatRoot && target && chatRoot.contains(target));
+            // Touches outside the chat shouldn't scroll the background.
+            if (!inChat) {
+                if (e.cancelable)
+                    e.preventDefault();
+                return;
+            }
+            // Inside the chat but no scrollable container — block to prevent body scroll.
+            if (!scrollEl) {
+                if (e.cancelable)
+                    e.preventDefault();
+                return;
+            }
+            // Inside a scrollable container — only block when at the edge in the
+            // swipe direction, so internal scrolling continues to work. Detect the
+            // dominant axis so horizontally-scrollable rows (e.g. the facets row)
+            // also get to handle their own touch gestures.
+            var currentX = (_b = (_a = e.touches[0]) === null || _a === void 0 ? void 0 : _a.clientX) !== null && _b !== void 0 ? _b : startX;
+            var currentY = (_d = (_c = e.touches[0]) === null || _c === void 0 ? void 0 : _c.clientY) !== null && _d !== void 0 ? _d : startY;
+            var deltaX = currentX - startX;
+            var deltaY = currentY - startY;
+            var horizontal = Math.abs(deltaX) > Math.abs(deltaY);
+            if (horizontal) {
+                var scrollsX = scrollEl.scrollWidth > scrollEl.clientWidth;
+                if (!scrollsX) {
+                    if (e.cancelable)
+                        e.preventDefault();
+                    return;
+                }
+                var atLeft = scrollEl.scrollLeft <= 0;
+                var atRight = scrollEl.scrollLeft + scrollEl.clientWidth >= scrollEl.scrollWidth - 1;
+                if ((atLeft && deltaX > 0) || (atRight && deltaX < 0)) {
+                    if (e.cancelable)
+                        e.preventDefault();
+                }
+            }
+            else {
+                var scrollsY = scrollEl.scrollHeight > scrollEl.clientHeight;
+                if (!scrollsY) {
+                    if (e.cancelable)
+                        e.preventDefault();
+                    return;
+                }
+                var atTop = scrollEl.scrollTop <= 0;
+                var atBottom = scrollEl.scrollTop + scrollEl.clientHeight >= scrollEl.scrollHeight - 1;
+                if ((atTop && deltaY > 0) || (atBottom && deltaY < 0)) {
+                    if (e.cancelable)
+                        e.preventDefault();
+                }
+            }
+        };
+        document.addEventListener('touchstart', onTouchStart, { passive: true });
+        document.addEventListener('touchmove', onTouchMove, { passive: false });
+        return function () {
+            document.removeEventListener('touchstart', onTouchStart);
+            document.removeEventListener('touchmove', onTouchMove);
+        };
+    }, [store.open]);
     var HistoryButton = function (props) { return ((0, jsx_runtime_1.jsx)(Button_1.Button, { className: "ss__chat__header__button--history", disabled: props.disabled, icon: {
             icon: 'history',
             title: 'Chat History',
@@ -288,7 +418,10 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
     var HistoryPopup = function (props) { return ((0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__history", children: [(0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__history__header", children: [(0, jsx_runtime_1.jsx)("h4", { children: "History" }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__header__buttons", children: (0, jsx_runtime_1.jsx)(Button_1.Button, { content: "clear", onClick: function () {
                                 controller.store.clearHistory();
                                 props.toggleOpen && props.toggleOpen();
-                            } }) })] }), store.chats.length > 0 ? ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__chats", children: store.chats.map(function (chat) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__chats__chat", children: (0, jsx_runtime_1.jsxs)(Button_1.Button, { className: "ss__chat__history__chat__button", onClick: function () {
+                            } }) })] }), store.chats.length > 0 ? ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__chats", children: store.chats
+                    .slice()
+                    .reverse()
+                    .map(function (chat) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__chats__chat", children: (0, jsx_runtime_1.jsxs)(Button_1.Button, { className: "ss__chat__history__chat__button", onClick: function () {
                             controller.store.switchChat(chat.id);
                         }, disabled: chat.id === store.currentChatId, children: [(0, jsx_runtime_1.jsx)("div", { className: "ss__chat__history__chat__button__text", children: (function () {
                                     var lastUserMessage = __spreadArray([], chat.chat, true).reverse().find(function (message) { return message.messageType === 'user'; });
@@ -357,13 +490,26 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                         boxShadow: '0px 3px 6px 0px rgba(0, 0, 0, 0.2)',
                         borderRadius: '6px',
                     },
-                }, children: (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet__options", children: (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet__slider", style: { padding: '12px 16px' }, children: (0, jsx_runtime_1.jsx)(__1.FacetSlider, { facet: props.facet }) }) }) }) }));
+                }, children: (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet__options", children: (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet__slider", style: { padding: '12px 16px' }, children: (0, jsx_runtime_1.jsx)(__1.FacetSlider, { facet: props.facet, onChange: function () {
+                                if (!multiselectFacets) {
+                                    // FacetSlider fires onChange before its urlManager update; defer
+                                    // so controller.search() reads the updated filter state. Force
+                                    // productSearch with the current filters so a slider tweak doesn't
+                                    // fall through to `general` when hasPendingFacetChanges happens to
+                                    // be false (e.g. the slider returned to the seeded range).
+                                    queueMicrotask(function () {
+                                        return controller.search({
+                                            data: { requestType: 'productSearch', searchFilters: controller.store.searchFilters },
+                                        });
+                                    });
+                                }
+                            } }) }) }) }) }));
     };
     // TODO: if starting a new chat and it's expired, this button would then disappear
     if (!controller.store.chatEnabled) {
         return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
     }
-    var _2 = (0, useChatGestures_1.useChatGestures)({
+    var _4 = (0, useChatGestures_1.useChatGestures)({
         panelRef: secondaryRef,
         shouldShowSideChat: !!shouldShowSideChat,
         activeMessageId: activeMessage === null || activeMessage === void 0 ? void 0 : activeMessage.id,
@@ -375,7 +521,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
             setMobileProductInfoOpen(false);
             (_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.dismissSideChat();
         },
-    }), swipeOffset = _2.swipeOffset, swipeAnimating = _2.swipeAnimating, swipeHandlers = _2.swipeHandlers;
+    }), swipeOffset = _4.swipeOffset, swipeAnimating = _4.swipeAnimating, swipeHandlers = _4.swipeHandlers;
     var requestType = (_f = store.currentChat) === null || _f === void 0 ? void 0 : _f.requestType;
     var loadingVerbs = (0, hooks_1.useMemo)(function () {
         switch (requestType) {
@@ -396,11 +542,13 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                 return undefined;
         }
     }, [requestType]);
+    var isWelcomeState = (!((_g = store.currentChat) === null || _g === void 0 ? void 0 : _g.chat) || store.currentChat.chat.length === 0) && !!store.welcomeMessage && !((_h = store.currentChat) === null || _h === void 0 ? void 0 : _h.isExpired);
     return ((0, jsx_runtime_1.jsx)(providers_1.CacheProvider, { children: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", __assign({ ref: chatRef, className: (0, classnames_1.default)('ss__chat', {
                         'ss__chat--open': store.open,
                         'ss__chat--minimized': !store.open,
                         'ss__chat--mobile': isMobile,
-                    }, className, internalClassName) }, styling, { children: [!disableBubbleSuggestedQuestions && !store.open && !store.currentChat && ((_g = store.suggestedQuestions) === null || _g === void 0 ? void 0 : _g.length) > 0 && ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__suggested-questions", children: store.suggestedQuestions.map(function (question, index) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__suggested-questions__item", onClick: function () {
+                        'ss__chat--welcome': isWelcomeState,
+                    }, className, internalClassName) }, styling, { children: [!disableBubbleSuggestedQuestions && !store.open && !store.currentChat && ((_j = store.suggestedQuestions) === null || _j === void 0 ? void 0 : _j.length) > 0 && ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__suggested-questions", children: store.suggestedQuestions.map(function (question, index) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__suggested-questions__item", onClick: function () {
                                     controller.openChat(question);
                                 }, children: question }, index)); }) })), (0, jsx_runtime_1.jsx)("button", { type: "button", className: 'ss__chat__bubble', "aria-label": store.open ? 'Close chat' : 'Open chat', "aria-expanded": store.open, onClick: function () { return controller.handlers.button.click(); }, children: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: "chat", title: "Open Chat" }) }), store.open && shouldShowSideChat && activeMessage ? ((0, jsx_runtime_1.jsxs)("div", { ref: secondaryRef, className: (0, classnames_1.default)('ss__chat__secondary'), role: "region", "aria-label": "Conversation details", style: isMobile
                                 ? {
@@ -414,7 +562,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                         productQuery: 'Product Information',
                                                     }[activeMessage.messageType] || null }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__header__title__secondary", children: {
                                                         inspirationResult: 'Choose a style direction to explore',
-                                                        productComparison: "Comparing ".concat(((_h = activeMessage === null || activeMessage === void 0 ? void 0 : activeMessage.searchResults) === null || _h === void 0 ? void 0 : _h.length) || '', " products"),
+                                                        productComparison: "Comparing ".concat(((_k = activeMessage === null || activeMessage === void 0 ? void 0 : activeMessage.searchResults) === null || _k === void 0 ? void 0 : _k.length) || '', " products"),
                                                         productQuery: 'Complete product details',
                                                     }[activeMessage.messageType] || null })] }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__header__buttons", children: (0, jsx_runtime_1.jsx)(Button_1.Button, { className: "ss__chat__header__button--close", "aria-label": "Close chat", icon: { icon: 'close2', title: 'Close Chat' }, onClick: function () {
                                                     var _a, _b;
@@ -432,7 +580,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                 } }) })] }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__content", children: (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__messages', children: {
                                             inspirationResult: ((0, jsx_runtime_1.jsx)(ChatInspirationResultMessage_1.ChatInspirationResultMessage, __assign({}, subProps.inspirationResultMessage, { chatItem: activeMessage, controller: controller, onProductQuickView: isMobile ? function () { return setMobileProductInfoOpen(true); } : undefined }))),
                                             productComparison: ((0, jsx_runtime_1.jsx)(ChatProductComparisonMessage_1.ChatProductComparisonMessage, __assign({}, subProps.productComparisonMessage, { chatItem: activeMessage, controller: controller }))),
-                                            productQuery: ((0, jsx_runtime_1.jsx)(ChatProductQueryMessage_1.ChatProductQueryMessage, __assign({}, subProps.productQueryMessage, { chatItem: activeMessage, controller: controller, displayFields: (_k = (_j = controller.config.settings) === null || _j === void 0 ? void 0 : _j.quickview) === null || _k === void 0 ? void 0 : _k.displayFields, primaryColor: colorPrimary, primaryColorText: colorPrimaryText }))),
+                                            productQuery: ((0, jsx_runtime_1.jsx)(ChatProductQueryMessage_1.ChatProductQueryMessage, __assign({}, subProps.productQueryMessage, { chatItem: activeMessage, controller: controller, displayFields: (_m = (_l = controller.config.settings) === null || _l === void 0 ? void 0 : _l.quickview) === null || _m === void 0 ? void 0 : _m.displayFields, primaryColor: colorPrimary, primaryColorText: colorPrimaryText }))),
                                         }[activeMessage.messageType] || null }) })] })) : null, store.open ? ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__primary', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__header', children: [(0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__header__title", children: [logo ? (0, jsx_runtime_1.jsx)("img", { className: "ss__chat__header__title__logo", src: logo }) : null, (0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__header__title__text", children: [title ? (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__header__title__text__primary", children: title }) : null, subtitle ? (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__header__title__text__secondary", children: subtitle }) : null] })] }), (0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__header__buttons", children: [(0, jsx_runtime_1.jsx)(Button_1.Button
                                                 // disabled={store.currentChat?.chat && store.currentChat.chat.length <= 1}
                                                 , { 
@@ -455,7 +603,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                 }, children: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: "close-thin", size: "14px" }) }))] })) : null;
                                 })(), (0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__content", children: [(0, jsx_runtime_1.jsx)("div", { ref: headerRef, className: (0, classnames_1.default)('ss__chat__content__header', {
                                                 'ss__chat__content__header--overlay': messagesOverflow,
-                                            }), children: ((_l = store.currentChat) === null || _l === void 0 ? void 0 : _l.comparisons.compared) && store.currentChat.comparisons.compared.length > 0 && ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__header', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__header__title', children: [(0, jsx_runtime_1.jsx)(__1.Icon, { className: 'ss__chat__content__header__comparisons__header__title__icon', icon: 'clipboard' }), (0, jsx_runtime_1.jsxs)("span", { className: 'ss__chat__content__header__comparisons__header__title__text', children: ["Compare Products (", (_m = store.currentChat) === null || _m === void 0 ? void 0 : _m.comparisons.compared.length, "/", (_o = store.currentChat) === null || _o === void 0 ? void 0 : _o.comparisons.maxItems, ")"] })] }), (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__content__header__comparisons__header__actions', children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () { var _a; return (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.comparisons.reset(); }, children: "clear" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__content', children: [(0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__content__header__comparisons__content__items', children: Array.from({ length: (_p = store.currentChat) === null || _p === void 0 ? void 0 : _p.comparisons.maxItems }).map(function (_, index) {
+                                            }), children: ((_o = store.currentChat) === null || _o === void 0 ? void 0 : _o.comparisons.compared) && store.currentChat.comparisons.compared.length > 0 && ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__header', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__header__title', children: [(0, jsx_runtime_1.jsx)(__1.Icon, { className: 'ss__chat__content__header__comparisons__header__title__icon', icon: 'clipboard' }), (0, jsx_runtime_1.jsxs)("span", { className: 'ss__chat__content__header__comparisons__header__title__text', children: ["Compare Products (", (_p = store.currentChat) === null || _p === void 0 ? void 0 : _p.comparisons.compared.length, "/", (_q = store.currentChat) === null || _q === void 0 ? void 0 : _q.comparisons.maxItems, ")"] })] }), (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__content__header__comparisons__header__actions', children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () { var _a; return (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.comparisons.reset(); }, children: "clear" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__content__header__comparisons__content', children: [(0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__content__header__comparisons__content__items', children: Array.from({ length: (_r = store.currentChat) === null || _r === void 0 ? void 0 : _r.comparisons.maxItems }).map(function (_, index) {
                                                                     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
                                                                     var comparisonItem = (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.comparisons.compared[index];
                                                                     return ((0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)('ss__chat__content__header__comparisons__content__comparison', {
@@ -475,8 +623,8 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                                         (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.comparisons.remove(comparisonItem.result.id);
                                                                                     }, children: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: 'close-thin', size: '12px' }) })] })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: 'plus-thin' }), (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__content__header__comparisons__content__comparison--placeholder__text', children: "Add" })] })) }, index));
                                                                 }) }), (0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)('ss__chat__content__header__comparisons__action', {
-                                                                    'ss__chat__content__header__comparisons__action--hidden': (((_q = store.currentChat) === null || _q === void 0 ? void 0 : _q.comparisons.compared.length) || 0) < 2,
-                                                                }), children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () { return controller.search(); }, icon: { icon: 'compare', title: 'Compare' }, children: "Compare" }) })] })] })) }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__messages', ref: messagesContainerRef, role: "log", "aria-live": "polite", "aria-relevant": "additions", "aria-label": "Chat messages", style: visibleChatLength ? { scrollbarGutter: 'stable' } : undefined, children: [(!((_r = store.currentChat) === null || _r === void 0 ? void 0 : _r.chat) || store.currentChat.chat.length === 0) && store.welcomeMessage && !((_s = store.currentChat) === null || _s === void 0 ? void 0 : _s.isExpired) && ((0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__welcome", children: [(0, jsx_runtime_1.jsx)("div", { className: "ss__chat__welcome__message", children: store.welcomeMessage }), (0, jsx_runtime_1.jsx)(ChatSuggestedQuestions_1.ChatSuggestedQuestions, __assign({}, subProps.suggestedQuestions, { questions: store.suggestedQuestions, controller: controller }))] })), (_t = store.currentChat) === null || _t === void 0 ? void 0 : _t.chat.filter(function (chatItem) { return chatItem.messageType !== 'productQuery'; }).map(function (chatItem, index) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__message ss__chat__message--".concat(chatItem.messageType), children: {
+                                                                    'ss__chat__content__header__comparisons__action--hidden': (((_s = store.currentChat) === null || _s === void 0 ? void 0 : _s.comparisons.compared.length) || 0) < 2,
+                                                                }), children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () { return controller.search(); }, icon: { icon: 'compare', title: 'Compare' }, children: "Compare" }) })] })] })) }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__messages', ref: messagesContainerRef, role: "log", "aria-live": "polite", "aria-relevant": "additions", "aria-label": "Chat messages", style: visibleChatLength ? { scrollbarGutter: 'stable' } : undefined, children: [(!((_t = store.currentChat) === null || _t === void 0 ? void 0 : _t.chat) || store.currentChat.chat.length === 0) && store.welcomeMessage && !((_u = store.currentChat) === null || _u === void 0 ? void 0 : _u.isExpired) && ((0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__welcome", children: [(0, jsx_runtime_1.jsx)("div", { className: "ss__chat__welcome__message", children: store.welcomeMessage }), (0, jsx_runtime_1.jsx)(ChatSuggestedQuestions_1.ChatSuggestedQuestions, __assign({}, subProps.suggestedQuestions, { questions: store.suggestedQuestions, controller: controller }))] })), (_v = store.currentChat) === null || _v === void 0 ? void 0 : _v.chat.filter(function (chatItem) { return chatItem.messageType !== 'productQuery'; }).map(function (chatItem, index) { return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__message ss__chat__message--".concat(chatItem.messageType), children: {
                                                         user: ((0, jsx_runtime_1.jsx)(ChatMessageUser_1.ChatMessageUser, __assign({}, subProps.messageUser, { chatItem: chatItem, controller: controller, onProductQuickView: isMobile ? function () { return setMobileProductInfoOpen(true); } : undefined, primaryColor: colorPrimary, primaryColorText: colorPrimaryText }))),
                                                         text: ((0, jsx_runtime_1.jsx)(ChatMessageText_1.ChatMessageText, __assign({}, subProps.messageText, { chatItem: chatItem, controller: controller, scrollToBottom: scrollToBottomIfNear, onProductQuickView: isMobile ? function () { return setMobileProductInfoOpen(true); } : undefined, sideChatOpen: !!shouldShowSideChat, primaryColor: colorPrimary, primaryColorText: colorPrimaryText }))),
                                                         content: ((0, jsx_runtime_1.jsx)(ChatMessageText_1.ChatMessageText, __assign({}, subProps.messageText, { chatItem: chatItem, controller: controller, scrollToBottom: scrollToBottomIfNear, onProductQuickView: isMobile ? function () { return setMobileProductInfoOpen(true); } : undefined, sideChatOpen: !!shouldShowSideChat, primaryColor: colorPrimary, primaryColorText: colorPrimaryText }))),
@@ -500,11 +648,11 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                     }[chatItem.messageType] || null }, index)); }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__messages__end", ref: messagesEndRef }), showNewMessages && messagesOverflow && ((0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__new-messages", onClick: function () {
                                                         scrollToBottom();
                                                         setShowNewMessages(false);
-                                                    }, children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: "angle-down", size: "12px" }), (0, jsx_runtime_1.jsx)("span", { children: "New messages" })] }))] }), (0, jsx_runtime_1.jsx)(ChatLoadingIndicator_1.ChatLoadingIndicator, __assign({}, subProps.loadingIndicator, { loading: store.loading, verbs: loadingVerbs })), !((_u = store.currentChat) === null || _u === void 0 ? void 0 : _u.isExpired) ? ((0, jsx_runtime_1.jsxs)("div", __assign({ className: "ss__chat__content__footer", ref: footerRef }, dragHandlers, { children: [store.error && (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__error", children: store.error.message }), ((_v = store.currentChat) === null || _v === void 0 ? void 0 : _v.sessionLimitReached) && ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift', children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: "info", size: "18px", className: 'ss__chat__topic-drift__icon--info' }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift__text', children: [(0, jsx_runtime_1.jsx)("span", { children: "Session limit reached" }), (0, jsx_runtime_1.jsx)("span", { children: "This chat has reached its maximum number of interactions. Start a new session to continue." })] }), (0, jsx_runtime_1.jsx)(Button_1.Button, { className: 'ss__chat__topic-drift__button', onClick: function () {
+                                                    }, children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: "angle-down", size: "12px" }), (0, jsx_runtime_1.jsx)("span", { children: "New messages" })] }))] }), (0, jsx_runtime_1.jsx)(ChatLoadingIndicator_1.ChatLoadingIndicator, __assign({}, subProps.loadingIndicator, { loading: store.loading, verbs: loadingVerbs })), !((_w = store.currentChat) === null || _w === void 0 ? void 0 : _w.isExpired) ? ((0, jsx_runtime_1.jsxs)("div", __assign({ className: "ss__chat__content__footer", ref: footerRef }, dragHandlers, { children: [store.error && (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__error", children: store.error.message }), ((_x = store.currentChat) === null || _x === void 0 ? void 0 : _x.sessionLimitReached) && ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift', children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: "info", size: "18px", className: 'ss__chat__topic-drift__icon--info' }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift__text', children: [(0, jsx_runtime_1.jsx)("span", { children: "Session limit reached" }), (0, jsx_runtime_1.jsx)("span", { children: "This chat has reached its maximum number of interactions. Start a new session to continue." })] }), (0, jsx_runtime_1.jsx)(Button_1.Button, { className: 'ss__chat__topic-drift__button', onClick: function () {
                                                                 controller.store.createChat();
                                                             }, children: "New Session" })] })), store.facets && store.facets.length > 0 && ((0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__actions', children: (0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__actions__wrap", children: [(0, jsx_runtime_1.jsxs)("div", { className: "ss__chat__actions__facets-header", children: [(0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions--title", children: "Filter by:" }), multiselectFacets && store.hasPendingFacetChanges && ((0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__actions__facets-apply ss__chat__actions__facets-apply--active', children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () {
                                                                                 controller.search();
-                                                                            }, children: "Apply" }) }))] }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions--facets", children: store.facets.slice(0, 10).map(function (facet, idx) {
+                                                                            }, children: store.pendingFacetCount > 0 ? "Apply (".concat(store.pendingFacetCount, ")") : 'Clear facets' }) }))] }), (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions--facets", children: store.facets.slice(0, 10).map(function (facet, idx) {
                                                                     var _a;
                                                                     // range/slider facets render via FacetSlider; everything else needs at least one value to be useful
                                                                     if (facet.type !== 'range' && !((_a = facet.values) === null || _a === void 0 ? void 0 : _a.length))
@@ -512,7 +660,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                     if (facet.type === 'range') {
                                                                         return (0, jsx_runtime_1.jsx)(SliderFacetDropdown, { facet: facet, label: getFacetButtonLabel(facet) }, idx);
                                                                     }
-                                                                    return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet ss__chat__actions__facet--".concat(facet.type), children: (0, jsx_runtime_1.jsx)(__1.Dropdown, { usePortal: true, dropUp: true, button: (0, jsx_runtime_1.jsx)(FacetButton, { label: getFacetButtonLabel(facet) }), style: {
+                                                                    return ((0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet ss__chat__actions__facet--".concat(facet.type), children: (0, jsx_runtime_1.jsx)(__1.Dropdown, { usePortal: true, dropUp: true, boundaryRef: chatRef, button: (0, jsx_runtime_1.jsx)(FacetButton, { label: getFacetButtonLabel(facet) }), style: {
                                                                                 '.ss__dropdown__content': __assign({ width: '150px', maxHeight: '200px', overflowY: 'auto', background: 'white', boxShadow: '0px 3px 6px 0px rgba(0, 0, 0, 0.2)', borderRadius: '6px' }, (multiselectFacets
                                                                                     ? {
                                                                                         '.ss__chat__actions__facet__option--checkbox': {
@@ -569,6 +717,9 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                                             '&:hover': {
                                                                                                 background: new utilities_1.Colour(colorPrimary).lightenHex(0.95),
                                                                                             },
+                                                                                            '&.ss__chat__actions__facet__option--selected': {
+                                                                                                fontWeight: 'bold',
+                                                                                            },
                                                                                         },
                                                                                     })),
                                                                             }, children: (0, jsx_runtime_1.jsx)("div", { className: "ss__chat__actions__facet__options", children: facet.type === 'range-buckets'
@@ -592,12 +743,28 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                                                             'ss__chat__actions__facet__option__checkbox--checked': isSelected_1,
                                                                                                         }), children: isSelected_1 && (0, jsx_runtime_1.jsx)(__1.Icon, { icon: "check-thin", size: "10px" }) }), (0, jsx_runtime_1.jsx)("span", { className: "ss__chat__actions__facet__option__label", children: rangeOption.label })] }, optionValue));
                                                                                         }
-                                                                                        return ((0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () {
-                                                                                                controller.store.addFacet({
-                                                                                                    key: facet.field,
-                                                                                                    value: optionValue,
+                                                                                        return ((0, jsx_runtime_1.jsx)(Button_1.Button, { className: (0, classnames_1.default)({
+                                                                                                'ss__chat__actions__facet__option--selected': controller.store.isFacetSelected(facet.field, optionValue),
+                                                                                            }), onClick: function () {
+                                                                                                // Non-multiselect: clicking an already-selected value toggles it off.
+                                                                                                // `addFacet` is idempotent against an existing urlManager value, so without
+                                                                                                // the toggle the state wouldn't change, `hasPendingFacetChanges` would stay
+                                                                                                // false, and the params getter would fall through to `general`.
+                                                                                                if (controller.store.isFacetSelected(facet.field, optionValue)) {
+                                                                                                    controller.store.removeFacet(facet.field, optionValue);
+                                                                                                }
+                                                                                                else {
+                                                                                                    controller.store.addFacet({
+                                                                                                        key: facet.field,
+                                                                                                        value: optionValue,
+                                                                                                    });
+                                                                                                }
+                                                                                                // Force productSearch with the current filter state rather than relying
+                                                                                                // on the params getter's hasPendingFacetChanges promotion — a facet click
+                                                                                                // in the chat is unambiguously a search intent.
+                                                                                                controller.search({
+                                                                                                    data: { requestType: 'productSearch', searchFilters: controller.store.searchFilters },
                                                                                                 });
-                                                                                                controller.search();
                                                                                             }, children: rangeOption.label }, optionValue));
                                                                                     })
                                                                                     : facet.values.map(function (option) {
@@ -619,12 +786,28 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                                                             'ss__chat__actions__facet__option__checkbox--checked': isSelected_2,
                                                                                                         }), children: isSelected_2 && (0, jsx_runtime_1.jsx)(__1.Icon, { icon: "check-thin", size: "10px" }) }), (0, jsx_runtime_1.jsx)("span", { className: "ss__chat__actions__facet__option__label", children: valueOption.label })] }, optionValue));
                                                                                         }
-                                                                                        return ((0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: function () {
-                                                                                                controller.store.addFacet({
-                                                                                                    key: facet.field,
-                                                                                                    value: optionValue,
+                                                                                        return ((0, jsx_runtime_1.jsx)(Button_1.Button, { className: (0, classnames_1.default)({
+                                                                                                'ss__chat__actions__facet__option--selected': controller.store.isFacetSelected(facet.field, optionValue),
+                                                                                            }), onClick: function () {
+                                                                                                // Non-multiselect: clicking an already-selected value toggles it off.
+                                                                                                // `addFacet` is idempotent against an existing urlManager value, so without
+                                                                                                // the toggle the state wouldn't change, `hasPendingFacetChanges` would stay
+                                                                                                // false, and the params getter would fall through to `general`.
+                                                                                                if (controller.store.isFacetSelected(facet.field, optionValue)) {
+                                                                                                    controller.store.removeFacet(facet.field, optionValue);
+                                                                                                }
+                                                                                                else {
+                                                                                                    controller.store.addFacet({
+                                                                                                        key: facet.field,
+                                                                                                        value: optionValue,
+                                                                                                    });
+                                                                                                }
+                                                                                                // Force productSearch with the current filter state rather than relying
+                                                                                                // on the params getter's hasPendingFacetChanges promotion — a facet click
+                                                                                                // in the chat is unambiguously a search intent.
+                                                                                                controller.search({
+                                                                                                    data: { requestType: 'productSearch', searchFilters: controller.store.searchFilters },
                                                                                                 });
-                                                                                                controller.search();
                                                                                             }, children: valueOption.label }, optionValue));
                                                                                     }) }) }, facet.field) }, idx));
                                                                 }) })] }) })), (function () {
@@ -653,12 +836,11 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                 id: result === null || result === void 0 ? void 0 : result.id,
                                                                 name: ((_b = (_a = d === null || d === void 0 ? void 0 : d.mappings) === null || _a === void 0 ? void 0 : _a.core) === null || _b === void 0 ? void 0 : _b.name) || '',
                                                                 imageUrl: ((_d = (_c = d === null || d === void 0 ? void 0 : d.mappings) === null || _c === void 0 ? void 0 : _c.core) === null || _d === void 0 ? void 0 : _d.thumbnailImageUrl) || ((_f = (_e = d === null || d === void 0 ? void 0 : d.mappings) === null || _e === void 0 ? void 0 : _e.core) === null || _f === void 0 ? void 0 : _f.imageUrl) || ((_h = (_g = d === null || d === void 0 ? void 0 : d.mappings) === null || _g === void 0 ? void 0 : _g.core) === null || _h === void 0 ? void 0 : _h.parentImageUrl) || '',
-                                                                onClick: isMobile
-                                                                    ? function () {
-                                                                        controller.productQuickView(result);
+                                                                onClick: function () {
+                                                                    controller.productQuickView(result);
+                                                                    if (isMobile)
                                                                         setMobileProductInfoOpen(true);
-                                                                    }
-                                                                    : undefined,
+                                                                },
                                                             };
                                                         })
                                                         : showCommittedComparisons
@@ -669,34 +851,29 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                     id: (_b = comparisonItem.result) === null || _b === void 0 ? void 0 : _b.id,
                                                                     name: ((_d = (_c = d === null || d === void 0 ? void 0 : d.mappings) === null || _c === void 0 ? void 0 : _c.core) === null || _d === void 0 ? void 0 : _d.name) || '',
                                                                     imageUrl: ((_f = (_e = d === null || d === void 0 ? void 0 : d.mappings) === null || _e === void 0 ? void 0 : _e.core) === null || _f === void 0 ? void 0 : _f.thumbnailImageUrl) || ((_h = (_g = d === null || d === void 0 ? void 0 : d.mappings) === null || _g === void 0 ? void 0 : _g.core) === null || _h === void 0 ? void 0 : _h.imageUrl) || ((_k = (_j = d === null || d === void 0 ? void 0 : d.mappings) === null || _j === void 0 ? void 0 : _j.core) === null || _k === void 0 ? void 0 : _k.parentImageUrl) || '',
-                                                                    onClick: isMobile
-                                                                        ? function () {
-                                                                            controller.productQuickView(comparisonItem.result);
+                                                                    onClick: function () {
+                                                                        controller.productQuickView(comparisonItem.result);
+                                                                        if (isMobile)
                                                                             setMobileProductInfoOpen(true);
-                                                                        }
-                                                                        : undefined,
+                                                                    },
                                                                 };
                                                             })
                                                             : [];
-                                                    var productItems = productAttachments.map(function (item) { return ({
-                                                        id: item.id,
-                                                        name: item.name || '',
-                                                        imageUrl: item.thumbnailUrl || '',
-                                                        onClick: isMobile
-                                                            ? function () {
-                                                                setMobileProductInfoOpen(true);
-                                                            }
-                                                            : function () {
-                                                                var _a, _b, _c;
-                                                                (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.setActiveMessage(((_c = (_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.activeMessage) === null || _c === void 0 ? void 0 : _c.id) || '');
-                                                            },
-                                                        onRemove: function () {
+                                                    var productItems = productAttachments.map(function (item) {
+                                                        var remove = function () {
                                                             var _a, _b;
                                                             (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.attachments.remove(item.id);
                                                             setMobileProductInfoOpen(false);
                                                             (_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.dismissSideChat();
-                                                        },
-                                                    }); });
+                                                        };
+                                                        return {
+                                                            id: item.id,
+                                                            name: item.name || '',
+                                                            imageUrl: item.thumbnailUrl || '',
+                                                            onClick: remove,
+                                                            onRemove: remove,
+                                                        };
+                                                    });
                                                     var imageItems = imageAttachments.map(function (item) {
                                                         var _a;
                                                         return ({
@@ -709,7 +886,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                             onRemove: function () { var _a; return (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.attachments.remove(item.id); },
                                                         });
                                                     });
-                                                    var productTitle = productItems.length > 1 ? 'Compare these products' : 'Ask about this product' + (isMobile ? '' : ' (click for details)');
+                                                    var productTitle = productItems.length > 1 ? 'Compare these products' : 'Ask about this product';
                                                     var hasImageError = imageItems.some(function (item) { return item.hasError; });
                                                     var imageTitle = imageItems.length > 0 && !hasImageError ? 'Find products similar to this image:' : '';
                                                     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [comparisonItems.length > 0 && ((0, jsx_runtime_1.jsx)(ChatAttachmentContext_1.ChatAttachmentContext, __assign({}, subProps.attachmentContext, { title: 'Compare these products', items: comparisonItems, onClose: function () {
@@ -738,21 +915,44 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                         : 'Start a fresh session for better assistance, or keep going in this one?';
                                                     var buttonText = isScopeRedirect ? '' : 'New Session';
                                                     return ((0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift', children: [(0, jsx_runtime_1.jsx)(__1.Icon, { icon: "info", size: "18px", className: 'ss__chat__topic-drift__icon--info' }), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__topic-drift__text', children: [(0, jsx_runtime_1.jsx)("span", { children: primaryText }), (0, jsx_runtime_1.jsx)("span", { children: secondaryText })] }), buttonText && ((0, jsx_runtime_1.jsx)(Button_1.Button, { className: 'ss__chat__topic-drift__button', onClick: function () {
-                                                                    var _a, _b;
+                                                                    var _a, _b, _c;
                                                                     if (isScopeRedirect) {
                                                                         (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.dismissTopicDrift();
                                                                         return;
                                                                     }
-                                                                    var messageText = (_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.handleTopicDrift();
+                                                                    // Capture image attachments from the current chat before handleTopicDrift /
+                                                                    // createChat tear down the conversation — an imageSearch that drifted needs
+                                                                    // the same image attached to the carried-over message in the new session,
+                                                                    // otherwise params would fall back to a `general` request without the image.
+                                                                    var previousImageAttachments = (((_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.attachments.attached) || [])
+                                                                        .filter(function (item) { return item.type === 'image' && item.state !== 'error'; })
+                                                                        .map(function (item) {
+                                                                        var img = item;
+                                                                        return {
+                                                                            type: 'image',
+                                                                            base64: img.base64,
+                                                                            fileName: img.fileName,
+                                                                            imageId: img.imageId,
+                                                                            imageUrl: img.imageUrl,
+                                                                            thumbnailUrl: img.thumbnailUrl,
+                                                                            // Already uploaded — skip the 'loading' default state.
+                                                                            state: 'attached',
+                                                                        };
+                                                                    });
+                                                                    var messageText = (_c = store.currentChat) === null || _c === void 0 ? void 0 : _c.handleTopicDrift();
                                                                     if (messageText) {
                                                                         controller.store.createChat();
+                                                                        previousImageAttachments.forEach(function (cfg) {
+                                                                            var _a;
+                                                                            (_a = controller.store.currentChat) === null || _a === void 0 ? void 0 : _a.attachments.add(cfg);
+                                                                        });
                                                                         controller.search({ data: { message: messageText } });
                                                                     }
                                                                 }, children: buttonText })), (0, jsx_runtime_1.jsx)("span", { onClick: function () {
                                                                     var _a;
                                                                     (_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.dismissTopicDrift();
                                                                 }, children: (0, jsx_runtime_1.jsx)(__1.Icon, { icon: "close-thin", size: "14px", className: 'ss__chat__topic-drift__icon--close' }) })] }));
-                                                })(), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__input', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__input__input', children: [(0, jsx_runtime_1.jsx)("input", { type: "text", name: "ss-chat-input", disabled: store.loading || store.blocked || ((_w = store.currentChat) === null || _w === void 0 ? void 0 : _w.sessionLimitReached), placeholder: (function () {
+                                                })(), (0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__input', children: [(0, jsx_runtime_1.jsxs)("div", { className: 'ss__chat__input__input', children: [(0, jsx_runtime_1.jsx)("input", { type: "text", name: "ss-chat-input", disabled: store.loading || store.blocked || ((_y = store.currentChat) === null || _y === void 0 ? void 0 : _y.sessionLimitReached), placeholder: (function () {
                                                                         var _a, _b, _c;
                                                                         var comparedCount = ((_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.comparisons.compared.length) || 0;
                                                                         var committedCount = ((_b = store.currentChat) === null || _b === void 0 ? void 0 : _b.comparisons.committed.length) || 0;
@@ -780,7 +980,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                         if (e.keyCode === 13 && isMobile && mobileProductInfoOpen) {
                                                                             setMobileProductInfoOpen(false);
                                                                         }
-                                                                    }, value: controller.store.inputValue }), store.features.imageSearch.enabled && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Button_1.Button, { className: 'ss__chat__upload-button', disabled: store.loading || store.blocked || ((_x = store.currentChat) === null || _x === void 0 ? void 0 : _x.sessionLimitReached), onClick: function () { var _a; return (_a = fileInputRef.current) === null || _a === void 0 ? void 0 : _a.click(); }, icon: { icon: 'image', title: 'Upload Image' } }), (0, jsx_runtime_1.jsx)("input", { ref: fileInputRef, onChange: function (e) { return __awaiter(void 0, void 0, void 0, function () {
+                                                                    }, value: controller.store.inputValue }), store.features.imageSearch.enabled && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Button_1.Button, { className: 'ss__chat__upload-button', disabled: store.loading || store.blocked || ((_z = store.currentChat) === null || _z === void 0 ? void 0 : _z.sessionLimitReached), onClick: function () { var _a; return (_a = fileInputRef.current) === null || _a === void 0 ? void 0 : _a.click(); }, icon: { icon: 'image', title: 'Upload Image' } }), (0, jsx_runtime_1.jsx)("input", { ref: fileInputRef, onChange: function (e) { return __awaiter(void 0, void 0, void 0, function () {
                                                                                 return __generator(this, function (_a) {
                                                                                     switch (_a.label) {
                                                                                         case 0: return [4 /*yield*/, controller.upload(e.target.files)];
@@ -791,7 +991,7 @@ exports.ChatOrganism = (0, mobx_react_lite_1.observer)(function (properties) {
                                                                                             return [2 /*return*/];
                                                                                     }
                                                                                 });
-                                                                            }); }, multiple: true, type: "file", accept: "image/*", className: "ss__chat__input__input__file" })] }))] }), (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__input__actions', children: (function () {
+                                                                            }); }, type: "file", accept: "image/*", className: "ss__chat__input__input__file" })] }))] }), (0, jsx_runtime_1.jsx)("div", { className: 'ss__chat__input__actions', children: (function () {
                                                                 var _a, _b;
                                                                 var hasImageAttachment = (((_a = store.currentChat) === null || _a === void 0 ? void 0 : _a.attachments.attached) || []).some(function (item) { return item.type === 'image' && !item.error; });
                                                                 var messageEmpty = !controller.store.inputValue.trim();