makula-schedule 1.1.8 → 2.0.0

package/README.md

@@ -1,13 +1,11 @@
 # Scheduler for React
 
-[![NPM version][npm-image]][npm-url] [![MIT License][mit-image]][mit-url] [![CodeQL][codeql-image]][codeql-url] [![CodeFactor][codeFactor-badge]][codeFactor-link]
+[![NPM version][npm-image]][npm-url] [![MIT License][mit-image]][mit-url] [![CodeFactor][codeFactor-badge]][codeFactor-link]
 
 [npm-image]: http://img.shields.io/npm/v/react-big-schedule.svg
 [npm-url]: http://npmjs.org/package/react-big-schedule
 [mit-image]: https://img.shields.io/badge/License-MIT-green.svg
 [mit-url]: https://github.com/ansulagrawal/react-big-schedule/blob/master/LICENSE
-[codeql-image]: https://github.com/ansulagrawal/react-big-schedule/actions/workflows/github-code-scanning/codeql/badge.svg?branch=master
-[codeql-url]: https://github.com/ansulagrawal/react-big-schedule/actions/workflows/github-code-scanning/codeql
 [codeFactor-badge]: https://www.codefactor.io/repository/github/ansulagrawal/react-big-schedule/badge
 [codeFactor-link]: https://www.codefactor.io/repository/github/ansulagrawal/react-big-schedule
 

package/dist/components/HeaderView.js

