@steroidsjs/core 3.0.14 → 3.0.16

package/ui/content/CalendarSystem/utils/utils.js

@@ -14,10 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.getFormattedWeekFromDate = exports.getSourceCalendarControl = exports.sortEventsInGroup = exports.getOmittedEvent = exports.isDateIsToday = exports.getWeekDaysFromDate = void 0;
+exports.formatEventTime = exports.getTopMarginFromEvent = exports.getProportionFromEvent = exports.getWeekDays = exports.getTwentyFourHoursArray = exports.getFormattedWeekFromDate = exports.getFormattedDay = exports.getSourceCalendarControl = exports.sortEventsInGroup = exports.getOmittedEvent = exports.isDateIsToday = exports.getWeekDaysFromDate = void 0;
 /* eslint-disable no-plusplus */
 var dayjs_1 = __importDefault(require("dayjs"));
 var omit_1 = __importDefault(require("lodash-es/omit"));
+var concat_1 = __importDefault(require("lodash-es/concat"));
+var slice_1 = __importDefault(require("lodash-es/slice"));
+var upperFirst_1 = __importDefault(require("lodash-es/upperFirst"));
+var ceil_1 = __importDefault(require("lodash-es/ceil"));
 var calendar_1 = require("../../../../utils/calendar");
 var SIX_DAYS_DIFF = 6;
 var MAX_DAYS_DIFF_IN_WEEK = 7;
@@ -43,10 +47,27 @@ var isDateIsToday = function (date) { return (0, dayjs_1["default"])(date).isTod
 exports.isDateIsToday = isDateIsToday;
 var getOmittedEvent = function (event) { return (0, omit_1["default"])(event, ['color', 'eventGroupId']); };
 exports.getOmittedEvent = getOmittedEvent;
-var sortEventsInGroup = function (group) { return group.events.sort(function (eventA, eventB) { return eventA.date.getTime() - eventB.date.getTime(); }); };
+var sortEventsInGroup = function (group) { return group.events
+    .sort(function (eventA, eventB) {
+    var durationAInMinutest = (0, dayjs_1["default"])(eventA.startDate).diff((0, dayjs_1["default"])(eventA.endDate), 'minutes');
+    var durationBInMinutest = (0, dayjs_1["default"])(eventB.startDate).diff((0, dayjs_1["default"])(eventB.endDate), 'minutes');
+    return durationBInMinutest - durationAInMinutest;
+}); };
 exports.sortEventsInGroup = sortEventsInGroup;
-var getSourceCalendarControl = function (control) { return document.querySelector("[data-sourcecontrol=\"".concat(control, "\"]")); };
+var getSourceCalendarControl = function (control) { return document.querySelector("[data-icon=\"control-".concat(control, "\"]")); };
 exports.getSourceCalendarControl = getSourceCalendarControl;
+var getFormattedDay = function (date) {
+    if (date === void 0) { date = null; }
+    var dateToFormat = date || new Date();
+    return {
+        dayNumber: dateToFormat.getDate(),
+        date: new Date(dateToFormat),
+        formattedDisplay: (0, calendar_1.convertDate)(dateToFormat, null, WEEK_DAY_FORMAT),
+        isToday: (0, exports.isDateIsToday)(dateToFormat)
+    };
+};
+exports.getFormattedDay = getFormattedDay;
+//TODO использовать существующие функции а не дублировать функционал
 var getFormattedWeekFromDate = function (fromDate) {
     if (fromDate === void 0) { fromDate = null; }
     var currentWeek = (0, exports.getWeekDaysFromDate)(fromDate || new Date());
@@ -58,3 +79,36 @@ var getFormattedWeekFromDate = function (fromDate) {
     });
 };
 exports.getFormattedWeekFromDate = getFormattedWeekFromDate;
