@droppii-org/chat-sdk 0.1.37 → 0.1.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"BizMessageList.d.ts","sourceRoot":"","sources":["../../../src/components/biz-thread-detail/BizMessageList.tsx"],"names":[],"mappings":"AAiBA,QAAA,MAAM,cAAc,+CAgFnB,CAAC;AAEF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"BizMessageList.d.ts","sourceRoot":"","sources":["../../../src/components/biz-thread-detail/BizMessageList.tsx"],"names":[],"mappings":"AAiBA,QAAA,MAAM,cAAc,+CA8EnB,CAAC;AAEF,eAAe,cAAc,CAAC"}
@@ -10,20 +10,19 @@ import { useMessageListScroll } from "../../hooks/message/useMessageListScroll";
10
10
  import useBizConversationStore from "../../store/bizConversation";
11
11
  import useConversationStore from "../../store/conversation";
12
12
  import useAuthStore from "../../store/auth";
13
- import { ConnectStatus, SyncStatus } from "../../types/chat";
13
+ import { useIsSdkMessageReady } from "../../hooks/common/useIsSdkMessageReady";
14
14
  import { isBizGroupChat } from "../../utils/bizConversation";
15
15
  import emitter from "../../utils/events";
16
16
  import BizMessageItem from "./item/BizMessageItem";
