@droppii-org/chat-sdk 0.3.5 → 0.3.7

package/dist/components/common/ConfirmModal.d.ts

@@ -0,0 +1,18 @@
+import type { ReactNode } from "react";
+export interface ConfirmModalProps {
+    open: boolean;
+    title: ReactNode;
+    okText: ReactNode;
+    cancelText: ReactNode;
+    onOk: () => void;
+    onCancel: () => void;
+    okType?: "danger" | "primary";
+    confirmLoading?: boolean;
+    okButtonProps?: {
+        disabled?: boolean;
+    };
+    children: ReactNode;
+}
+declare const ConfirmModal: ({ open, title, okText, cancelText, onOk, onCancel, okType, confirmLoading, okButtonProps, children, }: ConfirmModalProps) => import("react/jsx-runtime").JSX.Element;
+export default ConfirmModal;
+//# sourceMappingURL=ConfirmModal.d.ts.map

package/dist/components/common/ConfirmModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConfirmModal.d.ts","sourceRoot":"","sources":["../../../src/components/common/ConfirmModal.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACvC,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,QAAA,MAAM,YAAY,GAAI,uGAWnB,iBAAiB,4CAiCnB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/common/ConfirmModal.js

@@ -0,0 +1,15 @@
+"use client";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Modal } from "antd";
+const ConfirmModal = ({ open, title, okText, cancelText, onOk, onCancel, okType = "primary", confirmLoading, okButtonProps, children, }) => {
+    return (_jsx(Modal, { centered: true, open: open, onOk: onOk, onCancel: onCancel, okText: okText, cancelText: cancelText, confirmLoading: confirmLoading, okButtonProps: Object.assign(Object.assign({}, okButtonProps), { className: okType === "danger"
+                ? "!h-10 !rounded-lg !border-danger-400 !bg-danger-400 !text-white hover:!border-danger-300 hover:!bg-danger-300"
+                : "!h-10 !rounded-lg !border-primary-400 !bg-primary-400 !text-white hover:!border-primary-300 hover:!bg-primary-300" }), cancelButtonProps: {
+            className: "!h-10 !rounded-lg !border-gray-25 !bg-gray-25 !text-gray-900",
+        }, styles: {
+            header: { textAlign: "center", marginBottom: 0 },
+            footer: { marginTop: 16 },
+            body: { paddingTop: 4 },
+        }, classNames: { footer: "border-t border-gray-25 pt-4" }, title: _jsx("span", { className: "text-[18px] font-bold text-gray-900", children: title }), getContainer: false, forceRender: true, children: children }));
+};
+export default ConfirmModal;

package/dist/components/conversation/DeskConversationList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeskConversationList.d.ts","sourceRoot":"","sources":["../../../src/components/conversation/DeskConversationList.tsx"],"names":[],"mappings":"AA4BA,QAAA,MAAM,oBAAoB,+CAgSzB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"DeskConversationList.d.ts","sourceRoot":"","sources":["../../../src/components/conversation/DeskConversationList.tsx"],"names":[],"mappings":"AA4BA,QAAA,MAAM,oBAAoB,+CAySzB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/components/conversation/DeskConversationList.js

