@steroidsjs/core 2.2.11 → 2.2.14

package/hooks/useList.d.ts

@@ -84,6 +84,11 @@ export interface IListConfig {
      * @example true
      */
     autoDestroy?: boolean;
+    /**
+     * Отправлять запрос на обновление данных при изменении данных формы. По-умолчанию - включено.
+     * @example false
+     */
+    autoFetchOnFormChanges?: boolean;
     /**
      * Обработчик, который вызывается при изменении значений формы, и нужен для подгрузки новых элементов коллекции
      * @param {IList} list

package/hooks/useList.js

@@ -226,10 +226,12 @@ function useList(config) {
             // Sync with address bar
             updateQuery(formValues);
             // Send request
-            dispatch(list_2.listLazyFetch(config.listId));
+            if (config.autoFetchOnFormChanges !== false) {
+                dispatch(list_2.listLazyFetch(config.listId));
+            }
         }
-    }, [config.listId, dispatch, formId, formValues, paginationProps.attribute,
-        paginationProps.defaultValue, prevFormValues, updateQuery]);
+    }, [config.autoFetchOnFormChanges, config.listId, dispatch, formId, formValues,
+        paginationProps.attribute, paginationProps.defaultValue, prevFormValues, updateQuery]);
     // Check change query
     var prevQuery = react_use_1.usePrevious(config.query);
     react_use_1.useUpdateEffect(function () {

package/package.json

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

package/reducers/form.js

@@ -50,7 +50,7 @@ function reducerItem(state, action) {
         case form_1.FORM_SUBMIT:
             return dot_prop_immutable_1.set(state, 'submitCounter', (state.submitCounter || 0) + 1);
         case form_1.FORM_RESET:
-            return dot_prop_immutable_1.set(state, 'values', cloneDeep_1["default"](state.initialValues || {}));
+            return __assign(__assign({}, state), { values: cloneDeep_1["default"](state.initialValues || {}) });
         case form_1.FORM_ARRAY_ADD:
             // eslint-disable-next-line no-case-declarations
             var newValue = [].concat(get_1["default"](state, 'values.' + action.name) || []);

package/reducers/router.js

@@ -69,8 +69,8 @@ var buildUrl = function (path, params) {
     var pathKeys = [];
     try {
         pathKeys = path_to_regexp_1.parse(path)
-            .slice(1)
-            .map(function (p) { return p.name; });
+            .map(function (p) { return typeof p === 'object' && p.name; })
+            .filter(Boolean);
         url = path_to_regexp_1.compile(path)(__assign({}, params));
     }
     catch (e) {

package/ui/form/Button/Button.d.ts

@@ -90,7 +90,7 @@ export interface IButtonProps {
      * автоматически будет переключаться в режим загрузки (`loading`) на время выполнения `Promise`.
      * @param e => fetch(...)
      */
-    onClick?: (e: Event | React.MouseEvent) => Promise<any> | void;
+    onClick?: (e: Event | React.MouseEvent) => Promise<any> | any;
     /**
      * Переводит кнопку в состояние "не активна"
      * @example true

package/ui/form/CheckboxListField/CheckboxListField.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 var react_1 = require("react");
+var react_use_1 = require("react-use");
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../../../ui/form/Field/fieldWrapper"));
 function CheckboxListField(props) {
@@ -42,6 +43,17 @@ function CheckboxListField(props) {
     react_1.useEffect(function () {
         props.input.onChange.call(null, selectedIds);
     }, [props.input.onChange, selectedIds]);
+    var onReset = react_1.useCallback(function () {
+        setSelectedIds([]);
+    }, [setSelectedIds]);
+    // Reset selected ids on form reset
+    var prevInputValue = react_use_1.usePrevious(props.input.value);
+    react_use_1.useUpdateEffect(function () {
+        // if form reset
+        if (prevInputValue && props.input.value === undefined && selectedIds.length > 0) {
+            onReset();
+        }
+    }, [onReset, prevInputValue, props.input.value, selectedIds.length]);
     return components.ui.renderView(props.view || 'form.CheckboxListFieldView', __assign(__assign({}, props), { items: items,
         inputProps: inputProps,
         onItemSelect: onItemSelect,

package/ui/form/NumberField/NumberField.js

@@ -21,9 +21,9 @@ function NumberField(props) {
     var components = hooks_1.useComponents();
     props.inputProps = react_1.useMemo(function () {
         var _a;
-        return (__assign({ name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : undefined, onChange: function (e) { var _a, _b; return props.input.onChange(((_a = e.target) === null || _a === void 0 ? void 0 : _a.value) || ((_b = e.nativeEvent) === null || _b === void 0 ? void 0 : _b.text)); }, type: 'number', min: props.min, max: props.max, step: props.step, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps));
+        return (__assign({ name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: function (e) { var _a, _b; return props.input.onChange(((_a = e.target) === null || _a === void 0 ? void 0 : _a.value) || ((_b = e.nativeEvent) === null || _b === void 0 ? void 0 : _b.text)); }, type: 'number', min: props.min, max: props.max, step: props.step, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps));
     }, [props.disabled, props.input, props.inputProps, props.placeholder, props.min, props.max, props.step]);
-    return components.ui.renderView(props.view || 'form.NumberFieldView' || 'form.InputFieldView', props);
+    return components.ui.renderView(props.view || 'form.NumberFieldView', props);
 }
 NumberField.defaultProps = {
     disabled: false,

package/ui/list/Grid/Grid.js

@@ -64,7 +64,8 @@ function Grid(props) {
         searchModel: props.searchModel,
         items: props.items,
         initialItems: props.initialItems,
-        initialTotal: props.initialTotal
+        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;
     var renderLabel = react_1.useCallback(function (column) {
         if (column.headerView) {

package/ui/list/List/List.js

@@ -59,7 +59,8 @@ function List(props) {
         searchModel: props.searchModel,
         items: props.items,
         initialItems: props.initialItems,
-        initialTotal: props.initialTotal
+        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;
     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 }))); });