@droppii-org/chat-sdk 0.3.8 → 0.4.0

package/dist/components/video-player/VideoPlayerModal.js

@@ -34,7 +34,7 @@ const VideoPlayerModal = ({ open, videos, initialIndex, onClose, }) => {
     const currentVideo = videos[currentIndex];
     const { snapshotWidth = 0, snapshotHeight = 0 } = currentVideo || {};
     const hasSnapshotSize = snapshotWidth > 0 && snapshotHeight > 0;
-    return (_jsx(Modal, { open: open, onCancel: onClose, footer: null, centered: true, destroyOnHidden: true, getContainer: false, forceRender: true, closeIcon: _jsx("span", { className: CLOSE_BUTTON_CLASS, children: _jsx(Icon, { icon: "close-b", size: 18 }) }), styles: {
+    return (_jsx(Modal, { "data-cp-name": "VideoPlayerModal", open: open, onCancel: onClose, footer: null, centered: true, destroyOnHidden: true, getContainer: false, forceRender: true, closeIcon: _jsx("span", { className: CLOSE_BUTTON_CLASS, children: _jsx(Icon, { icon: "close-b", size: 18 }) }), styles: {
             content: {
                 padding: 0,
             },

package/dist/context/ChatContext.d.ts

@@ -2,5 +2,5 @@ import "../styles/global.css";
 import { ChatContextType, ChatProviderProps } from "../types/chat";
 export declare const ChatContext: import("react").Context<ChatContextType>;
 export declare const useChatContext: () => ChatContextType;
-export declare const ChatProvider: ({ children, config, renderCustomMessage, onNavigate, }: ChatProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ChatProvider: ({ children, config, renderCustomMessage, onNavigate, renderGroupAccessModal, }: ChatProviderProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ChatContext.d.ts.map

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;AAStB,eAAO,MAAM,WAAW,0CAOtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,wDAK1B,iBAAiB,4CAuGnB,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;AAStB,eAAO,MAAM,WAAW,0CAOtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,gFAM1B,iBAAiB,4CAwGnB,CAAC"}

package/dist/context/ChatContext.js

@@ -18,7 +18,7 @@ export const ChatContext = createContext({
     updateSyncStatus: () => { },
 });
 export const useChatContext = () => useContext(ChatContext);
-export const ChatProvider = ({ children, config, renderCustomMessage, onNavigate, }) => {
+export const ChatProvider = ({ children, config, renderCustomMessage, onNavigate, renderGroupAccessModal, }) => {
     const [connectStatus, setConnectStatus] = useState(ConnectStatus.Disconnected);
     const [syncStatus, setSyncStatus] = useState(SyncStatus.Success);
     const [user, setUser] = useState(null);
@@ -93,5 +93,6 @@ export const ChatProvider = ({ children, config, renderCustomMessage, onNavigate
             updateSyncStatus,
             renderCustomMessage,
             onNavigate,
+            renderGroupAccessModal,
         }, children: _jsx(ConfigProvider, { getPopupContainer: (triggerNode) => document.body, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(MainLayout, { children: children }) }) }) }));
 };

package/dist/hooks/global/useGlobalEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,cAAc,YA2a1B,CAAC"}
+{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,cAAc,YAmhB1B,CAAC"}

package/dist/hooks/global/useGlobalEvent.js

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { useLatest } from "ahooks";
 import { DChatSDK } from "../../constants/sdk";
-import { CbEvents, MessageType, SessionType, } from "@droppii-org/wasm-client-sdk";
+import { CbEvents, GroupVisibility, MessageType, SessionType, } from "@droppii-org/wasm-client-sdk";
 import { BusinessNotificationType, ConnectStatus, CustomType, SyncStatus, } from "../../types/chat";
 import { pushNewMessage, updateOneMessage } from "../../hooks/message/useMessage";
 import { fetchPinnedMessages } from "../../hooks/message/usePinnedMessages";
@@ -13,7 +13,7 @@ import { useRefetchChatToken } from "../../hooks/init/useChatToken";
 import { updateSession } from "../../hooks/session/useUpdateSession";
 import { QUERY_KEYS } from "../../services/query";
 import { useQueryClient } from "@tanstack/react-query";
-import { isGroupSession } from "../../utils/imCommon";
+import { isGroupConversation } from "../../utils/imCommon";
 import { ignoreInternalLatestMessage } from "../../utils/common";
 import { invalidateSessionQueries } from "../../utils/queryHelpers";
 import emitter from "../../utils/events";
@@ -37,8 +37,7 @@ export const useGlobalEvent = () => {
     });
     const refreshCurrentGroupState = async () => {
         const currentConversation = useConversationStore.getState().currentConversation;
-        if (!(currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) ||
-            !isGroupSession(currentConversation.conversationType)) {
+        if (!(currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) || !isGroupConversation(currentConversation)) {
             return;
         }
         await Promise.all([
@@ -49,6 +48,33 @@ export const useGlobalEvent = () => {
             getCurrentMemberInGroupByReq(currentConversation.groupID),
         ]);
     };
+    // For a groupID cache entry that isn't the currently-open conversation:
+    // evict rather than refetch (per the "no background refetch" decision) —
+    // the next time that group is reopened, updateCurrentConversation's
+    // cache-miss path fetches it fresh.
+    const evictGroupCache = (groupID) => {
+        useConversationStore.setState((state) => {
+            const groupInfo = new Map(state.currentGroupInfo);
+            groupInfo.delete(groupID);
+            const memberInGroup = new Map(state.currentMemberInGroup);
+            memberInGroup.delete(groupID);
+            return { currentGroupInfo: groupInfo, currentMemberInGroup: memberInGroup };
+        });
+    };
+    // Refetch when the change is for the group currently open (fresh data
+    // needed right now); evict when it's for a different cached group (no
+    // background refetch — just don't serve stale data on next reopen).
+    const refreshOrEvictGroupState = async (groupID) => {
+        const currentConversation = useConversationStore.getState().currentConversation;
+        const isCurrentGroupOpen = !!groupID && (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) === groupID;
+        if (isCurrentGroupOpen) {
+            await refreshCurrentGroupState();
+            return;
+        }
+        if (groupID) {
+            evictGroupCache(groupID);
+        }
+    };
     const revokedMessageHandler = ({ data }) => {
         applyRevokedMessage(data.clientMsgID);
     };
@@ -201,24 +227,47 @@ export const useGlobalEvent = () => {
                 break;
         }
     };
-    const groupMemberChangedHandler = () => {
-        void refreshCurrentGroupState();
+    // OnGroupMemberAdded's payload isn't in the SDK's typed EventDataMap —
+    // assumed to carry a GroupItem-shaped groupID, consistent with every
+    // other group event in this file that IS typed that way.
+    const groupMemberChangedHandler = ({ data }) => {
+        void refreshOrEvictGroupState(data === null || data === void 0 ? void 0 : data.groupID);
         emitter.emit("GROUP_MEMBERS_CHANGED");
     };
-    const groupInfoChangedHandler = () => {
-        void refreshCurrentGroupState();
+    // OnGroupInfoChanged's payload isn't in the SDK's typed EventDataMap —
+    // same assumption as groupMemberChangedHandler above.
+    const groupInfoChangedHandler = ({ data }) => {
+        void refreshOrEvictGroupState(data === null || data === void 0 ? void 0 : data.groupID);
     };
     // BE pushes this when a member's role/permissions change (DROPPII-30248
     // spec: actions must always check the LATEST permissions, not stale UI) —
-    // refetch so useGroupPermission picks up the new permissions[] right away.
-    const groupMemberInfoChangedHandler = () => {
-        void refreshCurrentGroupState();
+    // refetch so useGroupPermission picks up the new permissions[] right away
+    // if it's the open group; evict the cache entry otherwise.
+    const groupMemberInfoChangedHandler = ({ data }) => {
+        void refreshOrEvictGroupState(data.groupID);
     };
-    // Shared by OnGroupDismissed and OnJoinedGroupDeleted (kicked) — both
-    // leave the user out of a group they may have open, same cleanup either way.
-    const leftGroupHandler = ({ data }) => {
+    // OnGroupDismissed always blocks + navigates away (group is gone either
+    // way). OnJoinedGroupDeleted (kicked) branches by visibility: PRIVATE ->
+    // fully blocked, same as disbanded; PUBLIC -> stays open in view-only.
+    const leftGroupHandler = (data, reason) => {
         const currentConversation = useConversationStore.getState().currentConversation;
-        if ((currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) === data.groupID) {
+        const isCurrentGroupOpen = (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) === data.groupID;
+        const staysViewOnly = reason === "kicked" && data.visibility === GroupVisibility.Public;
+        // The kicked/disbanded group's own cached membership is stale the
+        // instant this event fires, whether or not it's currently open —
+        // nonMemberGroupID guards against a still-in-flight fetch resurrecting
+        // it (see the kick-guard in getCurrentMemberInGroupByReq/
+        // getSelfGroupPermissionByReq).
+        useConversationStore.setState((state) => {
+            const memberInGroup = new Map(state.currentMemberInGroup);
+            memberInGroup.delete(data.groupID);
+            return { currentMemberInGroup: memberInGroup, nonMemberGroupID: data.groupID };
+        });
+        if (isCurrentGroupOpen && staysViewOnly) {
+            useConversationStore.setState({ isViewOnlyMember: true });
+            void getCurrentGroupInfoByReq(data.groupID);
+        }
+        else if (isCurrentGroupOpen) {
             useConversationStore.getState().clearSelectedConversation();
             // OnGroupDismissed also fires on the disbanding owner's own client —
             // skip the modal for them, useDismissGroup already shows a toast.
@@ -238,9 +287,39 @@ export const useGlobalEvent = () => {
             const pathname = window.location.pathname;
             onNavigate === null || onNavigate === void 0 ? void 0 : onNavigate(query ? `${pathname}?${query}` : pathname);
         }
-        useConversationStore.setState((state) => ({
-            conversationList: state.conversationList.filter((conversation) => conversation.groupID !== data.groupID),
-        }));
+        // Public groups the user can still view-only stay in conversationList;
+        // private-blocked/disbanded groups get dropped.
+        if (!staysViewOnly) {
+            useConversationStore.setState((state) => ({
+                conversationList: state.conversationList.filter((conversation) => conversation.groupID !== data.groupID),
+            }));
+        }
+    };
+    // Thin wrappers matching the SDK's fixed callback signature, forwarding
+    // to leftGroupHandler with the right reason.
+    const groupDismissedHandler = ({ data }) => {
+        leftGroupHandler(data, "disbanded");
+    };
+    const joinedGroupDeletedHandler = ({ data }) => {
+        leftGroupHandler(data, "kicked");
+    };
+    // Fires for every member add/remove in a group, including other people's
+    // — only treat it as "I lost access" when the removed member is myself.
+    // The event payload (GroupMemberItem) has no visibility field, so read it
+    // from currentGroupInfo — but only trust that if it's actually info for
+    // THIS group (currentGroupInfo tracks whatever conversation is open, not
+    // necessarily the group being removed from) — otherwise fail closed.
+    const groupMemberDeletedHandler = ({ data }) => {
+        var _a, _b;
+        if (data.userID !== ((_a = userRef.current) === null || _a === void 0 ? void 0 : _a.userID)) {
+            void refreshOrEvictGroupState(data.groupID);
+            emitter.emit("GROUP_MEMBERS_CHANGED");
+            return;
+        }
+        const visibility = (_b = useConversationStore
+            .getState()
+            .currentGroupInfo.get(data.groupID)) === null || _b === void 0 ? void 0 : _b.visibility;
+        leftGroupHandler({ groupID: data.groupID, visibility }, "kicked");
     };
     const blackListChangedHandler = () => {
         emitter.emit("BLACK_LIST_CHANGED");
@@ -252,8 +331,19 @@ export const useGlobalEvent = () => {
     // query are separate stages"). OnJoinedGroupAdded fires as soon as the
     // client is confirmed a member, so refetch here instead of waiting on the
     // conversation-side events to eventually catch up.
-    const joinedGroupAddedHandler = (_event) => {
+    const joinedGroupAddedHandler = ({ data }) => {
         loadConversationList();
+        // Re-added as a member of the group currently open in view-only mode —
+        // clear the flag and refetch so membership-gated UI (send box, Leave
+        // group button) comes back instead of staying stuck read-only.
+        const currentConversation = useConversationStore.getState().currentConversation;
+        if ((currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) === data.groupID) {
+            useConversationStore.setState({
+                isViewOnlyMember: false,
+                nonMemberGroupID: null,
+            });
+            void refreshCurrentGroupState();
+        }
     };
     const setIMListener = () => {
         //account
@@ -276,13 +366,13 @@ export const useGlobalEvent = () => {
         DChatSDK.on(CbEvents.OnNewConversation, newConversationHandler);
         // group members
         DChatSDK.on(CbEvents.OnGroupMemberAdded, groupMemberChangedHandler);
-        DChatSDK.on(CbEvents.OnGroupMemberDeleted, groupMemberChangedHandler);
+        DChatSDK.on(CbEvents.OnGroupMemberDeleted, groupMemberDeletedHandler);
         DChatSDK.on(CbEvents.OnJoinedGroupAdded, joinedGroupAddedHandler);
         // group info
         DChatSDK.on(CbEvents.OnGroupInfoChanged, groupInfoChangedHandler);
         DChatSDK.on(CbEvents.OnGroupMemberInfoChanged, groupMemberInfoChangedHandler);
-        DChatSDK.on(CbEvents.OnGroupDismissed, leftGroupHandler);
-        DChatSDK.on(CbEvents.OnJoinedGroupDeleted, leftGroupHandler);
+        DChatSDK.on(CbEvents.OnGroupDismissed, groupDismissedHandler);
+        DChatSDK.on(CbEvents.OnJoinedGroupDeleted, joinedGroupDeletedHandler);
         // black list
         DChatSDK.on(CbEvents.OnBlackAdded, blackListChangedHandler);
         DChatSDK.on(CbEvents.OnBlackDeleted, blackListChangedHandler);
@@ -310,13 +400,13 @@ export const useGlobalEvent = () => {
         DChatSDK.off(CbEvents.OnNewConversation, newConversationHandler);
         // group members
         DChatSDK.off(CbEvents.OnGroupMemberAdded, groupMemberChangedHandler);
-        DChatSDK.off(CbEvents.OnGroupMemberDeleted, groupMemberChangedHandler);
+        DChatSDK.off(CbEvents.OnGroupMemberDeleted, groupMemberDeletedHandler);
         DChatSDK.off(CbEvents.OnJoinedGroupAdded, joinedGroupAddedHandler);
         // group info
         DChatSDK.off(CbEvents.OnGroupInfoChanged, groupInfoChangedHandler);
         DChatSDK.off(CbEvents.OnGroupMemberInfoChanged, groupMemberInfoChangedHandler);
-        DChatSDK.off(CbEvents.OnGroupDismissed, leftGroupHandler);
-        DChatSDK.off(CbEvents.OnJoinedGroupDeleted, leftGroupHandler);
+        DChatSDK.off(CbEvents.OnGroupDismissed, groupDismissedHandler);
+        DChatSDK.off(CbEvents.OnJoinedGroupDeleted, joinedGroupDeletedHandler);
         // black list
         DChatSDK.off(CbEvents.OnBlackAdded, blackListChangedHandler);
         DChatSDK.off(CbEvents.OnBlackDeleted, blackListChangedHandler);

package/dist/hooks/group/useGroupPermission.d.ts

@@ -13,5 +13,5 @@ export interface GroupPermissions {
     viewMemberInformation: boolean;
 }
 export declare const permissionListToGroupPermissions: (permissionList: string[] | undefined, roleLevel: GroupMemberRole) => GroupPermissions;
-export declare const useGroupPermission: (_groupID?: string) => GroupPermissions;
+export declare const useGroupPermission: (groupID?: string) => GroupPermissions;
 //# sourceMappingURL=useGroupPermission.d.ts.map

package/dist/hooks/group/useGroupPermission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGroupPermission.d.ts","sourceRoot":"","sources":["../../../src/hooks/group/useGroupPermission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAI/D,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sBAAsB,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;CAChC;AA+CD,eAAO,MAAM,gCAAgC,GAC3C,gBAAgB,MAAM,EAAE,GAAG,SAAS,EACpC,WAAW,eAAe,KACzB,gBAcF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,WAAW,MAAM,KAAG,gBAYtD,CAAC"}
+{"version":3,"file":"useGroupPermission.d.ts","sourceRoot":"","sources":["../../../src/hooks/group/useGroupPermission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAI/D,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sBAAsB,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;CAChC;AA+CD,eAAO,MAAM,gCAAgC,GAC3C,gBAAgB,MAAM,EAAE,GAAG,SAAS,EACpC,WAAW,eAAe,KACzB,gBAcF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,KAAG,gBAYrD,CAAC"}

package/dist/hooks/group/useGroupPermission.js

@@ -56,8 +56,8 @@ export const permissionListToGroupPermissions = (permissionList, roleLevel) => {
         permissionList.includes(permissionString),
     ]));
 };
-export const useGroupPermission = (_groupID) => {
-    const currentMemberInGroup = useConversationStore((state) => state.currentMemberInGroup);
+export const useGroupPermission = (groupID) => {
+    const currentMemberInGroup = useConversationStore((state) => groupID ? state.currentMemberInGroup.get(groupID) : undefined);
     return useMemo(() => {
         var _a;
         const roleLevel = (_a = currentMemberInGroup === null || currentMemberInGroup === void 0 ? void 0 : currentMemberInGroup.roleLevel) !== null && _a !== void 0 ? _a : GroupMemberRole.Normal;

package/dist/hooks/message/useMessage.d.ts

@@ -1,6 +1,9 @@
 import { MessageItem, MessageType } from "@droppii-org/wasm-client-sdk";
 export declare const visibleTypeMessage: MessageType[];
-export declare const isMessageHiddenForViewer: (message: MessageItem, isCrm: boolean) => boolean;
+export declare const isMessageHiddenForViewer: (message: MessageItem, isCrm: boolean, conversation?: {
+    peerType?: string;
+    conversationType?: number;
+}) => boolean;
 export declare const useMessage: (conversationId?: string, searchClientMsgID?: string, enabled?: boolean, useAppHistory?: boolean) => {
     loadState: {
         initLoading: boolean;

package/dist/hooks/message/useMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAEZ,MAAM,8BAA8B,CAAC;AAYtC,eAAO,MAAM,kBAAkB,eAkB9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,SAAS,WAAW,EACpB,OAAO,OAAO,KACb,OAWF,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc,EACd,uBAAqB;;;;;qBAeA,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;CAsSnC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,WAAW,SACpB,CAAC;AAChC,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,SACpB,CAAC;AAClC,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SACf,CAAC;AAEtC,eAAO,MAAM,kBAAkB,GAC7B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAkBhB,CAAC"}
+{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAEZ,MAAM,8BAA8B,CAAC;AAatC,eAAO,MAAM,kBAAkB,eAkB9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,SAAS,WAAW,EACpB,OAAO,OAAO,EACd,eAAe;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,KAC9D,OAqBF,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc,EACd,uBAAqB;;;;;qBAeA,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;CAsSnC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,WAAW,SACpB,CAAC;AAChC,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,SACpB,CAAC;AAClC,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SACf,CAAC;AAEtC,eAAO,MAAM,kBAAkB,GAC7B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAkBhB,CAAC"}

package/dist/hooks/message/useMessage.js

@@ -8,8 +8,9 @@ import isEmpty from "lodash/isEmpty";
 import { useChatContext } from "../../context/ChatContext";
 import useAuthStore from "../../store/auth";
 import { ConnectStatus, SyncStatus } from "../../types/chat";
-import { GROUP_NOTIFICATION_MESSAGE_TYPES, isSystemLogMessageType } from "../../utils/messageLog";
+import { GROUP_NOTIFICATION_MESSAGE_TYPES, isGroupNotificationMessageType, isSystemLogMessageType } from "../../utils/messageLog";
 import { isRenderableCustomMessage } from "../../utils/customMessage";
+import { isGroupConversation } from "../../utils/imCommon";
 export const visibleTypeMessage = [
     MessageType.TextMessage,
     MessageType.PictureMessage,
@@ -29,9 +30,15 @@ export const visibleTypeMessage = [
     MessageType.LogTextMessage,
     ...GROUP_NOTIFICATION_MESSAGE_TYPES,
 ];
-export const isMessageHiddenForViewer = (message, isCrm) => {
+export const isMessageHiddenForViewer = (message, isCrm, conversation) => {
     if (!visibleTypeMessage.includes(message === null || message === void 0 ? void 0 : message.contentType))
         return true;
+    // Group notification messages stay hidden in a CX support session even
+    // for CRM — the isCrm early-return below only applies past this check.
+    if (isGroupNotificationMessageType(message === null || message === void 0 ? void 0 : message.contentType) &&
+        !isGroupConversation(conversation)) {
+        return true;
+    }
     if (isCrm)
         return false;
     const isCustomMessage = MessageType.CustomMessage === (message === null || message === void 0 ? void 0 : message.contentType);

package/dist/hooks/message/useSendMessage.d.ts

@@ -1,6 +1,6 @@
-import { CustomMsgParams, MergerMsgParams, MessageItem } from "@droppii-org/wasm-client-sdk";
+import { AtMsgParams, CustomMsgParams, MergerMsgParams, MessageItem } from "@droppii-org/wasm-client-sdk";
 import { type CustomMessagePayload } from "../../types/customMessage";
-import { BotFlowMeta, ExtendMessageInfo, FileMsgParamsByFile, ImageMsgParamsByFile, UrlMetadataInfo, VideoMsgParamsByFile } from "../../types/chat";
+import { BotFlowMeta, ExtendMessageInfo, FileMsgParamsByFile, ImageMsgParamsByFile, MentionOffset, MentionSendPayload, UrlMetadataInfo, VideoMsgParamsByFile } from "../../types/chat";
 import { UploadFile } from "antd";
 import { ISessionResponse } from "../../types/dto";
 export declare const isMediaResendable: (message: {
@@ -12,6 +12,8 @@ export declare const createImageMessageByFile: (file: ImageMsgParamsByFile) => P
 export declare const createMergerMessage: (mergerMsgParams: MergerMsgParams) => Promise<MessageItem | null>;
 export declare const createVideoMessageByFile: (file: VideoMsgParamsByFile) => Promise<MessageItem | null>;
 export declare const createFileMessageByFile: (file: FileMsgParamsByFile) => Promise<MessageItem | null>;
+export declare const AT_ALL_TAG = "AtAllTag";
+export declare const createAtTextMessage: (params: AtMsgParams) => Promise<MessageItem | null>;
 export declare const createUrlTextMessage: (text: string, urls: string[]) => Promise<MessageItem | null>;
 export declare const createCustomMessageByParams: (params: CustomMsgParams) => Promise<MessageItem | null>;
 export declare const createCustomMessage: (payload: CustomMessagePayload) => Promise<MessageItem | null>;
@@ -21,7 +23,7 @@ export interface UseSendMessageOptions {
     scrollEvent?: SendMessageScrollEvent;
 }
 export declare const useSendMessage: (options?: UseSendMessageOptions) => {
-    sendMergeMessage: ({ richText, plainText, files, currentSession, isInternal, urlMetadata, flow, customMessage, }: {
+    sendMergeMessage: ({ richText, plainText, files, currentSession, isInternal, urlMetadata, flow, customMessage, mentions, }: {
         richText: string;
         plainText: string;
         files?: UploadFile[];
@@ -30,16 +32,18 @@ export declare const useSendMessage: (options?: UseSendMessageOptions) => {
         urlMetadata?: UrlMetadataInfo;
         flow?: BotFlowMeta;
         customMessage?: CustomMessagePayload;
+        mentions?: MentionSendPayload;
     }) => Promise<boolean>;
     sendCustomMessage: (payload: CustomMessagePayload, sendOptions?: {
         currentSession?: ISessionResponse;
     }) => Promise<boolean>;
     resendMessage: (failedMessage: MessageItem) => Promise<void>;
 };
-export declare const generateExtendMessageInfo: ({ richText, urlMetadata, currentSession, flow, }: {
+export declare const generateExtendMessageInfo: ({ richText, urlMetadata, currentSession, flow, mentionOffsets, }: {
     richText?: string;
     urlMetadata?: UrlMetadataInfo;
     currentSession?: ISessionResponse;
     flow?: BotFlowMeta;
+    mentionOffsets?: MentionOffset[];
 }) => ExtendMessageInfo;
 //# sourceMappingURL=useSendMessage.d.ts.map

package/dist/hooks/message/useSendMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,WAAW,EAIZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EACf,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQlC,OAAO,EAAgB,gBAAgB,EAAyB,MAAM,aAAa,CAAC;AAmBpF,eAAO,MAAM,iBAAiB,GAAI,SAAS;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,YAE0C,CAAC;AAE5C,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,gCAanD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,iBAAiB,eAAe,gCAazE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,MAAM,mBAAmB,gCAatE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,gCActE,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,QAAQ,eAAe,gCAcxB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,SAAS,oBAAoB,gCAOtE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,MAAM,EACZ,eAAe,WAAW,gCAc3B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,iDAAiD,CAAC;AAEtD,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,eAAO,MAAM,cAAc,GAAI,UAAU,qBAAqB;sHAsSvD;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;QACrB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,aAAa,CAAC,EAAE,oBAAoB,CAAC;KACtC,KAAG,OAAO,CAAC,OAAO,CAAC;iCA3CT,oBAAoB,gBACf;QAAE,cAAc,CAAC,EAAE,gBAAgB,CAAA;KAAE,KAClD,OAAO,CAAC,OAAO,CAAC;mCAnHG,WAAW;CAyVpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,kDAKvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,sBA8BA,CAAC"}
+{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EACf,WAAW,EAIZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQlC,OAAO,EAAgB,gBAAgB,EAAyB,MAAM,aAAa,CAAC;AAmBpF,eAAO,MAAM,iBAAiB,GAAI,SAAS;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,YAE0C,CAAC;AAE5C,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,gCAanD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,iBAAiB,eAAe,gCAazE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,MAAM,mBAAmB,gCAatE,CAAC;AAGF,eAAO,MAAM,UAAU,aAAa,CAAC;AAErC,eAAO,MAAM,mBAAmB,GAAU,QAAQ,WAAW,gCAa5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,gCActE,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,QAAQ,eAAe,gCAcxB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,SAAS,oBAAoB,gCAOtE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,MAAM,EACZ,eAAe,WAAW,gCAc3B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,iDAAiD,CAAC;AAEtD,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,eAAO,MAAM,cAAc,GAAI,UAAU,qBAAqB;gIAuSvD;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;QACrB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,aAAa,CAAC,EAAE,oBAAoB,CAAC;QACrC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;KAC/B,KAAG,OAAO,CAAC,OAAO,CAAC;iCA7CT,oBAAoB,gBACf;QAAE,cAAc,CAAC,EAAE,gBAAgB,CAAA;KAAE,KAClD,OAAO,CAAC,OAAO,CAAC;mCAnHG,WAAW;CA+WpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,kEAMvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC,sBAkCA,CAAC"}

package/dist/hooks/message/useSendMessage.js

@@ -26,7 +26,7 @@ const MEDIA_CONTENT_TYPES = new Set([
 export const isMediaResendable = (message) => !MEDIA_CONTENT_TYPES.has(message.contentType) ||
     messageFileStore.has(message.clientMsgID);
 export const createTextMessage = async (text) => {
-    let textMessage = await DChatSDK.createTextMessage(text, new Date().getTime().toString())
+    const textMessage = await DChatSDK.createTextMessage(text, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -37,7 +37,7 @@ export const createTextMessage = async (text) => {
     return textMessage;
 };
 export const createImageMessageByFile = async (file) => {
-    let imageMessage = await DChatSDK.createImageMessageByFile(file, new Date().getTime().toString())
+    const imageMessage = await DChatSDK.createImageMessageByFile(file, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -48,7 +48,7 @@ export const createImageMessageByFile = async (file) => {
     return imageMessage;
 };
 export const createMergerMessage = async (mergerMsgParams) => {
-    let mergerMessage = await DChatSDK.createMergerMessage(mergerMsgParams, new Date().getTime().toString())
+    const mergerMessage = await DChatSDK.createMergerMessage(mergerMsgParams, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -59,7 +59,7 @@ export const createMergerMessage = async (mergerMsgParams) => {
     return mergerMessage;
 };
 export const createVideoMessageByFile = async (file) => {
-    let videoMessage = await DChatSDK.createVideoMessageByFile(file, new Date().getTime().toString())
+    const videoMessage = await DChatSDK.createVideoMessageByFile(file, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -70,7 +70,7 @@ export const createVideoMessageByFile = async (file) => {
     return videoMessage;
 };
 export const createFileMessageByFile = async (file) => {
-    let fileMessage = await DChatSDK.createFileMessageByFile(file, new Date().getTime().toString())
+    const fileMessage = await DChatSDK.createFileMessageByFile(file, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -80,8 +80,21 @@ export const createFileMessageByFile = async (file) => {
     });
     return fileMessage;
 };
+// OpenIM SDK convention for "tag all members" in AtMsgParams.atUserIDList.
+export const AT_ALL_TAG = "AtAllTag";
+export const createAtTextMessage = async (params) => {
+    const atTextMessage = await DChatSDK.createTextAtMessage(params, new Date().getTime().toString())
+        .then(({ data }) => {
+        return data;
+    })
+        .catch(({ errCode, errMsg }) => {
+        console.error("createTextAtMessage", errCode, errMsg);
+        return null;
+    });
+    return atTextMessage;
+};
 export const createUrlTextMessage = async (text, urls) => {
-    let textMessage = await DChatSDK.createUrlTextMessage(text, JSON.stringify(urls), new Date().getTime().toString())
+    const textMessage = await DChatSDK.createUrlTextMessage(text, JSON.stringify(urls), new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -92,7 +105,7 @@ export const createUrlTextMessage = async (text, urls) => {
     return textMessage;
 };
 export const createCustomMessageByParams = async (params) => {
-    let customMessage = await DChatSDK.createCustomMessage(params, new Date().getTime().toString())
+    const customMessage = await DChatSDK.createCustomMessage(params, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
@@ -110,7 +123,7 @@ export const createCustomMessage = async (payload) => {
     });
 };
 export const createQuoteMessage = async (text, quotedMessage) => {
-    let textMessage = await DChatSDK.createQuoteMessage({
+    const textMessage = await DChatSDK.createQuoteMessage({
         text,
         message: JSON.stringify(quotedMessage),
     })
@@ -326,7 +339,7 @@ export const useSendMessage = (options) => {
         });
         return sendMessage(Object.assign(Object.assign({}, customMessage), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal: false }), sendOptions === null || sendOptions === void 0 ? void 0 : sendOptions.currentSession);
     }, [conversationData, recvID, groupID, sendMessage]);
-    const sendMergeMessage = useCallback(async ({ richText, plainText, files = [], currentSession, isInternal, urlMetadata, flow, customMessage, }) => {
+    const sendMergeMessage = useCallback(async ({ richText, plainText, files = [], currentSession, isInternal, urlMetadata, flow, customMessage, mentions, }) => {
         if (!conversationData || (!recvID && !groupID))
             return false;
         const messageList = [];
@@ -449,10 +462,24 @@ export const useSendMessage = (options) => {
                 console.error("Lỗi xử lý tin nhắn:", err);
             }
         }
+        const hasMentions = !!mentions && (mentions.atUserIDList.length > 0 || mentions.isAtAll);
         if (!!plainText && plainText.trim() !== "") {
             const urls = extractLinkUrls(plainText);
             let textMessage = null;
-            if (quotedMessage === null || quotedMessage === void 0 ? void 0 : quotedMessage.clientMsgID) {
+            if (hasMentions && mentions) {
+                // OpenIM SDK convention: "tag all" is signaled by the sentinel
+                // "AtAllTag" inside atUserIDList, not a separate flag/param.
+                textMessage = await createAtTextMessage({
+                    text: plainText,
+                    atUserIDList: mentions.isAtAll
+                        ? [AT_ALL_TAG, ...mentions.atUserIDList]
+                        : mentions.atUserIDList,
+                    atUsersInfo: mentions.atUsersInfo,
+                    message: (quotedMessage === null || quotedMessage === void 0 ? void 0 : quotedMessage.clientMsgID) ? quotedMessage : undefined,
+                });
+                setQuotedMessage(null);
+            }
+            else if (quotedMessage === null || quotedMessage === void 0 ? void 0 : quotedMessage.clientMsgID) {
                 textMessage = await createQuoteMessage(plainText, quotedMessage);
                 setQuotedMessage(null);
             }
@@ -475,7 +502,8 @@ export const useSendMessage = (options) => {
         for (const message of messageList) {
             const isTextLikeMessage = (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.TextMessage ||
                 (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.UrlTextMessage ||
-                (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.QuoteMessage;
+                (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.QuoteMessage ||
+                (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.AtTextMessage;
             const extendMessageInfo = generateExtendMessageInfo({
                 richText: isTextLikeMessage ? richText : "",
                 urlMetadata: (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.UrlTextMessage
@@ -483,6 +511,9 @@ export const useSendMessage = (options) => {
                     : undefined,
                 currentSession,
                 flow: isTextLikeMessage ? flow : undefined,
+                mentionOffsets: (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.AtTextMessage
+                    ? mentions === null || mentions === void 0 ? void 0 : mentions.mentionOffsets
+                    : undefined,
             });
             const mMessage = Object.assign(Object.assign({}, message), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal });
             await sendMessage(mMessage, currentSession);
@@ -502,7 +533,7 @@ export const useSendMessage = (options) => {
         resendMessage,
     };
 };
-export const generateExtendMessageInfo = ({ richText, urlMetadata, currentSession, flow, }) => {
+export const generateExtendMessageInfo = ({ richText, urlMetadata, currentSession, flow, mentionOffsets, }) => {
     const extendMessageInfo = {
         sessionId: (currentSession === null || currentSession === void 0 ? void 0 : currentSession.id) || "",
         applicationType: useAuthStore.getState().applicationType,
@@ -510,6 +541,9 @@ export const generateExtendMessageInfo = ({ richText, urlMetadata, currentSessio
     if (flow) {
         extendMessageInfo.flow = flow;
     }
+    if (mentionOffsets && mentionOffsets.length > 0) {
+        extendMessageInfo.mentions = { offsets: mentionOffsets };
+    }
     const trimmedRichText = richText === null || richText === void 0 ? void 0 : richText.trim();
     if (trimmedRichText) {
         extendMessageInfo.messageInfo = {

package/dist/hooks/session/useConversationSessionState.d.ts

@@ -2,9 +2,10 @@ import { SessionType } from "@droppii-org/wasm-client-sdk";
 interface UseConversationSessionStateParams {
     conversationId: string;
     conversationType?: SessionType;
+    peerType?: string;
     groupId?: string;
 }
-export declare const useConversationSessionState: ({ conversationId, conversationType, groupId, }: UseConversationSessionStateParams) => {
+export declare const useConversationSessionState: ({ conversationId, conversationType, peerType, groupId, }: UseConversationSessionStateParams) => {
     groupId: string | undefined;
     latestConversationSession: import("../../types/dto").ISessionResponse | undefined;
     customerUserID: string;

package/dist/hooks/session/useConversationSessionState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useConversationSessionState.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useConversationSessionState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,UAAU,iCAAiC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,2BAA2B,GAAI,gDAIzC,iCAAiC;;;;;CAoBnC,CAAC"}
+{"version":3,"file":"useConversationSessionState.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useConversationSessionState.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,UAAU,iCAAiC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,2BAA2B,GAAI,0DAKzC,iCAAiC;;;;;CAoBnC,CAAC"}

package/dist/hooks/session/useConversationSessionState.js

@@ -1,13 +1,13 @@
 "use client";
 import { useGetListSessionByConversation } from "./useGetListSessionByConversation";
-import { isGroupSession } from "../../utils/imCommon";
-export const useConversationSessionState = ({ conversationId, conversationType, groupId, }) => {
+import { isGroupConversation } from "../../utils/imCommon";
+export const useConversationSessionState = ({ conversationId, conversationType, peerType, groupId, }) => {
     var _a;
-    const isGroupConversation = isGroupSession(conversationType);
-    const currentGroupId = isGroupConversation ? groupId : undefined;
+    const isGroupChat = isGroupConversation({ peerType, conversationType });
+    const currentGroupId = isGroupChat ? groupId : undefined;
     const { data: conversationSessions, refetch: refetchConversationSessions, } = useGetListSessionByConversation({
         conversationId,
-        enabled: !isGroupConversation,
+        enabled: !isGroupChat,
     });
     const latestConversationSession = conversationSessions === null || conversationSessions === void 0 ? void 0 : conversationSessions[0];
     return {

package/dist/layout/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/layout/index.tsx"],"names":[],"mappings":"AAKA,OAAO,iBAAiB,CAAC;AAYzB,UAAU,eAAe;IACvB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AACD,QAAA,MAAM,UAAU,GAAI,cAAc,eAAe,4CAyBhD,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/layout/index.tsx"],"names":[],"mappings":"AAKA,OAAO,iBAAiB,CAAC;AAazB,UAAU,eAAe;IACvB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AACD,QAAA,MAAM,UAAU,GAAI,cAAc,eAAe,4CAsChD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/layout/index.js

@@ -9,6 +9,7 @@ import timezone from "dayjs/plugin/timezone";
 import { useSyncUsersInfo } from "../hooks/user/useUsersInfo";
 import useConversationStore from "../store/conversation";
 import InfoModal from "../components/common/InfoModal";
+import { useChatContext } from "../context/ChatContext";
 dayjs.extend(utc);
 dayjs.extend(timezone);
 dayjs.tz.setDefault("Asia/Ho_Chi_Minh");
@@ -17,8 +18,16 @@ const MainLayout = ({ children }) => {
     const { t } = useTranslation();
     useGlobalEvent();
     useSyncUsersInfo();
+    const { renderGroupAccessModal } = useChatContext();
     const removedFromGroupModalOpen = useConversationStore((state) => state.removedFromGroupModalOpen);
     const hideRemovedFromGroupModal = useConversationStore((state) => state.hideRemovedFromGroupModal);
-    return (_jsxs(_Fragment, { children: [children, _jsx(InfoModal, { open: removedFromGroupModalOpen, onOk: hideRemovedFromGroupModal, title: t("removed_from_group_modal_title"), okText: t("removed_from_group_modal_ok"), children: _jsx("p", { children: t("removed_from_group_modal_message") }) })] }));
+    const modalProps = {
+        open: removedFromGroupModalOpen,
+        onOk: hideRemovedFromGroupModal,
+        title: t("removed_from_group_modal_title"),
+        okText: t("removed_from_group_modal_ok"),
+        message: t("removed_from_group_modal_message"),
+    };
+    return (_jsxs(_Fragment, { children: [children, renderGroupAccessModal ? (renderGroupAccessModal(modalProps)) : (_jsx(InfoModal, { open: modalProps.open, onOk: modalProps.onOk, title: modalProps.title, okText: modalProps.okText, children: _jsx("p", { children: modalProps.message }) }))] }));
 };
 export default MainLayout;