@@ -68,20 +68,26 @@ const DeskConversationList = () => {
     }, [showSearch]);
     useEffect(() => {
         const threadId = searchParams.get("threadId");
-        if (threadId) {
-            setSelectedConversationId(threadId);
-            const selectedConversation = conversationList.find((conv) => conv.conversationID === threadId);
-            if (selectedConversation) {
-                setConversationData(selectedConversation);
-            }
-            else {
-                DChatSDK.getMultipleConversation([threadId]).then((res) => {
-                    if (res.data.length > 0) {
-                        setConversationData(res.data[0]);
-                        updateConversationList(res.data, "filter");
-                    }
-                });
-            }
+        if (!threadId) {
+            useConversationStore.getState().clearSelectedConversation();
+            return;
+        }
+        setSelectedConversationId(threadId);
+        const selectedConversation = conversationList.find((conv) => conv.conversationID === threadId);
+        if (selectedConversation) {
+            setConversationData(selectedConversation);
+        }
+        else {
+            DChatSDK.getMultipleConversation([threadId]).then((res) => {
+                // threadId can go stale between the fetch starting and resolving
+                // (e.g. the user was removed from that group mid-flight) — only
+                // apply the result if the URL still points at this conversation.
+                if (res.data.length > 0 &&
+                    searchParams.get("threadId") === threadId) {
+                    setConversationData(res.data[0]);
+                    updateConversationList(res.data, "filter");
+                }
+            });
         }
     }, [searchParams, conversationList]);
     useEffect(() => {

package/dist/components/group/AdminPermissionModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdminPermissionModal.d.ts","sourceRoot":"","sources":["../../../src/components/group/AdminPermissionModal.tsx"],"names":[],"mappings":"AAcA,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IAIpB,MAAM,CAAC,EAAE,OAAO,CAAC;IAKjB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IAKpC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC5E;AA8CD,QAAA,MAAM,oBAAoB,GAAI,uEAO3B,yBAAyB,mDA0L3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"AdminPermissionModal.d.ts","sourceRoot":"","sources":["../../../src/components/group/AdminPermissionModal.tsx"],"names":[],"mappings":"AAcA,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IAIpB,MAAM,CAAC,EAAE,OAAO,CAAC;IAKjB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IAKpC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC5E;AA6DD,QAAA,MAAM,oBAAoB,GAAI,uEAO3B,yBAAyB,mDA2M3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/components/group/AdminPermissionModal.js

@@ -3,19 +3,29 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { ConfigProvider, Modal, Switch, message } from "antd";
 import { useTranslation } from "react-i18next";
+import { GroupMemberRole } from "@droppii-org/wasm-client-sdk";
 import { useGroupPermission } from "../../hooks/group/useGroupPermission";
+import { useGroupMembers } from "../../hooks/group/useGroupMembers";
 import { useSetGroupMemberPermissions } from "../../hooks/group/useGroupMemberActions";
 import { Icon } from "../../components/icon";
 import { PERMISSION_SWITCH_COLOR } from "../../constants";
 import { GROUP_PERMISSION_KEY } from "../../constants/im";
-import useGroupPermissionOverridesStore from "../../store/groupPermissionOverrides";
+// "Cập nhật thông tin nhóm" is one switch in the UI but bundles 3 BE
+// permission keys (name/avatar/description) — DROPPII-30533 fix: reading
+// only checked UPDATE_GROUP_NAME, so turning the switch off only ever
+// stripped that one key, leaving avatar/description at the role default.
+const UPDATE_GROUP_INFO_KEYS = [
+    GROUP_PERMISSION_KEY.updateGroupName,
+    GROUP_PERMISSION_KEY.updateGroupAvatar,
+    GROUP_PERMISSION_KEY.updateGroupDescription,
+];
 const permissionListToOverrides = (permissionList) => ({
     sendMessage: permissionList.includes(GROUP_PERMISSION_KEY.sendMessage),
     pinMessage: permissionList.includes(GROUP_PERMISSION_KEY.pinMessage),
     viewMemberInformation: permissionList.includes(GROUP_PERMISSION_KEY.viewMemberInformation),
     addMember: permissionList.includes(GROUP_PERMISSION_KEY.addMember),
     removeMember: permissionList.includes(GROUP_PERMISSION_KEY.removeMember),
-    updateGroupInfo: permissionList.includes(GROUP_PERMISSION_KEY.updateGroupName),
+    updateGroupInfo: UPDATE_GROUP_INFO_KEYS.every((key) => permissionList.includes(key)),
 });
 const overridesToPermissionList = (overrides, currentPermissionList) => {
     const desired = {
@@ -25,6 +35,8 @@ const overridesToPermissionList = (overrides, currentPermissionList) => {
         [GROUP_PERMISSION_KEY.addMember]: overrides.addMember,
         [GROUP_PERMISSION_KEY.removeMember]: overrides.removeMember,
         [GROUP_PERMISSION_KEY.updateGroupName]: overrides.updateGroupInfo,
+        [GROUP_PERMISSION_KEY.updateGroupAvatar]: overrides.updateGroupInfo,
+        [GROUP_PERMISSION_KEY.updateGroupDescription]: overrides.updateGroupInfo,
     };
     const managedKeys = new Set(Object.keys(desired));
     const untouched = currentPermissionList.filter((permission) => !managedKeys.has(permission));
@@ -33,19 +45,23 @@ const overridesToPermissionList = (overrides, currentPermissionList) => {
         .map(([permission]) => permission);
     return [...untouched, ...enabled];
 };
-// Mocked config UI (DROPPII-30248 follow-up, "Configure Admin Permissions")
-// when used group-wide (no `member`, e.g. from GroupThreadInfo) — applies
-// to the whole Admin role in the group, no BE persistence yet, committed to
-// the in-memory override store on "Lưu" only. When `member` is passed
-// (from the member list's per-row menu), it instead patches that member's
-// own permission list via the same setGroupMemberInfo call used to mute a
-// member — real BE persistence, scoped to that user.
+// "Configure Admin Permissions" (DROPPII-30248 follow-up). When `member` is
+// passed (from the member list's per-row menu), it patches that one
+// member's permission list via setGroupMemberInfo. When used group-wide (no
+// `member`, e.g. from GroupThreadInfo's group settings), "Lưu" applies the
+// same permission set to every current Admin in the group (DROPPII-30529/
+// 30531 fix) — there is no separate BE endpoint for a role-wide default, so
+// this fans out the existing per-member call to each current Admin instead
+// of only writing to a local override store.
 const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member, onMemberPermissionsSaved, }) => {
     const { t } = useTranslation();
     const groupPermissions = useGroupPermission(groupID);
-    const setAdminOverrides = useGroupPermissionOverridesStore((state) => state.setAdminOverrides);
+    const { members: groupMembers } = useGroupMembers(member ? undefined : groupID);
     const { mutateAsync: setMemberPermissions } = useSetGroupMemberPermissions();
     const [isSaving, setIsSaving] = useState(false);
+    const isGroupInfoEditable = groupPermissions.updateGroupName &&
+        groupPermissions.updateGroupAvatar &&
+        groupPermissions.updateGroupDescription;
     const initialOverrides = () => member
         ? permissionListToOverrides(member.permissions)
         : {
@@ -54,7 +70,7 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
             viewMemberInformation: groupPermissions.viewMemberInformation,
             addMember: groupPermissions.addMember,
             removeMember: groupPermissions.removeMember,
-            updateGroupInfo: groupPermissions.updateGroupName,
+            updateGroupInfo: isGroupInfoEditable,
         };
     const [pending, setPending] = useState(initialOverrides);
     useEffect(() => {
@@ -71,7 +87,7 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
             viewMemberInformation: groupPermissions.viewMemberInformation,
             addMember: groupPermissions.addMember,
             removeMember: groupPermissions.removeMember,
-            updateGroupInfo: groupPermissions.updateGroupName,
+            updateGroupInfo: isGroupInfoEditable,
         };
     const hasChanges = pending.sendMessage !== baseline.sendMessage ||
         pending.pinMessage !== baseline.pinMessage ||
@@ -95,7 +111,15 @@ const AdminPermissionModal = ({ open, groupID, onClose, inline = false, member,
                 onMemberPermissionsSaved === null || onMemberPermissionsSaved === void 0 ? void 0 : onMemberPermissionsSaved(member.userID, nextPermissions);
             }
             else {
-                setAdminOverrides(groupID, pending);
+                const admins = groupMembers.filter((groupMember) => groupMember.roleLevel === GroupMemberRole.Admin);
+                await Promise.all(admins.map((admin) => {
+                    var _a;
+                    return setMemberPermissions({
+                        groupID,
+                        userID: admin.userID,
+                        permissions: overridesToPermissionList(pending, (_a = admin.permissions) !== null && _a !== void 0 ? _a : []),
+                    });
+                }));
             }
             message.success(t("update_admin_permissions_success"));
             onClose();

package/dist/components/message/GroupMembersDrawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupMembersDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/message/GroupMembersDrawer.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAiB/C,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA0CD,QAAA,MAAM,kBAAkB,GAAI,wDAKzB,uBAAuB,4CA6hBzB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"GroupMembersDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/message/GroupMembersDrawer.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAiB/C,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA0CD,QAAA,MAAM,kBAAkB,GAAI,wDAKzB,uBAAuB,4CA4iBzB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/components/message/GroupMembersDrawer.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { GroupMemberRole } from "@droppii-org/wasm-client-sdk";
-import { Avatar, Button, Drawer, Dropdown, Empty, Input, message, Modal, Spin } from "antd";
+import { Avatar, Button, Drawer, Dropdown, Empty, Input, message, Spin } from "antd";
+import ConfirmModal from "../../components/common/ConfirmModal";
 import { useEffect, useMemo, useState } from "react";
 import { useDebounce } from "ahooks";
 import { useTranslation } from "react-i18next";
@@ -202,6 +203,16 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
             message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) || t("update_group_info_failed"));
         }
     };
+    const handleConfirmAssignAdmin = async () => {
+        if ((confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) !== "assign-admin")
+            return;
+        try {
+            await handleToggleAdminRole(confirmMemberAction.member);
+        }
+        finally {
+            setConfirmMemberAction(null);
+        }
+    };
     const handleConfirmTransferOwner = async () => {
         var _a, _b;
         if (!groupID || (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) !== "transfer-owner")
@@ -256,7 +267,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                 const leaveGroupItem = {
                     key: "leave-group",
                     label: t("leave_group"),
-                    icon: _jsx(Icon, { icon: "logout-b", size: 16 }),
+                    icon: _jsx(Icon, { icon: "logout-o", size: 16 }),
                     onClick: handleLeaveGroup,
                     danger: true,
                 };
@@ -266,7 +277,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                             {
                                 key: "mute",
                                 label: t("mute_member"),
-                                icon: _jsx(Icon, { icon: "bell-off-b", size: 16 }),
+                                icon: _jsx(Icon, { icon: "bell-off-o", size: 16 }),
                                 disabled: true,
                             },
                             leaveGroupItem,
@@ -276,7 +287,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         {
                             key: "send-message",
                             label: t("send_message"),
-                            icon: _jsx(Icon, { icon: "send-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "send-o", size: 16 }),
                             disabled: true,
                         },
                         {
@@ -284,14 +295,14 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                             label: member.isSendMessageDisabled
                                 ? t("unmute_member")
                                 : t("mute_member"),
-                            icon: _jsx(Icon, { icon: "bell-off-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "bell-off-o", size: 16 }),
                             disabled: !permissions.removeMember,
                             onClick: () => void handleToggleMemberSendMessage(member),
                         },
                         {
                             key: "transfer-owner",
                             label: t("transfer_owner"),
-                            icon: _jsx(Icon, { icon: "key-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "key-o", size: 16 }),
                             disabled: !permissions.transferOwnership,
                             onClick: () => setConfirmMemberAction({ type: "transfer-owner", member }),
                         },
@@ -307,7 +318,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                                 {
                                     key: "remove-admin",
                                     label: t("remove_from_admin"),
-                                    icon: _jsx(Icon, { icon: "shield-fail-b", size: 16 }),
+                                    icon: _jsx(Icon, { icon: "shield-fail-o", size: 16 }),
                                     disabled: !permissions.addAdmin,
                                     onClick: () => void handleToggleAdminRole(member),
                                 },
@@ -316,15 +327,15 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                                 {
                                     key: "assign-admin",
                                     label: t("assign_as_admin"),
-                                    icon: _jsx(Icon, { icon: "shield-b", size: 16 }),
+                                    icon: _jsx(Icon, { icon: "shield-o", size: 16 }),
                                     disabled: !permissions.addAdmin,
-                                    onClick: () => void handleToggleAdminRole(member),
+                                    onClick: () => setConfirmMemberAction({ type: "assign-admin", member }),
                                 },
                             ]),
                         {
                             key: "remove-member",
                             label: t("remove_from_group"),
-                            icon: _jsx(Icon, { icon: "user-del-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "user-del-o", size: 16 }),
                             danger: true,
                             disabled: !permissions.removeMember,
                             onClick: () => setConfirmMemberAction({ type: "remove", member }),
@@ -332,7 +343,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         {
                             key: "remove-and-block",
                             label: t("remove_and_block"),
-                            icon: _jsx(Icon, { icon: "user-octagon-b", size: 16 }),
+                            icon: _jsx(Icon, { icon: "user-octagon-o", size: 16 }),
                             danger: true,
                             disabled: true,
                         },
@@ -340,7 +351,7 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                 return (_jsxs("div", { className: "flex items-center gap-3 px-4 py-2", children: [_jsx(Avatar, { src: member.faceURL, size: 40, className: "shrink-0", children: member.nickname.charAt(0) || "A" }), _jsxs("div", { className: "flex-1 min-w-0", children: [_jsxs("div", { className: "flex items-center gap-2 min-w-0", children: [_jsx("p", { className: "text-sm font-semibold text-gray-900 truncate", children: member.nickname }), member.isCurrentUser && (_jsx("span", { className: "text-xs text-blue-500 shrink-0", children: t("current_account") }))] }), member.roleLabel && (_jsx("p", { className: "text-sm text-gray-500 truncate", children: member.roleLabel }))] }), (isRealGroup || member.isCurrentUser) && (_jsx(Dropdown, { menu: { items: menuItems }, trigger: ["click"], placement: "bottomRight", children: _jsx("button", { type: "button", className: "flex items-center justify-center w-8 h-8 rounded-full text-gray-500 hover:bg-gray-100", onClick: (event) => event.stopPropagation(), children: _jsx(Icon, { icon: "more-horizontal-b", size: 18 }) }) }))] }, member.userID));
             }) }));
     };
-    return (_jsxs("div", { className: "inline-flex shrink-0", children: [_jsx(Button, { type: "text", shape: "default", className: "text-gray-500 w-8 h-8 p-0", onClick: handleOpenDrawer, disabled: disabled || !groupID, children: _jsx(Icon, { icon: "user-two-check-b", size: 22 }) }), _jsx(Drawer, { open: isOpen, onClose: handleCloseDrawer, mask: false, closeIcon: false, styles: {
+    return (_jsxs("div", { className: "inline-flex shrink-0", children: [_jsx(Button, { type: "text", shape: "default", className: "text-gray-500 w-8 h-8 p-0", onClick: handleOpenDrawer, disabled: disabled || !groupID, children: _jsx(Icon, { icon: "user-two-check-o", size: 22 }) }), _jsx(Drawer, { open: isOpen, onClose: handleCloseDrawer, mask: false, closeIcon: false, styles: {
                     body: {
                         padding: 0,
                         height: "100%",
@@ -350,9 +361,11 @@ const GroupMembersDrawer = ({ groupID, conversationId, currentSession, disabled
                         userID: adminPermissionMember.userID,
                         permissions: adminPermissionMember.permissions,
                     }
-                    : undefined, onMemberPermissionsSaved: patchMemberPermissions })), _jsx(Modal, { centered: true, open: showLeaveConfirm, onOk: handleConfirmLeave, onCancel: () => setShowLeaveConfirm(false), title: t("leave_group_confirm_title"), okText: t("leave_group"), cancelText: t("cancel"), okType: "danger", confirmLoading: isLeaving, getContainer: false, forceRender: true, children: _jsx("p", { children: t("leave_group_confirm_message") }) }), _jsx(Modal, { centered: true, open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "remove", onOk: handleConfirmRemoveMember, onCancel: () => setConfirmMemberAction(null), title: t("remove_member_confirm_title"), okText: t("remove_from_group"), cancelText: t("cancel"), okType: "danger", getContainer: false, forceRender: true, children: _jsx("p", { children: t("remove_member_confirm_message", {
+                    : undefined, onMemberPermissionsSaved: patchMemberPermissions })), _jsx(ConfirmModal, { open: showLeaveConfirm, onOk: handleConfirmLeave, onCancel: () => setShowLeaveConfirm(false), title: t("leave_group_confirm_title"), okText: t("leave_group"), cancelText: t("cancel"), okType: "danger", confirmLoading: isLeaving, children: _jsx("p", { children: t("leave_group_confirm_message") }) }), _jsx(ConfirmModal, { open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "remove", onOk: handleConfirmRemoveMember, onCancel: () => setConfirmMemberAction(null), title: t("remove_member_confirm_title"), okText: t("remove_from_group"), cancelText: t("cancel"), okType: "danger", children: _jsx("p", { children: t("remove_member_confirm_message", {
+                        name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
+                    }) }) }), _jsx(ConfirmModal, { open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "transfer-owner", onOk: handleConfirmTransferOwner, onCancel: () => setConfirmMemberAction(null), title: t("transfer_owner_confirm_title"), okText: t("transfer_owner"), cancelText: t("cancel"), okType: "danger", children: _jsx("p", { children: t("transfer_owner_confirm_message", {
                         name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
-                    }) }) }), _jsx(Modal, { centered: true, open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "transfer-owner", onOk: handleConfirmTransferOwner, onCancel: () => setConfirmMemberAction(null), title: t("transfer_owner_confirm_title"), okText: t("transfer_owner"), cancelText: t("cancel"), okType: "danger", getContainer: false, forceRender: true, children: _jsx("p", { children: t("transfer_owner_confirm_message", {
+                    }) }) }), _jsx(ConfirmModal, { open: (confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.type) === "assign-admin", onOk: handleConfirmAssignAdmin, onCancel: () => setConfirmMemberAction(null), title: t("assign_admin_confirm_title"), okText: t("agree"), cancelText: t("cancel"), children: _jsx("p", { children: t("assign_admin_confirm_message", {
                         name: confirmMemberAction === null || confirmMemberAction === void 0 ? void 0 : confirmMemberAction.member.nickname,
                     }) }) })] }));
 };

package/dist/components/message/MessageList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/message/MessageList.tsx"],"names":[],"mappings":"AA8BA,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,gBAAgB,4CAmR3C,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../src/components/message/MessageList.tsx"],"names":[],"mappings":"AAgCA,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,QAAA,MAAM,WAAW,GAAI,OAAO,gBAAgB,4CAgS3C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/components/message/MessageList.js

@@ -1,10 +1,11 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMessage } from "../../hooks/message/useMessage";
-import { Button, Empty, Modal, Spin, message as toastMessage } from "antd";
+import { Button, Empty, Spin, message as toastMessage } from "antd";
 import { useCallback, useEffect, useState } from "react";
 import dayjs from "dayjs";
 import isToday from "dayjs/plugin/isToday";
+import { GroupMemberRole, GroupStatus } from "@droppii-org/wasm-client-sdk";
 import emitter from "../../utils/events";
 import MessageItem from "./item";
 import MessageInfiniteScroll from "./MessageInfiniteScroll";
@@ -24,6 +25,7 @@ import { useGroupPermission } from "../../hooks/group/useGroupPermission";
 import { isGroupSession } from "../../utils/imCommon";
 import { ConnectStatus, SessionStatus } from "../../types/chat";
 import PinLimitModal from "../../components/conversation-detail/PinLimitModal";
+import ConfirmModal from "../../components/common/ConfirmModal";
 dayjs.extend(isToday);
 const MessageList = (props) => {
     const { t } = useTranslation();
@@ -32,7 +34,19 @@ const MessageList = (props) => {
     const conversationData = useConversationStore((state) => state.conversationData);
     const permissions = useGroupPermission(conversationData === null || conversationData === void 0 ? void 0 : conversationData.groupID);
     const isGroupChat = isGroupSession(conversationData === null || conversationData === void 0 ? void 0 : conversationData.conversationType);
-    const canSendMessage = !isGroupChat || permissions.sendMessage;
+    const currentGroupInfo = useConversationStore((state) => state.currentGroupInfo);
+    const currentMemberInGroup = useConversationStore((state) => state.currentMemberInGroup);
+    // Group/member data refetches async on conversation switch and can briefly
+    // hold the previous conversation's groupID or a not-yet-loaded roleLevel.
+    const isGroupStateFresh = !isGroupChat ||
+        ((currentGroupInfo === null || currentGroupInfo === void 0 ? void 0 : currentGroupInfo.groupID) === (conversationData === null || conversationData === void 0 ? void 0 : conversationData.groupID) &&
+            (currentMemberInGroup === null || currentMemberInGroup === void 0 ? void 0 : currentMemberInGroup.groupID) === (conversationData === null || conversationData === void 0 ? void 0 : conversationData.groupID) &&
+            (currentMemberInGroup === null || currentMemberInGroup === void 0 ? void 0 : currentMemberInGroup.roleLevel) !== undefined);
+    // Group-wide mute (GroupThreadInfo.tsx) restricts Normal members only.
+    const isRestrictedByGroupMute = isGroupChat &&
+        (currentGroupInfo === null || currentGroupInfo === void 0 ? void 0 : currentGroupInfo.status) === GroupStatus.Muted &&
+        (currentMemberInGroup === null || currentMemberInGroup === void 0 ? void 0 : currentMemberInGroup.roleLevel) === GroupMemberRole.Normal;
+    const canSendMessage = !isGroupChat || (permissions.sendMessage && !isRestrictedByGroupMute);
     const canPinMessage = !isGroupChat || permissions.pinMessage;
     const setQuotedMessage = useConversationStore((state) => state.setQuotedMessage);
     const setSearchClientMsgID = useConversationStore((state) => state.setSearchClientMsgID);
@@ -136,6 +150,6 @@ const MessageList = (props) => {
     if (!conversationData) {
         return (_jsx("div", { className: "flex flex-1 items-center justify-center h-full", children: connectStatus !== ConnectStatus.Connected ? (_jsx(Spin, {})) : (_jsx(Empty, { description: t("no_conversation_data") })) }));
     }
-    return (_jsxs("div", { className: "flex flex-col flex-1 relative h-full min-w-0 bg-white", style: { overflowX: "hidden" }, children: [_jsx(MessageHeader, { onClose: onClose, currentSession: latestConversationSession, isJoined: isJoined, onOpenThreadInfo: onOpenThreadInfo }), _jsx(MessageInfiniteScroll, { scrollRef: scrollRef, scrollableTargetId: "scrollableMessagesDiv", loadState: loadState, moreOldLoading: moreOldLoading, onLoadMoreOld: loadMoreOldMessage, onScroll: handleInfiniteScroll, children: loadState.messageList.map((message, _, array) => (_jsx(MessageItem, { message: message, allMessages: array, contextMenuOpen: openMenuId === message.clientMsgID, onContextMenuOpenChange: (open) => setOpenMenuId(open ? message.clientMsgID : null), onRevokeMessage: handleOpenRevoke, onQuoteMessage: setQuotedMessage, onPressQuoteMessage: onPressQuoteMessage, onPinMessage: canPinMessage ? handlePinMessage : undefined, onUnpinMessage: canPinMessage ? handleUnpinMessage : undefined }, message.clientMsgID))) }), moreNewLoading && (_jsx("div", { className: "flex items-center justify-center py-2", children: _jsx(Spin, {}) })), isCheckingMembership ? (_jsx("div", { className: "border-t bg-white py-4 flex items-center justify-center", children: _jsx(Spin, {}) })) : (latestConversationSession === null || latestConversationSession === void 0 ? void 0 : latestConversationSession.status) === SessionStatus.UNASSIGNED ? (_jsx(UnassignedSessionFooter, { sessionId: latestConversationSession.id, teamId: latestConversationSession.teamId })) : shouldRestrictToLastSession ? (_jsxs("div", { className: "border-t bg-white py-4 flex flex-col items-center gap-2", children: [_jsx("p", { className: "text-sm text-gray-500", children: t("join_group_required") }), _jsx(Button, { type: "primary", onClick: joinGroup, loading: isJoining, children: t("join_group") })] })) : !canSendMessage ? (_jsx("div", { className: "border-t bg-[#f5f5f5] py-3 flex items-center justify-center", children: _jsx("p", { className: "text-sm text-gray-500", children: t("send_message_disabled") }) })) : (_jsx(MessageFooter, { currentSession: latestConversationSession, openCreateCannedModal: openCreateCannedModal })), _jsx(Modal, { centered: true, open: showConfirmRevoke, onOk: onRevokeMessage, onCancel: handleCloseRevoke, title: t("revoke_message_confirm_title"), okText: t("revoke"), cancelText: t("cancel"), okType: "danger", confirmLoading: isRevoking, getContainer: false, forceRender: true, children: _jsx("p", { children: t("revoke_message_confirm_message") }) }), _jsx(PinLimitModal, { open: pinLimitModalOpen, max: pinnedTotalCount, onClose: () => setPinLimitModalOpen(false) })] }));
+    return (_jsxs("div", { className: "flex flex-col flex-1 relative h-full min-w-0 bg-white", style: { overflowX: "hidden" }, children: [_jsx(MessageHeader, { onClose: onClose, currentSession: latestConversationSession, isJoined: isJoined, onOpenThreadInfo: onOpenThreadInfo }), _jsx(MessageInfiniteScroll, { scrollRef: scrollRef, scrollableTargetId: "scrollableMessagesDiv", loadState: loadState, moreOldLoading: moreOldLoading, onLoadMoreOld: loadMoreOldMessage, onScroll: handleInfiniteScroll, children: loadState.messageList.map((message, _, array) => (_jsx(MessageItem, { message: message, allMessages: array, contextMenuOpen: openMenuId === message.clientMsgID, onContextMenuOpenChange: (open) => setOpenMenuId(open ? message.clientMsgID : null), onRevokeMessage: handleOpenRevoke, onQuoteMessage: setQuotedMessage, onPressQuoteMessage: onPressQuoteMessage, onPinMessage: canPinMessage ? handlePinMessage : undefined, onUnpinMessage: canPinMessage ? handleUnpinMessage : undefined }, message.clientMsgID))) }), moreNewLoading && (_jsx("div", { className: "flex items-center justify-center py-2", children: _jsx(Spin, {}) })), isCheckingMembership || !isGroupStateFresh ? (_jsx("div", { className: "border-t bg-white py-4 flex items-center justify-center", children: _jsx(Spin, {}) })) : (latestConversationSession === null || latestConversationSession === void 0 ? void 0 : latestConversationSession.status) === SessionStatus.UNASSIGNED ? (_jsx(UnassignedSessionFooter, { sessionId: latestConversationSession.id, teamId: latestConversationSession.teamId })) : shouldRestrictToLastSession ? (_jsxs("div", { className: "border-t bg-white py-4 flex flex-col items-center gap-2", children: [_jsx("p", { className: "text-sm text-gray-500", children: t("join_group_required") }), _jsx(Button, { type: "primary", onClick: joinGroup, loading: isJoining, children: t("join_group") })] })) : !canSendMessage ? (_jsx("div", { className: "border-t bg-[#f5f5f5] py-3 flex items-center justify-center", children: _jsx("p", { className: "text-sm text-gray-500", children: t(isRestrictedByGroupMute ? "send_message_disabled_group_mute" : "send_message_disabled") }) })) : (_jsx(MessageFooter, { currentSession: latestConversationSession, openCreateCannedModal: openCreateCannedModal })), _jsx(ConfirmModal, { open: showConfirmRevoke, onOk: onRevokeMessage, onCancel: handleCloseRevoke, title: t("revoke_message_confirm_title"), okText: t("revoke"), cancelText: t("cancel"), okType: "danger", confirmLoading: isRevoking, children: _jsx("p", { children: t("revoke_message_confirm_message") }) }), _jsx(PinLimitModal, { open: pinLimitModalOpen, max: pinnedTotalCount, onClose: () => setPinLimitModalOpen(false) })] }));
 };
 export default MessageList;

package/dist/components/message/item/MessageBubble.d.ts

@@ -1,4 +1,4 @@
-import type { ReactNode } from "react";
+import { type ReactNode } from "react";
 export interface MessageBubbleProps {
     isMine: boolean;
     content: ReactNode;
@@ -8,7 +8,8 @@ export interface MessageBubbleProps {
     isInternal?: boolean;
     id?: string;
     isTransparent?: boolean;
+    timeLabel?: string;
 }
-declare const MessageBubble: ({ isMine, content, senderName, showSenderName, showTip, isInternal, id, isTransparent, }: MessageBubbleProps) => import("react/jsx-runtime").JSX.Element;
+declare const MessageBubble: ({ isMine, content, senderName, showSenderName, showTip, isInternal, id, isTransparent, timeLabel, }: MessageBubbleProps) => import("react/jsx-runtime").JSX.Element;
 export default MessageBubble;
 //# sourceMappingURL=MessageBubble.d.ts.map

package/dist/components/message/item/MessageBubble.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageBubble.d.ts","sourceRoot":"","sources":["../../../../src/components/message/item/MessageBubble.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,SAAS,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AA4CD,QAAA,MAAM,aAAa,GAAI,0FASpB,kBAAkB,4CA6CpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"MessageBubble.d.ts","sourceRoot":"","sources":["../../../../src/components/message/item/MessageBubble.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAEjD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,SAAS,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA4CD,QAAA,MAAM,aAAa,GAAI,qGAUpB,kBAAkB,4CAiEpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/components/message/item/MessageBubble.js

@@ -1,6 +1,7 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import clsx from "clsx";
+import { useState } from "react";
 const INCOMING_TAIL_PATH = "M1.3798 18H4V0C3.51762 4.5 3.34269 10.5 0.966518 14C-0.568384 16.2608 -0.159364 18 1.3798 18Z";
 const OUTGOING_TAIL_PATH = "M2.6202 18H0V0C0.482375 4.5 0.657308 10.5 3.03348 14C4.56838 16.2608 4.15936 18 2.6202 18Z";
 const MessageBubbleTail = ({ isMine, isInternal, }) => (_jsx("div", { className: clsx("flex shrink-0 items-center justify-center", isInternal
@@ -8,8 +9,10 @@ const MessageBubbleTail = ({ isMine, isInternal, }) => (_jsx("div", { className:
         : isMine
             ? "text-chat-bubble-mine"
             : "text-chat-bubble-neutral"), children: _jsx("div", { className: "flex-none", children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", width: "4", height: "18", viewBox: "0 0 4 18", fill: "none", "aria-hidden": true, children: _jsx("path", { d: isMine ? OUTGOING_TAIL_PATH : INCOMING_TAIL_PATH, fill: "currentColor", fillOpacity: "0.1" }) }) }) }));
-const MessageBubble = ({ isMine, content, senderName, showSenderName, showTip = true, isInternal = false, id, isTransparent = false, }) => {
+const MessageBubble = ({ isMine, content, senderName, showSenderName, showTip = true, isInternal = false, id, isTransparent = false, timeLabel, }) => {
     const showTail = showTip && !isTransparent;
+    const [timeRevealed, setTimeRevealed] = useState(false);
+    const showTimeLabel = Boolean(timeLabel) && (showTip || timeRevealed);
     const bubbleClass = clsx("relative max-w-full", isTransparent
         ? "bg-transparent p-0"
         : clsx("p-2", showTip
@@ -21,6 +24,9 @@ const MessageBubble = ({ isMine, content, senderName, showSenderName, showTip =
             : isMine
                 ? "bg-chat-bubble-mine/10"
                 : "bg-chat-bubble-neutral/10"));
-    return (_jsxs("div", { className: "relative flex items-end", "data-testid": "message-bubble", children: [!isMine && showTail && (_jsx(MessageBubbleTail, { isMine: isMine, isInternal: isInternal })), _jsx("div", { className: bubbleClass, id: id, children: _jsxs("div", { className: clsx("flex flex-col gap-1", !isTransparent && "px-1"), children: [showSenderName && senderName && (_jsx("span", { className: "text-[12px] font-medium leading-[160%] tracking-[0.12px] text-gray-400", children: senderName })), _jsx("div", { className: "flex flex-col gap-2", children: content })] }) }), isMine && showTail && (_jsx(MessageBubbleTail, { isMine: isMine, isInternal: isInternal }))] }));
+    return (_jsxs("div", { className: "relative flex items-end", "data-testid": "message-bubble", onClick: () => {
+            if (!showTip && timeLabel)
+                setTimeRevealed((prev) => !prev);
+        }, children: [!isMine && showTail && (_jsx(MessageBubbleTail, { isMine: isMine, isInternal: isInternal })), _jsx("div", { className: bubbleClass, id: id, children: _jsxs("div", { className: clsx("flex flex-col gap-1", !isTransparent && "px-1"), children: [showSenderName && senderName && (_jsx("span", { className: "text-[12px] font-medium leading-[160%] tracking-[0.12px] text-gray-400", children: senderName })), _jsx("div", { className: "flex flex-col gap-2", children: content })] }) }), isMine && showTail && (_jsx(MessageBubbleTail, { isMine: isMine, isInternal: isInternal })), showTimeLabel && (_jsx("span", { "data-testid": "message-time-label", className: clsx("absolute -bottom-2 flex h-[19px] w-[30px] items-center justify-center rounded-full bg-white text-[10px] text-gray-400 shadow-sm", isMine ? "right-1" : "left-1"), children: timeLabel }))] }));
 };
 export default MessageBubble;

package/dist/components/message/item/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/message/item/index.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,8BAA8B,CAAC;AAkCtC,UAAU,gBAAgB;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAClD,eAAe,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAClD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAoBD,QAAA,MAAM,WAAW,GAAI,qMAalB,gBAAgB,mDA8RlB,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/message/item/index.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,8BAA8B,CAAC;AAmCtC,UAAU,gBAAgB;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAClD,eAAe,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IAClD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAyBD,QAAA,MAAM,WAAW,GAAI,qMAalB,gBAAgB,mDA6SlB,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/components/message/item/index.js

@@ -8,7 +8,8 @@ import MessageBubble from "./MessageBubble";
 import { renderBubbleContent } from "./renderMessageContent";
 import { getVisibleNeighbor, isMessageHiddenForViewer, } from "../../../hooks/message/useMessage";
 import { MSG_ITEM_CONTENT_PREFIX, MSG_ITEM_PREFIX } from "../../../constants";
-import { formatTimestamp } from "../../../utils/common";
+import { formatDividerTimestamp } from "../../../utils/common";
+import { CustomMessageType } from "../../../types/customMessage";
 import useAuthStore from "../../../store/auth";
 import useConversationStore from "../../../store/conversation";
 import { useMemo, useRef } from "react";
@@ -22,6 +23,9 @@ import GroupNotificationMessageItem from "./GroupNotificationMessage";
 import { isGroupNotificationMessageType, isSystemLogMessageType } from "../../../utils/messageLog";
 import { buildMessageToolboxMenuItems, getCopyableMessageText, isCopyableMessageType, isPinnableMessageType, MessageToolboxActionKey, MESSAGE_TOOLBOX_OVERLAY_CLASSNAME, useMessageToolboxVisibility, } from "../../../components/message/toolbox";
 const MESSAGE_AVATAR_SIZE = 24;
+const DIVIDER_GAP_MINUTES = 30;
+const GROUPING_GAP_MINUTES = 5;
+const isOrderMessage = (message) => { var _a; return ((_a = message === null || message === void 0 ? void 0 : message.customElem) === null || _a === void 0 ? void 0 : _a.extension) === CustomMessageType.Order; };
 const MessageAvatar = ({ avatarUrl, senderNickname, }) => {
     var _a;
     return (_jsx(Avatar, { size: MESSAGE_AVATAR_SIZE, src: avatarUrl, className: "shrink-0 self-end", children: ((_a = senderNickname === null || senderNickname === void 0 ? void 0 : senderNickname.charAt) === null || _a === void 0 ? void 0 : _a.call(senderNickname, 0)) || "A" }));
@@ -127,10 +131,21 @@ const MessageItem = ({ message, allMessages, isGroupChat = false, forceHideTip =
         message.clientMsgID;
     const previousMessage = getVisibleNeighbor(allMessages, message, "prev");
     const nextMessage = getVisibleNeighbor(allMessages, message, "next");
-    const prevSameUser = (previousMessage === null || previousMessage === void 0 ? void 0 : previousMessage.sendID) === (message === null || message === void 0 ? void 0 : message.sendID);
-    const nextSameUser = (nextMessage === null || nextMessage === void 0 ? void 0 : nextMessage.sendID) === (message === null || message === void 0 ? void 0 : message.sendID);
+    const isOrder = isOrderMessage(message);
+    const prevSameUser = !isOrder &&
+        !isOrderMessage(previousMessage) &&
+        (previousMessage === null || previousMessage === void 0 ? void 0 : previousMessage.sendID) === (message === null || message === void 0 ? void 0 : message.sendID) &&
+        Math.abs(dayjs(message.sendTime).diff(previousMessage.sendTime, "minute")) <=
+            GROUPING_GAP_MINUTES;
+    const nextSameUser = !isOrder &&
+        !isOrderMessage(nextMessage) &&
+        (nextMessage === null || nextMessage === void 0 ? void 0 : nextMessage.sendID) === (message === null || message === void 0 ? void 0 : message.sendID) &&
+        Math.abs(dayjs(nextMessage.sendTime).diff(message.sendTime, "minute")) <=
+            GROUPING_GAP_MINUTES;
     const showTimeBreak = !previousMessage ||
-        !dayjs(message.sendTime).isSame(previousMessage.sendTime, "days");
+        !dayjs(message.sendTime).isSame(previousMessage.sendTime, "days") ||
+        Math.abs(dayjs(message.sendTime).diff(previousMessage.sendTime, "minute")) >
+            DIVIDER_GAP_MINUTES;
     const showPeerInfo = isGroupChat || showSenderInfo;
     const showAvatar = showPeerInfo && !isMine && !nextSameUser;
     const showSenderName = showPeerInfo && !isMine && !prevSameUser;
@@ -142,7 +157,7 @@ const MessageItem = ({ message, allMessages, isGroupChat = false, forceHideTip =
         className: "flex flex-col gap-2 py-1 px-3 sm:px-4 min-w-0",
         id: `${MSG_ITEM_PREFIX}${message === null || message === void 0 ? void 0 : message.clientMsgID}`,
     };
-    const timeBreakNode = showTimeBreak ? (_jsx("div", { className: "flex justify-center", children: _jsx("span", { className: "rounded-full bg-neutral-100 px-2 py-1 text-center text-xs text-gray-600", children: formatTimestamp(message.sendTime, { hasTime: true }) }) })) : null;
+    const timeBreakNode = showTimeBreak ? (_jsx("div", { className: "flex justify-center", children: _jsx("span", { className: "rounded-full bg-neutral-100 px-2 py-1 text-center text-xs text-gray-600", children: formatDividerTimestamp(message.sendTime) }) })) : null;
     if (isSystemLogMessage) {
         return (_createElement("div", Object.assign({}, messageContainerProps, { key: message === null || message === void 0 ? void 0 : message.clientMsgID }),
             timeBreakNode,
@@ -153,8 +168,8 @@ const MessageItem = ({ message, allMessages, isGroupChat = false, forceHideTip =
             timeBreakNode,
             _jsx(GroupNotificationMessageItem, { message: message })));
     }
-    const bubbleNode = (_jsx(MessageBubble, { isMine: isMine, isInternal: isInternalMessage, senderName: message === null || message === void 0 ? void 0 : message.senderNickname, showSenderName: showSenderName, showTip: showTip, id: `${MSG_ITEM_CONTENT_PREFIX}${message === null || message === void 0 ? void 0 : message.clientMsgID}`, content: renderBubbleContent(message, onPressQuoteMessage), isTransparent: isStickerMessage }));
-    const showPinnedBadge = Boolean(message === null || message === void 0 ? void 0 : message.isPinned) && Boolean(onPinMessage);
+    const bubbleNode = (_jsx(MessageBubble, { isMine: isMine, isInternal: isInternalMessage, senderName: message === null || message === void 0 ? void 0 : message.senderNickname, showSenderName: showSenderName, showTip: showTip, id: `${MSG_ITEM_CONTENT_PREFIX}${message === null || message === void 0 ? void 0 : message.clientMsgID}`, content: renderBubbleContent(message, onPressQuoteMessage), isTransparent: isStickerMessage, timeLabel: dayjs.tz(message.sendTime).format("HH:mm") }));
+    const showPinnedBadge = Boolean(message === null || message === void 0 ? void 0 : message.isPinned);
     const pinnedBadgeNode = showPinnedBadge ? (_jsx("span", { "data-testid": "message-pinned-badge", className: clsx("absolute -top-2.5 z-[1] flex h-[22px] w-[26px] items-center justify-center rounded-full border border-white bg-gray-25", isMine ? "left-0" : "right-0"), children: _jsx(Icon, { icon: "thumbtack-b", size: 12, className: "text-primary-400" }) })) : null;
     const wrappedBubble = hasContextMenu ? (_jsx(Dropdown, { menu: { items: contextMenuItems }, trigger: ["contextMenu"], open: contextMenuOpen, onOpenChange: onContextMenuOpenChange, overlayClassName: MESSAGE_TOOLBOX_OVERLAY_CLASSNAME, children: _jsxs("div", { ref: bubbleWrapperRef, className: "relative min-w-0", children: [bubbleNode, pinnedBadgeNode] }) })) : (_jsxs("div", { className: "relative min-w-0", children: [bubbleNode, pinnedBadgeNode] }));
     return (_createElement("div", Object.assign({}, messageContainerProps, { key: message === null || message === void 0 ? void 0 : message.clientMsgID }),

package/dist/components/thread/GroupThreadInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupThreadInfo.d.ts","sourceRoot":"","sources":["../../../src/components/thread/GroupThreadInfo.tsx"],"names":[],"mappings":"AAmBA,MAAM,WAAW,qBAAqB;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,oBAAoB;IAC5B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,qBAAqB,CAAC;CAChC;AAID,QAAA,MAAM,eAAe,GAAI,qBAAqB,oBAAoB,mDAigBjE,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"GroupThreadInfo.d.ts","sourceRoot":"","sources":["../../../src/components/thread/GroupThreadInfo.tsx"],"names":[],"mappings":"AAoBA,MAAM,WAAW,qBAAqB;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,oBAAoB;IAC5B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,qBAAqB,CAAC;CAChC;AAID,QAAA,MAAM,eAAe,GAAI,qBAAqB,oBAAoB,mDAyjBjE,CAAC;AAEF,eAAe,eAAe,CAAC"}