@steroidsjs/core 3.0.0-beta.112 → 3.0.0-beta.114

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

@@ -1,5 +1,5 @@
-import * as React from 'react';
-import { IPreparedTreeItem, ITreeConfig } from '../../../hooks/useTree';
+import React from 'react';
+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;