+var getTwentyFourHoursArray = function () {
+    var hoursArray = [];
+    for (var i = 0; i < 24; i++) {
+        var formattedHour = (0, dayjs_1["default"])().startOf('day').add(i, 'hour').format('HH:00');
+        hoursArray.push(formattedHour);
+    }
+    return hoursArray;
+};
+exports.getTwentyFourHoursArray = getTwentyFourHoursArray;
+var getWeekDays = function () {
+    var unformattedDaysOfWeek = dayjs_1["default"].weekdaysMin();
+    return (0, concat_1["default"])((0, slice_1["default"])(unformattedDaysOfWeek, 1), unformattedDaysOfWeek[0]).map(function (weekDay) { return __("".concat((0, upperFirst_1["default"])(weekDay))); });
+};
+exports.getWeekDays = getWeekDays;
+var getProportionFromEvent = function (event) {
+    var startDate = (0, dayjs_1["default"])(event.startDate);
+    var endDate = (0, dayjs_1["default"])(event.endDate);
+    var durationInMinutest = endDate.diff(startDate, 'minutes');
+    return 100 * (0, ceil_1["default"])(durationInMinutest / 60, 1);
+};
+exports.getProportionFromEvent = getProportionFromEvent;
+var getTopMarginFromEvent = function (event) {
+    var startDate = (0, dayjs_1["default"])(event.startDate);
+    var startDateHour = startDate.set('minutes', 0);
+    var durationInMinutest = startDate.diff(startDateHour, 'minutes');
+    var topMargin = (0, ceil_1["default"])(durationInMinutest / 60, 1) * 100;
+    return {
+        top: "".concat(topMargin, "%")
+    };
+};
+exports.getTopMarginFromEvent = getTopMarginFromEvent;
+var formatEventTime = function (date) { return (0, calendar_1.convertDate)(date, null, 'HH:mm'); };
+exports.formatEventTime = formatEventTime;

package/ui/content/Icon/Icon.d.ts

@@ -41,6 +41,10 @@ export interface IIconProps extends Omit<IUiComponent, 'className' | 'style'>, P
     * Функция которая вызывается при клике по иконке
     */
     onClick?: any;
+    /**
+    * Дополнительные данные которые попадут в дата аттрибут data-icon
+    */
+    dataIcon?: any;
     [key: string]: any;
 }
 export interface IIconViewProps extends IIconProps {

package/ui/content/Icon/Icon.js

@@ -41,8 +41,9 @@ function Icon(props) {
         title: props.title,
         className: props.className,
         style: props.style,
-        icon: icon
-    }); }, [props.onClick, props.tabIndex, props.title, props.className, props.style, icon]);
+        icon: icon,
+        dataIcon: props.dataIcon
+    }); }, [props.onClick, props.tabIndex, props.title, props.className, props.style, props.dataIcon, icon]);
     if (!(0, isString_1["default"])(name)) {
         return null;
     }

package/ui/form/DateField/useDateInputState.js

