makula-schedule 2.2.1 → 2.2.3

package/dist/components/SchedulerData.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
 var _utc = _interopRequireDefault(require("dayjs/plugin/utc"));
 var _weekday = _interopRequireDefault(require("dayjs/plugin/weekday"));
+var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _rrule = require("rrule");
 var _default = require("../config/default");
 var _scheduler = _interopRequireDefault(require("../config/scheduler"));
@@ -1158,11 +1158,38 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
           var span = _this6._getSpan(item.start, item.end, _this6.headers);
           var eventStart = new Date(item.start);
           var eventEnd = new Date(item.end);
-          var pos = -1;
+
+          // Collect all overlapping headers first
+          var overlappingHeaders = [];
           resourceEvents.headerItems.forEach(function (header, index) {
             var headerStart = new Date(header.start);
             var headerEnd = new Date(header.end);
             if (headerEnd > eventStart && headerStart < eventEnd) {
+              overlappingHeaders.push({
+                header: header,
+                index: index
+              });
+            }
+          });
+          if (overlappingHeaders.length > 0) {
+            // Find a pos that is free across ALL overlapping headers
+            var pos = 0;
+            var posFound = false;
+            while (!posFound) {
+              posFound = true;
+              for (var i = 0; i < overlappingHeaders.length; i += 1) {
+                if (overlappingHeaders[i].header.events[pos] !== undefined) {
+                  posFound = false;
+                  pos += 1;
+                  break;
+                }
+              }
+            }
+
+            // Place the event at the found pos across all overlapping headers
+            overlappingHeaders.forEach(function (_ref6) {
+              var header = _ref6.header,
+                index = _ref6.index;
               header.count += 1;
               if (header.count > resourceEvents.rowMaxCount) {
                 resourceEvents.rowMaxCount = header.count;
@@ -1170,11 +1197,7 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
                 var newRowHeight = rowsCount * _this6.config.eventItemLineHeight + (_this6.config.creatable && _this6.config.checkConflict === false ? 20 : 2);
                 if (newRowHeight > resourceEvents.rowHeight) resourceEvents.rowHeight = newRowHeight;
               }
-              if (pos === -1) {
-                var tmp = 0;
-                while (header.events[tmp] !== undefined) tmp += 1;
-                pos = tmp;
-              }
+              var headerStart = new Date(header.start);
               var render = headerStart <= eventStart || index === 0;
               if (render === false) {
                 var previousHeader = resourceEvents.headerItems[index - 1];
@@ -1183,8 +1206,8 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
                 if (previousHeaderEnd <= eventStart || previousHeaderStart >= eventEnd) render = true;
               }
               header.events[pos] = _this6._createHeaderEvent(render, span, item);
-            }
-          });
+            });
+          }
         }
       });
       if (cellMaxEventsCount <= cellMaxEventsCountValue || this.behaviors.getSummaryFunc !== undefined) {

package/dist/components/index.js

@@ -521,8 +521,6 @@ function Scheduler(props) {
       }, configTableHeaderStyle)
     }, /*#__PURE__*/_react["default"].createElement("div", {
       style: {
-        overflowX: 'scroll',
-        overflowY: 'hidden',
         margin: "0px 0px -".concat(contentScrollbarHeight, "px")
       }
     }, /*#__PURE__*/_react["default"].createElement("table", {
@@ -571,7 +569,8 @@ function Scheduler(props) {
       style: {
         overflowX: 'scroll',
         overflowY: 'hidden',
-        margin: "0px 0px -".concat(contentScrollbarHeight, "px")
+        margin: "0px 0px -".concat(contentScrollbarHeight, "px"),
+        overscrollBehavior: 'none'
       },
       ref: schedulerHeadRef,
       onMouseOver: onSchedulerHeadMouseOver,
@@ -598,7 +597,8 @@ function Scheduler(props) {
       onScroll: onSchedulerContentScroll
     }, /*#__PURE__*/_react["default"].createElement("div", {
       style: {
-        width: schedulerWidth
+        width: schedulerWidth,
+        overflow: 'hidden'
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "scheduler-content"

package/package.json

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