@snack-uikit/table 0.37.1 → 0.37.2

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 0.37.2 (2025-09-03)
+
+
+### Bug Fixes
+
+* **FF-6982:** conditions in helpers for table state transform ([446f89c](https://github.com/cloud-ru-tech/snack-uikit/commit/446f89c2ea785a99507e36b398cbfe5326162c3f))
+
+
+
+
+
 ## 0.37.1 (2025-09-03)
 
 

package/README.md

@@ -109,8 +109,8 @@ const columnDefinitions: ColumnDefinition<TableData>[] = [
 ### Props
 | name | type | default value | description |
 |------|------|---------------|-------------|
-| sorting* | `SortingState` | - |  |
-| pagination* | `PaginationState` | - |  |
+| pagination | `PaginationState \| PaginationParams` | - |  |
+| sorting | `SortingState` | - |  |
 ## Table
 Компонент таблицы
 ### Props

package/dist/cjs/components/Table/utils/saveTableState/mappers.d.ts

@@ -4,12 +4,12 @@ import { FiltersState } from '@snack-uikit/chips';
 import { PersistedFilterState } from '@snack-uikit/toolbar';
 export declare const mapPaginationToTableState: (value?: RequestPayloadParams["pagination"]) => PaginationState;
 export declare const mapSortToTableState: (value?: RequestPayloadParams["sort"]) => SortingState;
-export declare const mapPaginationToRequestPayload: (value: PaginationState) => RequestPayloadParams["pagination"];
-export declare const mapSortToRequestPayload: (value: SortingState) => RequestPayloadParams["sort"];
+export declare const mapPaginationToRequestPayload: (value?: PaginationState | RequestPayloadParams["pagination"]) => RequestPayloadParams["pagination"];
+export declare const mapSortToRequestPayload: (value?: SortingState) => RequestPayloadParams["sort"];
 /** Вспомогательная функция для преобразования состояния таблицы к формату RequestPayloadParams */
-export declare const formatTableStateToRequestPayload: <T extends FiltersState>(state: Omit<PersistedFilterState<T>, "pagination" | "sorting"> & {
-    pagination: PaginationState;
-    sorting: SortingState;
+export declare const formatTableStateToRequestPayload: <T extends FiltersState>({ pagination, sorting, search, filter, }: Omit<PersistedFilterState<T>, "pagination" | "sorting"> & {
+    pagination?: PaginationState | RequestPayloadParams["pagination"];
+    sorting?: SortingState;
 }) => {
     toObject(): Partial<RequestPayloadParams>;
     toString(): string;

package/dist/cjs/components/Table/utils/saveTableState/mappers.js

@@ -27,19 +27,35 @@ const mapSortToTableState = function () {
   }));
 };
 exports.mapSortToTableState = mapSortToTableState;
-const mapPaginationToRequestPayload = value => ({
-  limit: value.pageSize,
-  offset: value.pageSize > 1 ? value.pageSize * value.pageIndex : 0
-});
+const mapPaginationToRequestPayload = value => {
+  if (!value) return undefined;
+  if ('limit' in value || 'offset' in value) {
+    return value;
+  }
+  return {
+    limit: value.pageSize,
+    offset: value.pageIndex > 1 ? value.pageSize * value.pageIndex : 0
+  };
+};
 exports.mapPaginationToRequestPayload = mapPaginationToRequestPayload;
-const mapSortToRequestPayload = value => (value === null || value === void 0 ? void 0 : value.map(column => ({
+const mapSortToRequestPayload = value => value === null || value === void 0 ? void 0 : value.map(column => ({
   field: column.id,
   direction: column.desc ? 'd' : 'a'
-}))) || [];
+}));
 exports.mapSortToRequestPayload = mapSortToRequestPayload;
 /** Вспомогательная функция для преобразования состояния таблицы к формату RequestPayloadParams */
-const formatTableStateToRequestPayload = state => (0, toolbar_1.formatFilterStateToRequestPayload)(Object.assign(Object.assign({}, state), {
-  pagination: (0, exports.mapPaginationToRequestPayload)(state.pagination),
-  sorting: (0, exports.mapSortToRequestPayload)(state.sorting)
-}));
+const formatTableStateToRequestPayload = _ref => {
+  let {
+    pagination,
+    sorting,
+    search,
+    filter
+  } = _ref;
+  return (0, toolbar_1.formatFilterStateToRequestPayload)({
+    filter,
+    search,
+    pagination: (0, exports.mapPaginationToRequestPayload)(pagination),
+    sorting: (0, exports.mapSortToRequestPayload)(sorting)
+  });
+};
 exports.formatTableStateToRequestPayload = formatTableStateToRequestPayload;

package/dist/esm/components/Table/utils/saveTableState/mappers.d.ts

@@ -4,12 +4,12 @@ import { FiltersState } from '@snack-uikit/chips';
 import { PersistedFilterState } from '@snack-uikit/toolbar';
 export declare const mapPaginationToTableState: (value?: RequestPayloadParams["pagination"]) => PaginationState;
 export declare const mapSortToTableState: (value?: RequestPayloadParams["sort"]) => SortingState;
-export declare const mapPaginationToRequestPayload: (value: PaginationState) => RequestPayloadParams["pagination"];
-export declare const mapSortToRequestPayload: (value: SortingState) => RequestPayloadParams["sort"];
+export declare const mapPaginationToRequestPayload: (value?: PaginationState | RequestPayloadParams["pagination"]) => RequestPayloadParams["pagination"];
+export declare const mapSortToRequestPayload: (value?: SortingState) => RequestPayloadParams["sort"];
 /** Вспомогательная функция для преобразования состояния таблицы к формату RequestPayloadParams */
-export declare const formatTableStateToRequestPayload: <T extends FiltersState>(state: Omit<PersistedFilterState<T>, "pagination" | "sorting"> & {
-    pagination: PaginationState;
-    sorting: SortingState;
+export declare const formatTableStateToRequestPayload: <T extends FiltersState>({ pagination, sorting, search, filter, }: Omit<PersistedFilterState<T>, "pagination" | "sorting"> & {
+    pagination?: PaginationState | RequestPayloadParams["pagination"];
+    sorting?: SortingState;
 }) => {
     toObject(): Partial<RequestPayloadParams>;
     toString(): string;

package/dist/esm/components/Table/utils/saveTableState/mappers.js

@@ -13,13 +13,25 @@ export const mapSortToTableState = (value = []) => value.map(column => ({
     id: column.field,
     desc: column.direction === 'd',
 }));
-export const mapPaginationToRequestPayload = (value) => ({
-    limit: value.pageSize,
-    offset: value.pageSize > 1 ? value.pageSize * value.pageIndex : 0,
-});
-export const mapSortToRequestPayload = (value) => (value === null || value === void 0 ? void 0 : value.map(column => ({
+export const mapPaginationToRequestPayload = (value) => {
+    if (!value)
+        return undefined;
+    if ('limit' in value || 'offset' in value) {
+        return value;
+    }
+    return {
+        limit: value.pageSize,
+        offset: value.pageIndex > 1 ? value.pageSize * value.pageIndex : 0,
+    };
+};
+export const mapSortToRequestPayload = (value) => value === null || value === void 0 ? void 0 : value.map(column => ({
     field: column.id,
     direction: (column.desc ? 'd' : 'a'),
-}))) || [];
+}));
 /** Вспомогательная функция для преобразования состояния таблицы к формату RequestPayloadParams */
-export const formatTableStateToRequestPayload = (state) => formatFilterStateToRequestPayload(Object.assign(Object.assign({}, state), { pagination: mapPaginationToRequestPayload(state.pagination), sorting: mapSortToRequestPayload(state.sorting) }));
+export const formatTableStateToRequestPayload = ({ pagination, sorting, search, filter, }) => formatFilterStateToRequestPayload({
+    filter,
+    search,
+    pagination: mapPaginationToRequestPayload(pagination),
+    sorting: mapSortToRequestPayload(sorting),
+});

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Table",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -66,5 +66,5 @@
   "peerDependencies": {
     "@snack-uikit/locale": "*"
   },
-  "gitHead": "e709f1d1c76cd74c446b5cfdbeeb546112aae4ad"
+  "gitHead": "d19049c7017c7753cc6d261afebf555e1aa76661"
 }

package/src/components/Table/utils/saveTableState/mappers.ts

@@ -23,26 +23,40 @@ export const mapSortToTableState = (value: RequestPayloadParams['sort'] = []): S
     desc: column.direction === 'd',
   }));
 
-export const mapPaginationToRequestPayload = (value: PaginationState): RequestPayloadParams['pagination'] => ({
-  limit: value.pageSize,
-  offset: value.pageSize > 1 ? value.pageSize * value.pageIndex : 0,
-});
+export const mapPaginationToRequestPayload = (
+  value?: PaginationState | RequestPayloadParams['pagination'],
+): RequestPayloadParams['pagination'] => {
+  if (!value) return undefined;
 
-export const mapSortToRequestPayload = (value: SortingState): RequestPayloadParams['sort'] =>
+  if ('limit' in value || 'offset' in value) {
+    return value;
+  }
+
+  return {
+    limit: value.pageSize,
+    offset: value.pageIndex > 1 ? value.pageSize * value.pageIndex : 0,
+  };
+};
+
+export const mapSortToRequestPayload = (value?: SortingState): RequestPayloadParams['sort'] =>
   value?.map(column => ({
     field: column.id,
     direction: (column.desc ? 'd' : 'a') as SortDirection,
-  })) || [];
+  }));
 
 /** Вспомогательная функция для преобразования состояния таблицы к формату RequestPayloadParams */
-export const formatTableStateToRequestPayload = <T extends FiltersState>(
-  state: Omit<PersistedFilterState<T>, 'pagination' | 'sorting'> & {
-    pagination: PaginationState;
-    sorting: SortingState;
-  },
-) =>
+export const formatTableStateToRequestPayload = <T extends FiltersState>({
+  pagination,
+  sorting,
+  search,
+  filter,
+}: Omit<PersistedFilterState<T>, 'pagination' | 'sorting'> & {
+  pagination?: PaginationState | RequestPayloadParams['pagination'];
+  sorting?: SortingState;
+}) =>
   formatFilterStateToRequestPayload({
-    ...state,
-    pagination: mapPaginationToRequestPayload(state.pagination),
-    sorting: mapSortToRequestPayload(state.sorting),
+    filter,
+    search,
+    pagination: mapPaginationToRequestPayload(pagination),
+    sorting: mapSortToRequestPayload(sorting),
   });