@@ -42,7 +42,7 @@ function useDateInputState(props) {
     }, [propsDisplayValue]);
     // Display input change handler
     var onDisplayValueChange = (0, react_1.useCallback)(function (value) {
-        value = value.replace(/[^0-9:. ]/g, '');
+        value = value.replace(/[^0-9:., ]/g, '');
         setDisplayValue(value);
         var newValue = value;
         if (value !== null) {

package/ui/form/DateTimeField/DateTimeField.js

@@ -91,7 +91,8 @@ DateTimeField.defaultProps = {
     maskOptions: (0, kit_1.maskitoDateTimeOptionsGenerator)({
         dateMode: 'dd/mm/yyyy',
         timeMode: 'HH:MM',
-        dateSeparator: '.'
+        dateSeparator: '.',
+        dateTimeSeparator: DATE_TIME_SEPARATOR
     })
 };
 exports["default"] = (0, fieldWrapper_1["default"])('DateTimeField', DateTimeField);

package/ui/form/PasswordField/PasswordField.js

@@ -62,21 +62,28 @@ function PasswordField(props) {
     }, [type]);
     var inputProps = (0, react_1.useMemo)(function () {
         var _a;
-        return (__assign({ name: props.input.name, defaultValue: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', placeholder: props.placeholder, disabled: props.disabled, ref: inputRef, onChange: onChange, type: type }, props.inputProps));
-    }, [inputRef, onChange, props.disabled, props.input.name, props.input.value, props.inputProps, props.placeholder, type]);
+        return (__assign({ name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', placeholder: props.placeholder, ref: inputRef, onChange: onChange, type: type }, props.inputProps));
+    }, [inputRef, onChange, props.input.name, props.input.value, props.inputProps, props.placeholder, type]);
     var viewProps = (0, react_1.useMemo)(function () { return ({
-        viewProps: props.viewProps,
+        inputRef: inputRef,
         inputProps: inputProps,
-        securityLevel: props.showSecurityBar ? (0, exports.checkPassword)(props.input.value) : null,
         onClear: onClear,
         onShowButtonClick: onShowButtonClick,
+        securityLevel: props.showSecurityBar ? (0, exports.checkPassword)(props.input.value) : null,
         size: props.size,
         input: props.input,
         className: props.className,
         showSecurityIcon: props.showSecurityIcon,
-        showSecurityBar: props.showSecurityBar
-    }); }, [inputProps, onClear, onShowButtonClick, props.className, props.input, props.showSecurityBar, props.showSecurityIcon,
-        props.size, props.viewProps]);
+        showSecurityBar: props.showSecurityBar,
+        errors: props.errors,
+        style: props.style,
+        placeholder: props.placeholder,
+        required: props.required,
+        id: props.id,
+        viewProps: props.viewProps,
+        disabled: props.disabled
+    }); }, [inputProps, inputRef, onClear, onShowButtonClick, props.className, props.disabled, props.errors, props.id,
+        props.input, props.placeholder, props.required, props.showSecurityBar, props.showSecurityIcon, props.size, props.style, props.viewProps]);
     return components.ui.renderView(props.view || 'form.PasswordFieldView' || 'form.InputFieldView', viewProps);
 }
 PasswordField.defaultProps = {

package/ui/form/RadioListField/RadioListField.js

@@ -92,7 +92,7 @@ RadioListField.defaultProps = {
     disabled: false,
     required: false,
     className: '',
-    multiple: true,
+    multiple: false,
     errors: null,
     orientation: 'vertical'
 };

package/ui/form/SliderField/SliderField.d.ts

@@ -56,6 +56,14 @@ export interface ISliderFieldProps extends IFieldWrapperInputProps, IUiComponent
         };
         label: any;
     } | React.ReactNode | string>;
