@steroidsjs/core 3.0.16 → 3.0.17

package/docs-autogen-result.json

@@ -4170,6 +4170,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "renderLoading",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "any",
+                    "example": null,
+                    "parameters": []
+                },
                 {
                     "name": "renderPagination",
                     "decorators": [],
@@ -6892,6 +6901,24 @@
                             "example": null
                         }
                     ]
+                },
+                {
+                    "name": "onTodayButtonClick",
+                    "decorators": [],
+                    "description": "Callback вызываемый при нажатии на кнопку 'Сегодня'",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": [
+                        {
+                            "name": "newDate",
+                            "decorators": [],
+                            "description": "текущая дата\n",
+                            "required": true,
+                            "type": "Date",
+                            "example": null
+                        }
+                    ]
                 }
             ]
         },
@@ -7092,6 +7119,24 @@
                         }
                     ]
                 },
+                {
+                    "name": "onTodayButtonClick",
+                    "decorators": [],
+                    "description": "Callback вызываемый при нажатии на кнопку 'Сегодня'",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": [
+                        {
+                            "name": "newDate",
+                            "decorators": [],
+                            "description": "текущая дата\n",
+                            "required": true,
+                            "type": "Date",
+                            "example": null
+                        }
+                    ]
+                },
                 {
                     "name": "toggleCaptionPanel",
                     "decorators": [],
@@ -7541,6 +7586,15 @@
                     "example": null,
                     "defaultValue": null
                 },
