File tree 6 files changed +15
-15
lines changed 6 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 1
1
import { CreateMessage } from "@/app/messaging/components/CreateMessage"
2
2
import { MessagesList } from "@/app/messaging/components/MessagesList"
3
3
4
- import { getMessages , getRoom , getRooms } from "@/modules/messaging"
4
+ import { getMessages , getRoom } from "@/modules/messaging"
5
5
6
6
export default async function Page ( { params } : { params : { roomId : string } } ) {
7
7
const roomId = parseInt ( params . roomId )
8
8
const messages = await getMessages ( { roomId } )
9
- console . log ( messages )
10
9
11
10
const room = await getRoom ( { id : roomId } )
12
11
return (
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ export default function CreateRoomSheet({
42
42
rooms : Room [ ]
43
43
} ) {
44
44
const [ open , setOpen ] = React . useState ( false )
45
- const [ value , setValue ] = React . useState ( "" )
45
+ const [ value ] = React . useState ( "" )
46
46
const [ selectedUsers , setSelectedUsers ] = useState < User [ ] > ( [ ] )
47
47
const [ roomName , setRoomName ] = useState ( "" )
48
48
Original file line number Diff line number Diff line change @@ -25,12 +25,6 @@ export const MessagesList: React.FC<{
25
25
26
26
useEffect ( ( ) => {
27
27
if ( scrollRef . current ) {
28
- console . log (
29
- "message created" ,
30
- scrollRef . current . scrollTop ,
31
- scrollRef . current . scrollHeight
32
- )
33
-
34
28
scrollRef . current . scrollTop = scrollRef . current . scrollHeight + 200
35
29
}
36
30
} , [ messages . at ( - 1 ) ?. id ] )
@@ -57,6 +51,7 @@ export const MessagesList: React.FC<{
57
51
user_id : string
58
52
} ) => (
59
53
< MessagePanel
54
+ key = { id }
60
55
newMessages = { newMessages }
61
56
id = { id }
62
57
user_id = { user_id }
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ const CommandInput = React.forwardRef<
41
41
React . ElementRef < typeof CommandPrimitive . Input > ,
42
42
React . ComponentPropsWithoutRef < typeof CommandPrimitive . Input >
43
43
> ( ( { className, ...props } , ref ) => (
44
- < div className = "flex items-center border-b px-3" cmdk-input-wrapper = "" >
44
+ < div className = "flex items-center border-b px-3" >
45
45
< MagnifyingGlassIcon className = "mr-2 h-4 w-4 shrink-0 opacity-50" />
46
46
< CommandPrimitive . Input
47
47
ref = { ref }
Original file line number Diff line number Diff line change @@ -72,7 +72,11 @@ export const useMessages = ({
72
72
. then ( ( { data : messagesOlder } ) => {
73
73
console . log ( messagesOlder )
74
74
75
- setMessages ( ( messages ) => [ ...messagesOlder , ...messages ] )
75
+ if ( messagesOlder ) {
76
+ setMessages ( ( messages ) => [ ...messagesOlder , ...messages ] )
77
+ } else {
78
+ setMessages ( messages )
79
+ }
76
80
} )
77
81
} ,
78
82
[ messages , setMessages , roomId ]
Original file line number Diff line number Diff line change @@ -135,10 +135,12 @@ export const useRooms = ({
135
135
)
136
136
. eq ( "room_id" , roomId )
137
137
138
- return participants . data ?. map ( ( data ) => ( {
139
- id : data . id ,
140
- username : data . profiles . at ( 0 ) ?. username ?? "" ,
141
- } ) )
138
+ return (
139
+ participants . data ?. map ( ( data ) => ( {
140
+ id : data . id ,
141
+ username : data . profiles . at ( 0 ) ?. username ?? "" ,
142
+ } ) ) || null
143
+ )
142
144
} ,
143
145
[ ]
144
146
)
You can’t perform that action at this time.
0 commit comments