makula-schedule 2.3.3 → 2.3.5

package/dist/components/DnDSource.js

@@ -74,20 +74,28 @@ var DnDSource = exports["default"] = /*#__PURE__*/_createClass(function DnDSourc
             }
           });
         }
-        if (hasConflict) {
+        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');
           }
-          if (!config.allowConflicts) return;
+          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,7 +282,7 @@ var EventItem = /*#__PURE__*/function (_Component) {
                   }
                 });
               }
-              if (!hasConflict) {
+              if (!(hasConflict && !config.allowConflicts)) {
                 _context.n = 6;
                 break;
               }
@@ -291,10 +291,6 @@ var EventItem = /*#__PURE__*/function (_Component) {
               } else {
                 console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
               }
-              if (config.allowConflicts) {
-                _context.n = 6;
-                break;
-              }
               _this.setState({
                 left: left,
                 top: top,
@@ -304,6 +300,13 @@ var EventItem = /*#__PURE__*/function (_Component) {
               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');
+                }
+              }
             case 7:
               return _context.a(2);
           }
@@ -457,7 +460,7 @@ var EventItem = /*#__PURE__*/function (_Component) {
                   }
                 });
               }
-              if (!hasConflict) {
+              if (!(hasConflict && !config.allowConflicts)) {
                 _context2.n = 6;
                 break;
               }
@@ -466,10 +469,6 @@ var EventItem = /*#__PURE__*/function (_Component) {
               } else {
                 console.error('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
               }
-              if (config.allowConflicts) {
-                _context2.n = 6;
-                break;
-              }
               _this.setState({
                 left: left,
                 top: top,
@@ -481,6 +480,13 @@ var EventItem = /*#__PURE__*/function (_Component) {
               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');
+                }
+              }
             case 7:
               return _context2.a(2);
           }

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,9 +207,24 @@ var ResourceEvents = /*#__PURE__*/function (_Component) {
         } else {
           console.log('Conflict occurred, set conflictOccurred func in Scheduler to handle it');
         }
-        if (!config.allowConflicts) return;
+        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/components/index.js

@@ -472,7 +472,7 @@ function Scheduler(props) {
     var resourcePaddingBottom = resourceScrollbarHeight === 0 ? contentScrollbarHeight : 0;
     var contentPaddingBottom = contentScrollbarHeight === 0 ? resourceScrollbarHeight : 0;
     var schedulerContentStyle = {
-      overflowX: viewType === _default.ViewType.Week ? 'hidden' : 'auto',
+      overflowX: 'auto',
       overflowY: 'auto',
       margin: '0px',
       position: 'relative',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makula-schedule",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "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",