+                {
+                    "name": "asideCalendarProps",
+                    "decorators": [],
+                    "description": "Дополнительные свойства для бокового календаря",
+                    "required": false,
+                    "type": "ICalendarProps",
+                    "example": null,
+                    "defaultValue": null
+                },
                 {
                     "name": "calendarModalProps",
                     "decorators": [],
@@ -7562,7 +7616,7 @@
                 {
                     "name": "dayGrid",
                     "decorators": [],
-                    "description": "Свойства для сетки  дня",
+                    "description": "Свойства для сетки дня",
                     "required": false,
                     "type": "IGridViews",
                     "example": null,
@@ -7589,7 +7643,7 @@
                 {
                     "name": "monthGrid",
                     "decorators": [],
-                    "description": "Свойства для сетки  месяца",
+                    "description": "Свойства для сетки месяца",
                     "required": false,
                     "type": "IGridViews",
                     "example": null,
@@ -7625,7 +7679,7 @@
                 {
                     "name": "weekGrid",
                     "decorators": [],
-                    "description": "Свойства для сетки  недели",
+                    "description": "Свойства для сетки недели",
                     "required": false,
                     "type": "IGridViews",
                     "example": null,
@@ -7636,7 +7690,7 @@
                 {
                     "name": "onChangeCalendarType",
                     "decorators": [],
-                    "description": "Функция, которая вызовется при смене типа календаря",
+                    "description": "Функция, которая вызывется при смене типа календаря",
                     "required": false,
                     "type": "void",
                     "example": null,
@@ -7662,7 +7716,7 @@
             "defaultProps": null,
             "extends": [
                 "Pick<ICalendarSystemProps",
-                "'className' | 'style' | 'additionalViewProps' | 'users'>"
+                "'className' | 'style' | 'additionalViewProps' | 'users' | 'asideCalendarProps'>"
             ],
             "properties": [
                 {
@@ -7673,6 +7727,14 @@
                     "type": "Record",
                     "example": null
                 },
+                {
+                    "name": "asideCalendarProps",
+                    "decorators": [],
+                    "description": "Дополнительные свойства для бокового календаря",
+                    "required": false,
+                    "type": "ICalendarProps",
+                    "example": null
+                },
                 {
                     "name": "calendarType",
                     "decorators": [],
@@ -35000,6 +35062,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "renderLoading",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "any",
+                    "example": null,
+                    "parameters": []
+                },
                 {
                     "name": "renderPagination",
                     "decorators": [],
@@ -35653,6 +35724,15 @@
                         }
                     ]
                 },
+                {
+                    "name": "renderLoading",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "any",
+                    "example": null,
+                    "parameters": []
+                },
                 {
                     "name": "renderPagination",
                     "decorators": [],

package/en.json

@@ -988,9 +988,10 @@
     "Количество элементов на странице, используется для корректного отображения пагинации": "",
     "Параметры роутинга": "",
     "Сохранение в localStorage уровней вложенности.": "",
-    "Свойства для сетки  дня": "",
-    "Свойства для сетки  месяца": "",
-    "Свойства для сетки  недели": "",
+    "Дополнительные свойства для бокового календаря": "",
+    "Свойства для сетки дня": "",
+    "Свойства для сетки месяца": "",
+    "Свойства для сетки недели": "",
     "Конечная дата": "",
     "Начальная дата": "",
     "Дополнительные данные которые попадут в дата аттрибут data-icon": "",

package/hooks/useList.d.ts

@@ -203,6 +203,7 @@ export interface IListOutput {
     layoutNamesPosition: ListControlPosition;
     renderList: (children: any) => any;
     renderEmpty: () => any;
+    renderLoading: () => any;
     renderPagination: () => any;
     renderPaginationSize: () => any;
     renderLayoutNames: () => any;

package/hooks/useList.js

@@ -57,6 +57,7 @@ var useInitial_1 = __importDefault(require("../hooks/useInitial"));
 var Pagination_1 = require("../ui/list/Pagination/Pagination");
 var PaginationSize_1 = require("../ui/list/PaginationSize/PaginationSize");
 var Empty_1 = require("../ui/list/Empty/Empty");
+var layout_1 = require("../ui/layout");
 exports.defaultConfig = {
     actionMethod: 'get',
     primaryKey: 'id',
@@ -116,12 +117,16 @@ function useList(config) {
     var list = (0, useSelector_1["default"])(function (state) { return (0, list_1.getList)(state, config.listId); });
     // Normalize sort config
     var sort = (0, exports.normalizeSortProps)(config.sort);
+    // Loading
+    var renderLoading = function () { return (list === null || list === void 0 ? void 0 : list.isLoading)
+        ? react_1["default"].createElement(layout_1.Loader, null)
+        : null; };
     // Empty
     var Empty = require('../ui/list/Empty')["default"];
     var emptyProps = (0, Empty_1.normalizeEmptyProps)(config.empty);
     var renderEmpty = function () {
         var _a;
-        if (!emptyProps.enable || (list === null || list === void 0 ? void 0 : list.isLoading) || ((_a = list === null || list === void 0 ? void 0 : list.items) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        if (!emptyProps.enable || ((_a = list === null || list === void 0 ? void 0 : list.items) === null || _a === void 0 ? void 0 : _a.length) > 0 || !(list === null || list === void 0 ? void 0 : list.isFetched)) {
             return null;
         }
         return (react_1["default"].createElement(Empty, __assign({ list: list }, emptyProps)));
@@ -129,13 +134,13 @@ function useList(config) {
     // Pagination size
     var PaginationSize = require('../ui/list/PaginationSize')["default"];
     var paginationSizeProps = (0, PaginationSize_1.normalizePaginationSizeProps)(config.paginationSize);
-    var renderPaginationSize = function () { return paginationSizeProps.enable
+    var renderPaginationSize = function () { return paginationSizeProps.enable && (list === null || list === void 0 ? void 0 : list.isFetched)
         ? (react_1["default"].createElement(PaginationSize, __assign({ list: list }, paginationSizeProps)))
         : null; };
     // Pagination
     var Pagination = require('../ui/list/Pagination')["default"];
     var paginationProps = (0, Pagination_1.normalizePaginationProps)(config.pagination);
-    var renderPagination = function () { return paginationProps.enable
+    var renderPagination = function () { return paginationProps.enable && (list === null || list === void 0 ? void 0 : list.isFetched)
         ? (react_1["default"].createElement(Pagination, __assign({ list: list }, paginationProps, { sizeAttribute: paginationSizeProps.attribute })))
         : null; };
     // Layout switcher
@@ -284,6 +289,7 @@ function useList(config) {
         paginationSizePosition: paginationSizeProps.position,
         layoutNamesPosition: layoutNamesProps.position,
         renderList: renderList,
+        renderLoading: renderLoading,
         renderEmpty: renderEmpty,
         renderPagination: renderPagination,
         renderPaginationSize: renderPaginationSize,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steroidsjs/core",
-    "version": "3.0.16",
+    "version": "3.0.17",
     "description": "",
     "author": "Vladimir Kozhin <hello@kozhindev.com>",
     "repository": {

package/ui/content/Calendar/Calendar.d.ts

@@ -45,6 +45,11 @@ export interface ICalendarProps extends IUiComponent {
      * Отображать Footer для календаря (содержит todayButton)
      */
     showFooter?: boolean;
+    /**
+     * Callback вызываемый при нажатии на кнопку 'Сегодня'
+     * @param newDate - текущая дата
+     */
+    onTodayButtonClick?: (newDate: Date) => void;
     /**
      * Количество отображаемых за раз месяцев
      * @example 1

package/ui/content/Calendar/Calendar.js

@@ -24,7 +24,11 @@ function Calendar(props) {
         if (props.onChange) {
             props.onChange.call(null, (0, calendar_1.convertDate)(date, null, props.valueFormat, false, true));
         }
-    }, [props.onChange, props.valueFormat]);
+        if (props.onTodayButtonClick) {
+            props.onTodayButtonClick(date);
+            setMonth(date);
+        }
+    }, [props]);
     var toggleCaptionPanel = (0, react_1.useCallback)(function () {
         setIsCaptionPanelVisible(!isCaptionPanelVisible);
     }, [isCaptionPanelVisible]);

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ICalendarProps } from '../../../ui/content/Calendar/Calendar';
 import { IModalProps } from '../../../ui/modal/Modal/Modal';
 import CalendarEnum from './enums/CalendarType';
 import { ICustomViews } from './hooks/useCustomViews';
@@ -95,7 +96,7 @@ export interface IGridViews {
  */
 export interface ICalendarSystemProps extends IUiComponent {
     /**
-    * Функция, которая вызовется при смене типа календаря
+    * Функция, которая вызывется при смене типа календаря
     */
     onChangeCalendarType?: (newType: string) => void;
     /**
@@ -120,15 +121,15 @@ export interface ICalendarSystemProps extends IUiComponent {
         eventGroups: IEventGroup[];
     };
     /**
-    * Свойства для сетки  дня
+    * Свойства для сетки дня
     */
     dayGrid?: IGridViews;
     /**
-    * Свойства для сетки  недели
+    * Свойства для сетки недели
     */
     weekGrid?: IGridViews;
     /**
-    * Свойства для сетки  месяца
+    * Свойства для сетки месяца
     */
     monthGrid?: IGridViews;
     users: ICalendarUser[];
@@ -136,9 +137,13 @@ export interface ICalendarSystemProps extends IUiComponent {
     * Дополнительные свойства, которые передаются во view компонента
     */
     additionalViewProps?: Record<string, any>;
+    /**
+     * Дополнительные свойства для бокового календаря
+     */
+    asideCalendarProps?: ICalendarProps;
     [key: string]: any;
 }
-export interface ICalendarSystemViewProps extends Pick<ICalendarSystemProps, 'className' | 'style' | 'additionalViewProps' | 'users'> {
+export interface ICalendarSystemViewProps extends Pick<ICalendarSystemProps, 'className' | 'style' | 'additionalViewProps' | 'users' | 'asideCalendarProps'> {
     onCalendarChangedMonth: (newDate: Date) => void;
     eventGroups: IEventGroup[];
     eventGroupsTitle: string;

package/ui/content/CalendarSystem/CalendarSystem.js

@@ -36,6 +36,7 @@ function CalendarSystem(props) {
         additionalViewProps: props.additionalViewProps,
         users: calendarSystem.users,
         eventGroupsTitle: props.eventBlock.title,
+        asideCalendarProps: props.asideCalendarProps,
         dateToDisplay: calendarSystem.dateToDisplay,
         eventGroups: calendarSystem.innerEventGroups,
         calendarType: calendarSystem.calendarType,
@@ -50,7 +51,7 @@ function CalendarSystem(props) {
         monthGridProps: __assign({ monthGridWeekDays: calendarSystem.monthGridWeekDays, monthGridCalendarDays: calendarSystem.monthGridCalendarDays }, monthGridViews),
         weekGridProps: __assign({ weekGridTwentyFourHoursArray: calendarSystem.weekGridTwentyFourHoursArray, weekGridCurrentWeekDays: calendarSystem.weekGridCurrentWeekDays }, weekGridViews),
         dayGridProps: __assign({ dayGridTwentyFourHoursArray: calendarSystem.dayGridTwentyFourHoursArray, dayGridCurrentDay: calendarSystem.dayGridCurrentDay }, dayGridViews)
-    }); }, [props.className, props.style, props.additionalViewProps, props.eventBlock.title, calendarSystem, monthGridViews, weekGridViews, dayGridViews]);
+    }); }, [props.className, props.style, props.additionalViewProps, props.eventBlock.title, props.asideCalendarProps, calendarSystem, monthGridViews, weekGridViews, dayGridViews]);
     return components.ui.renderView(props.view || 'content.CalendarSystemView', viewProps);
 }
 exports["default"] = CalendarSystem;

package/ui/list/Grid/Grid.d.ts

@@ -192,6 +192,7 @@ export interface IGridViewProps extends Omit<IGridProps, 'onFetch'> {
     layoutNamesPosition: ListControlPosition;
     renderList: (children: any) => any;
     renderEmpty: () => any;
+    renderLoading: () => any;
     renderPagination: () => any;
     renderPaginationSize: () => any;
     renderLayoutNames: () => any;

package/ui/list/Grid/Grid.js

@@ -69,7 +69,7 @@ function Grid(props) {
         initialItems: props.initialItems,
         initialTotal: props.initialTotal,
         autoFetchOnFormChanges: props.autoFetchOnFormChanges
-    }), list = _a.list, model = _a.model, searchModel = _a.searchModel, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm, onFetch = _a.onFetch, onSort = _a.onSort;
+    }), list = _a.list, model = _a.model, searchModel = _a.searchModel, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderLoading = _a.renderLoading, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm, onFetch = _a.onFetch, onSort = _a.onSort;
     var renderLabel = (0, react_1.useCallback)(function (column) {
         if (column.headerView) {
             var HeaderView = column.headerView;
@@ -124,6 +124,7 @@ function Grid(props) {
         paginationSizePosition: paginationSizePosition,
         layoutNamesPosition: layoutNamesPosition,
         renderList: renderList,
+        renderLoading: renderLoading,
         renderEmpty: renderEmpty,
         renderPagination: renderPagination,
         renderPaginationSize: renderPaginationSize,
@@ -143,7 +144,7 @@ function Grid(props) {
         primaryKey: props.primaryKey
     }); }, [columns, layoutNamesPosition, list, onFetch, onSort, paginationPosition, paginationSizePosition, props.className,
         props.hasAlternatingColors, props.isLoading, props.listId, props.primaryKey, props.searchForm, props.size, renderEmpty,
-        renderLayoutNames, renderList, renderPagination, renderPaginationSize, renderSearchForm, renderValue]);
+        renderLayoutNames, renderList, renderPagination, renderPaginationSize, renderSearchForm, renderValue, renderLoading]);
     return components.ui.renderView(props.view || 'list.GridView', viewProps);
 }
 exports["default"] = Grid;

package/ui/list/List/List.js

@@ -67,7 +67,7 @@ function List(props) {
         initialItems: props.initialItems,
         initialTotal: props.initialTotal,
         autoFetchOnFormChanges: props.autoFetchOnFormChanges
-    }), list = _a.list, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm;
+    }), list = _a.list, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderLoading = _a.renderLoading, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm;
     var ItemView = props.itemView || components.ui.getView('list.ListItemView');
     var content = ((list === null || list === void 0 ? void 0 : list.items) || []).map(function (item, index) { return (React.createElement(ItemView, __assign({}, props.itemProps, { key: item[props.primaryKey] || index, primaryKey: props.primaryKey, item: item, index: index, layoutSelected: list.layoutName }))); });
     var viewProps = (0, react_1.useMemo)(function () { return ({
@@ -76,6 +76,7 @@ function List(props) {
         paginationSizePosition: paginationSizePosition,
         layoutNamesPosition: layoutNamesPosition,
         renderList: renderList,
+        renderLoading: renderLoading,
         renderEmpty: renderEmpty,
         renderPagination: renderPagination,
         renderPaginationSize: renderPaginationSize,
@@ -86,7 +87,7 @@ function List(props) {
         className: props.className,
         contentClassName: props.contentClassName
     }); }, [content, layoutNamesPosition, list, paginationPosition, paginationSizePosition, props.className, props.contentClassName,
-        props.isLoading, renderEmpty, renderLayoutNames, renderList, renderPagination, renderPaginationSize, renderSearchForm]);
+        props.isLoading, renderEmpty, renderLayoutNames, renderList, renderPagination, renderPaginationSize, renderSearchForm, renderLoading]);
     return components.ui.renderView(props.view || 'list.ListView', viewProps);
 }
 exports["default"] = List;