@steroidsjs/core 3.0.0-beta.111 → 3.0.0-beta.113

package/ui/content/CalendarSystem/hooks/{useWeekCalendar.d.ts → useWeekGrid.d.ts}

@@ -1,15 +1,16 @@
 import DateControlEnum from '../enums/DateControlType';
-declare const useWeekCalendar: (currentMonthDate: Date) => {
-    currentWeek: {
+declare const useWeekGrid: (currentMonthFirstDayDate: Date) => {
+    weekGridTwentyFourHoursArray: any[];
+    weekGridCurrentWeekDays: {
         dayNumber: number;
         date: Date;
         outOfRange?: boolean;
         isToday?: boolean;
         formattedDisplay?: string;
     }[];
-    weekControls: {
+    weekGridControls: {
         [key: string]: () => void | DateControlEnum;
     };
-    forceUpdateWeekOnMonthChange: (newMonthDate: Date) => void;
+    updateWeekOnMonthChange: (newMonthDate: Date) => void;
 };
-export default useWeekCalendar;
+export default useWeekGrid;

package/ui/content/CalendarSystem/hooks/useWeekGrid.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+/* eslint-disable no-plusplus */
+var react_1 = __importDefault(require("react"));
+var dayjs_1 = __importDefault(require("dayjs"));
+var DateControlType_1 = __importDefault(require("../enums/DateControlType"));
+var utils_1 = require("../utils/utils");
+var ONE_DAY = 1;
+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;
+};
+var useWeekGrid = function (currentMonthFirstDayDate) {
+    var _a;
+    var _b = react_1["default"].useState((0, utils_1.getFormattedWeekFromDate)()), currentWeek = _b[0], setCurrentWeek = _b[1];
+    var updateWeekOnMonthChange = react_1["default"].useCallback(function (newMonthDate) {
+        setCurrentWeek((0, utils_1.getFormattedWeekFromDate)(newMonthDate));
+    }, []);
+    var changeMonthAfterWeekChanged = react_1["default"].useCallback(function (formattedWeek) {
+        var firstDayOfWeek = formattedWeek[0].date;
+        var currentMonthNumber = currentMonthFirstDayDate.getMonth();
+        var isWeekOutOfMonth = formattedWeek.every(function (dayOfWeek) { return dayOfWeek.date.getMonth() !== currentMonthNumber; });
+        if (!isWeekOutOfMonth) {
+            return;
+        }
+        if (currentMonthNumber - firstDayOfWeek.getMonth() === 1) {
+            var lastDayOfWeekInNewMonth = formattedWeek[formattedWeek.length - 1].date;
+            var prevMonthControl = (0, utils_1.getSourceCalendarControl)(DateControlType_1["default"].PREV_ONE);
+            prevMonthControl.click();
+            updateWeekOnMonthChange(lastDayOfWeekInNewMonth);
+        }
+        else {
+            var firstDayOfWeekInNewMonth = formattedWeek[0].date;
+            var nextMonthControl = (0, utils_1.getSourceCalendarControl)(DateControlType_1["default"].NEXT_ONE);
+            nextMonthControl.click();
+            updateWeekOnMonthChange(firstDayOfWeekInNewMonth);
+        }
+    }, [currentMonthFirstDayDate, updateWeekOnMonthChange]);
+    var setNextWeek = react_1["default"].useCallback(function () {
+        var lastDayOfWeek = currentWeek[currentWeek.length - 1].date;
+        lastDayOfWeek.setDate(lastDayOfWeek.getDate() + ONE_DAY);
+        var formattedNextWeek = (0, utils_1.getFormattedWeekFromDate)(lastDayOfWeek);
+        setCurrentWeek(formattedNextWeek);
+        changeMonthAfterWeekChanged(formattedNextWeek);
+    }, [currentWeek, changeMonthAfterWeekChanged]);
+    var setPrevWeek = react_1["default"].useCallback(function () {
+        var firstDayOfWeek = currentWeek[0].date;
+        firstDayOfWeek.setDate(firstDayOfWeek.getDate() - ONE_DAY);
+        var formattedPrevWeek = (0, utils_1.getFormattedWeekFromDate)(firstDayOfWeek);
+        setCurrentWeek(formattedPrevWeek);
+        changeMonthAfterWeekChanged(formattedPrevWeek);
+    }, [currentWeek, changeMonthAfterWeekChanged]);
+    return {
+        weekGridTwentyFourHoursArray: getTwentyFourHoursArray(),
+        weekGridCurrentWeekDays: currentWeek,
+        weekGridControls: (_a = {},
+            _a[DateControlType_1["default"].NEXT_DOUBLE] = DateControlType_1["default"].NEXT_ONE,
+            _a[DateControlType_1["default"].NEXT_ONE] = setNextWeek,
+            _a[DateControlType_1["default"].PREV_ONE] = setPrevWeek,
+            _a[DateControlType_1["default"].PREV_DOUBLE] = DateControlType_1["default"].PREV_ONE,
+            _a),
+        updateWeekOnMonthChange: updateWeekOnMonthChange
+    };
+};
+exports["default"] = useWeekGrid;

package/ui/content/CalendarSystem/utils/utils.d.ts

@@ -3,3 +3,11 @@ export declare const getWeekDaysFromDate: (date: Date) => IDay[];
 export declare const isDateIsToday: (date: Date) => boolean;
 export declare const getOmittedEvent: (event: IEvent | Omit<IEvent, 'color'>) => any;
 export declare const sortEventsInGroup: (group: IEventGroup) => Omit<IEvent, "color">[];
+export declare const getSourceCalendarControl: (control: string) => HTMLElement;
+export declare const getFormattedWeekFromDate: (fromDate?: Date) => {
+    dayNumber: number;
+    date: Date;
+    outOfRange?: boolean;
+    isToday?: boolean;
+    formattedDisplay?: string;
+}[];

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

@@ -1,14 +1,27 @@
 "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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.sortEventsInGroup = exports.getOmittedEvent = exports.isDateIsToday = exports.getWeekDaysFromDate = void 0;
+exports.getFormattedWeekFromDate = 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 calendar_1 = require("../../../../utils/calendar");
 var SIX_DAYS_DIFF = 6;
 var MAX_DAYS_DIFF_IN_WEEK = 7;
+var WEEK_DAY_FORMAT = 'dd, D MMM';
 var getWeekDaysFromDate = function (date) {
     var weekDays = [];
     var firstDayOfWeek = new Date(date);
@@ -32,3 +45,16 @@ var getOmittedEvent = function (event) { return (0, omit_1["default"])(event, ['
 exports.getOmittedEvent = getOmittedEvent;
 var sortEventsInGroup = function (group) { return group.events.sort(function (eventA, eventB) { return eventA.date.getTime() - eventB.date.getTime(); }); };
 exports.sortEventsInGroup = sortEventsInGroup;
+var getSourceCalendarControl = function (control) { return document.querySelector("[data-sourcecontrol=\"".concat(control, "\"]")); };
+exports.getSourceCalendarControl = getSourceCalendarControl;
+var getFormattedWeekFromDate = function (fromDate) {
+    if (fromDate === void 0) { fromDate = null; }
+    var currentWeek = (0, exports.getWeekDaysFromDate)(fromDate || new Date());
+    return currentWeek.map(function (dayOfWeek) {
+        var copyOfDayWeek = __assign({}, dayOfWeek);
+        copyOfDayWeek.formattedDisplay = (0, calendar_1.convertDate)(dayOfWeek.date, null, WEEK_DAY_FORMAT);
+        copyOfDayWeek.isToday = (0, exports.isDateIsToday)(copyOfDayWeek.date);
+        return copyOfDayWeek;
+    });
+};
+exports.getFormattedWeekFromDate = getFormattedWeekFromDate;

package/ui/form/CheckboxTreeField/CheckboxTreeField.d.ts

@@ -19,7 +19,7 @@ type CheckboxTreeItems = string | ({
  *
  * Список с вложенными чекбоксами. Используется в формах для создания иерархической структуры и выбора нескольких значений.
  */
-export interface ICheckboxTreeFieldProps extends IFieldWrapperInputProps, Omit<IDataProviderConfig, 'items'>, Omit<IDataSelectConfig, 'items'>, IUiComponent, Pick<ITreeProps, 'levelPadding' | 'alwaysOpened'> {
+export interface ICheckboxTreeFieldProps extends IFieldWrapperInputProps, Omit<IDataProviderConfig, 'items'>, Omit<IDataSelectConfig, 'items'>, IUiComponent, Pick<ITreeProps, 'levelPadding' | 'alwaysOpened' | 'hasIcon' | 'customIcon'> {
     /**
      * Свойства для элемента input
      * @example { onKeyDown: ... }
@@ -48,7 +48,7 @@ export interface ICheckboxTreeFieldProps extends IFieldWrapperInputProps, Omit<I
     primaryKey?: string;
     [key: string]: any;
 }
-export interface ICheckboxTreeFieldViewProps extends IFieldWrapperOutputProps {
+export interface ICheckboxTreeFieldViewProps extends IFieldWrapperOutputProps, Pick<ITreeProps, 'levelPadding' | 'customIcon'> {
     items: {
         id: number | string | boolean;
         label?: string;
@@ -61,7 +61,6 @@ export interface ICheckboxTreeFieldViewProps extends IFieldWrapperOutputProps {
     onItemSelect: (checkbox: IPreparedTreeItem) => void;
     renderCheckbox: (checkboxProps: ICheckboxFieldViewProps) => JSX.Element;
     size?: Size;
-    levelPadding: number;
 }
 export declare const getNestedItemsIds: (item: any, groupAttribute: any) => any[];
 declare const _default: import("../../../ui/form/Field/fieldWrapper").FieldWrapperComponent<ICheckboxTreeFieldProps>;

package/ui/form/CheckboxTreeField/CheckboxTreeField.js

@@ -114,7 +114,7 @@ function CheckboxTreeField(props) {
     }, [onReset, prevInputValue, props.input.value, selectedIds.length]);
     var CheckboxFieldView = components.ui.getView('form.CheckboxFieldView');
     var renderCheckbox = function (checkboxProps) { return (React.createElement(CheckboxFieldView, __assign({}, checkboxProps))); };
-    return components.ui.renderView(props.view || 'form.CheckboxTreeFieldView', __assign(__assign({}, props), { items: treeItems, onItemSelect: onItemSelect, selectedIds: selectedIds, levelPadding: props.levelPadding, renderCheckbox: renderCheckbox }));
+    return components.ui.renderView(props.view || 'form.CheckboxTreeFieldView', __assign(__assign({}, props), { items: treeItems, onItemSelect: onItemSelect, selectedIds: selectedIds, renderCheckbox: renderCheckbox }));
 }
 CheckboxTreeField.defaultProps = {
     disabled: false,

package/ui/list/TreeTable/TreeTable.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { ITreeProps } from '@steroidsjs/core/ui/nav/Tree/Tree';
 import { IPreparedTreeItem, ITreeItem } from '../../../hooks/useTree';
 import { IColumnViewProps, IGridColumn, IGridProps } from '../Grid/Grid';
-export interface ITreeColumnViewProps extends IColumnViewProps, Pick<ITreeTableProps, 'levelPadding'> {
+export interface ITreeColumnViewProps extends IColumnViewProps, Pick<ITreeTableProps, 'levelPadding' | 'customIcon'> {
     item: IPreparedTreeItem;
 }
 /**
@@ -10,7 +10,7 @@ export interface ITreeColumnViewProps extends IColumnViewProps, Pick<ITreeTableP
  *
  * Компонент для представления данных коллекции в виде иерархической структуры.
  */
-export interface ITreeTableProps extends Omit<IGridProps, 'items'>, Pick<ITreeProps, 'alwaysOpened' | 'levelPadding'> {
+export interface ITreeTableProps extends Omit<IGridProps, 'items'>, Pick<ITreeProps, 'alwaysOpened' | 'levelPadding' | 'customIcon'> {
     /**
      * Элементы коллекции
      * @example
@@ -27,8 +27,9 @@ export interface ITreeTableProps extends Omit<IGridProps, 'items'>, Pick<ITreePr
      * ]
      */
     items?: ITreeItem[];
+    customIcon?: string | React.ReactElement;
 }
-export declare const addTreeColumnFieldsToFirstColumn: (columns: IGridColumn[], levelPadding: string | number) => IGridColumn[];
+export declare const addTreeColumnFieldsToFirstColumn: (columns: IGridColumn[], levelPadding: string | number, customIcon?: string | React.ReactElement) => IGridColumn[];
 declare function TreeTable(props: ITreeTableProps): JSX.Element;
 declare namespace TreeTable {
     var defaultProps: {

package/ui/list/TreeTable/TreeTable.js

@@ -58,15 +58,15 @@ var TREE_COLUMN_VIEW_FIELDS = {
     valueView: 'TreeColumnView',
     headerClassName: 'TreeColumnHeader'
 };
-var addTreeColumnFieldsToFirstColumn = function (columns, levelPadding) {
+var addTreeColumnFieldsToFirstColumn = function (columns, levelPadding, customIcon) {
     var newColumns = __spreadArray([], columns, true);
     // Add tree view to the first column
-    (0, merge_1["default"])(newColumns[0], __assign(__assign({}, TREE_COLUMN_VIEW_FIELDS), { levelPadding: levelPadding }));
+    (0, merge_1["default"])(newColumns[0], __assign(__assign({}, TREE_COLUMN_VIEW_FIELDS), { levelPadding: levelPadding, customIcon: customIcon }));
     return newColumns;
 };
 exports.addTreeColumnFieldsToFirstColumn = addTreeColumnFieldsToFirstColumn;
 function TreeTable(props) {
-    var columns = (0, react_1.useMemo)(function () { return (0, exports.addTreeColumnFieldsToFirstColumn)(props.columns, props.levelPadding); }, [props.columns, props.levelPadding]);
+    var columns = (0, react_1.useMemo)(function () { return (0, exports.addTreeColumnFieldsToFirstColumn)(props.columns, props.levelPadding, props.customIcon); }, [props.columns, props.customIcon, props.levelPadding]);
     var list = (0, useSelector_1["default"])(function (state) { return (0, list_1.getList)(state, props.listId); });
     var treeItems = (0, useTree_1["default"])({
         items: props.items,

package/ui/nav/Router/Router.d.ts

@@ -137,11 +137,17 @@ export interface IRouterProps {
      * @example SomeComponent
      */
     children?: React.ReactNode;
+    /**
+     * Флаг, который позволяет использовать вложенные роуты c указанием вложенного пути
+     * @example true
+     */
+    alwaysAppendParentRoutePath?: boolean;
 }
 declare function Router(props: IRouterProps): JSX.Element;
 declare namespace Router {
     var defaultProps: {
         autoScrollTop: boolean;
+        alwaysAppendParentRoutePath: boolean;
     };
 }
 export default Router;

package/ui/nav/Router/Router.js

@@ -97,7 +97,7 @@ function Router(props) {
     var dispatch = (0, useDispatch_1["default"])();
     (0, react_use_1.useEffectOnce)(function () {
         if (props.routes) {
-            dispatch((0, router_1.initRoutes)((0, helpers_1.walkRoutesRecursive)(__assign({ id: 'root' }, props.routes), props.defaultRoles ? { roles: props.defaultRoles } : undefined)));
+            dispatch((0, router_1.initRoutes)((0, helpers_1.walkRoutesRecursive)(__assign({ id: 'root' }, props.routes), props.defaultRoles ? { roles: props.defaultRoles } : undefined, {}, props.alwaysAppendParentRoutePath)));
         }
     });
     // Sync route params with redux
@@ -108,7 +108,7 @@ function Router(props) {
         }
     }, [dispatch, prevRouteParams, routeParams]);
     // Routes state
-    var _b = (0, react_1.useState)((0, helpers_1.treeToList)(props.routes)), routes = _b[0], setRoutes = _b[1];
+    var _b = (0, react_1.useState)((0, helpers_1.treeToList)(props.routes, true, null, props.alwaysAppendParentRoutePath)), routes = _b[0], setRoutes = _b[1];
     (0, react_use_1.useUpdateEffect)(function () {
         setRoutes(props.routes);
     }, [props.routes]);
@@ -205,6 +205,7 @@ function Router(props) {
     return (React.createElement(connected_react_router_1.ConnectedRouter, { history: components.store.history }, renderContent()));
 }
 Router.defaultProps = {
-    autoScrollTop: true
+    autoScrollTop: true,
+    alwaysAppendParentRoutePath: true
 };
 exports["default"] = Router;

package/ui/nav/Router/helpers.d.ts

@@ -1,4 +1,4 @@
 import { IRouteItem } from './Router';
 export declare const findRedirectPathRecursive: (route: IRouteItem) => any;
-export declare const walkRoutesRecursive: (item: IRouteItem | Record<string, any>, defaultItem?: any, parentItem?: any) => any;
-export declare const treeToList: (item: IRouteItem | Record<string, any>, isRoot?: boolean) => Record<string, any>;
+export declare const walkRoutesRecursive: (item: IRouteItem | Record<string, any>, defaultItem?: any, parentItem?: any, alwaysAppendParentRoutePath?: boolean) => any;
+export declare const treeToList: (item: IRouteItem | Record<string, any>, isRoot?: boolean, parentItem?: any, alwaysAppendParentRoutePath?: boolean) => Record<string, any>;

package/ui/nav/Router/helpers.js

@@ -18,6 +18,7 @@ exports.treeToList = exports.walkRoutesRecursive = exports.findRedirectPathRecur
 var get_1 = __importDefault(require("lodash-es/get"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
+var SLASH = '/';
 var findRedirectPathRecursive = function (route) {
     if (!route) {
         return null;
@@ -34,10 +35,36 @@ var findRedirectPathRecursive = function (route) {
         : null;
 };
 exports.findRedirectPathRecursive = findRedirectPathRecursive;
-var walkRoutesRecursive = function (item, defaultItem, parentItem) {
+var addSlashIfNotPresent = function (path) {
+    if (path === void 0) { path = ''; }
+    return path.startsWith(SLASH) ? path : (SLASH + path);
+};
+var joinChildAndParentPaths = function (path, parentPath) {
+    if (path === void 0) { path = ''; }
+    if (parentPath === void 0) { parentPath = null; }
+    if (!parentPath || parentPath === SLASH) {
+        return addSlashIfNotPresent(path);
+    }
+    return addSlashIfNotPresent(parentPath) + addSlashIfNotPresent(path);
+};
+var appendChildIfNoSlash = function (path, parentPath) {
+    if (path === void 0) { path = ''; }
+    if (parentPath === void 0) { parentPath = null; }
+    if (parentPath === SLASH) {
+        return addSlashIfNotPresent(path);
+    }
+    if (!path.startsWith(SLASH)) {
+        return addSlashIfNotPresent(parentPath) + addSlashIfNotPresent(path);
+    }
+    return path;
+};
+var walkRoutesRecursive = function (item, defaultItem, parentItem, alwaysAppendParentRoutePath) {
     if (defaultItem === void 0) { defaultItem = {}; }
     if (parentItem === void 0) { parentItem = {}; }
-    var normalizedItem = __assign(__assign(__assign({}, defaultItem), item), { id: item.id, exact: item.exact, path: item.path && (item.path.indexOf('/') !== 0 && parentItem.path ? parentItem.path + '/' : '') + item.path, label: item.label, title: item.title, isVisible: typeof item.isVisible !== 'undefined'
+    if (alwaysAppendParentRoutePath === void 0) { alwaysAppendParentRoutePath = true; }
+    var normalizedItem = __assign(__assign(__assign({}, defaultItem), item), { id: item.id, exact: item.exact, path: item.path && (alwaysAppendParentRoutePath
+            ? joinChildAndParentPaths(item.path, parentItem.path)
+            : appendChildIfNoSlash(item.path, parentItem.path)), label: item.label, title: item.title, isVisible: typeof item.isVisible !== 'undefined'
             ? item.isVisible
             : (typeof parentItem.isVisible !== 'undefined'
                 ? parentItem.isVisible
@@ -48,32 +75,39 @@ var walkRoutesRecursive = function (item, defaultItem, parentItem) {
                 : defaultItem.isNavVisible), layout: item.layout || parentItem.layout || defaultItem.layout || null, roles: item.roles || parentItem.roles || defaultItem.roles || null, component: null, componentProps: null });
     var items = null;
     if ((0, isArray_1["default"])(item.items)) {
-        items = item.items.map(function (subItem) { return (0, exports.walkRoutesRecursive)(subItem, defaultItem, normalizedItem); });
+        items = item.items.map(function (subItem) { return (0, exports.walkRoutesRecursive)(subItem, defaultItem, normalizedItem, alwaysAppendParentRoutePath); });
     }
     else if ((0, isObject_1["default"])(item.items)) {
         items = Object.keys(item.items)
-            .map(function (id) { return (0, exports.walkRoutesRecursive)(__assign(__assign({}, item.items[id]), { id: id }), defaultItem, normalizedItem); });
+            .map(function (id) { return (0, exports.walkRoutesRecursive)(__assign(__assign({}, item.items[id]), { id: id }), defaultItem, normalizedItem, alwaysAppendParentRoutePath); });
     }
     return __assign(__assign({}, normalizedItem), { items: items });
 };
 exports.walkRoutesRecursive = walkRoutesRecursive;
-var treeToList = function (item, isRoot) {
+var treeToList = function (item, isRoot, parentItem, alwaysAppendParentRoutePath) {
     if (isRoot === void 0) { isRoot = true; }
+    if (parentItem === void 0) { parentItem = {}; }
+    if (alwaysAppendParentRoutePath === void 0) { alwaysAppendParentRoutePath = true; }
     if ((0, isArray_1["default"])(item)) {
         return item;
     }
+    if (item.path) {
+        item.path = alwaysAppendParentRoutePath
+            ? joinChildAndParentPaths(item.path, parentItem === null || parentItem === void 0 ? void 0 : parentItem.path)
+            : appendChildIfNoSlash(item.path, parentItem === null || parentItem === void 0 ? void 0 : parentItem.path);
+    }
     if (isRoot && !item.id) {
         item.id = 'root';
     }
     var items = item.path ? [item] : [];
     if ((0, isArray_1["default"])(item.items)) {
         item.items.forEach(function (subItem) {
-            items = items.concat((0, exports.treeToList)(subItem, false));
+            items = items.concat((0, exports.treeToList)(subItem, false, item, alwaysAppendParentRoutePath));
         });
     }
     else if ((0, isObject_1["default"])(item.items)) {
         Object.keys(item.items).forEach(function (id) {
-            items = items.concat((0, exports.treeToList)(__assign(__assign({}, item.items[id]), { id: id }), false));
+            items = items.concat((0, exports.treeToList)(__assign(__assign({}, item.items[id]), { id: id }), false, item, alwaysAppendParentRoutePath));
         });
     }
     return items;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { IPreparedTreeItem, ITreeConfig } from '../../../hooks/useTree';
+import { IPreparedTreeItem, ITreeConfig, ITreeItem } from '../../../hooks/useTree';
 export interface ITreeViewProps extends ITreeProps {
     items: IPreparedTreeItem[];
 }
@@ -30,7 +30,7 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
      * Обработчик на клик по узлу
      * @param args
      */
-    onItemClick?: (...args: any[]) => any;
+    onItemClick?: (event: React.MouseEvent, item: ITreeItem) => any;
     /**
      * Отображать раскрытыми узлы из LocalStorage
      * @example true
@@ -41,6 +41,15 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
      * @example 32
      */
     levelPadding?: number;
+    /**
+     * Показать иконку c лева от элемента
+     * @example true
+     */
+    showIcon?: boolean;
+    /**
+     * Кастомная иконка, заменяющая иконку раскрытия по умолчанию
+     */
+    customIcon?: string | React.ReactElement;
     /**
      * Флаг, определяющий раскрывать вложенные элементы по клику на весь элемент или только на иконку
      * @example false
@@ -57,6 +66,8 @@ declare namespace Tree {
         level: number;
         levelPadding: number;
         hasIconExpandOnly: boolean;
+        useSameSelectedItemId: boolean;
+        showIcon: boolean;
     };
 }
 export default Tree;

package/ui/nav/Tree/Tree.js

@@ -22,7 +22,8 @@ function Tree(props) {
         autoOpenLevels: props.autoOpenLevels,
         onExpand: props.onItemClick,
         level: props.level,
-        alwaysOpened: props.alwaysOpened
+        alwaysOpened: props.alwaysOpened,
+        useSameSelectedItemId: props.useSameSelectedItemId
     }).treeItems;
     return components.ui.renderView(props.view || 'nav.TreeView', __assign(__assign({}, props), { items: treeItems }));
 }
@@ -33,5 +34,7 @@ Tree.defaultProps = {
     autoSave: false,
     level: 0,
     levelPadding: 32,
-    hasIconExpandOnly: false
+    hasIconExpandOnly: false,
+    useSameSelectedItemId: true,
+    showIcon: true
 };

package/ui/content/CalendarSystem/hooks/useWeekCalendar.js

@@ -1,86 +0,0 @@
-"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);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var react_1 = __importDefault(require("react"));
-var calendar_1 = require("../../../../utils/calendar");
-var DateControlType_1 = __importDefault(require("../enums/DateControlType"));
-var useCalendarControls_1 = require("./useCalendarControls");
-var utils_1 = require("../utils/utils");
-var WEEK_DAY_FORMAT = 'dd, D MMM';
-var ONE_DAY = 1;
-var getFormattedWeekFromDate = function (fromDate) {
-    if (fromDate === void 0) { fromDate = null; }
-    var currentWeek = (0, utils_1.getWeekDaysFromDate)(fromDate || new Date());
-    return currentWeek.map(function (dayOfWeek) {
-        var copyOfDayWeek = __assign({}, dayOfWeek);
-        copyOfDayWeek.formattedDisplay = (0, calendar_1.convertDate)(dayOfWeek.date, null, WEEK_DAY_FORMAT);
-        // eslint-disable-next-line no-unused-expressions
-        (0, utils_1.isDateIsToday)(copyOfDayWeek.date) ? copyOfDayWeek.isToday = true : copyOfDayWeek.isToday = false;
-        return copyOfDayWeek;
-    });
-};
-var useWeekCalendar = function (currentMonthDate) {
-    var _a;
-    var _b = react_1["default"].useState(getFormattedWeekFromDate()), currentWeek = _b[0], setCurrentWeek = _b[1];
-    var forceUpdateWeekOnMonthChange = react_1["default"].useCallback(function (newMonthDate) {
-        setCurrentWeek(getFormattedWeekFromDate(newMonthDate));
-    }, []);
-    var changeMonthAfterWeekChanged = react_1["default"].useCallback(function (formattedWeek) {
-        var firstDayOfWeek = formattedWeek[0].date;
-        var currentMonthNumber = currentMonthDate.getMonth();
-        var isWeekOutOfMonth = formattedWeek.every(function (dayOfWeek) { return dayOfWeek.date.getMonth() !== currentMonthNumber; });
-        if (!isWeekOutOfMonth) {
-            return;
-        }
-        if (currentMonthNumber - firstDayOfWeek.getMonth() === 1) {
-            var lastDayOfWeekInNewMonth = formattedWeek[formattedWeek.length - 1].date;
-            var prevMonthControl = (0, useCalendarControls_1.getSourceCalendarControl)(DateControlType_1["default"].PREV_ONE);
-            prevMonthControl.click();
-            forceUpdateWeekOnMonthChange(lastDayOfWeekInNewMonth);
-        }
-        else {
-            var firstDayOfWeekInNewMonth = formattedWeek[0].date;
-            var nextMonthControl = (0, useCalendarControls_1.getSourceCalendarControl)(DateControlType_1["default"].NEXT_ONE);
-            nextMonthControl.click();
-            forceUpdateWeekOnMonthChange(firstDayOfWeekInNewMonth);
-        }
-    }, [currentMonthDate, forceUpdateWeekOnMonthChange]);
-    var setNextWeek = react_1["default"].useCallback(function () {
-        var lastDayOfWeek = currentWeek[currentWeek.length - 1].date;
-        lastDayOfWeek.setDate(lastDayOfWeek.getDate() + ONE_DAY);
-        var formattedNextWeek = getFormattedWeekFromDate(lastDayOfWeek);
-        setCurrentWeek(formattedNextWeek);
-        changeMonthAfterWeekChanged(formattedNextWeek);
-    }, [currentWeek, changeMonthAfterWeekChanged]);
-    var setPrevWeek = react_1["default"].useCallback(function () {
-        var firstDayOfWeek = currentWeek[0].date;
-        firstDayOfWeek.setDate(firstDayOfWeek.getDate() - ONE_DAY);
-        var formattedPrevWeek = getFormattedWeekFromDate(firstDayOfWeek);
-        setCurrentWeek(formattedPrevWeek);
-        changeMonthAfterWeekChanged(formattedPrevWeek);
-    }, [currentWeek, changeMonthAfterWeekChanged]);
-    return {
-        currentWeek: currentWeek,
-        weekControls: (_a = {},
-            _a[DateControlType_1["default"].NEXT_DOUBLE] = DateControlType_1["default"].NEXT_ONE,
-            _a[DateControlType_1["default"].NEXT_ONE] = setNextWeek,
-            _a[DateControlType_1["default"].PREV_ONE] = setPrevWeek,
-            _a[DateControlType_1["default"].PREV_DOUBLE] = DateControlType_1["default"].PREV_ONE,
-            _a),
-        forceUpdateWeekOnMonthChange: forceUpdateWeekOnMonthChange
-    };
-};
-exports["default"] = useWeekCalendar;