@steroidsjs/core 2.2.83 → 2.2.86

package/hooks/useApplication.d.ts

@@ -8,6 +8,7 @@ import { IComponents } from '../providers/ComponentsProvider';
 import { IRouteItem } from '../ui/nav/Router/Router';
 import MetricsComponent from '../components/MetricsComponent';
 import { IScreenProviderProps } from '../providers/ScreenProvider';
+import { IFetchConfig } from '../hooks/useFetch';
 /**
  * Application HOC
  * Обертка над корневым компонентом приложения, используется только в `Application.tsx`. Добавляет через React Context
@@ -27,6 +28,10 @@ export interface IApplicationHookConfig {
     layoutView?: () => CustomView;
     layoutProps?: Record<string, unknown>;
     screen?: boolean | Omit<IScreenProviderProps, 'children'>;
+    /**
+     * These fetch configurations will be used to preload and store for no matter what route matched in case of SSR
+     */
+    defaultFetches?: IFetchConfig[];
 }
 export interface IApplicationHookResult {
     renderApplication: (children?: any) => JSX.Element;

package/package.json

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

package/ui/list/Pagination/Pagination.js

@@ -75,11 +75,15 @@ function Pagination(props) {
     }) || initialValues, page = _e.page, pageSize = _e.pageSize;
     var totalPages = Math.ceil((((_c = props.list) === null || _c === void 0 ? void 0 : _c.total) || 0) / (pageSize || 1));
     var pages = react_1.useMemo(function () { return exports.generatePages(page, totalPages, props.aroundCount)
-        .map(function (pageItem) { return ({
-        page: pageItem !== '...' ? pageItem : null,
-        label: pageItem,
-        isActive: page === pageItem
-    }); }); }, [page, props.aroundCount, totalPages]);
+        .map(function (pageItem, index, pages) {
+        // Номер страницы для '...' кнопки (выбирает страницу между двумя соседними пронумерованными)
+        var pageNumberForButtonWithDots = Math.floor(((pages[index + 1] + pages[index - 1]) / 2));
+        return {
+            page: pageItem !== '...' ? pageItem : pageNumberForButtonWithDots,
+            label: pageItem,
+            isActive: page === pageItem
+        };
+    }); }, [page, props.aroundCount, totalPages]);
     var onSelect = react_1.useCallback(function (newPage) {
         if (formDispatch) {
             formDispatch(form_1.formChange(formId, props.attribute, newPage));

package/utils/form.js

@@ -64,7 +64,7 @@ var mergeLayoutProp = function (layout1, layout2) {
 exports.mergeLayoutProp = mergeLayoutProp;
 var cleanEmptyObject = function (object) {
     // if all properties are null substitute the object with null
-    if (!Object.values(object).some(function (x) { return x; })) {
+    if (!Object.values(object).some(function (x) { return x !== null; })) {
         return null;
     }
     Object.keys(object).forEach(function (key) {