|
@@ -137,10 +137,14 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
}, [total,seen,mute]);
|
|
}, [total,seen,mute]);
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
- if (divRef.current) {
|
|
|
|
- const { scrollHeight, clientHeight } = divRef.current
|
|
|
|
- if(total !== seen&&scrollHeight === clientHeight) seenChat(companionId)
|
|
|
|
|
|
+ const handleReset = () => {
|
|
|
|
+ if (divRef.current) {
|
|
|
|
+ const { scrollHeight, clientHeight } = divRef.current
|
|
|
|
+ if (total !== seen && scrollHeight === clientHeight) seenChat(companionId)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ const idInterval = setInterval(handleReset, refreshAppTime);
|
|
|
|
+ return () => clearInterval(idInterval);
|
|
}, [total, seen, companionId]);
|
|
}, [total, seen, companionId]);
|
|
|
|
|
|
return (
|
|
return (
|
|
@@ -149,7 +153,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
<div ref={divRef} onScroll={debouncedHandleScroll}
|
|
<div ref={divRef} onScroll={debouncedHandleScroll}
|
|
className={messages.length > 0 ? classes.messagesScroll : classes.messagesEmpty}>
|
|
className={messages.length > 0 ? classes.messagesScroll : classes.messagesEmpty}>
|
|
<div className={classes.messagesBody}>
|
|
<div className={classes.messagesBody}>
|
|
- {messages.length > 0 ? messages.map(({ message, name, lastName, color,
|
|
|
|
|
|
+ {messages.length > 0 ? messages.map(({ message, name, lastName, color,pinned,
|
|
createdAt,number, type,fullType,caption,emoji,emojiCompanion,_id }) => {
|
|
createdAt,number, type,fullType,caption,emoji,emojiCompanion,_id }) => {
|
|
let isTime
|
|
let isTime
|
|
if (!time) {
|
|
if (!time) {
|
|
@@ -171,6 +175,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -186,6 +191,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -200,6 +206,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -214,6 +221,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -228,6 +236,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -244,6 +253,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -259,6 +269,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -273,6 +284,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -287,6 +299,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|
|
@@ -301,6 +314,7 @@ const ChatBar = ({selectedArr,setSelectedArr,isSomeSelected,setIsSomeSelected}:I
|
|
caption={caption}
|
|
caption={caption}
|
|
emoji={emoji}
|
|
emoji={emoji}
|
|
emojiCompanion={emojiCompanion}
|
|
emojiCompanion={emojiCompanion}
|
|
|
|
+ pinned={pinned}
|
|
isSomeSelected={isSomeSelected}
|
|
isSomeSelected={isSomeSelected}
|
|
isSelected={isSelected}
|
|
isSelected={isSelected}
|
|
handleSelected={handleSelected}
|
|
handleSelected={handleSelected}
|