@steroidsjs/core 3.0.0-beta.17 → 3.0.0-beta.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/hooks/useForm.d.ts +0 -1
  2. package/hooks/useForm.js +0 -1
  3. package/index.d.ts +0 -17
  4. package/package.json +1 -1
  5. package/ui/form/AutoCompleteField/demo/errors.js +1 -1
  6. package/ui/form/Button/Button.d.ts +0 -9
  7. package/ui/form/Button/Button.js +1 -10
  8. package/ui/form/DateField/demo/errors.js +1 -1
  9. package/ui/form/DateRangeField/demo/errors.js +1 -1
  10. package/ui/form/DateTimeField/demo/errors.js +1 -1
  11. package/ui/form/DateTimeRangeField/demo/errors.js +1 -1
  12. package/ui/form/DropDownField/DropDownField.d.ts +1 -1
  13. package/ui/form/Field/fieldWrapper.d.ts +0 -6
  14. package/ui/form/Field/fieldWrapper.js +1 -6
  15. package/ui/form/FieldLayout/FieldLayout.d.ts +2 -15
  16. package/ui/form/FieldLayout/FieldLayout.js +1 -13
  17. package/ui/form/FieldList/FieldList.js +1 -2
  18. package/ui/form/FieldSet/FieldSet.js +2 -4
  19. package/ui/form/Form/Form.d.ts +0 -14
  20. package/ui/form/Form/Form.js +2 -6
  21. package/ui/form/NavField/demo/errors.js +1 -1
  22. package/ui/form/RateField/demo/errors.js +1 -1
  23. package/ui/form/ReCaptchaField/demo/basic.js +1 -1
  24. package/ui/form/SliderField/demo/errors.js +1 -1
  25. package/ui/form/SwitcherField/demo/errors.js +1 -1
  26. package/ui/form/TimeField/demo/errors.js +1 -1
  27. package/utils/form.d.ts +0 -2
  28. package/utils/form.js +1 -12
  29. package/ui/form/Field/demo/basic.d.ts +0 -8
  30. package/ui/form/Field/demo/basic.js +0 -37
  31. package/ui/form/Field/demo/component.d.ts +0 -8
  32. package/ui/form/Field/demo/component.js +0 -38
  33. package/ui/form/Field/demo/model.d.ts +0 -8
  34. package/ui/form/Field/demo/model.js +0 -48
  35. package/ui/form/FieldLayout/demo/errors.d.ts +0 -8
  36. package/ui/form/FieldLayout/demo/errors.js +0 -38
  37. package/ui/form/FieldLayout/demo/layouts.d.ts +0 -8
  38. package/ui/form/FieldLayout/demo/layouts.js +0 -43
  39. package/ui/form/FieldLayout/demo/required.d.ts +0 -8
  40. package/ui/form/FieldLayout/demo/required.js +0 -38
  41. package/ui/format/DateFormatter/demo/basic.d.ts +0 -3
  42. package/ui/format/DateFormatter/demo/basic.js +0 -32
  43. package/ui/format/DateTimeFormatter/demo/basic.d.ts +0 -3
  44. package/ui/format/DateTimeFormatter/demo/basic.js +0 -32
@@ -3,7 +3,6 @@ export default function useForm(): {
3
3
  model: any;
4
4
  prefix: string | boolean;
5
5
  size: string;
6
- layout: FormLayout;
7
6
  formDispatch: any;
8
7
  formSelector: (selector: (state: any, setValue: any) => any) => any;
9
8
  };
package/hooks/useForm.js CHANGED
@@ -10,7 +10,6 @@ function useForm() {
10
10
  model: context.model,
11
11
  prefix: context.prefix,
12
12
  size: context.size,
13
- layout: context.layout,
14
13
  formDispatch: context === null || context === void 0 ? void 0 : context.dispatch,
15
14
  formSelector: function (selector) { var _a; return (_a = context === null || context === void 0 ? void 0 : context.provider) === null || _a === void 0 ? void 0 : _a.select(context.formId, selector); }
16
15
  }
