makula-schedule 2.3.2 → 2.3.4

package/dist/components/DnDContext.js

@@ -40,7 +40,8 @@ var DnDContext = exports["default"] = /*#__PURE__*/_createClass(function DnDCont
     return {
       drop: function drop(props, monitor, component) {
         var schedulerData = props.schedulerData,
-          resourceEvents = props.resourceEvents;
+          resourceEvents = props.resourceEvents,
+          conflictOccurred = props.conflictOccurred;
         var cellUnit = schedulerData.cellUnit,
           localeDayjs = schedulerData.localeDayjs;
         var type = monitor.getItemType();
@@ -68,7 +69,8 @@ var DnDContext = exports["default"] = /*#__PURE__*/_createClass(function DnDCont
           start: startTime,
           end: endTime,
           initialStart: initialStartTime,
-          initialEnd: initialEndTime
+          initialEnd: initialEndTime,
+          conflictOccurred: conflictOccurred
         };
       },
       hover: function hover(props, monitor, component) {

package/dist/components/DnDSource.js

@@ -74,18 +74,28 @@ var DnDSource = exports["default"] = /*#__PURE__*/_createClass(function DnDSourc
             }
           });
         }
-        if (hasConflict) {
-          var conflictOccurred = props.conflictOccurred;
+        if (hasConflict && !config.allowConflicts) {
+          var conflictOccurred = props.conflictOccurred || dropResult.conflictOccurred;
           if (conflictOccurred !== undefined) {
             conflictOccurred(schedulerData, action, item, type, slotId, slotName, newStart, newEnd);
           } else {
             console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
           }
-        } else if (isEvent) {
+          return;
+        }
+        if (isEvent) {
           if (moveEvent !== undefined) {
             moveEvent(schedulerData, item, slotId, slotName, newStart, newEnd);
           }
         } else if (newEvent !== undefined) newEvent(schedulerData, slotId, slotName, newStart, newEnd, type, item);
+        if (hasConflict && config.allowConflicts) {
+          var _conflictOccurred = props.conflictOccurred || dropResult.conflictOccurred;
+          if (_conflictOccurred !== undefined) {
+            _conflictOccurred(schedulerData, action, item, type, slotId, slotName, newStart, newEnd);
+          } else {
+            console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
+          }
+        }
       },
       canDrag: function canDrag(props) {
         var schedulerData = props.schedulerData,

package/dist/components/EventItem.js

@@ -282,20 +282,32 @@ var EventItem = /*#__PURE__*/function (_Component) {
                   }
                 });
               }
-              if (hasConflict) {
-                _this.setState({
-                  left: left,
-                  top: top,
-                  width: width
-                });
+              if (!(hasConflict && !config.allowConflicts)) {
+                _context.n = 6;
+                break;
+              }
+              if (conflictOccurred !== undefined) {
+                conflictOccurred(schedulerData, 'StartResize', eventItem, _default2.DnDTypes.EVENT, slotId, slotName, newStart, eventItem.end);
+              } else {
+                console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
+              }
+              _this.setState({
+                left: left,
+                top: top,
+                width: width
+              });
+              _this.subscribeResizeEvent(_this.props);
+              return _context.a(2);
+            case 6:
+              if (updateEventStart !== undefined) updateEventStart(schedulerData, eventItem, newStart);
+              if (hasConflict && config.allowConflicts) {
                 if (conflictOccurred !== undefined) {
                   conflictOccurred(schedulerData, 'StartResize', eventItem, _default2.DnDTypes.EVENT, slotId, slotName, newStart, eventItem.end);
                 } else {
                   console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
                 }
-                _this.subscribeResizeEvent(_this.props);
-              } else if (updateEventStart !== undefined) updateEventStart(schedulerData, eventItem, newStart);
-            case 6:
+              }
+            case 7:
               return _context.a(2);
           }
         }, _callee);
@@ -448,22 +460,34 @@ var EventItem = /*#__PURE__*/function (_Component) {
                   }
                 });
               }
