@onesy/ui-react 1.0.156 → 1.0.158

package/CalendarMenu/CalendarMenu.js

@@ -287,7 +287,7 @@ const CalendarMenu = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
     if (value !== null && value !== void 0 && (_value$repeat9 = value.repeat) !== null && _value$repeat9 !== void 0 && _value$repeat9.skip_weekends && [0, 6].includes(day.dayWeek)) repeating = false;
     if (repeating) {
       var _value$repeat0, _value$repeat1, _value$repeat$ends;
-      const formated = (0, _date.format)(day, _utils2.formats.date);
+      const formatted = (0, _date.format)(day, _utils2.formats.date);
       if (value !== null && value !== void 0 && (_value$repeat0 = value.repeat) !== null && _value$repeat0 !== void 0 && (_value$repeat0 = _value$repeat0.ends) !== null && _value$repeat0 !== void 0 && _value$repeat0.active) {
         // date
         if ((value === null || value === void 0 ? void 0 : value.repeat.ends.version) === 'date') {
@@ -297,11 +297,11 @@ const CalendarMenu = /*#__PURE__*/_react.default.forwardRef((props_, ref) => {
       }
       if (repeating) {
         if (!refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id]) refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id] = [];
-        if (!refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id].includes(formated)) refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id].push(formated);
+        if (!refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id].includes(formatted)) refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id].push(formatted);
       }
       if (value !== null && value !== void 0 && (_value$repeat1 = value.repeat) !== null && _value$repeat1 !== void 0 && (_value$repeat1 = _value$repeat1.ends) !== null && _value$repeat1 !== void 0 && _value$repeat1.active) {
         var _refs$repeatCount$cur;
-        const indexRepeated = (_refs$repeatCount$cur = refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id]) === null || _refs$repeatCount$cur === void 0 ? void 0 : _refs$repeatCount$cur.indexOf(formated);
+        const indexRepeated = (_refs$repeatCount$cur = refs.repeatCount.current[value === null || value === void 0 ? void 0 : value.id]) === null || _refs$repeatCount$cur === void 0 ? void 0 : _refs$repeatCount$cur.indexOf(formatted);
 
         // count
         if ((value === null || value === void 0 ? void 0 : value.repeat.ends.version) === 'count') repeating = repeating && (value === null || value === void 0 ? void 0 : value.repeat.ends.value) >= (indexRepeated === -1 ? 0 : indexRepeated) + 1;

package/CalendarMonth/CalendarMonth.js

@@ -374,7 +374,6 @@ const CalendarMonth = /*#__PURE__*/_react.default.forwardRef((props__, ref) => {
     };
     return values[order_];
   };
-  const days = [];
   const monthNow = new _date.OnesyDate();
 
   // value or value range selected value