package/index.d.ts CHANGED
@@ -47,23 +47,6 @@ declare type PrimaryKey = number | string;
47
47
  */
48
48
  declare type Size = 'small' | 'middle' | 'large' | string;
49
49
 
50
- /**
51
- * Макет формы или ее части, влияющий на расположение полей
52
- */
53
- declare type FormLayoutName = 'default' | 'vertical' | 'inline' | string;
54
-
55
- /**
56
- * Свойства для настройки макета формы
57
- */
58
- declare type FormLayout = FormLayoutName | boolean | {
59
- layout?: FormLayoutName | boolean,
60
- className?: CssClassName,
61
- style?: CustomStyle,
62
- label?: boolean,
63
- cols?: number[],
64
- [key: string]: any,
65
- };
66
-
67
50
  /**
68
51
  * Объект из свойства `input` от redux-form
69
52
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steroidsjs/core",
3
- "version": "3.0.0-beta.17",
3
+ "version": "3.0.0-beta.19",
4
4
  "description": "",
5
5
  "author": "Vladimir Kozhin <hello@kozhindev.com>",
6
6
  "repository": {
@@ -35,4 +35,4 @@ var basic_1 = require("./basic");
35
35
  * @col 6
36
36
  */
37
37
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
38
- React.createElement(AutoCompleteField_1["default"], { label: 'Errors', items: basic_1.items, errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
38
+ React.createElement(AutoCompleteField_1["default"], { label: 'Errors', items: basic_1.items, errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -125,14 +125,6 @@ export interface IButtonProps {
125
125
  * @example {userId: 52}
126
126
  */
127
127
  toRouteParams?: Record<string, unknown>;
128
- /**
129
- * Выбор макета для распложения кнопки в форме. Если кнопка находится внутри `<Form>...</Form>`, то `layout` будет
130
- * взят из контекста формы и автоматически применен при отораженн. Для его отключения укажите `false`.
131
- * Данное свойство так же может принимать объект, если нужно прокинуть дополнительные свойства в шаблон макета.
132
- * Пример: `{layout: 'horizontal', cols: [2,6]}`
133
- * @example horizontal
134
- */
135
- layout?: FormLayout;
136
128
  /**
137
129
  * ID формы, для которой кнопка выполняет submit. При указании ID формы кнопка будет показывать состояние загрузки
138
130
  * при отправке формы.
@@ -161,7 +153,6 @@ export interface IButtonViewProps extends IButtonProps {
161
153
  badge?: IButtonBadge;
162
154
  url?: string;
163
155
  formId?: string;
164
- layout?: string;
165
156
  disabled?: boolean;
166
157
  onClick?: any;
167
158
  submitting?: boolean;
@@ -33,19 +33,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
33
33
  __setModuleDefault(result, mod);
34
34
  return result;
35
35
  };
36
- var __importDefault = (this && this.__importDefault) || function (mod) {
37
- return (mod && mod.__esModule) ? mod : { "default": mod };
38
- };
39
36
  exports.__esModule = true;
40
37
  var React = __importStar(require("react"));
41
38
  var react_redux_1 = require("react-redux");
42
39
  var react_1 = require("react");
43
- var FieldLayout_1 = __importDefault(require("../FieldLayout"));
44
40
  var router_1 = require("../../../actions/router");
45
41
  var router_2 = require("../../../reducers/router");
46
42
  var hooks_1 = require("../../../hooks");
47
43
  var Form_1 = require("../Form/Form");
48
- var form_1 = require("../../../utils/form");
49
44
  function Button(props) {
50
45
  var components = (0, hooks_1.useComponents)();
51
46
  var dispatch = (0, react_redux_1.useDispatch)();
@@ -71,7 +66,6 @@ function Button(props) {
71
66
  }
72
67
  var disabled = submitting || props.disabled;
73
68
  var tag = props.tag || (props.link || url ? 'a' : 'button');
74
- var layout = (0, react_1.useMemo)(function () { return (0, form_1.mergeLayoutProp)(context.layout, props.layout); }, [context.layout, props.layout]);
75
69
  var failedTimer = (0, react_1.useRef)(null);
76
70
  var onClick = (0, react_1.useCallback)(function (e) {
77
71
  e.stopPropagation();
@@ -126,10 +120,7 @@ function Button(props) {
126
120
  }
127
121
  }
128
122
  }, [dispatch, props, tag]);
129
- var button = components.ui.renderView(props.view || 'form.ButtonView', __assign(__assign({}, props), { badge: badge, layout: layout, isFailed: isFailed, isLoading: isLoading, disabled: disabled, submitting: submitting, tag: tag, formId: (context === null || context === void 0 ? void 0 : context.formId) || null, url: url || (tag === 'a' ? '#' : null), onClick: !disabled ? onClick : undefined, children: props.label || props.children }));
130
- if (layout) {
131
- return (React.createElement(FieldLayout_1["default"], { layout: layout }, button));
132
- }
123
+ var button = components.ui.renderView(props.view || 'form.ButtonView', __assign(__assign({}, props), { badge: badge, isFailed: isFailed, isLoading: isLoading, disabled: disabled, submitting: submitting, tag: tag, formId: (context === null || context === void 0 ? void 0 : context.formId) || null, url: url || (tag === 'a' ? '#' : null), onClick: !disabled ? onClick : undefined, children: props.label || props.children }));
133
124
  return button;
134
125
  }
135
126
  Button.defaultProps = {
@@ -34,4 +34,4 @@ var DateField_1 = __importDefault(require("../DateField"));
34
34
  * @col 6
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(DateField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(DateField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -34,4 +34,4 @@ var DateRangeField_1 = __importDefault(require("../DateRangeField"));
34
34
  * @col 6
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(DateRangeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(DateRangeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -34,4 +34,4 @@ var DateTimeField_1 = __importDefault(require("../DateTimeField"));
34
34
  * @col 6
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(DateTimeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(DateTimeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -34,4 +34,4 @@ var DateTimeRangeField_1 = __importDefault(require("../DateTimeRangeField"));
34
34
  * @col 6
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(DateTimeRangeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(DateTimeRangeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -86,7 +86,7 @@ export interface IDropDownFieldProps extends IFieldWrapperInputProps, Omit<IData
86
86
  * Элементы вложенные внутрь DropDownField
87
87
  * @example [{id: 1, label: 'Ivan Ivanov', type: 'icon', typeSrc: 'user'}]
88
88
  */
89
- items: IDropDownFieldItem[];
89
+ items?: IDropDownFieldItem[];
90
90
  /**
91
91
  * Нужно ли использовать троеточие при переполнении DropDownField
92
92
  * @example {'true'}
@@ -40,12 +40,6 @@ export interface IFieldWrapperInputProps {
40
40
  * @example Your text...
41
41
  */
42
42
  placeholder?: string;
43
- /**
44
- * Шаблон для поля, который настраивает его расположение внутри формы.
45
- * Если false, то поле будет отрендерено без шаблона.
46
- * @example 'horizontal'
47
- */
48
- layout?: FormLayout;
49
43
  /**
50
44
  * Input ID для связи поля с label
51
45
  */
@@ -129,14 +129,9 @@ function fieldWrapper(componentId, Component, optionsConfig) {
129
129
  if (!Component.DynamicField) {
130
130
  Component.DynamicField = createDynamicField(componentId, Component, options);
131
131
  }
132
- // Resolve layout
133
- var layout = (0, react_1.useMemo)(function () { return (0, form_1.mergeLayoutProp)(context.layout, props.layout); }, [context.layout, props.layout]);
134
132
  var uniqueId = (0, hooks_1.useUniqueId)('input');
135
133
  var inputId = props.id || uniqueId;
136
- if (layout !== null) {
137
- return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { layout: layout, size: props.size || context.size || null, required: (0, has_1["default"])(props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : ((0, has_1["default"])(props, 'label') ? props.label : metaProps.label), hint: (0, has_1["default"])(props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, id: inputId, children: (React.createElement(Component.DynamicField, __assign({}, props, { id: inputId }))) }));
138
- }
139
- return components.ui.renderView(Component.DynamicField, props);
134
+ return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { size: props.size || context.size || null, required: (0, has_1["default"])(props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : ((0, has_1["default"])(props, 'label') ? props.label : metaProps.label), hint: (0, has_1["default"])(props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, id: inputId, children: (React.createElement(Component.DynamicField, __assign({}, props, { id: inputId }))) }));
140
135
  };
141
136
  NewComponent.WrappedComponent = Component;
142
137
  NewComponent.displayName = componentId;
@@ -10,7 +10,7 @@ export interface IFieldLayoutProps {
10
10
  */
11
11
  label?: string | boolean | any;
12
12
  /**
13
- * Подсказка, которая отображается, когда в поле нет ошибок и layout !== 'inline'
13
+ * Подсказка, которая отображается, когда в поле нет ошибок
14
14
  * @example 'Save'
15
15
  */
16
16
  hint?: string | boolean;
@@ -20,11 +20,6 @@ export interface IFieldLayoutProps {
20
20
  * @example true
21
21
  */
22
22
  required?: boolean;
23
- /**
24
- * Выбор шаблона для расположения поля. Если false, то поле будет отрендерено без шаблона
25
- * @example 'inline'
26
- */
27
- layout?: FormLayout;
28
23
  /**
29
24
  * Ошибки в поле
30
25
  * @example 'Field is required'
@@ -39,7 +34,7 @@ export interface IFieldLayoutProps {
39
34
  * Переопределение view React компонента для кастомизации отображения
40
35
  * @example MyCustomView
41
36
  */
42
- layoutView?: CustomView;
37
+ view?: CustomView;
43
38
  [key: string]: any;
44
39
  }
45
40
  export interface IFieldLayoutViewProps {
@@ -50,14 +45,6 @@ export interface IFieldLayoutViewProps {
50
45
  successful: boolean;
51
46
  id: string;
52
47
  size: Size;
53
- layout?: {
54
- layout: FormLayoutName | boolean;
55
- className?: CssClassName;
56
- style?: CustomStyle;
57
- label: boolean;
58
- cols: number[];
59
- [key: string]: any;
60
- };
61
48
  children?: React.ReactNode;
62
49
  }
63
50
  declare function FieldLayout(props: IFieldLayoutProps): JSX.Element;
@@ -39,23 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  exports.__esModule = true;
40
40
  var React = __importStar(require("react"));
41
41
  var get_1 = __importDefault(require("lodash-es/get"));
42
- var react_1 = require("react");
43
42
  var hooks_1 = require("../../../hooks");
44
- var form_1 = require("../../../utils/form");
45
- var defaultProps = {
46
- layout: {
47
- layout: 'default',
48
- cols: [3, 6]
49
- }
50
- };
51
43
  function FieldLayout(props) {
52
44
  var components = (0, hooks_1.useComponents)();
53
45
  // Error from state
54
46
  var errors = (0, hooks_1.useForm)().formSelector(function (state) { return (0, get_1["default"])(state, 'errors.' + props.attribute); });
55
- var layout = (0, react_1.useMemo)(function () { return (0, form_1.mergeLayoutProp)(defaultProps.layout, props.layout); }, [props.layout]);
56
- if (layout === false) {
57
- return props.children;
58
- }
59
- return components.ui.renderView(props.layoutView || 'form.FieldLayoutView', __assign(__assign({}, props), { errors: props.errors || errors, layout: layout }));
47
+ return components.ui.renderView(props.view || 'form.FieldLayoutView', __assign(__assign({}, props), { errors: props.errors || errors }));
60
48
  }
61
49
  exports["default"] = React.memo(FieldLayout);
@@ -90,10 +90,9 @@ function FieldList(props) {
90
90
  model: props.model,
91
91
  prefix: props.prefix,
92
92
  size: props.size,
93
- layout: props.layout,
94
93
  provider: context.provider,
95
94
  reducer: context.reducer
96
- }); }, [context.provider, context.reducer, props.formId, props.layout, props.model, props.prefix, props.size]);
95
+ }); }, [context.provider, context.reducer, props.formId, props.model, props.prefix, props.size]);
97
96
  var commonProps = {
98
97
  showAdd: props.showAdd,
99
98
  showRemove: props.showRemove,
@@ -42,7 +42,6 @@ var isString_1 = __importDefault(require("lodash-es/isString"));
42
42
  var Field_1 = __importDefault(require("../Field"));
43
43
  var Form_1 = require("../Form/Form");
44
44
  var hooks_1 = require("../../../hooks");
45
- var form_1 = require("../../../utils/form");
46
45
  function FieldSet(props) {
47
46
  var components = (0, hooks_1.useComponents)();
48
47
  var context = (0, react_1.useContext)(Form_1.FormContext);
@@ -53,11 +52,10 @@ function FieldSet(props) {
53
52
  .filter(Boolean)
54
53
  .join('.'),
55
54
  size: props.size || context.size,
56
- layout: (0, form_1.mergeLayoutProp)(context.layout, props.layout),
57
55
  provider: context.provider,
58
56
  reducer: context.reducer
59
- }); }, [context.formId, context.layout, context.model, context.prefix, context.provider, context.reducer,
60
- context.size, props.formId, props.layout, props.model, props.prefix, props.size]);
57
+ }); }, [context.formId, context.model, context.prefix, context.provider, context.reducer,
58
+ context.size, props.formId, props.model, props.prefix, props.size]);
61
59
  var FieldSetView = props.view || components.ui.getView('form.FieldSetView');
