@droppii-org/chat-sdk 0.7.7 → 0.7.9

package/dist/hooks/message/useMessage.js

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { ViewType, MessageType, } from "@droppii-org/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
 import { PAGE_SIZE } from "../../constants";
@@ -87,6 +87,17 @@ onSearchMessageRevoked) => {
     // without this the user sees it stacked. Keyed by conversation + target so
     // jumping to a different revoked message still notifies.
     const toastedRevokedTargetRef = useRef(null);
+    // Also used by the scroll guard for a search hit recalled since the results came back.
+    const notifyRevokedTarget = useCallback((clientMsgID) => {
+        const revokedTargetKey = `${conversationIdRef.current}:${clientMsgID}`;
+        if (toastedRevokedTargetRef.current === revokedTargetKey)
+            return;
+        toastedRevokedTargetRef.current = revokedTargetKey;
+        if (onSearchMessageRevoked)
+            onSearchMessageRevoked();
+        else
+            antdMessage.info(t("message_revoked_or_deleted"));
+    }, [conversationIdRef, onSearchMessageRevoked, t]);
     const { loading: moreOldLoading, runAsync: getMoreOldMessages } = useRequest(async (loadMore = true) => {
         var _a, _b, _c, _d, _e;
         const reqConversationID = conversationId;
@@ -208,14 +219,7 @@ onSearchMessageRevoked) => {
         // list with a window centred on a tombstone is worse than not moving.
         const targetMessage = currentMessages.find((item) => item.clientMsgID === searchClientMsgID);
         if ((targetMessage === null || targetMessage === void 0 ? void 0 : targetMessage.contentType) === MessageType.RevokeMessage) {
-            const revokedTargetKey = `${reqConversationID}:${searchClientMsgID}`;
-            if (toastedRevokedTargetRef.current !== revokedTargetKey) {
-                toastedRevokedTargetRef.current = revokedTargetKey;
-                if (onSearchMessageRevoked)
-                    onSearchMessageRevoked();
-                else
-                    antdMessage.info(t("message_revoked_or_deleted"));
-            }
+            notifyRevokedTarget(searchClientMsgID);
             // Deliberately outside the guard: a repeat run still needs to leave
             // the user with a usable list. The fallback is a no-op once the first
             // one has populated it, and skipping it here would strand an empty
@@ -397,6 +401,7 @@ onSearchMessageRevoked) => {
         moreNewLoading,
         getMoreNewMessages,
         refreshLatestMessages,
+        notifyRevokedTarget,
     };
 };
 export const pushNewMessage = (message) => emit("PUSH_NEW_MSG", message);

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

@@ -19,8 +19,10 @@ interface UseMessageListScrollParams {
     getMoreNewMessages: () => void | Promise<unknown>;
     /** Holds mark-as-read back while the first-unread lookup is still pending. */
     markAsReadBlocked?: boolean;
+    /** Tells the user a search jump target was recalled (deduped with the search load). */
+    notifyRevokedTarget?: (clientMsgID: string) => void;
 }
-export declare const useMessageListScroll: ({ conversationId, userId, isGroupChat, loadState, latestLoadState, moreOldLoading, moreNewLoading, getMoreOldMessages, getMoreNewMessages, markAsReadBlocked, }: UseMessageListScrollParams) => {
+export declare const useMessageListScroll: ({ conversationId, userId, isGroupChat, loadState, latestLoadState, moreOldLoading, moreNewLoading, getMoreOldMessages, getMoreNewMessages, markAsReadBlocked, notifyRevokedTarget, }: UseMessageListScrollParams) => {
     scrollRef: RefObject<HTMLDivElement>;
     handleMarkConversationMessageAsRead: () => void;
     loadMoreOldMessage: () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"useMessageListScroll.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessageListScroll.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkC,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAU3D,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,0BAA0B;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,oBAAoB,CAAC;IAChC,eAAe,EAAE,SAAS,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,oBAAoB,GAAI,iKAWlC,0BAA0B;;;;8BAqErB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;mCA0Ce,MAAM;CA6CzD,CAAC"}
+{"version":3,"file":"useMessageListScroll.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessageListScroll.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkC,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,WAAW,EAAe,MAAM,8BAA8B,CAAC;AAYxE,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,0BAA0B;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,oBAAoB,CAAC;IAChC,eAAe,EAAE,SAAS,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uFAAuF;IACvF,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED,eAAO,MAAM,oBAAoB,GAAI,sLAYlC,0BAA0B;;;;8BAsErB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;mCA0Ce,MAAM;CAyEzD,CAAC"}

package/dist/hooks/message/useMessageListScroll.js

@@ -1,13 +1,17 @@
 "use client";
 import { useCallback, useEffect, useRef } from "react";
-import { useDebounceFn } from "ahooks";
+import { MessageType } from "@droppii-org/wasm-client-sdk";
+import { useDebounceFn, useLatest } from "ahooks";
 import { isNumber } from "lodash";
 import { markConversationMessageAsRead } from "../../hooks/conversation/useConversation";
 import { MSG_ITEM_BUBBLE_GROUP_PREFIX, MSG_ITEM_CONTENT_PREFIX, MSG_ITEM_PREFIX, } from "../../constants";
+import useConversationStore from "../../store/conversation";
+import { holdMessageHighlight } from "./holdMessageHighlight";
 export const MESSAGE_LIST_BOTTOM_THRESHOLD = -5;
-export const useMessageListScroll = ({ conversationId, userId, isGroupChat, loadState, latestLoadState, moreOldLoading, moreNewLoading, getMoreOldMessages, getMoreNewMessages, markAsReadBlocked = false, }) => {
+export const useMessageListScroll = ({ conversationId, userId, isGroupChat, loadState, latestLoadState, moreOldLoading, moreNewLoading, getMoreOldMessages, getMoreNewMessages, markAsReadBlocked = false, notifyRevokedTarget, }) => {
     const scrollRef = useRef(null);
     const autoFillAttemptedRef = useRef(false);
+    const notifyRevokedTargetRef = useLatest(notifyRevokedTarget);
     useEffect(() => {
         autoFillAttemptedRef.current = false;
     }, [conversationId]);
@@ -97,7 +101,22 @@ export const useMessageListScroll = ({ conversationId, userId, isGroupChat, load
         });
     }, [handleMarkConversationMessageAsRead]);
     const scrollToMessage = useCallback((clientMsgID) => {
+        // A search hit recalled since the results came back: say so instead of landing on its placeholder.
+        // Checked before the scroll and again before the highlight, since the list reloads in between.
+        const dropRevokedSearchTarget = () => {
+            var _a, _b, _c, _d;
+            const state = useConversationStore.getState();
+            const isRevoked = state.heldHighlightClientMsgID === clientMsgID &&
+                ((_c = (_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList) === null || _b === void 0 ? void 0 : _b.find((message) => message.clientMsgID === clientMsgID)) === null || _c === void 0 ? void 0 : _c.contentType) === MessageType.RevokeMessage;
+            if (!isRevoked)
+                return false;
+            state.setHeldHighlightClientMsgID("");
+            (_d = notifyRevokedTargetRef.current) === null || _d === void 0 ? void 0 : _d.call(notifyRevokedTargetRef, clientMsgID);
+            return true;
+        };
         setTimeout(() => {
+            if (dropRevokedSearchTarget())
+                return;
             const targetElement = document.getElementById(`${MSG_ITEM_PREFIX}${clientMsgID}`);
             targetElement === null || targetElement === void 0 ? void 0 : targetElement.scrollIntoView({
                 behavior: "auto",
@@ -105,10 +124,23 @@ export const useMessageListScroll = ({ conversationId, userId, isGroupChat, load
             });
             setTimeout(() => {
                 var _a;
+                if (dropRevokedSearchTarget())
+                    return;
                 const targetContentElement = document.getElementById(`${MSG_ITEM_CONTENT_PREFIX}${clientMsgID}`);
                 // The border hugs the bubble; the pulse runs on the wrapper that also
                 // holds the pin badge, or the badge stays put while the bubble scales.
                 const pulseElement = (_a = document.getElementById(`${MSG_ITEM_BUBBLE_GROUP_PREFIX}${clientMsgID}`)) !== null && _a !== void 0 ? _a : targetContentElement;
+                const isHeld = useConversationStore.getState().heldHighlightClientMsgID ===
+                    clientMsgID;
+                if (targetContentElement && isHeld) {
+                    holdMessageHighlight(targetContentElement, () => {
+                        const state = useConversationStore.getState();
+                        if (state.heldHighlightClientMsgID === clientMsgID) {
+                            state.setHeldHighlightClientMsgID("");
+                        }
+                    });
+                    return;
+                }
                 targetContentElement === null || targetContentElement === void 0 ? void 0 : targetContentElement.classList.add("border-blue-500", "border");
                 pulseElement === null || pulseElement === void 0 ? void 0 : pulseElement.classList.add("zoom-in-out-element");
                 const onEnd = () => {
@@ -121,7 +153,7 @@ export const useMessageListScroll = ({ conversationId, userId, isGroupChat, load
                 });
             }, 500);
         }, 200);
-    }, []);
+    }, [latestLoadState, notifyRevokedTargetRef]);
     return {
         scrollRef,
         handleMarkConversationMessageAsRead,

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

@@ -42,7 +42,7 @@ export declare const useSendMessage: (options?: UseSendMessageOptions) => {
     sendStickerMessage: (sticker: StickerItem, sendOptions?: {
         currentSession?: ISessionResponse;
     }) => Promise<boolean>;
-    resendMessage: (failedMessage: MessageItem) => Promise<void>;
+    resendMessage: (failedMessage: MessageItem) => Promise<boolean>;
 };
 export declare const generateExtendMessageInfo: ({ richText, urlMetadata, currentSession, flow, mentionOffsets, stickerId, }: {
     richText?: string;

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":"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"}
+{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"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"}