@steroidsjs/core 3.0.70 → 3.0.72

package/docs-autogen-result.json

@@ -34713,6 +34713,15 @@
                     "type": "React.ReactNode | {}",
                     "example": "MyCustomView",
                     "defaultValue": null
+                },
+                {
+                    "name": "viewProps",
+                    "decorators": [],
+                    "description": "Пропсы для отображения элемента",
+                    "required": false,
+                    "type": "any",
+                    "example": null,
+                    "defaultValue": null
                 }
             ],
             "methods": [

package/package.json

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

package/ui/form/FieldList/FieldList.js

@@ -53,6 +53,9 @@ var range_1 = __importDefault(require("lodash-es/range"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 var concat_1 = __importDefault(require("lodash-es/concat"));
 var get_1 = __importDefault(require("lodash-es/get"));
+var omit_1 = __importDefault(require("lodash-es/omit"));
+var values_1 = __importDefault(require("lodash-es/values"));
+var zipObject_1 = __importDefault(require("lodash-es/zipObject"));
 var react_use_1 = require("react-use");
 var hooks_1 = require("../../../hooks");
 var Form_1 = require("../../form/Form/Form");
@@ -66,7 +69,7 @@ function FieldList(props) {
     var context = (0, react_1.useContext)(Form_1.FormContext);
     // Resolve model
     var modelAttributes = (_a = components.meta.getModel(props.model)) === null || _a === void 0 ? void 0 : _a.attributes;
-    var isWithReduxForm = (0, hooks_1.useSelector)(function (state) { return (0, get_1["default"])(state, ['form', context.formId]) || null; });
+    var reduxFormValues = (0, hooks_1.useSelector)(function (state) { return (0, get_1["default"])(state, ['form', context.formId]) || null; });
     var dispatch = context.provider.useDispatch();
     // Mapper for preserving the correct sequence of rows on the UI
     var _b = (0, react_1.useState)((0, range_1["default"])(props.input.value) || []), storeToRowIndexMap = _b[0], setStoreToRowIndexMap = _b[1];
@@ -86,9 +89,26 @@ function FieldList(props) {
         dispatch((0, form_1.formArrayAdd)(context.formId, props.input.name, rowsCount, props.initialValues));
     }, [addRowIndexes, context.formId, dispatch, props.initialValues, props.input.name]);
     var onRemove = (0, react_1.useCallback)(function (rowIndex) {
+        var _a;
         removeRowIndex(rowIndex);
-        dispatch((0, form_1.formArrayRemove)(context.formId, props.input.name, rowIndex));
-    }, [context.formId, dispatch, props.input.name, removeRowIndex]);
+        var actions = [
+            (0, form_1.formArrayRemove)(context.formId, props.input.name, rowIndex),
+        ];
+        var listErrors = (0, get_1["default"])(reduxFormValues === null || reduxFormValues === void 0 ? void 0 : reduxFormValues.errors, props.input.name);
+        if (!(0, isEmpty_1["default"])(listErrors)) {
+            /**
+             * После удаления строки, удаляет соответствующую этой строке ошибку
+             * и обновляет индексы для последующих элементов
+             */
+            var errorsWithoutRemoved = (0, omit_1["default"])(listErrors, String(rowIndex));
+            var errorsArray = (0, values_1["default"])(errorsWithoutRemoved);
+            var errorsForList = (0, zipObject_1["default"])((0, range_1["default"])(errorsArray.length), errorsArray);
+            var newTotalErrors = __assign(__assign({}, reduxFormValues.errors), (_a = {}, _a[props.input.name] = errorsForList, _a));
+            // @ts-ignore
+            actions.push((0, form_1.formSetErrors)(context.formId, newTotalErrors));
+        }
+        dispatch(actions);
+    }, [context.formId, dispatch, reduxFormValues === null || reduxFormValues === void 0 ? void 0 : reduxFormValues.errors, props.input.name, removeRowIndex]);
     (0, react_use_1.useMount)(function () {
         // Add initial rows
         if (!props.input.value) {
@@ -140,7 +160,7 @@ function FieldList(props) {
     var FieldListView = props.view || components.ui.getView('form.FieldListView');
     var FieldListItemView = props.itemView || components.ui.getView('form.FieldListItemView');
     return (react_1["default"].createElement(Form_1.FormContext.Provider, { value: contextValue },
-        react_1["default"].createElement(FieldListView, __assign({}, viewProps), !(0, isEmpty_1["default"])(storeToRowIndexMap) && (0, range_1["default"])(props.input.value || 0).map(function (index) { return (react_1["default"].createElement(FieldListItemView, __assign({}, itemViewProps, { key: isWithReduxForm ? storeToRowIndexMap[index] : index, prefix: props.input.name + '.' + index, rowIndex: index }))); }))));
+        react_1["default"].createElement(FieldListView, __assign({}, viewProps), !(0, isEmpty_1["default"])(storeToRowIndexMap) && (0, range_1["default"])(props.input.value || 0).map(function (index) { return (react_1["default"].createElement(FieldListItemView, __assign({}, itemViewProps, { key: reduxFormValues ? storeToRowIndexMap[index] : index, prefix: props.input.name + '.' + index, rowIndex: index }))); }))));
 }
 FieldList.defaultProps = {
     initialValues: null,

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

@@ -138,6 +138,10 @@ export interface IGridProps extends IListConfig {
      * @example MyCustomView
      */
     view?: CustomView;
+    /**
+     * Пропсы для отображения элемента
+     */
+    viewProps?: CustomViewProps;
     /**
      * Коллекция с наименованиями и свойствами колонок в таблице
      * @example

package/ui/list/Grid/Grid.js

@@ -119,36 +119,10 @@ function Grid(props) {
         .map(function (column) { return ((0, isString_1["default"])(column) ? { attribute: column } : column); })
         .filter(function (column) { return column.visible !== false; })
         .map(function (column) { return (__assign(__assign({}, column), { label: renderLabel(column) })); }); }, [props.columns, props.controls, props.itemsIndexing, renderLabel]);
-    var viewProps = (0, react_1.useMemo)(function () { return ({
-        list: list,
-        paginationPosition: paginationPosition,
-        paginationSizePosition: paginationSizePosition,
-        layoutNamesPosition: layoutNamesPosition,
-        renderList: renderList,
-        renderLoading: renderLoading,
-        renderEmpty: renderEmpty,
-        renderPagination: renderPagination,
-        renderPaginationSize: renderPaginationSize,
-        renderLayoutNames: renderLayoutNames,
-        renderSearchForm: renderSearchForm,
-        renderInfiniteScroll: renderInfiniteScroll,
-        renderValue: renderValue,
-        columns: columns,
-        onFetch: onFetch,
-        onSort: onSort,
-        sort: sort,
-        items: (list === null || list === void 0 ? void 0 : list.items) || [],
-        searchForm: props.searchForm,
-        listId: props.listId,
-        isLoading: props.isLoading,
-        size: props.size,
-        hasAlternatingColors: props.hasAlternatingColors,
-        className: props.className,
-        primaryKey: props.primaryKey
-    }); }, [list, paginationPosition, paginationSizePosition, layoutNamesPosition, renderList, renderLoading, renderEmpty,
-        renderPagination, renderPaginationSize, renderLayoutNames, renderSearchForm, renderInfiniteScroll, renderValue, columns,
-        onFetch, onSort, sort, props.searchForm, props.listId, props.isLoading, props.size, props.hasAlternatingColors, props.className,
-        props.primaryKey]);
+    var viewProps = (0, react_1.useMemo)(function () { return (__assign(__assign({}, props.viewProps), { list: list, paginationPosition: paginationPosition, paginationSizePosition: paginationSizePosition, layoutNamesPosition: layoutNamesPosition, renderList: renderList, renderLoading: renderLoading, renderEmpty: renderEmpty, renderPagination: renderPagination, renderPaginationSize: renderPaginationSize, renderLayoutNames: renderLayoutNames, renderSearchForm: renderSearchForm, renderInfiniteScroll: renderInfiniteScroll, renderValue: renderValue, columns: columns, onFetch: onFetch, onSort: onSort, sort: sort, items: (list === null || list === void 0 ? void 0 : list.items) || [], searchForm: props.searchForm, listId: props.listId, isLoading: props.isLoading, size: props.size, hasAlternatingColors: props.hasAlternatingColors, className: props.className, primaryKey: props.primaryKey })); }, [list, paginationPosition, paginationSizePosition, layoutNamesPosition, renderList, renderLoading, renderEmpty,
+        renderPagination, renderPaginationSize, renderLayoutNames, renderSearchForm, renderInfiniteScroll, renderValue,
+        columns, onFetch, onSort, sort, props.searchForm, props.listId, props.isLoading, props.size, props.hasAlternatingColors,
+        props.className, props.primaryKey, props.viewProps]);
     return components.ui.renderView(props.view || 'list.GridView', viewProps);
 }
 exports["default"] = Grid;