Complete recurrence editing and calendar preferences
This commit is contained in:
@@ -12,6 +12,7 @@ import {
|
||||
HOUR_ROW_HEIGHT,
|
||||
INITIAL_SCROLL_HOUR,
|
||||
calendarEventColorStyle,
|
||||
calendarEventInstanceId,
|
||||
chunk,
|
||||
continuousVirtualWindow,
|
||||
dayKey,
|
||||
@@ -185,12 +186,12 @@ export function CalendarWeekRows({
|
||||
<div className="calendar-event-stack">
|
||||
{dayEvents.slice(0, eventLimit).map((event) => (
|
||||
<CalendarEventChip
|
||||
key={event.id}
|
||||
key={calendarEventInstanceId(event)}
|
||||
event={event}
|
||||
color={calendarColorById.get(event.calendar_id)}
|
||||
canDrag={canWrite}
|
||||
dragging={draggingEventId === event.id}
|
||||
linkedHover={hoveredEventId === event.id}
|
||||
dragging={draggingEventId === calendarEventInstanceId(event)}
|
||||
linkedHover={hoveredEventId === calendarEventInstanceId(event)}
|
||||
onSelect={onEventSelect}
|
||||
onHover={onEventHover}
|
||||
onDragStart={onEventDragStart}
|
||||
@@ -350,13 +351,13 @@ export function CalendarTimeGrid({
|
||||
>
|
||||
{day.events.map((event) => (
|
||||
<CalendarEventChip
|
||||
key={event.id}
|
||||
key={calendarEventInstanceId(event)}
|
||||
event={event}
|
||||
color={calendarColorById.get(event.calendar_id)}
|
||||
compact
|
||||
canDrag={canWrite}
|
||||
dragging={draggingEventId === event.id}
|
||||
linkedHover={hoveredEventId === event.id}
|
||||
dragging={draggingEventId === calendarEventInstanceId(event)}
|
||||
linkedHover={hoveredEventId === calendarEventInstanceId(event)}
|
||||
onSelect={onEventSelect}
|
||||
onHover={onEventHover}
|
||||
onDragStart={onEventDragStart}
|
||||
@@ -503,11 +504,11 @@ function TimedDayColumn({
|
||||
)}
|
||||
{layout.items.map((item) => (
|
||||
<div
|
||||
key={item.event.id}
|
||||
key={calendarEventInstanceId(item.event)}
|
||||
className={[
|
||||
"calendar-timed-event",
|
||||
draggingEventId === item.event.id ? "is-dragging" : "",
|
||||
hoveredEventId === item.event.id
|
||||
draggingEventId === calendarEventInstanceId(item.event) ? "is-dragging" : "",
|
||||
hoveredEventId === calendarEventInstanceId(item.event)
|
||||
? "is-linked-hover"
|
||||
: "",
|
||||
]
|
||||
@@ -518,7 +519,7 @@ function TimedDayColumn({
|
||||
calendarColorById.get(item.event.calendar_id),
|
||||
)}
|
||||
draggable={canWrite}
|
||||
onMouseEnter={() => onEventHover(item.event.id)}
|
||||
onMouseEnter={() => onEventHover(calendarEventInstanceId(item.event))}
|
||||
onMouseLeave={() => onEventHover("")}
|
||||
onDragStart={
|
||||
canWrite
|
||||
@@ -546,7 +547,7 @@ function TimedDayColumn({
|
||||
type="button"
|
||||
className="calendar-timed-event-content"
|
||||
onClick={() => onEventSelect(item.event)}
|
||||
onFocus={() => onEventHover(item.event.id)}
|
||||
onFocus={() => onEventHover(calendarEventInstanceId(item.event))}
|
||||
onBlur={() => onEventHover("")}
|
||||
title={i18nMessage(
|
||||
"i18n:govoplan-calendar.edit_value.fad75899",
|
||||
@@ -629,9 +630,9 @@ function CalendarEventChip({
|
||||
style={calendarEventColorStyle(color)}
|
||||
draggable={canDrag}
|
||||
onClick={() => onSelect(event)}
|
||||
onMouseEnter={onHover ? () => onHover(event.id) : undefined}
|
||||
onMouseEnter={onHover ? () => onHover(calendarEventInstanceId(event)) : undefined}
|
||||
onMouseLeave={onHover ? () => onHover("") : undefined}
|
||||
onFocus={onHover ? () => onHover(event.id) : undefined}
|
||||
onFocus={onHover ? () => onHover(calendarEventInstanceId(event)) : undefined}
|
||||
onBlur={onHover ? () => onHover("") : undefined}
|
||||
onDragStart={
|
||||
canDrag && onDragStart
|
||||
|
||||
Reference in New Issue
Block a user