@astral/ui 0.41.2 → 0.41.3

package/DataGrid/DataGridHeadColumn/styled.js

@@ -13,17 +13,17 @@ exports.StyledTableSortLabel = (0, styles_1.styled)(Table_1.TableSortLabel)(temp
 });
 exports.StyledTableCell = (0, styles_1.styled)(Table_1.TableCell, {
     shouldForwardProp: function (prop) { return prop !== 'width'; },
-})(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  width: ", ";\n\n  cursor: ", ";\n  padding: ", ";\n  color: ", ";\n  user-select: none;\n"], ["\n  width: ", ";\n\n  cursor: ", ";\n  padding: ", ";\n  color: ", ";\n  user-select: none;\n"])), function (_a) {
+})(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  width: ", ";\n  padding: ", ";\n\n  color: ", ";\n\n  cursor: ", ";\n\n  user-select: none;\n"], ["\n  width: ", ";\n  padding: ", ";\n\n  color: ", ";\n\n  cursor: ", ";\n\n  user-select: none;\n"])), function (_a) {
     var _b = _a.width, width = _b === void 0 ? 'auto' : _b;
     return width;
-}, function (_a) {
-    var sortable = _a.sortable;
-    return (sortable ? 'pointer' : 'initial');
 }, function (_a) {
     var theme = _a.theme;
     return theme.spacing(3, 4);
 }, function (_a) {
     var theme = _a.theme;
     return theme.palette.grey[700];
+}, function (_a) {
+    var sortable = _a.sortable;
+    return (sortable ? 'pointer' : 'initial');
 });
 var templateObject_1, templateObject_2;

package/DataGridPagination/DataGridPagination.d.ts

@@ -1,3 +1,17 @@
 /// <reference types="react" />
-import { DataGridPaginationProps } from './types';
+import { PaginationProps } from '../Pagination';
+export declare type DataGridPaginationProps = Omit<PaginationProps, 'count'> & {
+    /**
+     * Количество всех записей
+     */
+    totalCount: number;
+    /**
+     * Количество записей на страницу
+     */
+    rowsPerPage?: number;
+    /**
+     * Текущая страница
+     */
+    page: number;
+};
 export declare const DataGridPagination: ({ page, rowsPerPage, totalCount, className, ...props }: DataGridPaginationProps) => JSX.Element;

package/DataGridPagination/DataGridPagination.js

@@ -30,8 +30,8 @@ var styled_1 = require("./styled");
 var DataGridPagination = function (_a) {
     var page = _a.page, _b = _a.rowsPerPage, rowsPerPage = _b === void 0 ? 10 : _b, totalCount = _a.totalCount, className = _a.className, props = __rest(_a, ["page", "rowsPerPage", "totalCount", "className"]);
     var count = Math.ceil(totalCount / rowsPerPage);
-    var rangeStart = (0, react_1.useMemo)(function () { return page * rowsPerPage; }, [page]);
-    var rangeEnd = (0, react_1.useMemo)(function () { return page * rowsPerPage + rowsPerPage; }, [page]);
+    var rangeStart = (0, react_1.useMemo)(function () { return (page - 1) * rowsPerPage + 1; }, [page, rowsPerPage]);
+    var rangeEnd = (0, react_1.useMemo)(function () { return (page - 1) * rowsPerPage + rowsPerPage; }, [page, rowsPerPage]);
     var formattedRange = "".concat(rangeStart, " \u2014 ").concat(rangeEnd, " \u0438\u0437 ").concat(totalCount, " \u0437\u0430\u043F\u0438\u0441\u0435\u0439");
     return ((0, jsx_runtime_1.jsxs)(styled_1.PaginationWrapper, __assign({ className: className }, { children: [(0, jsx_runtime_1.jsx)(styled_1.Range, __assign({ variant: "h6" }, { children: formattedRange })), (0, jsx_runtime_1.jsx)(Pagination_1.Pagination, __assign({ count: count }, props))] })));
 };

package/DataGridPagination/index.d.ts

@@ -1,2 +1 @@
 export * from './DataGridPagination';
-export * from './types';

package/DataGridPagination/index.js

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./DataGridPagination"), exports);
-__exportStar(require("./types"), exports);

package/esm/DataGrid/DataGridHeadColumn/styled.js

@@ -10,17 +10,17 @@ export var StyledTableSortLabel = styled(TableSortLabel)(templateObject_1 || (te
 });
 export var StyledTableCell = styled(TableCell, {
     shouldForwardProp: function (prop) { return prop !== 'width'; },
-})(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  width: ", ";\n\n  cursor: ", ";\n  padding: ", ";\n  color: ", ";\n  user-select: none;\n"], ["\n  width: ", ";\n\n  cursor: ", ";\n  padding: ", ";\n  color: ", ";\n  user-select: none;\n"])), function (_a) {
+})(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  width: ", ";\n  padding: ", ";\n\n  color: ", ";\n\n  cursor: ", ";\n\n  user-select: none;\n"], ["\n  width: ", ";\n  padding: ", ";\n\n  color: ", ";\n\n  cursor: ", ";\n\n  user-select: none;\n"])), function (_a) {
     var _b = _a.width, width = _b === void 0 ? 'auto' : _b;
     return width;
-}, function (_a) {
-    var sortable = _a.sortable;
-    return (sortable ? 'pointer' : 'initial');
 }, function (_a) {
     var theme = _a.theme;
     return theme.spacing(3, 4);
 }, function (_a) {
     var theme = _a.theme;
     return theme.palette.grey[700];
+}, function (_a) {
+    var sortable = _a.sortable;
+    return (sortable ? 'pointer' : 'initial');
 });
 var templateObject_1, templateObject_2;