62
60
  return (react_1["default"].createElement(Form_1.FormContext.Provider, { value: contextValue },
63
61
  react_1["default"].createElement(FieldSetView, __assign({ className: props.className, label: props.label }, props),
@@ -33,11 +33,6 @@ export interface IFormProps {
33
33
  * @example Упс, что-то пошло не так
34
34
  */
35
35
  submitErrorMessage?: string;
36
- /**
37
- * Шаблон для полей в форме
38
- * @example horizontal
39
- */
40
- layout?: FormLayout;
41
36
  /**
42
37
  * Обработчик события отправки формы
43
38
  * @param args
@@ -156,13 +151,6 @@ export interface IFormViewProps {
156
151
  isBordered?: boolean;
157
152
  autoFocus?: boolean;
158
153
  style?: CustomStyle;
159
- layout?: {
160
- layout: FormLayoutName | boolean;
161
- className: CssClassName;
162
- label: boolean;
163
- cols: number[];
164
- [key: string]: any;
165
- };
166
154
  children?: React.ReactNode;
167
155
  }
168
156
  export interface IFormReducerState {
@@ -176,7 +164,6 @@ export interface IFormContext {
176
164
  formId?: string;
177
165
  model?: any;
178
166
  prefix?: string | boolean;
179
- layout?: FormLayout;
180
167
  size?: Size;
181
168
  provider?: any;
182
169
  reducer?: {
@@ -191,7 +178,6 @@ declare namespace Form {
191
178
  var defaultProps: {
192
179
  actionMethod: string;
193
180
  autoStartTwoFactor: boolean;
194
- layout: string;
195
181
  captchaActionName: string;
196
182
  };
197
183
  }
@@ -111,8 +111,6 @@ function Form(props) {
111
111
  // Get components and dispatch method
112
112
  var components = (0, hooks_1.useComponents)();
113
113
  var reduxDispatch = (0, hooks_1.useDispatch)();
114
- // Normalize layout
115
- var layout = (0, react_1.useMemo)(function () { return (0, form_1.normalizeLayout)(props.layout); }, [props.layout]);
116
114
  // Address bar synchronization
117
115
  var _a = (0, useAddressBar_1["default"])(__assign({ enable: !!props.addressBar, model: props.model }, (typeof props.addressBar === 'boolean' ? { enable: props.addressBar } : props.addressBar))), initialQuery = _a.initialQuery, updateQuery = _a.updateQuery;
118
116
  // Resolve initial values
@@ -325,24 +323,22 @@ function Form(props) {
325
323
  model: props.model,
326
324
  prefix: props.prefix,
327
325
  size: props.size,
328
- layout: props.layout,
329
326
  provider: provider,
330
327
  reducer: reducer,
331
328
  dispatch: dispatch
332
- }); }, [dispatch, props.formId, props.layout, props.model, props.prefix, props.size, provider, reducer]);
329
+ }); }, [dispatch, props.formId, props.model, props.prefix, props.size, provider, reducer]);
333
330
  // Wait initialization (only for redux)
334
331
  if (values === undefined) {
335
332
  return null;
336
333
  }
337
334
  // Render context and form
338
335
  return (React.createElement(exports.FormContext.Provider, { value: formContextValue }, props.view !== false
339
- ? components.ui.renderView(props.view || 'form.FormView', __assign(__assign({}, props.viewProps), { isInvalid: isInvalid, isSubmitting: isSubmitting, layout: layout, onSubmit: onSubmit, submitLabel: props.submitLabel, fields: props.fields, children: props.children, isBordered: props.isBordered, className: props.className, style: props.style, autoFocus: props.autoFocus }))
336
+ ? components.ui.renderView(props.view || 'form.FormView', __assign(__assign({}, props.viewProps), { isInvalid: isInvalid, isSubmitting: isSubmitting, onSubmit: onSubmit, submitLabel: props.submitLabel, fields: props.fields, children: props.children, isBordered: props.isBordered, className: props.className, style: props.style, autoFocus: props.autoFocus }))
340
337
  : props.children));
341
338
  }
342
339
  Form.defaultProps = {
343
340
  actionMethod: 'POST',
344
341
  autoStartTwoFactor: true,
345
- layout: 'default',
346
342
  captchaActionName: 'submit'
347
343
  };
348
344
  exports["default"] = Form;
@@ -35,4 +35,4 @@ var basic_1 = require("./basic");
35
35
  * @col 3
36
36
  */
37
37
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
38
- React.createElement(NavField_1["default"], { items: basic_1.items, label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
38
+ React.createElement(NavField_1["default"], { items: basic_1.items, label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -34,4 +34,4 @@ var RateField_1 = __importDefault(require("../RateField"));
34
34
  * @col 6
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(RateField_1["default"], { errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(RateField_1["default"], { errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -37,7 +37,7 @@ var ReCaptchaField_1 = __importDefault(require("../ReCaptchaField"));
37
37
  * @col 4
38
38
  */
39
39
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
40
- React.createElement(Form_1["default"], { formId: 'CaptchaForm', layout: false },
40
+ React.createElement(Form_1["default"], { formId: 'CaptchaForm' },
41
41
  React.createElement(InputField_1["default"], { label: 'Label', attribute: 'text', required: true }),
42
42
  React.createElement(ReCaptchaField_1["default"], { attribute: 'token' }),
43
43
  React.createElement(Button_1["default"], { type: 'submit', label: 'Submit' })))); });
@@ -34,4 +34,4 @@ var SliderField_1 = __importDefault(require("../SliderField"));
34
34
  * @col 4
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement("div", { style: { padding: '20px 30px 10px' } },
37
- React.createElement(SliderField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(SliderField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -35,4 +35,4 @@ var basic_1 = require("./basic");
35
35
  * @col 6
36
36
  */
37
37
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
38
- React.createElement(SwitcherField_1["default"], { label: 'Errors', items: basic_1.items, errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
38
+ React.createElement(SwitcherField_1["default"], { label: 'Errors', items: basic_1.items, errors: ['Error 1 text', 'Error 2 text'] }))); });
@@ -34,4 +34,4 @@ var TimeField_1 = __importDefault(require("../TimeField"));
34
34
  * @col 3
35
35
  */
36
36
  exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(TimeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'], layout: true }))); });
37
+ React.createElement(TimeField_1["default"], { label: 'Errors', errors: ['Error 1 text', 'Error 2 text'] }))); });
package/utils/form.d.ts CHANGED
@@ -1,7 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  export declare const setInWithPath: (state: any, value: any, path: string[], pathIndex?: number) => any;
3
- export declare const normalizeLayout: (layout: any) => any;
4
- export declare const mergeLayoutProp: (layout1: any, layout2: any) => any;
5
3
  export declare const cleanEmptyObject: (object: any) => any;
6
4
  export declare const providers: {
7
5
  redux: {
package/utils/form.js CHANGED
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  exports.__esModule = true;
17
- exports.providers = exports.cleanEmptyObject = exports.mergeLayoutProp = exports.normalizeLayout = exports.setInWithPath = void 0;
17
+ exports.providers = exports.cleanEmptyObject = exports.setInWithPath = void 0;
18
18
  var isPlainObject_1 = __importDefault(require("lodash-es/isPlainObject"));
19
19
  var isArray_1 = __importDefault(require("lodash-es/isArray"));
20
20
  var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
@@ -51,17 +51,6 @@ var setInWithPath = function (state, value, path, pathIndex) {
51
51
  return __assign(__assign({}, state), (_b = {}, _b[first] = next, _b));
52
52
  };
53
53
  exports.setInWithPath = setInWithPath;
54
- var normalizeLayout = function (layout) { return (typeof layout === 'object' ? layout : { layout: layout }); };
55
- exports.normalizeLayout = normalizeLayout;
56
- var mergeLayoutProp = function (layout1, layout2) {
57
- if (layout2 === false) {
58
- return null;
59
- }
60
- layout1 = layout1 ? (0, exports.normalizeLayout)(layout1) : null;
61
- layout2 = layout2 ? (0, exports.normalizeLayout)(layout2) : null;
62
- return layout1 || layout2 ? __assign(__assign({}, layout1), layout2) : null;
63
- };
64
- exports.mergeLayoutProp = mergeLayoutProp;
65
54
  var cleanEmptyObject = function (object) {
66
55
  // if all properties are null substitute the object with null
67
56
  if (!Object.values(object).some(function (x) { return x !== null; })) {
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * Обычный пример использования Field.
4
- * @order 1
5
- * @col 6
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,37 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var Field_1 = __importDefault(require("../Field"));
31
- /**
32
- * Обычный пример использования Field.
33
- * @order 1
34
- * @col 6
35
- */
36
- exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(Field_1["default"], { attribute: 'field', label: 'Basic' }))); });
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * Field с компонентом.
4
- * @order 3
5
- * @col 6
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,38 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var Field_1 = __importDefault(require("../Field"));
31
- var DateField_1 = __importDefault(require("../../DateField"));
32
- /**
33
- * Field с компонентом.
34
- * @order 3
35
- * @col 6
36
- */
37
- exports["default"] = (function () { return (React.createElement(React.Fragment, null,
38
- React.createElement(Field_1["default"], { component: DateField_1["default"], label: 'Date' }))); });
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * Field с прокинутой моделью.
4
- * @order 2
5
- * @col 6
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,48 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var Field_1 = __importDefault(require("../Field"));
31
- /**
32
- * Field с прокинутой моделью.
33
- * @order 2
34
- * @col 6
35
- */
36
- exports["default"] = (function () { return (React.createElement(React.Fragment, null,
37
- React.createElement(Field_1["default"], { attribute: 'category', model: {
38
- attributes: [
39
- {
40
- attribute: 'category',
41
- label: 'Category',
42
- field: 'DropDownField',
43
- fieldProps: {
44
- items: ['items_1', 'items_2', 'items_3']
45
- }
46
- },
47
- ]
48
- } }))); });
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * Обработка ошибок.
4
- * @order 3
5
- * @col 6
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,38 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var InputField_1 = __importDefault(require("../../InputField"));
31
- var FieldLayout_1 = __importDefault(require("../FieldLayout"));
32
- /**
33
- * Обработка ошибок.
34
- * @order 3
35
- * @col 6
36
- */
37
- exports["default"] = (function () { return (React.createElement(FieldLayout_1["default"], { errors: ['The field is filled incorrectly'] },
38
- React.createElement(InputField_1["default"], null))); });
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * По-умлочанию FieldLayout имеет 3 заданных ориентации.
4
- * @order 5
5
- * @col 12
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,43 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var InputField_1 = __importDefault(require("../../InputField"));
31
- var FieldLayout_1 = __importDefault(require("../FieldLayout"));
32
- var layouts = {
33
- inline: 'Inline',
34
- "default": 'Default',
35
- horizontal: 'Horizontal'
36
- };
37
- /**
38
- * По-умлочанию FieldLayout имеет 3 заданных ориентации.
39
- * @order 5
40
- * @col 12
41
- */
42
- exports["default"] = (function () { return (React.createElement("div", { style: { display: 'grid', gridGap: '10px' } }, Object.keys(layouts).map(function (layout) { return (React.createElement(FieldLayout_1["default"], { className: 'col-12 mb-4', key: layout, layout: layout },
43
- React.createElement(InputField_1["default"], { label: layouts[layout] }))); }))); });
@@ -1,8 +0,0 @@
1
- /// <reference types="react" />
2
- /**
3
- * Как обязательное поле для заполнения.
4
- * @order 2
5
- * @col 6
6
- */
7
- declare const _default: () => JSX.Element;
8
- export default _default;
@@ -1,38 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var InputField_1 = __importDefault(require("../../InputField"));
31
- var FieldLayout_1 = __importDefault(require("../FieldLayout"));
32
- /**
33
- * Как обязательное поле для заполнения.
34
- * @order 2
35
- * @col 6
36
- */
37
- exports["default"] = (function () { return (React.createElement(FieldLayout_1["default"], { required: true },
38
- React.createElement(InputField_1["default"], { required: true, label: 'Required' }))); });
@@ -1,3 +0,0 @@
1
- /// <reference types="react" />
2
- declare const _default: () => JSX.Element;
3
- export default _default;
@@ -1,32 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var DateFormatter_1 = __importDefault(require("../DateFormatter"));
31
- exports["default"] = (function () { return (React.createElement(React.Fragment, null,
32
- React.createElement(DateFormatter_1["default"], { value: '2018-05-04' }))); });
@@ -1,3 +0,0 @@
1
- /// <reference types="react" />
2
- declare const _default: () => JSX.Element;
3
- export default _default;
@@ -1,32 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- exports.__esModule = true;
29
- var React = __importStar(require("react"));
30
- var DateTimeFormatter_1 = __importDefault(require("../DateTimeFormatter"));
31
- exports["default"] = (function () { return (React.createElement(React.Fragment, null,
32
- React.createElement(DateTimeFormatter_1["default"], { value: '2018-05-04 16:15:00' }))); });