@droppii-org/chat-sdk 0.6.24 → 0.6.25

package/dist/context/ChatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,iBAAiB,EAGlB,MAAM,cAAc,CAAC;AAUtB,eAAO,MAAM,WAAW,0CAQtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAU5D,eAAO,MAAM,YAAY,GAAI,oGAQ1B,iBAAiB,4CAmInB,CAAC"}
+{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,iBAAiB,EAGlB,MAAM,cAAc,CAAC;AAUtB,eAAO,MAAM,WAAW,0CAQtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAU5D,eAAO,MAAM,YAAY,GAAI,oGAQ1B,iBAAiB,4CA8InB,CAAC"}

package/dist/context/ChatContext.js

@@ -6,7 +6,7 @@ import { ConnectStatus, SyncStatus, } from "../types/chat";
 import { DChatSDK } from "../constants/sdk";
 import MainLayout from "../layout";
 import useAuthStore from "../store/auth";
-import { setUrlStateEnabled } from "../store/conversation";
+import { setUrlNavigate, setUrlStateEnabled } from "../store/conversation";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ConfigProvider } from "antd";
 const queryClient = new QueryClient();
@@ -35,6 +35,16 @@ export const ChatProvider = ({ children, config, renderCustomMessage, onNavigate
     useEffect(() => {
         setUrlStateEnabled(useUrlState);
     }, [useUrlState]);
+    // Lets clearSelectedConversation route URL cleanup through the host's
+    // router instead of a raw history.replaceState.
+    // Gated on useUrlState like useChatNavigate, even though the sole current
+    // consumer (clearSelectedConversation) already checks urlStateEnabled
+    // itself — keeps this registration from becoming a footgun if a future
+    // bubble-mode-unaware consumer is added.
+    useEffect(() => {
+        setUrlNavigate(useUrlState ? (onNavigate !== null && onNavigate !== void 0 ? onNavigate : null) : null);
+        return () => setUrlNavigate(null);
+    }, [onNavigate, useUrlState]);
     const themeStyle = {
         "--dc-color-primary": (_a = theme === null || theme === void 0 ? void 0 : theme.primary) !== null && _a !== void 0 ? _a : DEFAULT_THEME["--dc-color-primary"],
         "--dc-color-primary-hover": (_b = theme === null || theme === void 0 ? void 0 : theme.primaryHover) !== null && _b !== void 0 ? _b : DEFAULT_THEME["--dc-color-primary-hover"],

package/dist/hooks/conversation/useResolveConversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useResolveConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useResolveConversation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAe,MAAM,8BAA8B,CAAC;AAU7E,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA2BD,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,KACZ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAWjC,CAAC;AAwCF,eAAO,MAAM,sBAAsB,GAAI,wDAMpC,4BAA4B;;;CA4H9B,CAAC"}
+{"version":3,"file":"useResolveConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useResolveConversation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAe,MAAM,8BAA8B,CAAC;AAU7E,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA2BD,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,KACZ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAWjC,CAAC;AAkDF,eAAO,MAAM,sBAAsB,GAAI,wDAMpC,4BAA4B;;;CA4H9B,CAAC"}

package/dist/hooks/conversation/useResolveConversation.js

@@ -32,21 +32,37 @@ export const fetchConversationByBotId = async (botId) => {
 const fetchConversationByTarget = ({ conversationId, userId, groupId, botId, }) => {
     if (conversationId)
         return fetchByConversationId(conversationId);
-    if (userId)
-        return fetchBySource(userId, SessionType.Single);
+    // groupId before userId: a group-message notification link carries both
+    // (the group, plus the sender's userId as secondary info) — resolving
+    // userId first would wrongly open a 1:1 thread with the sender instead
+    // of the group.
     if (groupId)
         return fetchBySource(groupId, SessionType.Group);
     if (botId)
         return fetchConversationByBotId(botId);
+    if (userId)
+        return fetchBySource(userId, SessionType.Single);
     return Promise.resolve(null);
 };
+// Mirrors fetchConversationByTarget's conversationId → groupId → botId →
+// userId precedence exactly — matching on any present field independently
+// (the old OR-chain) let a stale field win over the one that's actually
+// authoritative. Concretely: viewing a 1:1 with sender X, then a group
+// notification for the same sender arrives ({groupId, userId: X}) — matching
+// on userId alone would treat the already-open 1:1 as satisfying the group
+// target and skip resolving the group entirely.
 const matchesTarget = (conversation, { conversationId, userId, groupId, botId }) => {
     if (!conversation)
         return false;
-    return ((!!conversationId && conversation.conversationID === conversationId) ||
-        (!!userId && conversation.userID === userId) ||
-        (!!groupId && conversation.groupID === groupId) ||
-        (!!botId && resolveConversationBotId(conversation) === botId));
+    if (conversationId)
+        return conversation.conversationID === conversationId;
+    if (groupId)
+        return conversation.groupID === groupId;
+    if (botId)
+        return resolveConversationBotId(conversation) === botId;
+    if (userId)
+        return conversation.userID === userId;
+    return false;
 };
 const targetKey = ({ conversationId, userId, groupId, botId, messageId, }) => `${conversationId !== null && conversationId !== void 0 ? conversationId : ""}|${userId !== null && userId !== void 0 ? userId : ""}|${groupId !== null && groupId !== void 0 ? groupId : ""}|${botId !== null && botId !== void 0 ? botId : ""}|${messageId !== null && messageId !== void 0 ? messageId : ""}`;
 export const useResolveConversation = ({ conversationId, userId, groupId, botId, messageId, }) => {

package/dist/screens/conversation-inbox/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screens/conversation-inbox/index.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,MAAM,WAAW,2BAA2B;IAC1C,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACjC,6FAA6F;IAC7F,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,yEAAyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAClC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3E;AA2ND,QAAA,MAAM,sBAAsB,GAAI,OAAO,2BAA2B,4CAQjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screens/conversation-inbox/index.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,MAAM,WAAW,2BAA2B;IAC1C,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACjC,6FAA6F;IAC7F,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,yEAAyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAClC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3E;AAkOD,QAAA,MAAM,sBAAsB,GAAI,OAAO,2BAA2B,4CAQjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/dist/screens/conversation-inbox/index.js

@@ -80,20 +80,24 @@ const useInboxConversationList = (chatCategory) => {
 const DChatConversationInboxBody = ({ onSelectThread, className, moreOptions, showSearch = true, headerTitle, headerRightSlot, onCopyMessageLink, target, conversationList, }) => {
     const { t } = useTranslation("conversation-inbox");
     const selectedConversationId = useConversationStore((state) => state.selectedConversationId);
+    const removedFromGroupModalOpen = useConversationStore((state) => state.removedFromGroupModalOpen);
     const [isSearchOpen, { setTrue: openSearch, setFalse: closeSearch }] = useBoolean(false);
     const { threadId, userId, groupId, botId, messageId } = target;
     // Any of the four targets opens the detail screen — useResolveConversation
     // turns userId/groupId/botId into a thread (creating the bot one when
     // missing), so entry points that only know the peer still work.
     // threadId alone must also match selectedConversationId: clearSelectedConversation
-    // strips threadId from the URL via history.replaceState, which Next's Pages
-    // Router compat shim for useSearchParams doesn't react to (only router.push/
-    // replace do) — without this check, a stale threadId here would keep
-    // rendering the detail screen against an already-cleared store forever.
-    const hasConversationTarget = !!((threadId && threadId === selectedConversationId) ||
-        userId ||
-        groupId ||
-        botId);
+    // strips threadId (and groupId/userId/botId) from the URL through the
+    // host's router (setUrlNavigate) when one is registered, so useSearchParams
+    // picks up the change on its own — but the
+    // modal-open check still covers the brief render between the reject firing
+    // and that router navigation completing, so the list shows immediately
+    // instead of flashing empty behind the modal.
+    const hasConversationTarget = !removedFromGroupModalOpen &&
+        !!((threadId && threadId === selectedConversationId) ||
+            userId ||
+            groupId ||
+            botId);
     if (hasConversationTarget) {
         return (_jsx(DChatConversationDetail, { className: className, moreOptions: moreOptions, conversationId: threadId !== null && threadId !== void 0 ? threadId : undefined, userId: userId, groupId: groupId, botId: botId, onCopyMessageLink: onCopyMessageLink, messageId: messageId }));
     }

package/dist/store/conversation.d.ts

@@ -1,5 +1,6 @@
 import { ConversationStore } from "./type";
 export declare const setUrlStateEnabled: (enabled: boolean) => void;
+export declare const setUrlNavigate: (fn: ((url: string) => void) | null) => void;
 declare const useConversationStore: import("zustand").UseBoundStore<import("zustand").StoreApi<ConversationStore>>;
 export default useConversationStore;
 //# sourceMappingURL=conversation.d.ts.map

package/dist/store/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/store/conversation.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAY3C,eAAO,MAAM,kBAAkB,GAAI,SAAS,OAAO,SAElD,CAAC;AAEF,QAAA,MAAM,oBAAoB,gFAuYvB,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/store/conversation.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAY3C,eAAO,MAAM,kBAAkB,GAAI,SAAS,OAAO,SAElD,CAAC;AAUF,eAAO,MAAM,cAAc,GAAI,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,SAEhE,CAAC;AAEF,QAAA,MAAM,oBAAoB,gFAsZvB,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}

package/dist/store/conversation.js

@@ -13,6 +13,17 @@ let urlStateEnabled = true;
 export const setUrlStateEnabled = (enabled) => {
     urlStateEnabled = enabled;
 };
+// Module-level (not store state): ChatProvider syncs this from its onNavigate
+// prop, same reason as urlStateEnabled above. clearSelectedConversation uses
+// this instead of window.history.replaceState directly — Next's Pages Router
+// compat shim for useSearchParams only re-reads the URL after a router
+// navigation, never after a raw history.replaceState, so a caller reading
+// groupId/userId/botId via useSearchParams would keep seeing the stale,
+// just-cleared value forever.
+let navigate = null;
+export const setUrlNavigate = (fn) => {
+    navigate = fn;
+};
 const useConversationStore = create((set, get) => ({
     conversationData: null,
     setConversationData: (data, dataSearchClientMsgID, options) => {
@@ -258,19 +269,37 @@ const useConversationStore = create((set, get) => ({
     clearSelectedConversation: () => {
         // DeskConversationList's threadId-driven effect re-selects the same
         // conversation on its next run otherwise (conversationList changes
-        // trigger it) — clobbering this reset right back. No onNavigate/router
-        // dependency by design: this store has no access to one.
+        // trigger it) — clobbering this reset right back.
         if (urlStateEnabled && typeof window !== "undefined") {
             const params = new URLSearchParams(window.location.search);
-            // `conversationId` is an accepted alias for `threadId` — leaving it
-            // behind would let the next effect run re-select what we just cleared.
-            const hadThreadParam = params.has("threadId") || params.has("conversationId");
-            if (hadThreadParam) {
-                params.delete("threadId");
-                params.delete("conversationId");
+            // `conversationId` is an accepted alias for `threadId`; groupId/botId/
+            // userId are the BIZ inbox's notification/deep-link entry params —
+            // leaving any of these behind would let the next effect run (or a
+            // URL-reading hasConversationTarget check) re-select the target we
+            // just rejected. Listed in the same conversationId -> groupId -> userId
+            // -> botId precedence useResolveConversation resolves them by.
+            const staleParams = [
+                "threadId",
+                "conversationId",
+                "groupId",
+                "botId",
+                "userId",
+            ];
+            const hadStaleParam = staleParams.some((key) => params.has(key));
+            if (hadStaleParam) {
+                staleParams.forEach((key) => params.delete(key));
                 const query = params.toString();
                 const url = `${window.location.pathname}${query ? `?${query}` : ""}`;
-                window.history.replaceState(null, "", url);
+                // Prefer the host's router (set via setUrlNavigate) so Next's
+                // useSearchParams actually re-reads the cleared params on the next
+                // render — a raw history.replaceState leaves useSearchParams stale
+                // until an unrelated router navigation happens to occur. Falls back
+                // to history.replaceState when no navigate fn is registered (e.g.
+                // CRM never set one — matches this function's prior behavior there).
+                if (navigate)
+                    navigate(url);
+                else
+                    window.history.replaceState(null, "", url);
             }
         }
         // Deselecting is normal navigation, not a reason to drop the groupID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-sdk",
-  "version": "0.6.24",
+  "version": "0.6.25",
   "description": "Droppii React Chat SDK",
   "repository": {
     "type": "git",