17
17
  const BizMessageList = () => {
18
18
  const { t } = useTranslation("biz-inbox");
19
- const { user, connectStatus, syncStatus } = useChatContext();
19
+ const { user } = useChatContext();
20
20
  const authUserID = useAuthStore((state) => state.userID);
21
+ const isSdkReady = useIsSdkMessageReady();
21
22
  const conversation = useBizConversationStore((state) => state.conversationData);
22
23
  const selectedConversationId = useConversationStore((state) => state.selectedConversationId);
23
24
  const conversationId = selectedConversationId || (conversation === null || conversation === void 0 ? void 0 : conversation.conversationId) || "";
24
25
  const isGroupChat = conversation ? isBizGroupChat(conversation) : false;
25
- const isSdkReady = connectStatus === ConnectStatus.Connected &&
26
- syncStatus !== SyncStatus.Loading;
27
26
  const messageController = useMessage(conversationId, undefined, isSdkReady && !!conversationId);
28
27
  const { scrollRef, loadMoreOldMessage, handleInfiniteScroll, scrollToBottomIfAtBottom, } = useMessageListScroll(Object.assign({ conversationId, userId: (user === null || user === void 0 ? void 0 : user.userID) || authUserID }, messageController));
29
28
  const { loadState, moreOldLoading } = messageController;
@@ -1 +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,sBAAsB,iBAAiB,4CA+FnE,CAAC"}
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,sBAAsB,iBAAiB,4CAgGnE,CAAC"}
@@ -12,7 +12,7 @@ const queryClient = new QueryClient();
12
12
  export const ChatContext = createContext({
13
13
  user: null,
14
14
  connectStatus: ConnectStatus.Disconnected,
15
- syncStatus: SyncStatus.Success,
15
+ syncStatus: SyncStatus.Loading,
16
16
  getSelfUserInfo: () => { },
17
17
  updateConnectStatus: () => { },
18
18
  updateSyncStatus: () => { },
@@ -20,7 +20,7 @@ export const ChatContext = createContext({
20
20
  export const useChatContext = () => useContext(ChatContext);
21
21
  export const ChatProvider = ({ children, config }) => {
22
22
  const [connectStatus, setConnectStatus] = useState(ConnectStatus.Disconnected);
23
- const [syncStatus, setSyncStatus] = useState(SyncStatus.Success);
23
+ const [syncStatus, setSyncStatus] = useState(SyncStatus.Loading);
24
24
  const [user, setUser] = useState(null);
25
25
  const initAuthStore = useAuthStore((state) => state.initAuthStore);
26
26
  const setFallbackUserFromAuth = () => {
@@ -77,6 +77,7 @@ export const ChatProvider = ({ children, config }) => {
77
77
  nickname: "",
78
78
  faceURL: "",
79
79
  });
80
+ setSyncStatus(SyncStatus.Loading);
80
81
  }
81
82
  }, [config]);
82
83
  return (_jsx(ChatContext.Provider, { value: {
@@ -0,0 +1,2 @@
1
+ export declare const useIsSdkMessageReady: () => boolean;
2
+ //# sourceMappingURL=useIsSdkMessageReady.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useIsSdkMessageReady.d.ts","sourceRoot":"","sources":["../../../src/hooks/common/useIsSdkMessageReady.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,eAMhC,CAAC"}
@@ -0,0 +1,7 @@
1
+ import { useChatContext } from "../../context/ChatContext";
2
+ import { ConnectStatus, SyncStatus } from "../../types/chat";
3
+ export const useIsSdkMessageReady = () => {
4
+ const { connectStatus, syncStatus } = useChatContext();
5
+ return (connectStatus === ConnectStatus.Connected &&
6
+ syncStatus === SyncStatus.Success);
7
+ };
@@ -1 +1 @@
1
- {"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,cAAc,YAqT1B,CAAC"}
1
+ {"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,cAAc,YAoT1B,CAAC"}
@@ -143,7 +143,6 @@ export const useGlobalEvent = () => {
143
143
  };
144
144
  const connectSuccessHandler = () => {
145
145
  updateConnectStatus(ConnectStatus.Connected);
146
- updateSyncStatus(SyncStatus.Loading);
147
146
  };
148
147
  const connectFailedHandler = () => {
149
148
  updateConnectStatus(ConnectStatus.Disconnected);
@@ -1 +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,yBAAyB,CAAC;AAKtD,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,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;CACnD;AAED,eAAO,MAAM,oBAAoB,GAAI,iIASlC,0BAA0B;;;;8BAsFrB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;CAkDpC,CAAC"}
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,yBAAyB,CAAC;AAKtD,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,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;CACnD;AAED,eAAO,MAAM,oBAAoB,GAAI,iIASlC,0BAA0B;;;;8BA6DrB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;CAkDpC,CAAC"}
@@ -10,33 +10,6 @@ export const useMessageListScroll = ({ conversationId, userId, loadState, latest
10
10
  useEffect(() => {
11
11
  autoFillAttemptedRef.current = false;
12
12
  }, [conversationId]);
13
- useEffect(() => {
14
- if (!moreOldLoading) {
15
- autoFillAttemptedRef.current = false;
16
- }
17
- }, [moreOldLoading]);
18
- useEffect(() => {
19
- if (moreOldLoading ||
20
- loadState.initLoading ||
21
- !loadState.hasMoreOld ||
22
- loadState.messageList.length === 0) {
23
- return;
24
- }
25
- const scrollEl = scrollRef.current;
26
- if (!scrollEl || scrollEl.scrollHeight > scrollEl.clientHeight) {
27
- return;
28
- }
29
- if (autoFillAttemptedRef.current)
30
- return;
31
- autoFillAttemptedRef.current = true;
32
- getMoreOldMessages();
33
- }, [
34
- moreOldLoading,
35
- loadState.initLoading,
36
- loadState.hasMoreOld,
37
- loadState.messageList.length,
38
- getMoreOldMessages,
39
- ]);
40
13
  const handleMarkConversationMessageAsRead = useCallback(() => {
41
14
  var _a, _b, _c, _d;
42
15
  const lastMessage = (_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList) === null || _b === void 0 ? void 0 : _b[0];
@@ -66,6 +39,12 @@ export const useMessageListScroll = ({ conversationId, userId, loadState, latest
66
39
  const loadMoreOldMessage = useCallback(() => {
67
40
  if (!loadState.hasMoreOld || moreOldLoading)
68
41
  return;
42
+ const scrollEl = scrollRef.current;
43
+ if (scrollEl && scrollEl.scrollHeight <= scrollEl.clientHeight) {
44
+ if (autoFillAttemptedRef.current)
45
+ return;
46
+ autoFillAttemptedRef.current = true;
47
+ }
69
48
  getMoreOldMessages();
70
49
  }, [loadState.hasMoreOld, moreOldLoading, getMoreOldMessages]);
71
50
  const { run: loadMoreNewMessage } = useDebounceFn(() => {