package/esm/DataGridPagination/DataGridPagination.d.ts

@@ -1,3 +1,17 @@
 /// <reference types="react" />
-import { DataGridPaginationProps } from './types';
+import { PaginationProps } from '../Pagination';
+export declare type DataGridPaginationProps = Omit<PaginationProps, 'count'> & {
+    /**
+     * Количество всех записей
+     */
+    totalCount: number;
+    /**
+     * Количество записей на страницу
+     */
+    rowsPerPage?: number;
+    /**
+     * Текущая страница
+     */
+    page: number;
+};
 export declare const DataGridPagination: ({ page, rowsPerPage, totalCount, className, ...props }: DataGridPaginationProps) => JSX.Element;

package/esm/DataGridPagination/DataGridPagination.js

@@ -27,8 +27,8 @@ import { PaginationWrapper, Range } from './styled';
 export var DataGridPagination = function (_a) {
     var page = _a.page, _b = _a.rowsPerPage, rowsPerPage = _b === void 0 ? 10 : _b, totalCount = _a.totalCount, className = _a.className, props = __rest(_a, ["page", "rowsPerPage", "totalCount", "className"]);
     var count = Math.ceil(totalCount / rowsPerPage);
-    var rangeStart = useMemo(function () { return page * rowsPerPage; }, [page]);
-    var rangeEnd = useMemo(function () { return page * rowsPerPage + rowsPerPage; }, [page]);
+    var rangeStart = useMemo(function () { return (page - 1) * rowsPerPage + 1; }, [page, rowsPerPage]);
+    var rangeEnd = useMemo(function () { return (page - 1) * rowsPerPage + rowsPerPage; }, [page, rowsPerPage]);
     var formattedRange = "".concat(rangeStart, " \u2014 ").concat(rangeEnd, " \u0438\u0437 ").concat(totalCount, " \u0437\u0430\u043F\u0438\u0441\u0435\u0439");
     return (_jsxs(PaginationWrapper, __assign({ className: className }, { children: [_jsx(Range, __assign({ variant: "h6" }, { children: formattedRange })), _jsx(Pagination, __assign({ count: count }, props))] })));
 };

package/esm/DataGridPagination/index.d.ts

@@ -1,2 +1 @@
 export * from './DataGridPagination';
-export * from './types';

package/esm/DataGridPagination/index.js

@@ -1,2 +1 @@
 export * from './DataGridPagination';
-export * from './types';

package/esm/theme/baseTheme.js

@@ -17,5 +17,6 @@ export var createTheme = function (params) {
         components: getComponents(fontsUrls),
     };
     var muiTheme = createMuiTheme(merge({}, themeOptions, options));
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return merge(muiTheme, { elevation: elevation, shape: shape });
 };

package/esm/theme/components/MuiTypography.js

@@ -12,6 +12,7 @@ export var MuiTypography = {
         variantMapping: {
             link: 'a',
             code: 'code',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         },
     },
 };

package/esm/theme/hooks/useTheme/index.js

@@ -1,2 +1,4 @@
 import { useTheme as useEmotionTheme } from '@emotion/react';
+// any необходим для коннекта темы
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export var useTheme = function () { return useEmotionTheme(); };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "0.41.2",
+  "version": "0.41.3",
   "browser": "./src/index.ts",
   "jest": {
     "moduleNameMapper": {
@@ -8,7 +8,7 @@
     }
   },
   "dependencies": {
-    "@astral/icons": "^0.41.2",
+    "@astral/icons": "^0.41.3",
     "@emotion/cache": "11.7.1",
     "@emotion/react": "11.9.0",
     "@emotion/server": "11.4.0",

package/theme/baseTheme.js

@@ -20,6 +20,7 @@ var createTheme = function (params) {
         components: (0, components_1.getComponents)(fontsUrls),
     };
     var muiTheme = (0, styles_1.createTheme)((0, lodash_es_1.merge)({}, themeOptions, options));
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return (0, lodash_es_1.merge)(muiTheme, { elevation: elevation_1.elevation, shape: shape_1.shape });
 };
 exports.createTheme = createTheme;

package/theme/components/MuiTypography.js

@@ -15,6 +15,7 @@ exports.MuiTypography = {
         variantMapping: {
             link: 'a',
             code: 'code',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
         },
     },
 };

package/theme/hooks/useTheme/index.js

@@ -2,5 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useTheme = void 0;
 var react_1 = require("@emotion/react");
+// any необходим для коннекта темы
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 var useTheme = function () { return (0, react_1.useTheme)(); };
 exports.useTheme = useTheme;

package/DataGridPagination/types.d.ts

@@ -1,6 +0,0 @@
-import { PaginationProps } from '../Pagination';
-export declare type DataGridPaginationProps = Omit<PaginationProps, 'count'> & {
-    totalCount: number;
-    rowsPerPage?: number;
-    page: number;
-};

package/DataGridPagination/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/esm/DataGridPagination/types.d.ts

@@ -1,6 +0,0 @@
-import { PaginationProps } from '../Pagination';
-export declare type DataGridPaginationProps = Omit<PaginationProps, 'count'> & {
-    totalCount: number;
-    rowsPerPage?: number;
-    page: number;
-};

package/esm/DataGridPagination/types.js

@@ -1 +0,0 @@
-export {};