colibri-ui 0.8.30 → 0.8.31

package/TimeSelect/helpers.js

@@ -21,13 +21,20 @@ var generateSuggest = function generateSuggest() {
   });
 };
 var checkIsBeforeNow = function checkIsBeforeNow(time, currentDate) {
-  return currentDate ? dateFns.isBefore(dateFns.parse(time, "HH:mm", currentDate), new Date()) : false;
+  if (!currentDate) return false;
+  var baseDate = new Date(currentDate);
+  baseDate.setHours(0, 0, 0, 0);
+  var parsedTime = dateFns.parse(time, "HH:mm", baseDate);
+  return dateFns.isBefore(parsedTime, currentDate);
 };
 var checkIsBeforeSelectedDate = function checkIsBeforeSelectedDate(time, interval, date) {
   if (date) {
     var selectedDate = new Date(date);
     selectedDate.setMinutes(selectedDate.getMinutes() + interval);
-    return dateFns.isBefore(dateFns.parse(time, "HH:mm", date), selectedDate);
+    var baseDate = new Date(date);
+    baseDate.setHours(0, 0, 0, 0);
+    var parsedTime = dateFns.parse(time, "HH:mm", baseDate);
+    return dateFns.isBefore(parsedTime, selectedDate);
   }
   return false;
 };

package/TimeSelect/index.d.ts

@@ -1,11 +1,16 @@
 import type { SelectProps } from "../Select/index.props";
 import type { FC } from "react";
+type TimeRange = {
+    start: string;
+    end: string;
+};
 interface TimeSelectProps extends Omit<SelectProps<string>, "options"> {
     interval?: 5 | 10 | 15 | 30;
     currentDate?: Date | null;
     selectedDate?: Date | null;
     name?: string;
     disabled?: boolean;
+    allowedTimeRange?: TimeRange;
 }
 declare const TimeSelect: FC<TimeSelectProps>;
 export default TimeSelect;

package/TimeSelect/index.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var tslib = require('tslib');
 var React = require('react');
 var index$1 = require('../Select/index.js');
