diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index d081c7e22..9aec61484 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -504,10 +504,26 @@ export const RoomInput = forwardRef( const queryClient = useQueryClient(); const delayedEventsSupported = useAtomValue(delayedEventsSupportedAtom); - const [scheduledTime, setScheduledTime] = useAtom(roomIdToScheduledTimeAtomFamily(roomId)); - const [editingScheduledDelayId, setEditingScheduledDelayId] = useAtom( + const [roomScheduledTime, setRoomScheduledTime] = useAtom( + roomIdToScheduledTimeAtomFamily(roomId) + ); + const [roomEditingScheduledDelayId, setRoomEditingScheduledDelayId] = useAtom( roomIdToEditingScheduledDelayIdAtomFamily(roomId) ); + const scheduledTime = threadRootId ? null : roomScheduledTime; + const editingScheduledDelayId = threadRootId ? null : roomEditingScheduledDelayId; + const setScheduledTime = useCallback( + (value: Date | null) => { + if (!threadRootId) setRoomScheduledTime(value); + }, + [setRoomScheduledTime, threadRootId] + ); + const setEditingScheduledDelayId = useCallback( + (value: string | null) => { + if (!threadRootId) setRoomEditingScheduledDelayId(value); + }, + [setRoomEditingScheduledDelayId, threadRootId] + ); const [AddMenuAnchor, setAddMenuAnchor] = useState(); const [showAttachmentSheet, setShowAttachmentSheet] = useState(false); const attachmentSkipReturnFocusRef = useRef(false);