@@ -441,8 +440,8 @@ const CalendarMonth = /*#__PURE__*/_react.default.forwardRef((props__, ref) => {
       selectedSame: value.filter(item => item.year === day.year && item.month === day.month && item.day === day.day).length === 2
     };
 
-    // selected
-    for (const itemRange of rangesSelected) {
+    // value
+    for (const itemRange of rangesValue) {
       const rangeStartDay = (0, _date.format)(new _date.OnesyDate(itemRange.start), 'DD-MM-YYYY');
       const rangeEndDay = (0, _date.format)(new _date.OnesyDate(itemRange.end), 'DD-MM-YYYY');
 
@@ -457,14 +456,11 @@ const CalendarMonth = /*#__PURE__*/_react.default.forwardRef((props__, ref) => {
 
       // same
       result.same = result.start && result.end;
-      if (result.selected) {
-        result.fromSelected = true;
-        return result;
-      }
+      if (result.selected) return result;
     }
 
-    // value
-    for (const itemRange of rangesValue) {
+    // selected
+    for (const itemRange of rangesSelected) {
       const rangeStartDay = (0, _date.format)(new _date.OnesyDate(itemRange.start), 'DD-MM-YYYY');
       const rangeEndDay = (0, _date.format)(new _date.OnesyDate(itemRange.end), 'DD-MM-YYYY');
 
@@ -479,73 +475,77 @@ const CalendarMonth = /*#__PURE__*/_react.default.forwardRef((props__, ref) => {
 
       // same
       result.same = result.start && result.end;
-      if (result.selected) return result;
+      if (result.selected) {
+        result.fromSelected = true;
+        return result;
+      }
     }
     result.outside = true;
     return result;
   }, [value, selected, rangesSelected, rangesValue]);
-  let isMonthFrom = false;
-  let isMonthTo = false;
+  const days = _react.default.useMemo(() => {
+    const items = [];
 
-  // Add all month days
-  for (let i = 0; i < month.daysInMonth; i++) {
-    let day = (0, _date.set)(i + 1, 'day', month);
-    day = (0, _date.set)(14, 'hour', day);
-    const details = getDetails(day);
-    if (details.selectedIndex === 0) isMonthFrom = true;else if (details.selectedIndex === 1) isMonthTo = true;
-    days.push({
-      value: i + 1,
-      in: true,
-      dayWeek: day.dayWeek,
-      weekend: [0, 6].includes(day.dayWeek),
-      today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
-      is: _objectSpread({}, details),
-      onesyDate: day
-    });
-  }
-  days[0].start = true;
-  days[days.length - 1].end = true;
-
-  // Add to start
-  if (weekStartDay === 'Sunday' && monthStart.dayWeek !== 0 || weekStartDay === 'Monday' && monthStart.dayWeek !== 1) {
-    let toAdd = monthStart.dayWeek === 0 ? 6 : monthStart.dayWeek - 1;
-    if (weekStartDay === 'Sunday') toAdd++;
-    for (let i = 0; i < toAdd; i++) {
-      const day = (0, _date.set)(previousMonthEnd.day - i, 'day', previousMonth);
+    // Add all month days
+    for (let i = 0; i < month.daysInMonth; i++) {
+      let day = (0, _date.set)(i + 1, 'day', month);
+      day = (0, _date.set)(14, 'hour', day);
       const details = getDetails(day);
-      days.unshift({
-        value: day.day,
-        in: false,
+      items.push({
+        value: i + 1,
+        in: true,
         dayWeek: day.dayWeek,
         weekend: [0, 6].includes(day.dayWeek),
         today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
         is: _objectSpread({}, details),
-        start: true,
         onesyDate: day
       });
     }
-  }
+    items[0].start = true;
+    items[items.length - 1].end = true;
 
-  // Add to end
-  const dayLast = days[days.length - 1];
-  if (dayLast.dayWeek < 7) {
-    let toAdd = 7 - dayLast.dayWeek;
-    if (days.length + toAdd - 1 < 42) toAdd += 41 - (days.length + toAdd - 1);
-    for (let i = 0; i < toAdd; i++) {
-      const day = (0, _date.set)(i + 1, 'day', nextMonth);
-      const details = getDetails(day);
-      days.push({
-        value: i + 1,
-        in: false,
-        dayWeek: day.dayWeek,
-        weekend: [0, 6].includes(day.dayWeek),
-        today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
-        is: _objectSpread({}, details),
-        end: true,
-        onesyDate: day
-      });
+    // Add to start
+    if (weekStartDay === 'Sunday' && monthStart.dayWeek !== 0 || weekStartDay === 'Monday' && monthStart.dayWeek !== 1) {
+      let toAdd = monthStart.dayWeek === 0 ? 6 : monthStart.dayWeek - 1;
+      if (weekStartDay === 'Sunday') toAdd++;
+      for (let i = 0; i < toAdd; i++) {
+        const day = (0, _date.set)(previousMonthEnd.day - i, 'day', previousMonth);
+        const details = getDetails(day);
+        items.unshift({
+          value: day.day,
+          in: false,
+          dayWeek: day.dayWeek,
+          weekend: [0, 6].includes(day.dayWeek),
+          today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
+          is: _objectSpread({}, details),
+          start: true,
+          onesyDate: day
+        });
+      }
     }
-  }
+
+    // Add to end
+    const dayLast = items[items.length - 1];
+    if (dayLast.dayWeek < 7) {
+      let toAdd = 7 - dayLast.dayWeek;
+      if (items.length + toAdd - 1 < 42) toAdd += 41 - (items.length + toAdd - 1);
+      for (let i = 0; i < toAdd; i++) {
+        const day = (0, _date.set)(i + 1, 'day', nextMonth);
+        const details = getDetails(day);
+        items.push({
+          value: i + 1,
+          in: false,
+          dayWeek: day.dayWeek,
+          weekend: [0, 6].includes(day.dayWeek),
+          today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
+          is: _objectSpread({}, details),
+          end: true,
+          onesyDate: day
+        });
+      }
+    }
+    return items;
+  }, [month, getDetails]);
   const colorSelectedTheme = _react.default.useMemo(() => {
     return theme.palette.color[colorSelected] || theme.methods.color(colorSelected);
   }, [colorSelected, theme]);
@@ -646,10 +646,6 @@ const CalendarMonth = /*#__PURE__*/_react.default.forwardRef((props__, ref) => {
     gap: 0,
     direction: "column",
     className: (0, _styleReact.classNames)([(0, _utils2.staticClassName)('CalendarMonth', theme) && ['onesy-CalendarMonth-root', `onesy-CalendarMonth-size-${size}`], className, noTransition ? classes.root : classes.root_transition, classes[`size_${size}`], classes[`move_${refs.move.current}`], !labels && classes.root_no_labels, disabled && classes.disabled])
-  }, isMonthFrom && {
-    'data-month-from': true
-  }, isMonthTo && {
-    'data-month-to': true
   }, other), labels && /*#__PURE__*/_react.default.createElement(Line, {
     gap: 0,
     direction: "row",

package/esm/CalendarMenu/CalendarMenu.js

@@ -242,7 +242,7 @@ const CalendarMenu = /*#__PURE__*/React.forwardRef((props_, ref) => {
     }
     if (value?.repeat?.skip_weekends && [0, 6].includes(day.dayWeek)) repeating = false;
     if (repeating) {
-      const formated = format(day, formats.date);
+      const formatted = format(day, formats.date);
       if (value?.repeat?.ends?.active) {
         // date
         if (value?.repeat.ends.version === 'date') {
@@ -252,10 +252,10 @@ const CalendarMenu = /*#__PURE__*/React.forwardRef((props_, ref) => {
       }
       if (repeating) {
         if (!refs.repeatCount.current[value?.id]) refs.repeatCount.current[value?.id] = [];
-        if (!refs.repeatCount.current[value?.id].includes(formated)) refs.repeatCount.current[value?.id].push(formated);
+        if (!refs.repeatCount.current[value?.id].includes(formatted)) refs.repeatCount.current[value?.id].push(formatted);
       }
       if (value?.repeat?.ends?.active) {
-        const indexRepeated = refs.repeatCount.current[value?.id]?.indexOf(formated);
+        const indexRepeated = refs.repeatCount.current[value?.id]?.indexOf(formatted);
 
         // count
         if (value?.repeat.ends.version === 'count') repeating = repeating && value?.repeat.ends.value >= (indexRepeated === -1 ? 0 : indexRepeated) + 1;

package/esm/CalendarMonth/CalendarMonth.js

@@ -343,7 +343,6 @@ const CalendarMonth = /*#__PURE__*/React.forwardRef((props__, ref) => {
     };
     return values[order_];
   };
-  const days = [];
   const monthNow = new OnesyDate();
 
   // value or value range selected value
@@ -410,8 +409,8 @@ const CalendarMonth = /*#__PURE__*/React.forwardRef((props__, ref) => {
       selectedSame: value.filter(item => item.year === day.year && item.month === day.month && item.day === day.day).length === 2
     };
 
-    // selected
-    for (const itemRange of rangesSelected) {
+    // value
+    for (const itemRange of rangesValue) {
       const rangeStartDay = format(new OnesyDate(itemRange.start), 'DD-MM-YYYY');
       const rangeEndDay = format(new OnesyDate(itemRange.end), 'DD-MM-YYYY');
 
@@ -426,14 +425,11 @@ const CalendarMonth = /*#__PURE__*/React.forwardRef((props__, ref) => {
 
       // same
       result.same = result.start && result.end;
-      if (result.selected) {
-        result.fromSelected = true;
-        return result;
-      }
+      if (result.selected) return result;
     }
 
-    // value
-    for (const itemRange of rangesValue) {
+    // selected
+    for (const itemRange of rangesSelected) {
       const rangeStartDay = format(new OnesyDate(itemRange.start), 'DD-MM-YYYY');
       const rangeEndDay = format(new OnesyDate(itemRange.end), 'DD-MM-YYYY');
 
@@ -448,73 +444,77 @@ const CalendarMonth = /*#__PURE__*/React.forwardRef((props__, ref) => {
 
       // same
       result.same = result.start && result.end;
-      if (result.selected) return result;
+      if (result.selected) {
+        result.fromSelected = true;
+        return result;
+      }
     }
     result.outside = true;
     return result;
   }, [value, selected, rangesSelected, rangesValue]);
-  let isMonthFrom = false;
-  let isMonthTo = false;
+  const days = React.useMemo(() => {
+    const items = [];
 
-  // Add all month days
-  for (let i = 0; i < month.daysInMonth; i++) {
-    let day = set(i + 1, 'day', month);
-    day = set(14, 'hour', day);
-    const details = getDetails(day);
-    if (details.selectedIndex === 0) isMonthFrom = true;else if (details.selectedIndex === 1) isMonthTo = true;
-    days.push({
-      value: i + 1,
-      in: true,
-      dayWeek: day.dayWeek,
-      weekend: [0, 6].includes(day.dayWeek),
-      today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
-      is: _objectSpread({}, details),
-      onesyDate: day
-    });
-  }
-  days[0].start = true;
-  days[days.length - 1].end = true;
-
-  // Add to start
-  if (weekStartDay === 'Sunday' && monthStart.dayWeek !== 0 || weekStartDay === 'Monday' && monthStart.dayWeek !== 1) {
-    let toAdd = monthStart.dayWeek === 0 ? 6 : monthStart.dayWeek - 1;
-    if (weekStartDay === 'Sunday') toAdd++;
-    for (let i = 0; i < toAdd; i++) {
-      const day = set(previousMonthEnd.day - i, 'day', previousMonth);
+    // Add all month days
+    for (let i = 0; i < month.daysInMonth; i++) {
+      let day = set(i + 1, 'day', month);
+      day = set(14, 'hour', day);
       const details = getDetails(day);
-      days.unshift({
-        value: day.day,
-        in: false,
+      items.push({
+        value: i + 1,
+        in: true,
         dayWeek: day.dayWeek,
         weekend: [0, 6].includes(day.dayWeek),
         today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
         is: _objectSpread({}, details),
-        start: true,
         onesyDate: day
       });
     }
-  }
+    items[0].start = true;
+    items[items.length - 1].end = true;
 
-  // Add to end
-  const dayLast = days[days.length - 1];
-  if (dayLast.dayWeek < 7) {
-    let toAdd = 7 - dayLast.dayWeek;
-    if (days.length + toAdd - 1 < 42) toAdd += 41 - (days.length + toAdd - 1);
-    for (let i = 0; i < toAdd; i++) {
-      const day = set(i + 1, 'day', nextMonth);
-      const details = getDetails(day);
-      days.push({
-        value: i + 1,
-        in: false,
-        dayWeek: day.dayWeek,
-        weekend: [0, 6].includes(day.dayWeek),
-        today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
-        is: _objectSpread({}, details),
-        end: true,
-        onesyDate: day
-      });
+    // Add to start
+    if (weekStartDay === 'Sunday' && monthStart.dayWeek !== 0 || weekStartDay === 'Monday' && monthStart.dayWeek !== 1) {
+      let toAdd = monthStart.dayWeek === 0 ? 6 : monthStart.dayWeek - 1;
+      if (weekStartDay === 'Sunday') toAdd++;
+      for (let i = 0; i < toAdd; i++) {
+        const day = set(previousMonthEnd.day - i, 'day', previousMonth);
+        const details = getDetails(day);
+        items.unshift({
+          value: day.day,
+          in: false,
+          dayWeek: day.dayWeek,
+          weekend: [0, 6].includes(day.dayWeek),
+          today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
+          is: _objectSpread({}, details),
+          start: true,
+          onesyDate: day
+        });
+      }
     }
-  }
+
+    // Add to end
+    const dayLast = items[items.length - 1];
+    if (dayLast.dayWeek < 7) {
+      let toAdd = 7 - dayLast.dayWeek;
+      if (items.length + toAdd - 1 < 42) toAdd += 41 - (items.length + toAdd - 1);
+      for (let i = 0; i < toAdd; i++) {
+        const day = set(i + 1, 'day', nextMonth);
+        const details = getDetails(day);
+        items.push({
+          value: i + 1,
+          in: false,
+          dayWeek: day.dayWeek,
+          weekend: [0, 6].includes(day.dayWeek),
+          today: day.year === monthNow.year && day.dayYear === monthNow.dayYear,
+          is: _objectSpread({}, details),
+          end: true,
+          onesyDate: day
+        });
+      }
+    }
+    return items;
+  }, [month, getDetails]);
   const colorSelectedTheme = React.useMemo(() => {
     return theme.palette.color[colorSelected] || theme.methods.color(colorSelected);
   }, [colorSelected, theme]);
@@ -614,10 +614,6 @@ const CalendarMonth = /*#__PURE__*/React.forwardRef((props__, ref) => {
     gap: 0,
     direction: "column",
     className: classNames([staticClassName('CalendarMonth', theme) && ['onesy-CalendarMonth-root', `onesy-CalendarMonth-size-${size}`], className, noTransition ? classes.root : classes.root_transition, classes[`size_${size}`], classes[`move_${refs.move.current}`], !labels && classes.root_no_labels, disabled && classes.disabled])
-  }, isMonthFrom && {
-    'data-month-from': true
-  }, isMonthTo && {
-    'data-month-to': true
   }, other), labels && /*#__PURE__*/React.createElement(Line, {
     gap: 0,
     direction: "row",

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license UiReact v1.0.155
+/** @license UiReact v1.0.157
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/index.js

@@ -1,4 +1,4 @@
-/** @license UiReact v1.0.155
+/** @license UiReact v1.0.157
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onesy/ui-react",
-  "version": "1.0.156",
+  "version": "1.0.158",
   "description": "UI for React",
   "repository": "https://github.com/onesy-me/onesy.git",
   "author": "Lazar Erić <lazareric1@proton.me>",