@@ -5,167 +5,174 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _default2 = require("../config/default");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-// eslint-disable-next-line no-unused-vars
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // eslint-disable-next-line no-unused-vars
+/**
+ * Render the table header rows for a scheduler view, including an optional week-number row and the main header cells.
+ * @param {Object} props.schedulerData - Scheduler configuration and utilities (headers array,
+ * cell unit, formatting, sizing, and locale/date functions).
+ * @param {Function} [props.nonAgendaCellHeaderTemplateResolver] - Optional resolver to customize
+ * rendering of individual header cells. Called with (schedulerData, headerItem, formattedList, style).
+ * @returns {JSX.Element} A <thead> element containing the optional week-number row and the
+ * main header row for the scheduler table.
+ */
 function HeaderView(_ref) {
   var schedulerData = _ref.schedulerData,
-    nonAgendaCellHeaderTemplateResolver = _ref.nonAgendaCellHeaderTemplateResolver,
-    showWeekNumber = _ref.showWeekNumber;
+    nonAgendaCellHeaderTemplateResolver = _ref.nonAgendaCellHeaderTemplateResolver;
   var headers = schedulerData.headers,
     cellUnit = schedulerData.cellUnit,
     config = schedulerData.config,
     localeDayjs = schedulerData.localeDayjs;
+  var showWeekNumber = config.showWeekNumber,
+    _config$weekNumberRow = config.weekNumberRowHeight,
+    weekNumberRowHeight = _config$weekNumberRow === void 0 ? 24 : _config$weekNumberRow;
   var headerHeight = schedulerData.getTableHeaderHeight();
   var cellWidth = schedulerData.getContentCellWidth();
   var minuteStepsInHour = schedulerData.getMinuteStepsInHour();
-  var headerList = [];
-  var weekNumberRow = [];
-  var style;
 
-  // Helper function to generate week number cells with merged columns
-  var generateWeekNumberRow = function generateWeekNumberRow() {
+  // Week number row generation
+  var weekNumberRow = (0, _react.useMemo)(function () {
     if (!showWeekNumber) return null;
     var weekGroups = [];
+    var currentWeekKey = null;
     var currentWeek = null;
+    var currentYear = null;
     var colspan = 0;
-    var startIndex = 0;
-    headers.forEach(function (item, index) {
-      var datetime = localeDayjs(new Date(item.time));
-      var weekNum = datetime.isoWeek();
-      if (currentWeek === null) {
-        currentWeek = weekNum;
-        colspan = 1;
-        startIndex = index;
-      } else if (currentWeek === weekNum) {
+    headers.forEach(function (item) {
+      var year = localeDayjs(new Date(item.time)).year();
+      var weekNum = localeDayjs(new Date(item.time)).isoWeek();
+      var weekKey = "".concat(year, "-").concat(weekNum);
+      if (currentWeekKey === weekKey) {
         colspan += 1;
       } else {
-        weekGroups.push({
-          week: currentWeek,
-          colspan: colspan,
-          startIndex: startIndex
-        });
+        if (currentWeekKey !== null) {
+          weekGroups.push({
+            week: currentWeek,
+            year: currentYear,
+            colspan: colspan
+          });
+        }
+        currentWeekKey = weekKey;
         currentWeek = weekNum;
+        currentYear = year;
         colspan = 1;
-        startIndex = index;
       }
     });
 
     // Push the last week group
-    if (currentWeek !== null) {
+    if (currentWeekKey !== null) {
       weekGroups.push({
         week: currentWeek,
-        colspan: colspan,
-        startIndex: startIndex
+        year: currentYear,
+        colspan: colspan
       });
     }
+    var cellStyle = {
+      fontSize: '0.85em',
+      opacity: 0.7,
+      borderBottom: "1px solid ".concat(config.headerBorderColor || '#e9e9e9'),
+      padding: '4px 8px',
+      textAlign: 'center'
+    };
     return weekGroups.map(function (group, idx) {
-      var cellStyle = {
-        fontSize: '0.85em',
-        opacity: 0.7,
-        borderBottom: '1px solid #e9e9e9',
-        padding: '4px 8px',
-        textAlign: 'center'
-      };
       return /*#__PURE__*/_react["default"].createElement("th", {
-        key: "week-".concat(group.week, "-").concat(idx),
+        key: "week-".concat(group.year, "-").concat(group.week, "-").concat(idx),
         colSpan: group.colspan,
         style: cellStyle
       }, "W", group.week);
     });
-  };
-  if (cellUnit === _default2.CellUnit.Hour) {
-    headers.forEach(function (item, index) {
-      if (index % minuteStepsInHour === 0) {
-        var datetime = localeDayjs(new Date(item.time));
-        style = item.nonWorkingTime ? {
-          width: cellWidth * minuteStepsInHour,
-          color: config.nonWorkingTimeHeadColor,
-          backgroundColor: config.nonWorkingTimeHeadBgColor
-        } : {
-          width: cellWidth * minuteStepsInHour
-        };
-        if (index === headers.length - minuteStepsInHour) {
-          style = item.nonWorkingTime ? {
-            color: config.nonWorkingTimeHeadColor,
-            backgroundColor: config.nonWorkingTimeHeadBgColor
-          } : {};
-        }
-        var pFormattedList = config.nonAgendaDayCellHeaderFormat.split('|').map(function (pitem) {
-          return datetime.format(pitem);
-        });
-        var element;
-        if (typeof nonAgendaCellHeaderTemplateResolver === 'function') {
-          element = nonAgendaCellHeaderTemplateResolver(schedulerData, item, pFormattedList, style);
-        } else {
-          var pList = pFormattedList.map(function (formattedItem, pIndex) {
-            return /*#__PURE__*/_react["default"].createElement("div", {
-              key: pIndex
-            }, formattedItem);
-          });
-          element = /*#__PURE__*/_react["default"].createElement("th", {
-            key: "header-".concat(item.time),
-            className: "header3-text",
-            style: style
-          }, /*#__PURE__*/_react["default"].createElement("div", null, pList));
-        }
-        headerList.push(element);
-      }
-    });
-  } else {
-    headerList = headers.map(function (item, index) {
-      var datetime = localeDayjs(new Date(item.time));
-      style = item.nonWorkingTime ? {
-        width: cellWidth,
-        color: config.nonWorkingTimeHeadColor,
-        backgroundColor: config.nonWorkingTimeHeadBgColor
-      } : {
-        width: cellWidth
-      };
-      if (index === headers.length - 1) style = item.nonWorkingTime ? {
+  }, [showWeekNumber, headers, localeDayjs]);
+
+  // Extract common style creation logic
+  var createCellStyle = (0, _react.useCallback)(function (item, width, isLastCell) {
+    if (isLastCell) {
+      return item.nonWorkingTime ? {
         color: config.nonWorkingTimeHeadColor,
         backgroundColor: config.nonWorkingTimeHeadBgColor
       } : {};
-      var cellFormat = cellUnit === _default2.CellUnit.Week ? config.nonAgendaWeekCellHeaderFormat : cellUnit === _default2.CellUnit.Month ? config.nonAgendaMonthCellHeaderFormat : cellUnit === _default2.CellUnit.Year ? config.nonAgendaYearCellHeaderFormat : config.nonAgendaOtherCellHeaderFormat;
-      var pFormattedList = cellFormat.split('|').map(function (dateFormatPart) {
-        return datetime.format(dateFormatPart);
+    }
+    return item.nonWorkingTime ? {
+      width: width,
+      color: config.nonWorkingTimeHeadColor,
+      backgroundColor: config.nonWorkingTimeHeadBgColor
+    } : {
+      width: width
+    };
+  }, [config]);
+
+  // Extract cell format selection logic
+  var getCellFormat = (0, _react.useCallback)(function (cellUnitParam) {
+    var formatMap = _defineProperty(_defineProperty(_defineProperty({}, _default2.CellUnit.Week, config.nonAgendaWeekCellHeaderFormat), _default2.CellUnit.Month, config.nonAgendaMonthCellHeaderFormat), _default2.CellUnit.Year, config.nonAgendaYearCellHeaderFormat);
+    return formatMap[cellUnitParam] || config.nonAgendaOtherCellHeaderFormat;
+  }, [config]);
+
+  // Render cell content helper
+  var renderCellContent = (0, _react.useCallback)(function (item, formattedList, style) {
+    if (typeof nonAgendaCellHeaderTemplateResolver === 'function') {
+      return nonAgendaCellHeaderTemplateResolver(schedulerData, item, formattedList, style);
+    }
+    var content = formattedList.map(function (text, idx) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: "".concat(item.time, "-").concat(idx, "-").concat(text)
+      }, text);
+    });
+    return /*#__PURE__*/_react["default"].createElement("th", {
+      key: "header-".concat(item.time),
+      className: "header3-text",
+      style: style
+    }, /*#__PURE__*/_react["default"].createElement("div", null, content));
+  }, [nonAgendaCellHeaderTemplateResolver, schedulerData]);
+
+  // Memoize header list generation
+  var headerList = (0, _react.useMemo)(function () {
+    if (cellUnit === _default2.CellUnit.Hour) {
+      var result = [];
+      var _lastIndex = headers.length - minuteStepsInHour;
+      headers.forEach(function (item, index) {
+        if (index % minuteStepsInHour !== 0) return;
+        var datetime = localeDayjs(new Date(item.time));
+        var width = cellWidth * minuteStepsInHour;
+        var isLastCell = index === _lastIndex;
+        var style = createCellStyle(item, width, isLastCell);
+        var formattedList = config.nonAgendaDayCellHeaderFormat.split('|').map(function (format) {
+          return datetime.format(format);
+        });
+        result.push(renderCellContent(item, formattedList, style));
       });
-      if (typeof nonAgendaCellHeaderTemplateResolver === 'function') {
-        return nonAgendaCellHeaderTemplateResolver(schedulerData, item, pFormattedList, style);
-      }
-      var pList = pFormattedList.map(function (formattedItem, pIndex) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          key: pIndex
-        }, formattedItem);
+      return result;
+    }
+
+    // Non-hour cell units
+    var cellFormat = getCellFormat(cellUnit);
+    var lastIndex = headers.length - 1;
+    return headers.map(function (item, index) {
+      var datetime = localeDayjs(new Date(item.time));
+      var isLastCell = index === lastIndex;
+      var style = createCellStyle(item, cellWidth, isLastCell);
+      var formattedList = cellFormat.split('|').map(function (format) {
+        return datetime.format(format);
       });
-      return /*#__PURE__*/_react["default"].createElement("th", {
-        key: "header-".concat(item.time),
-        className: "header3-text",
-        style: style
-      }, /*#__PURE__*/_react["default"].createElement("div", null, pList));
+      return renderCellContent(item, formattedList, style);
     });
-  }
-  weekNumberRow = generateWeekNumberRow();
-  return /*#__PURE__*/_react["default"].createElement("thead", null, showWeekNumber && weekNumberRow && /*#__PURE__*/_react["default"].createElement("tr", {
+  }, [cellUnit, headers, minuteStepsInHour, cellWidth, config, localeDayjs, createCellStyle, getCellFormat, renderCellContent]);
+  return /*#__PURE__*/_react["default"].createElement("thead", null, weekNumberRow && /*#__PURE__*/_react["default"].createElement("tr", {
     style: {
-      height: 24
+      height: weekNumberRowHeight
     }
   }, weekNumberRow), /*#__PURE__*/_react["default"].createElement("tr", {
     style: {
       height: headerHeight
-    },
-    className: "no-scrollbar"
+    }
   }, headerList));
 }
 HeaderView.propTypes = {
   schedulerData: _propTypes["default"].object.isRequired,
-  nonAgendaCellHeaderTemplateResolver: _propTypes["default"].func,
-  showWeekNumber: _propTypes["default"].bool
+  nonAgendaCellHeaderTemplateResolver: _propTypes["default"].func
 };
-
-// HeaderView.defaultProps = {
-//   nonAgendaCellHeaderTemplateResolver: null,
-// };
 var _default = exports["default"] = HeaderView;

package/dist/components/ResourceEvents.js

@@ -334,9 +334,44 @@ var ResourceEvents = /*#__PURE__*/function (_Component) {
               var isEnd = eventEnd <= durationEnd;
               var _left = index * cellWidth + (index > 0 ? 2 : 3);
               var _width = evt.span * cellWidth - (index > 0 ? 5 : 6) > 0 ? evt.span * cellWidth - (index > 0 ? 5 : 6) : 0;
+              var dayStart = localeDayjs(new Date(headerItem.start)).startOf('day');
+              var dayDurationMinutes = 1440;
+              var baseCellWidth = cellWidth - (index > 0 ? 5 : 6);
+              if (cellUnit === _default2.CellUnit.Day) {
+                if (evt.span === 1) {
+                  var startOffsetMinutes = eventStart.diff(dayStart, 'minute');
+                  var eventDurationMinutes = eventEnd.diff(eventStart, 'minute');
+                  var startPercentage = startOffsetMinutes / dayDurationMinutes;
+                  var durationPercentage = eventDurationMinutes / dayDurationMinutes;
+                  var leftOffset = baseCellWidth * startPercentage;
+                  var eventWidth = baseCellWidth * durationPercentage;
+                  _left = index * cellWidth + (index > 0 ? 2 : 3) + leftOffset;
+                  _width = Math.max(1, eventWidth); // ensure minimum width of 1px
+                } else {
+                  var headerStart = localeDayjs(new Date(headerItem.start));
+                  var headerEnd = localeDayjs(new Date(headerItem.end));
+                  var isFirstDay = eventStart >= headerStart && eventStart < headerEnd;
+                  if (isFirstDay) {
+                    var eventStartDayStart = eventStart.startOf('day');
+                    var eventEndDayEnd = eventEnd.endOf('day');
+                    var totalSpanMinutes = eventEndDayEnd.diff(eventStartDayStart, 'minute');
+                    var eventStartOffsetMinutes = eventStart.diff(eventStartDayStart, 'minute');
+                    var _eventDurationMinutes = eventEnd.diff(eventStart, 'minute');
+                    var _startPercentage = eventStartOffsetMinutes / dayDurationMinutes;
+                    var _durationPercentage = totalSpanMinutes > 0 ? _eventDurationMinutes / totalSpanMinutes : 1;
+                    var totalWidth = evt.span * cellWidth - (index > 0 ? 5 : 6);
+                    var _leftOffset = cellWidth * _startPercentage;
+                    var _eventWidth = totalWidth * _durationPercentage;
+                    _left = index * cellWidth + (index > 0 ? 2 : 3) + _leftOffset;
+                    _width = Math.max(1, _eventWidth);
+                  }
+                }
+              } else {
+                _width = evt.span * cellWidth - (index > 0 ? 5 : 6) > 0 ? evt.span * cellWidth - (index > 0 ? 5 : 6) : 0;
+              }
               var top = marginTop + idx * config.eventItemLineHeight;
               var eventItem = /*#__PURE__*/_react["default"].createElement(_EventItem["default"], _extends({}, _this2.props, {
-                key: evt.eventItem.id,
+                key: "".concat(evt.eventItem.id, "_").concat(headerItem.time),
                 eventItem: evt.eventItem,
                 dndSource: dndSource,
                 isStart: isStart,

package/dist/components/ResourceView.js

@@ -9,6 +9,23 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); } // eslint-disable-next-line no-unused-vars
+/**
+ * Render the scheduler's resource table with hierarchical indentation, optional expand/collapse controls,
+ * clickable slot names, and support for custom slot templates or an injected resource-cell renderer.
+ *
+ * @param {object} schedulerData - Scheduler state and helpers; must include `renderData`,
+ * `getResourceTableWidth`, and `config`.
+ * @param {number} contentScrollbarHeight - Height used to set the container's bottom padding.
+ * @param {Function} [slotClickedFunc] - Called as `slotClickedFunc(schedulerData, item)` when a slot name is clicked.
+ * @param {Function} [slotItemTemplateResolver] - Called as `slotItemTemplateResolver
+ * (schedulerData, item, slotClickedFunc, width, className)` to provide a custom slot cell element;
+ * if a value is returned it replaces the default slot cell.
+ * @param {Function} [toggleExpandFunc] - Called as `toggleExpandFunc(schedulerData, slotId)`
+ * to toggle expansion for items with children.
+ * @param {Function} [CustomResourceCell] - Optional React component rendered inside the resource
+ * `<td>` when provided; receives props `{ schedulerData, item, indents, slotClickedFunc, handleToggleExpand }`.
+ * @returns {JSX.Element} The rendered resource table element.
+ */
 function ResourceView(_ref) {
   var schedulerData = _ref.schedulerData,
     contentScrollbarHeight = _ref.contentScrollbarHeight,
@@ -45,6 +62,24 @@ function ResourceView(_ref) {
       }, iconProps));
     }
     indents.push(indent);
+    var tdStyle = {
+      height: item.rowHeight,
+      backgroundColor: item.groupOnly ? schedulerData.config.groupOnlySlotColor : undefined
+    };
+    if (CustomResourceCell) {
+      return /*#__PURE__*/_react["default"].createElement("tr", {
+        key: item.slotId
+      }, /*#__PURE__*/_react["default"].createElement("td", {
+        "data-resource-id": item.slotId,
+        style: tdStyle
+      }, /*#__PURE__*/_react["default"].createElement(CustomResourceCell, {
+        schedulerData: schedulerData,
+        item: item,
+        indents: indents,
+        slotClickedFunc: slotClickedFunc,
+        handleToggleExpand: handleToggleExpand
+      })));
+    }
     var slotCell = slotClickedFunc ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "slot-cell"
     }, indents, /*#__PURE__*/_react["default"].createElement("button", {
@@ -78,26 +113,6 @@ function ResourceView(_ref) {
         slotItem = resolvedTemplate;
       }
     }
-    var tdStyle = {
-      height: item.rowHeight,
-      backgroundColor: item.groupOnly ? schedulerData.config.groupOnlySlotColor : undefined
-    };
-    if (CustomResourceCell) {
-      return /*#__PURE__*/_react["default"].createElement("tr", {
-        key: item.slotId
-      }, /*#__PURE__*/_react["default"].createElement("td", {
-        "data-resource-id": item.slotId,
-        style: tdStyle
-      }, /*#__PURE__*/_react["default"].createElement(CustomResourceCell, {
-        schedulerData: schedulerData,
-        item: item,
-        indents: indents,
-        slotClickedFunc: slotClickedFunc,
-        toggleExpandFunc: function toggleExpandFunc() {
-          return handleToggleExpand(item);
-        }
-      })));
-    }
     return /*#__PURE__*/_react["default"].createElement("tr", {
       key: item.slotId
     }, /*#__PURE__*/_react["default"].createElement("td", {

package/dist/components/SchedulerData.js

@@ -12,6 +12,7 @@ var _weekday = _interopRequireDefault(require("dayjs/plugin/weekday"));
 var _rrule = require("rrule");
 var _default = require("../config/default");
 var _scheduler = _interopRequireDefault(require("../config/scheduler"));
+var _i18n = require("../config/i18n");
 var _behaviors = _interopRequireDefault(require("../helper/behaviors"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -53,17 +54,40 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
     _dayjs["default"].extend(_utc["default"]);
     this.localeDayjs = _dayjs["default"];
     this.config = newConfig === undefined ? _scheduler["default"] : _objectSpread(_objectSpread({}, _scheduler["default"]), newConfig);
+    this._updateLabelsFromI18n();
     this._validateMinuteStep(this.config.minuteStep);
     this.behaviors = newBehaviors === undefined ? _behaviors["default"] : _objectSpread(_objectSpread({}, _behaviors["default"]), newBehaviors);
     this._resolveDate(0, date);
     this._createHeaders();
     this._createRenderData();
   }
+
+  /**
+   * Update user-facing labels from the i18n provider
+   * This allows apps to provide localized labels via setLabelsProvider()
+   * @private
+   */
   return _createClass(SchedulerData, [{
+    key: "_updateLabelsFromI18n",
+    value: function _updateLabelsFromI18n(locale) {
+      // Get labels from the i18n provider if available
+      var defaults = (0, _i18n.getDefaultLabels)();
+      var applyIfProvided = function applyIfProvided(key, current) {
+        var value = (0, _i18n.getLabel)(key, locale);
+        if (value === undefined || value === null) return current;
+        return value !== defaults[key] ? value : current;
+      };
+      this.config.resourceName = applyIfProvided('resourceName', this.config.resourceName);
+      this.config.taskName = applyIfProvided('taskName', this.config.taskName);
+      this.config.agendaViewHeader = applyIfProvided('agendaViewHeader', this.config.agendaViewHeader);
+      this.config.weekNumberLabel = applyIfProvided('weekNumberLabel', this.config.weekNumberLabel);
+    }
+  }, {
     key: "setSchedulerLocale",
     value: function setSchedulerLocale(preset) {
       if (!preset) return;
       this.localeDayjs.locale(preset);
+      this._updateLabelsFromI18n(preset);
       this._shouldReloadViewType = true;
       this.setViewType(this.viewType, this.showAgenda, this.isEventPerspective);
     }
@@ -702,11 +726,10 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
         case _default.ViewType.Week:
           if (date !== undefined) {
             this.startDate = this.selectDate.startOf('isoWeek');
-            this.endDate = this.startDate.endOf('isoWeek');
           } else {
             this.startDate = this.startDate.add(num, 'weeks');
-            this.endDate = this.startDate.endOf('isoWeek');
           }
+          this.endDate = this.startDate.endOf('isoWeek');
           break;
         case _default.ViewType.Day:
           this.startDate = date !== undefined ? this.selectDate : this.startDate.add(num, 'days');
@@ -823,54 +846,6 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
       }
       this.headers = headers;
     }
-
-    // Fix Optimited code
-    // _createHeaders() {
-    //   const headers = [];
-    //   const start = this.localeDayjs(new Date(this.startDate));
-    //   const end = this.localeDayjs(new Date(this.endDate));
-
-    //   const processHeader = (header, format, unit, incrementFn) => {
-    //     let head = header;
-    //     while (head >= start && head <= end) {
-    //       const time = head.format(format);
-    //       if (unit === CellUnit.Day) {
-    //         const dayOfWeek = head.weekday();
-    //         if (this.config.displayWeekend || (dayOfWeek !== 0 && dayOfWeek !== 6)) {
-    //           const nonWorkingTime = this.behaviors.isNonWorkingTimeFunc(this, time);
-    //           headers.push({ time, nonWorkingTime });
-    //         }
-    //       } else {
-    //         headers.push({ time });
-    //       }
-    //       head = head.add(1, incrementFn);
-    //     }
-    //   };
-
-    //   if (this.showAgenda) {
-    //     headers.push({ time: start.format(DATETIME_FORMAT), nonWorkingTime: false });
-    //   } else if (this.cellUnit === CellUnit.Hour) {
-    //     const hourIncrement = this.config.minuteStep < 60 ? 'minutes' : 'hours';
-    //     const minuteSteps = this.getMinuteStepsInHour();
-    //     let header = start.hour() === 0 ? start.add(this.config.dayStartFrom, 'hours') : start;
-    //     while (header <= end) {
-    //       const hour = header.hour();
-    //       if (hour >= this.config.dayStartFrom && hour <= this.config.dayStopTo) {
-    //         const time = header.format(DATETIME_FORMAT);
-    //         const nonWorkingTime = this.behaviors.isNonWorkingTimeFunc(this, time);
-    //         headers.push({ time, nonWorkingTime });
-    //       }
-    //       header = header.add(minuteSteps, hourIncrement);
-    //     }
-    //   } else {
-    //     const header = start;
-    //     const format = this.cellUnit === CellUnit.Day ? DATETIME_FORMAT : DATE_FORMAT;
-    //     const incrementFn = this.cellUnit === CellUnit.Day ? 'days' : `${this.cellUnit}s`;
-    //     processHeader(header, format, this.cellUnit, incrementFn);
-    //   }
-
-    //   this.headers = headers;
-    // }
   }, {
     key: "_createInitHeaderEvents",
     value: function _createInitHeaderEvents(header) {
@@ -954,7 +929,7 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
         var headerEvents = headers.map(function (header) {
           return _this5._createInitHeaderEvents(header);
         });
-        var slotRenderData = _objectSpread({
+        var slotRenderData = _objectSpread(_objectSpread({}, slot), {}, {
           slotId: slot.id,
           slotName: slot.name,
           slotTitle: slot.title,
@@ -1026,13 +1001,6 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
     key: "_getSpan",
     value: function _getSpan(startTime, endTime, headers) {
       if (this.showAgenda) return 1;
-
-      // function startOfWeek(date) {
-      //   const day = date.getDay();
-      //   const diff = date.getDate() - day;
-      //   return new Date(date.getFullYear(), date.getMonth(), diff);
-      // }
-
       var timeBetween = function timeBetween(date1, date2, timeIn) {
         if (timeIn === 'days' || timeIn === 'day') {
           if (date1.getDate() === date2.getDate() && date1.getMonth() === date2.getMonth()) {
@@ -1212,7 +1180,6 @@ var SchedulerData = exports["default"] = /*#__PURE__*/function () {
                 var previousHeaderEnd = new Date(previousHeader.end);
                 if (previousHeaderEnd <= eventStart || previousHeaderStart >= eventEnd) render = true;
               }
-              // console.log(`span: ${span}`)
               header.events[pos] = _this6._createHeaderEvent(render, span, item);
             }
           });