+    /**
+     * Функция, вызываемая в момент перетаскивания tip'а у слайдера
+     * @example
+     * {
+     *  () => console.log('Slider is moving')
+     * }
+     */
+    onChange?: (value: any) => void;
     /**
      * Функция, вызываемая после отпускания tip'а у слайдера (при событии onmouseup)
      * @see https://github.com/schrodinger/rc-slider

package/ui/form/SliderField/SliderField.js

@@ -21,6 +21,19 @@ var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var normalizeValue = function (value) { return (0, toInteger_1["default"])(String(value).replace(/[0-9]g/, '')) || 0; };
 function SliderField(props) {
     var components = (0, hooks_1.useComponents)();
+    var onChange = (0, react_1.useCallback)(function (value) {
+        if (props.onChange) {
+            props.onChange(value);
+        }
+        props.input.onChange(value);
+    }, [props]);
+    var onAfterChange = (0, react_1.useCallback)(function (value) {
+        var normalizedValue = normalizeValue(value);
+        if (props.onAfterChange) {
+            props.onAfterChange(normalizedValue);
+        }
+        props.input.onChange(normalizedValue);
+    }, [props]);
     var sliderProps = (0, react_1.useMemo)(function () { return ({
         min: props.min,
         max: props.max,
@@ -33,13 +46,10 @@ function SliderField(props) {
         valuePostfix: props.valuePostfix,
         defaultValue: props.defaultValue,
         tooltipIsVisible: props.tooltipIsVisible,
-        onChange: function (range) { return props.input.onChange.call(null, range); },
-        onAfterChange: function (value) {
-            value = normalizeValue(value);
-            props.input.onChange.call(null, value);
-        }
-    }); }, [props.min, props.max, props.step, props.marks, props.isRange, props.disabled, props.isVertical, props.input.value,
-        props.input.onChange, props.valuePostfix, props.defaultValue, props.tooltipIsVisible]);
+        onChange: onChange,
+        onAfterChange: onAfterChange
+    }); }, [onAfterChange, onChange, props.defaultValue, props.disabled, props.input.value, props.isRange,
+        props.isVertical, props.marks, props.max, props.min, props.step, props.tooltipIsVisible, props.valuePostfix]);
     var viewProps = (0, react_1.useMemo)(function () { return (__assign(__assign({}, sliderProps), { slider: props.slider, className: props.className, rangeDefaultValue: props.rangeDefaultValue, sliderDefaultValue: props.sliderDefaultValue, style: props.style })); }, [props.className, props.rangeDefaultValue, props.slider, props.sliderDefaultValue, props.style, sliderProps]);
     return components.ui.renderView(props.view || 'form.SliderFieldView', viewProps);
 }

package/ui/nav/Tree/Tree.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { IPreparedTreeItem, ITreeConfig, ITreeItem } from '../../../hooks/useTree';
 export interface ITreeViewProps extends ITreeProps {
     items: IPreparedTreeItem[];
+    onItemFocus?: () => void;
 }
 export interface ITreeItemViewProps extends ITreeProps {
     item: IPreparedTreeItem;
@@ -11,6 +12,12 @@ export interface ITreeItemViewProps extends ITreeProps {
 /**
  * Tree
  * Компонент, который представляет в виде дерева список с иерархической структурой данных
+ *
+ * Дополнительный функционал: в кастомном view компонента есть возможность реализовать кнопку, по клику на которую
+ * будет вызываться функция props.onItemFocus. Данная функция "находит" текущий роут в дереве -
+ * раскрывает родительские уровни, делает элемент активным.
+ * Данная функция не включает скролл к активному компоненту внутри дерева, это также необходимо
+ * реализовать в кастомном view локально в проекте.
  */
 export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPage'> {
     /**

package/ui/nav/Tree/Tree.js

@@ -1,10 +1,21 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 exports.__esModule = true;
 var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 function Tree(props) {
     var components = (0, hooks_1.useComponents)();
-    var treeItems = (0, hooks_1.useTree)({
+    var _a = (0, hooks_1.useTree)({
         items: props.items,
         selectedItemId: props.selectedItemId,
         routerParams: props.routerParams,
@@ -17,15 +28,8 @@ function Tree(props) {
         collapseChildItems: props.collapseChildItems,
         saveInClientStorage: props.autoSave,
         clientStorageId: props.id
-    }).treeItems;
-    var viewProps = (0, react_1.useMemo)(function () { return ({
-        items: treeItems,
-        levelPadding: props.levelPadding,
-        className: props.className,
-        hideIcon: props.hideIcon,
-        customIcon: props.customIcon,
-        hasIconExpandOnly: props.hasIconExpandOnly
-    }); }, [props.className, props.customIcon, props.hasIconExpandOnly, props.hideIcon, props.levelPadding, treeItems]);
+    }), treeItems = _a.treeItems, onItemFocus = _a.onItemFocus;
+    var viewProps = (0, react_1.useMemo)(function () { return (__assign(__assign({}, props), { onItemFocus: onItemFocus, items: treeItems, levelPadding: props.levelPadding, className: props.className, hideIcon: props.hideIcon, customIcon: props.customIcon, hasIconExpandOnly: props.hasIconExpandOnly })); }, [props, treeItems, onItemFocus]);
     return components.ui.renderView(props.view || 'nav.TreeView', viewProps);
 }
 exports["default"] = Tree;