@steroidsjs/core 3.0.21 → 3.0.23

package/docs-autogen-result.json

@@ -13569,6 +13569,15 @@
                     "example": "true",
                     "defaultValue": null
                 },
+                {
+                    "name": "empty",
+                    "decorators": [],
+                    "description": "Текст при отсутствии элементов",
+                    "required": false,
+                    "type": "string",
+                    "example": "'Ничего не найдено'",
+                    "defaultValue": null
+                },
                 {
                     "name": "errors",
                     "decorators": [],
@@ -13921,6 +13930,15 @@
                 }
             ],
             "methods": [
+                {
+                    "name": "onClear",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": []
+                },
                 {
                     "name": "onItemHover",
                     "decorators": [],
@@ -20741,6 +20759,15 @@
                     "example": null,
                     "defaultValue": null
                 },
+                {
+                    "name": "initialItems",
+                    "decorators": [],
+                    "description": "Начальные элементы списка",
+                    "required": false,
+                    "type": "{}[]",
+                    "example": "[\n    {\n     name: 'Ivan',\n     amount: 5\n    },\n    {\n     name: 'John',\n     amount: 1\n    }\n]",
+                    "defaultValue": null
+                },
                 {
                     "name": "initialRowsCount",
                     "decorators": [],
@@ -20753,7 +20780,7 @@
                 {
                     "name": "initialValues",
                     "decorators": [],
-                    "description": "Начальные значения в полях",
+                    "description": "Значения для полей при нажатии кнопки 'Добавить'",
                     "required": false,
                     "type": "{}",
                     "example": "{\n name: 'Ivan',\n amount: 5\n}",
@@ -25291,6 +25318,7 @@
             "tags": {},
             "defaultProps": null,
             "extends": [
+                "IFieldWrapperInputProps",
                 "IBaseFieldProps"
             ],
             "properties": [

package/en.json

@@ -996,7 +996,10 @@
     "Начальная дата": "",
     "Дополнительные данные которые попадут в дата аттрибут data-icon": "",
     "Компоненты для подключения wysiwyg редактора": "",
+    "Текст при отсутствии элементов": "",
     "Отображать чекбоксы только на узлах, не имеющих вложенных элементов": "",
+    "Начальные элементы списка": "",
+    "Значения для полей при нажатии кнопки 'Добавить'": "",
     "Размер компонента и вложенных полей": "",
     "Параметры для кнопки отправки формы": "",
     "Очищать сообщение об ошибке при редактировании поля. По-умолчанию включено": "",

package/hooks/useSaveCursorPosition.d.ts

@@ -1,6 +1,6 @@
 import React, { ChangeEvent } from 'react';
 import { IInputParams } from '../ui/form/Field/fieldWrapper';
-export default function useSaveCursorPosition(inputParams: IInputParams): {
+export default function useSaveCursorPosition(inputParams: IInputParams, onChangeCallback?: (value: any) => void): {
     inputRef: React.MutableRefObject<any>;
     onChange: (event: ChangeEvent<HTMLInputElement>, value?: any) => void;
 };

package/hooks/useSaveCursorPosition.js

@@ -9,7 +9,7 @@ exports.__esModule = true;
 /* eslint-disable no-return-assign */
 /* eslint-disable no-unused-expressions */
 var react_1 = __importDefault(require("react"));
-function useSaveCursorPosition(inputParams) {
+function useSaveCursorPosition(inputParams, onChangeCallback) {
     var _a = react_1["default"].useState(null), cursor = _a[0], setCursor = _a[1];
     var inputRef = react_1["default"].useRef(null);
     react_1["default"].useEffect(function () {
@@ -19,11 +19,14 @@ function useSaveCursorPosition(inputParams) {
         }
     }, [cursor, inputParams.value]);
     var onChange = react_1["default"].useCallback(function (event, value) {
-        var _a, _b;
+        var _a, _b, _c;
         if (value === void 0) { value = null; }
-        setCursor((_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.selectionStart);
-        inputParams.onChange(value || ((_b = event.target) === null || _b === void 0 ? void 0 : _b.value));
-    }, [inputParams]);
+        if (onChangeCallback) {
+            onChangeCallback(value || ((_a = event.target) === null || _a === void 0 ? void 0 : _a.value));
+        }
+        setCursor((_b = event === null || event === void 0 ? void 0 : event.target) === null || _b === void 0 ? void 0 : _b.selectionStart);
+        inputParams.onChange(value || ((_c = event.target) === null || _c === void 0 ? void 0 : _c.value));
+    }, [inputParams, onChangeCallback]);
     return {
         inputRef: inputRef,
         onChange: onChange

package/package.json

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

package/ui/form/AutoCompleteField/AutoCompleteField.d.ts

@@ -32,6 +32,11 @@ export interface IAutoCompleteFieldProps extends IBaseFieldProps, IDataProviderC
      * @example true
      */
     searchOnFocus?: boolean;
+    /**
+     * Текст при отсутствии элементов
+     * @example 'Ничего не найдено'
+     */
+    empty?: string;
 }
 export interface IAutoCompleteFieldViewProps extends Omit<IAutoCompleteFieldProps, 'items'> {
     items: IAutoCompleteItem[];
@@ -53,6 +58,7 @@ export interface IAutoCompleteFieldViewProps extends Omit<IAutoCompleteFieldProp
     isLoading?: boolean;
     onItemSelect: (id: PrimaryKey | any) => void;
     onItemHover: (id: PrimaryKey | any) => void;
+    onClear: () => void;
 }
 declare const _default: import("../../../ui/form/Field/fieldWrapper").FieldWrapperComponent<IAutoCompleteFieldProps>;
 export default _default;

package/ui/form/AutoCompleteField/AutoCompleteField.js

@@ -40,14 +40,16 @@ function AutoCompleteField(props) {
         dataProvider: props.dataProvider,
         autoComplete: props.autoComplete,
         autoFetch: props.autoFetch,
+        initialSelectedIds: props.selectedIds,
         query: query
-    }), items = _b.items, isLoading = _b.isLoading;
+    }), items = _b.items, isLoading = _b.isLoading, sourceItems = _b.sourceItems;
     // Data select
     var _c = (0, hooks_1.useDataSelect)({
         selectedIds: props.selectedIds,
         primaryKey: props.primaryKey,
         items: items,
-        inputValue: props.input.value
+        inputValue: props.input.value,
+        sourceItems: sourceItems
     }), isOpened = _c.isOpened, setIsOpened = _c.setIsOpened, setIsFocused = _c.setIsFocused, hoveredId = _c.hoveredId, setHoveredId = _c.setHoveredId, selectedIds = _c.selectedIds, setSelectedIds = _c.setSelectedIds;
     var onOpen = (0, react_1.useCallback)(function () {
         setQuery('');
@@ -65,6 +67,9 @@ function AutoCompleteField(props) {
         setIsFocused(false);
         setIsOpened(false);
     }, [setIsFocused, setIsOpened]);
+    var onClear = (0, react_1.useCallback)(function () {
+        setSelectedIds([]);
+    }, [setSelectedIds]);
     // Outside click -> close
     var forwardedRef = (0, react_1.useRef)(null);
     (0, react_use_1.useClickAway)(forwardedRef, onClose);
@@ -99,6 +104,7 @@ function AutoCompleteField(props) {
         onOpen: onOpen,
         isOpened: isOpened,
         onClose: onClose,
+        onClear: onClear,
         forwardedRef: forwardedRef,
         onItemHover: onItemHover,
         onItemSelect: onItemSelect,
@@ -109,10 +115,12 @@ function AutoCompleteField(props) {
         required: props.required,
         categories: getCategories(props.items),
         className: props.className,
-        style: props.style
-    }); }, [inputProps, items, isLoading, hoveredId, selectedIds, onOpen, isOpened, onClose,
-        onItemHover, onItemSelect, props.primaryKey, props.size, props.placeholder, props.disabled,
-        props.required, props.items, props.className, props.style]);
+        style: props.style,
+        showClear: props.showClear,
+        empty: props.empty
+    }); }, [inputProps, items, isLoading, hoveredId, selectedIds, onOpen, isOpened, onClose, onClear, onItemHover, onItemSelect,
+        props.primaryKey, props.size, props.placeholder, props.disabled, props.required, props.items, props.className,
+        props.style, props.showClear, props.empty]);
     return components.ui.renderView(props.view || 'form.AutoCompleteFieldView', viewProps);
 }
 AutoCompleteField.defaultProps = {
@@ -120,6 +128,7 @@ AutoCompleteField.defaultProps = {
     autoComplete: true,
     multiple: false,
     disabled: false,
-    required: false
+    required: false,
+    showClear: false
 };
 exports["default"] = (0, fieldWrapper_1["default"])('AutoCompleteField', AutoCompleteField);

package/ui/form/FieldList/FieldList.d.ts

@@ -34,7 +34,7 @@ export interface IFieldListItem extends IFieldWrapperInputProps, IUiComponent {
  */
 export interface IFieldListProps extends IFieldWrapperInputProps, IUiComponent {
     /**
-     * Начальные значения в полях
+     * Значения для полей при нажатии кнопки 'Добавить'
      * @example
      * {
      *  name: 'Ivan',
@@ -44,6 +44,23 @@ export interface IFieldListProps extends IFieldWrapperInputProps, IUiComponent {
     initialValues?: {
         [key: string]: any;
     };
+    /**
+     * Начальные элементы списка
+     * @example
+     * [
+     *     {
+     *      name: 'Ivan',
+     *      amount: 5
+     *     },
+     *     {
+     *      name: 'John',
+     *      amount: 1
+     *     }
+     * ]
+     */
+    initialItems?: {
+        [key: string]: any;
+    }[];
     /**
      * Список с полями формы
      */

package/ui/form/FieldList/FieldList.js

@@ -88,11 +88,15 @@ function FieldList(props) {
         removeRowIndex(rowIndex);
         dispatch((0, form_1.formArrayRemove)(context.formId, props.input.name, rowIndex));
     }, [context.formId, dispatch, props.input.name, removeRowIndex]);
-    // Add initial rows
     (0, react_use_1.useMount)(function () {
+        // Add initial rows
         if (!props.input.value) {
             onAdd(props.initialRowsCount);
         }
+        // Add initial items
+        if (props.initialItems) {
+            dispatch((0, form_1.formChange)(context.formId, props.input.name, props.initialItems));
+        }
     });
     // Keyboard navigation
     var nodeRef = (0, react_1.useRef)();
@@ -138,6 +142,7 @@ function FieldList(props) {
 }
 FieldList.defaultProps = {
     initialValues: null,
+    initialItems: null,
     disabled: false,
     required: false,
     showAdd: true,

package/ui/form/NumberField/NumberField.d.ts

@@ -1,12 +1,12 @@
 import React, { ChangeEvent } from 'react';
 import { IBaseFieldProps } from '../InputField/InputField';
-import { IFieldWrapperOutputProps } from '../Field/fieldWrapper';
+import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 /**
  * NumberField
  *
  * Числовое поле ввода. Этот компонент представляет собой поле ввода для числовых значений.
  **/
-export interface INumberFieldProps extends IBaseFieldProps {
+export interface INumberFieldProps extends IFieldWrapperInputProps, IBaseFieldProps {
     /**
      * Минимальное значение
      * @example 1

package/ui/form/NumberField/NumberField.js

@@ -45,7 +45,7 @@ var useInputTypeNumber_1 = __importDefault(require("./hooks/useInputTypeNumber")
 var DEFAULT_STEP = 1;
 function NumberField(props) {
     var components = (0, hooks_1.useComponents)();
-    var _a = (0, hooks_1.useSaveCursorPosition)(props.input), currentInputRef = _a.inputRef, onChange = _a.onChange;
+    var _a = (0, hooks_1.useSaveCursorPosition)(props.input, props.onChange), currentInputRef = _a.inputRef, onChange = _a.onChange;
     var step = react_1["default"].useMemo(function () { var _a; return (_a = props.step) !== null && _a !== void 0 ? _a : DEFAULT_STEP; }, [props.step]);
     var onInputChange = (0, useInputTypeNumber_1["default"])(currentInputRef, {
         max: props.max,

package/ui/form/SliderField/SliderField.js

@@ -16,6 +16,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var react_1 = require("react");
 var toInteger_1 = __importDefault(require("lodash-es/toInteger"));
+var head_1 = __importDefault(require("lodash-es/head"));
+var last_1 = __importDefault(require("lodash-es/last"));
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var normalizeValue = function (value) { return (0, toInteger_1["default"])(String(value).replace(/[0-9]g/, '')) || 0; };
@@ -28,7 +30,12 @@ function SliderField(props) {
         props.input.onChange(value);
     }, [props]);
     var onAfterChange = (0, react_1.useCallback)(function (value) {
-        var normalizedValue = normalizeValue(value);
+        var normalizedValue = props.isRange
+            ? [
+                normalizeValue((0, head_1["default"])(value)),
+                normalizeValue((0, last_1["default"])(value)),
+            ]
+            : normalizeValue(value);
         if (props.onAfterChange) {
             props.onAfterChange(normalizedValue);
         }