@@ -10,8 +11,27 @@ var index = require('./Label/index.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+var _slicedToArray__default = /*#__PURE__*/_interopDefault(_slicedToArray);
 var React__default = /*#__PURE__*/_interopDefault(React);
 
+var isTimeInRange = function isTimeInRange(timeString, range) {
+  var _timeString$split$map = timeString.split(":").map(Number),
+    _timeString$split$map2 = _slicedToArray__default.default(_timeString$split$map, 2),
+    hours = _timeString$split$map2[0],
+    minutes = _timeString$split$map2[1];
+  var totalMinutes = hours * 60 + minutes;
+  var _range$start$split$ma = range.start.split(":").map(Number),
+    _range$start$split$ma2 = _slicedToArray__default.default(_range$start$split$ma, 2),
+    startHours = _range$start$split$ma2[0],
+    startMinutes = _range$start$split$ma2[1];
+  var startTotalMinutes = startHours * 60 + startMinutes;
+  var _range$end$split$map = range.end.split(":").map(Number),
+    _range$end$split$map2 = _slicedToArray__default.default(_range$end$split$map, 2),
+    endHours = _range$end$split$map2[0],
+    endMinutes = _range$end$split$map2[1];
+  var endTotalMinutes = endHours * 60 + endMinutes;
+  return totalMinutes >= startTotalMinutes && totalMinutes <= endTotalMinutes;
+};
 var TimeSelect = function TimeSelect(_a) {
   var value = _a.value,
     name = _a.name,
@@ -22,7 +42,8 @@ var TimeSelect = function TimeSelect(_a) {
     interval = _a$interval === void 0 ? 15 : _a$interval,
     onChange = _a.onChange,
     disabled = _a.disabled,
-    props = tslib.__rest(_a, ["value", "name", "currentDate", "selectedDate", "label", "interval", "onChange", "disabled"]);
+    allowedTimeRange = _a.allowedTimeRange,
+    props = tslib.__rest(_a, ["value", "name", "currentDate", "selectedDate", "label", "interval", "onChange", "disabled", "allowedTimeRange"]);
   var baseOptions = React.useMemo(function () {
     return helpers.generateSuggest(interval).map(function (item) {
       return {
@@ -35,11 +56,15 @@ var TimeSelect = function TimeSelect(_a) {
   }, [interval]);
   var options = React.useMemo(function () {
     return baseOptions.map(function (option) {
+      var timeRangeDisabled = !!allowedTimeRange && !isTimeInRange(option.value, allowedTimeRange);
+      var beforeSelectedDisabled = !!selectedDate && helpers.checkIsBeforeSelectedDate(option.value, interval, selectedDate);
+      var beforeCurrentDisabled = !!currentDate && helpers.checkIsBeforeNow(option.value, currentDate);
+      var isDisabled = timeRangeDisabled || beforeSelectedDisabled || beforeCurrentDisabled;
       return Object.assign(Object.assign({}, option), {
-        disabled: !!selectedDate && helpers.checkIsBeforeSelectedDate(option.value, interval, selectedDate) || !!currentDate && helpers.checkIsBeforeNow(option.value, currentDate)
+        disabled: isDisabled
       });
     });
-  }, [baseOptions, currentDate, selectedDate, interval]);
+  }, [baseOptions, currentDate, selectedDate, interval, allowedTimeRange]);
   return /*#__PURE__*/React__default.default.createElement(index$1.default, Object.assign({}, props, {
     name: name,
     value: value,

package/Tooltip/index.js

@@ -62,24 +62,24 @@ var Tooltip = function Tooltip(_ref) {
     }
     return React.Children.only(children);
   }, [children]);
-  var onToggle = function onToggle(event) {
+  var onToggle = React.useCallback(function (event) {
     event.stopPropagation();
     setVisible(function (state) {
       return !state;
     });
-  };
-  var onShow = function onShow() {
+  }, []);
+  var onShow = React.useCallback(function () {
     setVisible(true);
-  };
-  var onHide = function onHide() {
+  }, []);
+  var onHide = React.useCallback(function () {
     setVisible(false);
-  };
+  }, []);
   var onClickOutside = React.useCallback(function (event) {
     if (controlElement === null || controlElement === void 0 ? void 0 : controlElement.contains(event.target)) return;
     onHide();
   }, [onHide, controlElement]);
-  var onClickOverlay = React.useCallback(function (e) {
-    e.stopPropagation();
+  var onClickOverlay = React.useCallback(function (event) {
+    event.stopPropagation();
     onHide();
   }, [onHide]);
   React.useEffect(function () {

package/esm/TimeSelect/helpers.js

@@ -1,4 +1,4 @@
-import { addMinutes, isBefore, parse, format } from 'date-fns';
+import { addMinutes, parse, isBefore, format } from 'date-fns';
 
 var day = new Date();
 day.setHours(24, 0, 0, 0);
@@ -15,13 +15,20 @@ var generateSuggest = function generateSuggest() {
   });
 };
 var checkIsBeforeNow = function checkIsBeforeNow(time, currentDate) {
-  return currentDate ? isBefore(parse(time, "HH:mm", currentDate), new Date()) : false;
+  if (!currentDate) return false;
+  var baseDate = new Date(currentDate);
+  baseDate.setHours(0, 0, 0, 0);
+  var parsedTime = parse(time, "HH:mm", baseDate);
+  return isBefore(parsedTime, currentDate);
 };
 var checkIsBeforeSelectedDate = function checkIsBeforeSelectedDate(time, interval, date) {
   if (date) {
     var selectedDate = new Date(date);
     selectedDate.setMinutes(selectedDate.getMinutes() + interval);
-    return isBefore(parse(time, "HH:mm", date), selectedDate);
+    var baseDate = new Date(date);
+    baseDate.setHours(0, 0, 0, 0);
+    var parsedTime = parse(time, "HH:mm", baseDate);
+    return isBefore(parsedTime, selectedDate);
   }
   return false;
 };

package/esm/TimeSelect/index.d.ts

@@ -1,11 +1,16 @@
 import type { SelectProps } from "../Select/index.props";
 import type { FC } from "react";
+type TimeRange = {
+    start: string;
+    end: string;
+};
 interface TimeSelectProps extends Omit<SelectProps<string>, "options"> {
     interval?: 5 | 10 | 15 | 30;
     currentDate?: Date | null;
     selectedDate?: Date | null;
     name?: string;
     disabled?: boolean;
+    allowedTimeRange?: TimeRange;
 }
 declare const TimeSelect: FC<TimeSelectProps>;
 export default TimeSelect;

package/esm/TimeSelect/index.js

@@ -1,9 +1,28 @@
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { __rest } from 'tslib';
 import React__default, { useMemo } from 'react';
 import Select from '../Select/index.js';
 import { generateSuggest, checkIsBeforeSelectedDate, checkIsBeforeNow } from './helpers.js';
 import OptionLabel from './Label/index.js';
 
+var isTimeInRange = function isTimeInRange(timeString, range) {
+  var _timeString$split$map = timeString.split(":").map(Number),
+    _timeString$split$map2 = _slicedToArray(_timeString$split$map, 2),
+    hours = _timeString$split$map2[0],
+    minutes = _timeString$split$map2[1];
+  var totalMinutes = hours * 60 + minutes;
+  var _range$start$split$ma = range.start.split(":").map(Number),
+    _range$start$split$ma2 = _slicedToArray(_range$start$split$ma, 2),
+    startHours = _range$start$split$ma2[0],
+    startMinutes = _range$start$split$ma2[1];
+  var startTotalMinutes = startHours * 60 + startMinutes;
+  var _range$end$split$map = range.end.split(":").map(Number),
+    _range$end$split$map2 = _slicedToArray(_range$end$split$map, 2),
+    endHours = _range$end$split$map2[0],
+    endMinutes = _range$end$split$map2[1];
+  var endTotalMinutes = endHours * 60 + endMinutes;
+  return totalMinutes >= startTotalMinutes && totalMinutes <= endTotalMinutes;
+};
 var TimeSelect = function TimeSelect(_a) {
   var value = _a.value,
     name = _a.name,
@@ -14,7 +33,8 @@ var TimeSelect = function TimeSelect(_a) {
     interval = _a$interval === void 0 ? 15 : _a$interval,
     onChange = _a.onChange,
     disabled = _a.disabled,
-    props = __rest(_a, ["value", "name", "currentDate", "selectedDate", "label", "interval", "onChange", "disabled"]);
+    allowedTimeRange = _a.allowedTimeRange,
+    props = __rest(_a, ["value", "name", "currentDate", "selectedDate", "label", "interval", "onChange", "disabled", "allowedTimeRange"]);
   var baseOptions = useMemo(function () {
     return generateSuggest(interval).map(function (item) {
       return {
@@ -27,11 +47,15 @@ var TimeSelect = function TimeSelect(_a) {
   }, [interval]);
   var options = useMemo(function () {
     return baseOptions.map(function (option) {
+      var timeRangeDisabled = !!allowedTimeRange && !isTimeInRange(option.value, allowedTimeRange);
+      var beforeSelectedDisabled = !!selectedDate && checkIsBeforeSelectedDate(option.value, interval, selectedDate);
+      var beforeCurrentDisabled = !!currentDate && checkIsBeforeNow(option.value, currentDate);
+      var isDisabled = timeRangeDisabled || beforeSelectedDisabled || beforeCurrentDisabled;
       return Object.assign(Object.assign({}, option), {
-        disabled: !!selectedDate && checkIsBeforeSelectedDate(option.value, interval, selectedDate) || !!currentDate && checkIsBeforeNow(option.value, currentDate)
+        disabled: isDisabled
       });
     });
-  }, [baseOptions, currentDate, selectedDate, interval]);
+  }, [baseOptions, currentDate, selectedDate, interval, allowedTimeRange]);
   return /*#__PURE__*/React__default.createElement(Select, Object.assign({}, props, {
     name: name,
     value: value,

package/esm/Tooltip/index.js

@@ -51,24 +51,24 @@ var Tooltip = function Tooltip(_ref) {
     }
     return Children.only(children);
   }, [children]);
-  var onToggle = function onToggle(event) {
+  var onToggle = useCallback(function (event) {
     event.stopPropagation();
     setVisible(function (state) {
       return !state;
     });
-  };
-  var onShow = function onShow() {
+  }, []);
+  var onShow = useCallback(function () {
     setVisible(true);
-  };
-  var onHide = function onHide() {
+  }, []);
+  var onHide = useCallback(function () {
     setVisible(false);
-  };
+  }, []);
   var onClickOutside = useCallback(function (event) {
     if (controlElement === null || controlElement === void 0 ? void 0 : controlElement.contains(event.target)) return;
     onHide();
   }, [onHide, controlElement]);
-  var onClickOverlay = useCallback(function (e) {
-    e.stopPropagation();
+  var onClickOverlay = useCallback(function (event) {
+    event.stopPropagation();
     onHide();
   }, [onHide]);
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "colibri-ui",
-  "version": "0.8.30",
+  "version": "0.8.31",
   "description": "React UI components library",
   "main": "index.js",
   "scripts": {},