Skip to content

Expose toUpdatedEvents, toInsertedEvents, toDeletedEvents + Fixed event drag/drop issues. #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 4, 2024
Merged

Expose toUpdatedEvents, toInsertedEvents, toDeletedEvents + Fixed event drag/drop issues. #1369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62c5dec
expose inserted,updated and deleted events + added startTime,endTime …
raheeliftikhar5 Dec 2, 2024
3d1e09e
update data on events drag/drop
raheeliftikhar5 Dec 2, 2024
3a00b21
fix drag/drop event triggers
raheeliftikhar5 Dec 4, 2024
0ec2a69
Merge branch 'dev' into calendar-updates
FalkWolsky Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update data on events drag/drop
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Dec 4, 2024
commit 3d1e09e9123f8de9ef55d90b376a37fb19faac6b
40 changes: 24 additions & 16 deletions client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import adaptivePlugin from "@fullcalendar/adaptive";
import dayGridPlugin from "@fullcalendar/daygrid";
import multiMonthPlugin from '@fullcalendar/multimonth';
import timeGridPlugin from "@fullcalendar/timegrid";
import interactionPlugin from "@fullcalendar/interaction";
import interactionPlugin, { EventResizeDoneArg } from "@fullcalendar/interaction";
import listPlugin from "@fullcalendar/list";
import allLocales from "@fullcalendar/core/locales-all";
import { EventContentArg, DateSelectArg } from "@fullcalendar/core";
import { EventContentArg, DateSelectArg, EventDropArg } from "@fullcalendar/core";
import momentPlugin from "@fullcalendar/moment";

import ErrorBoundary from "./errorBoundary";
Expand Down Expand Up @@ -83,6 +83,7 @@ import {
resourceTimeGridHeaderToolbar,
} from "./calendarConstants";
import { EventOptionControl } from "./eventOptionsControl";
import { EventImpl } from "@fullcalendar/core/internal";

function fixOldData(oldData: any) {
if(!Boolean(oldData)) return;
Expand Down Expand Up @@ -823,20 +824,34 @@ let CalendarBasicComp = (function () {
showModal(event, false);
}, [editEvent, showModal]);

const handleDrop = useCallback((eventInfo: EventType) => {
const updateEventsOnDragOrResize = useCallback((eventInfo: EventImpl) => {
const {extendedProps, title, ...event} = eventInfo.toJSON();

let eventsList = [...props.events];
const eventIdx = eventsList.findIndex(
(item: EventType) => item.id === eventInfo.id
(item: EventType) => item.id === event.id
);
if (eventIdx > -1) {
eventsList[eventIdx] = eventInfo;
eventsList[eventIdx] = {
label: title,
...event,
...extendedProps,
};
handleEventDataChange(eventsList);
}
}, [props.events, handleEventDataChange]);

const handleDrop = useCallback((eventInfo: EventDropArg) => {
updateEventsOnDragOrResize(eventInfo.event);

if (typeof props.onDropEvent === 'function') {
props.onDropEvent("dropEvent");
}
}, [props.onDropEvent]);
}, [props.onDropEvent, updateEventsOnDragOrResize]);

const handleResize = useCallback((eventInfo: EventResizeDoneArg) => {
updateEventsOnDragOrResize(eventInfo.event);
}, [props.onDropEvent, updateEventsOnDragOrResize]);

return (
<Wrapper
Expand All @@ -854,7 +869,7 @@ let CalendarBasicComp = (function () {
slotEventOverlap={false}
events={ events }
dayHeaders={true}
dayHeaderFormat={{ weekday: 'short', month: 'numeric', day: 'numeric', omitCommas: true }}
// dayHeaderFormat={{ weekday: 'short', month: 'numeric', day: 'numeric', omitCommas: true }}
expandRows={true}
multiMonthMinWidth={250}
nowIndicator={true}
Expand Down Expand Up @@ -944,15 +959,8 @@ let CalendarBasicComp = (function () {
props.onEvent("change");
}
}}
eventDrop={(info) => {
const {extendedProps, ...event} = info.event.toJSON();
if (info.view) {
handleDrop({
...event,
...extendedProps,
});
}
}}
eventDrop={handleDrop}
eventResize={handleResize}
/>
</ErrorBoundary>
</Wrapper>
Expand Down
19 changes: 0 additions & 19 deletions client/packages/lowcoder-comps/src/comps/calendarComp/calendarConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,25 +988,6 @@ export const defaultEvents = [
end: dayjs().hour(21).minute(30).second(0).format(DATE_TIME_FORMAT),
color: "#079968",
},
{
id: "6",
label: "Coding",
start: dayjs().hour(15).minute(0).second(0).format(DATE_TIME_FORMAT),
end: dayjs().hour(17).minute(30).second(0).format(DATE_TIME_FORMAT),
color: "#079968",
backgroundColor:"#ffffff",
detail: 'Discuss project milestones and deliverables.',
titleColor:"#000000",
detailColor:"#000000",
titleFontWeight:"normal",
titleFontStyle:"italic",
detailFontWeight:"normal",
detailFontStyle:"italic",
animation:"none",
animationDelay:"0s",
animationDuration:"0s",
animationIterationCount:"0",
},
];
export const resourcesEventsDefaultData = [
{
Expand Down
Loading