golomazov/hotelsync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: block drag-to-move if target room has conflicting booking

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
HotelSync
2026-03-21 01:05:40 +03:00
parent 456a35e00d
commit 7bd0e038ba
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/calendar/BookingCalendar.tsx
View File

@@ -87,8 +87,10 @@ export function BookingCalendar({ rooms, bookings, slug, onBookingCreate, onBook
const [ghostPos, setGhostPos] = useState<{ x: number; y: number } | null>(null) const [ghostPos, setGhostPos] = useState<{ x: number; y: number } | null>(null)
const movingBookingRef = useRef<Booking | null>(null) const movingBookingRef = useRef<Booking | null>(null)
const moveTargetRoomIdRef = useRef<string | null>(null) // всегда актуален, без stale closure const moveTargetRoomIdRef = useRef<string | null>(null) // всегда актуален, без stale closure
const bookingsRef = useRef<Booking[]>(bookings)
const didDragRef = useRef(false) const didDragRef = useRef(false)
movingBookingRef.current = movingBooking movingBookingRef.current = movingBooking
bookingsRef.current = bookings
// Compact mode (default from Settings → Appearance) // Compact mode (default from Settings → Appearance)
const [compact, setCompact] = useState( const [compact, setCompact] = useState(
@@ -510,9 +512,18 @@ export function BookingCalendar({ rooms, bookings, slug, onBookingCreate, onBook
// Читаем из ref — всегда актуальное значение, не stale closure // Читаем из ref — всегда актуальное значение, не stale closure
const targetRoomId = moveTargetRoomIdRef.current const targetRoomId = moveTargetRoomIdRef.current
if (targetRoomId && targetRoomId !== booking.roomId) { if (targetRoomId && targetRoomId !== booking.roomId) {
// Проверяем конфликт в целевом номере
const hasConflict = bookingsRef.current.some(b =>
b.roomId === targetRoomId &&
b.id !== booking.id &&
b.status !== 'cancelled' && b.status !== 'no_show' && b.status !== 'checked_out' &&
b.checkIn < booking.checkOut && b.checkOut > booking.checkIn,
)
if (!hasConflict) {
didDragRef.current = true didDragRef.current = true
onBookingUpdate(booking.id, { roomId: targetRoomId }) onBookingUpdate(booking.id, { roomId: targetRoomId })
} }
}
setMovingBooking(null) setMovingBooking(null)
setMoveTargetRoomId(null) setMoveTargetRoomId(null)
setGhostPos(null) setGhostPos(null)