-              if (hasConflict) {
-                _this.setState({
-                  left: left,
-                  top: top,
-                  width: width
-                });
+              if (!(hasConflict && !config.allowConflicts)) {
+                _context2.n = 6;
+                break;
+              }
+              if (conflictOccurred !== undefined) {
+                conflictOccurred(schedulerData, 'EndResize', eventItem, _default2.DnDTypes.EVENT, slotId, slot ? slot.name : null, eventItem.start, newEnd);
+              } else {
+                console.error('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
+              }
+              _this.setState({
+                left: left,
+                top: top,
+                width: width
+              });
+              _this.subscribeResizeEvent(_this.props);
+              return _context2.a(2);
+            case 6:
+              if (updateEventEnd !== undefined) {
+                updateEventEnd(schedulerData, eventItem, newEnd);
+              }
+              if (hasConflict && config.allowConflicts) {
                 if (conflictOccurred !== undefined) {
                   conflictOccurred(schedulerData, 'EndResize', eventItem, _default2.DnDTypes.EVENT, slotId, slot ? slot.name : null, eventItem.start, newEnd);
                 } else {
                   console.error('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
                 }
-                _this.subscribeResizeEvent(_this.props);
-              } else if (updateEventEnd !== undefined) {
-                updateEventEnd(schedulerData, eventItem, newEnd);
               }
-            case 6:
+            case 7:
               return _context2.a(2);
           }
         }, _callee2);

package/dist/components/ResourceEvents.js

@@ -193,7 +193,7 @@ var ResourceEvents = /*#__PURE__*/function (_Component) {
           }
         });
       }
-      if (hasConflict) {
+      if (hasConflict && !config.allowConflicts) {
         var conflictOccurred = _this.props.conflictOccurred;
         if (conflictOccurred !== undefined) {
           conflictOccurred(schedulerData, 'New', {
@@ -207,7 +207,24 @@ var ResourceEvents = /*#__PURE__*/function (_Component) {
         } else {
           console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
         }
-      } else if (newEvent !== undefined) newEvent(schedulerData, slotId, slotName, startTime, endTime);
+        return;
+      }
+      if (newEvent !== undefined) newEvent(schedulerData, slotId, slotName, startTime, endTime);
+      if (hasConflict && config.allowConflicts) {
+        var _conflictOccurred = _this.props.conflictOccurred;
+        if (_conflictOccurred !== undefined) {
+          _conflictOccurred(schedulerData, 'New', {
+            id: undefined,
+            start: startTime,
+            end: endTime,
+            slotId: slotId,
+            slotName: slotName,
+            title: undefined
+          }, _default2.DnDTypes.EVENT, slotId, slotName, startTime, endTime);
+        } else {
+          console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
+        }
+      }
     });
     _defineProperty(_this, "cancelDrag", function (ev) {
       ev.stopPropagation();

package/dist/config/scheduler.js

@@ -67,6 +67,7 @@ var _default = exports["default"] = {
   creatable: true,
   crossResourceMove: true,
   checkConflict: false,
+  allowConflicts: false,
   scrollToSpecialDayjsEnabled: true,
   eventItemPopoverEnabled: true,
   eventItemPopoverShowColor: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makula-schedule",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "React Big Schedule  is a powerful and intuitive scheduler and resource planning solution built with React. Seamlessly integrate this modern browser-compatible component into your applications to effectively manage time, appointments, and resources. With drag-and-drop functionality, interactive UI, and granular views, react-big-schedule empowers users to effortlessly schedule and allocate resources with precision. Enhance productivity and streamline your workflow with this React-based solution, designed to optimize time management and simplify calendar-based operations. Perfect for applications requiring advanced scheduling capabilities, react-big-schedule offers a seamless and intuitive experience for managing appointments, resource allocation, and time slots. Unlock the potential of your React projects with react-big-schedule and revolutionize the way you handle scheduling and resource planning. It is the updated version of react-big-scheduler",
   "keywords": [
     "react-big-schedule",
@@ -109,4 +109,4 @@
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.3"
   }
-}
+}