@steroidsjs/core 2.2.20 → 2.2.23

package/actions/router.js

@@ -39,7 +39,7 @@ var goToParent = function (level) {
         var getRouteParams = require('../reducers/router').getRouteParams;
         var state = getState();
         var params = getRouteParams(state);
-        var parentRoute = getRouteParent(state, level);
+        var parentRoute = getRouteParent(state, null, level);
         var parentRouteId = parentRoute ? parentRoute.id : null;
         var parentRouteParams = parentRoute ? params : null;
         if (parentRouteId) {

package/package.json

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

package/ui/form/FieldSet/FieldSet.d.ts

@@ -1,12 +1,11 @@
-import * as React from 'react';
-import { IComponentsHocOutput } from '../../../hoc/components';
+import React from 'react';
 import { IFieldProps } from '../Field/Field';
 import { IFormContext } from '../Form/Form';
 /**
  * FieldSet
  * Компонент для группировки полей формы
  */
-export interface IFieldSetProps extends IFormContext, IComponentsHocOutput {
+export interface IFieldSetProps extends IFormContext {
     /**
      * Конфигурационный массив с полями формы
      */
@@ -32,6 +31,5 @@ export interface IFieldSetViewProps {
     children?: React.ReactNode;
     label?: string | any;
 }
-export default class FieldSet extends React.PureComponent<IFieldSetProps> {
-    render(): JSX.Element;
-}
+declare function FieldSet(props: IFieldSetProps): JSX.Element;
+export default FieldSet;

package/ui/form/FieldSet/FieldSet.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -37,12 +22,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -54,35 +33,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var React = __importStar(require("react"));
+var react_1 = __importStar(require("react"));
 var isString_1 = __importDefault(require("lodash-es/isString"));
-var hoc_1 = require("../../../hoc");
 var Field_1 = __importDefault(require("../Field"));
 var Form_1 = require("../Form/Form");
+var hooks_1 = require("../../../hooks");
 var form_1 = require("../../../utils/form");
-var FieldSet = /** @class */ (function (_super) {
-    __extends(FieldSet, _super);
-    function FieldSet() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    FieldSet.prototype.render = function () {
-        var _this = this;
-        var FieldSetView = this.props.view || this.props.ui.getView('form.FieldSetView');
-        return (React.createElement(Form_1.FormContext.Consumer, null, function (context) { return (React.createElement(Form_1.FormContext.Provider, { value: {
-                formId: _this.props.formId || context.formId,
-                model: _this.props.model || context.model,
-                prefix: [context.prefix, _this.props.prefix]
-                    .filter(Boolean)
-                    .join('.'),
-                layout: form_1.mergeLayoutProp(context.layout, _this.props.layout)
-            } },
-            React.createElement(FieldSetView, __assign({ className: _this.props.className, label: _this.props.label }, _this.props),
-                _this.props.children,
-                (_this.props.fields || []).map(function (field, index) { return (React.createElement(Field_1["default"], __assign({ key: index }, (isString_1["default"](field) ? { attribute: field } : field), { prefix: null }))); })))); }));
-    };
-    FieldSet = __decorate([
-        hoc_1.components('ui')
-    ], FieldSet);
-    return FieldSet;
-}(React.PureComponent));
+function FieldSet(props) {
+    var components = hooks_1.useComponents();
+    var context = react_1.useContext(Form_1.FormContext);
+    var contextValue = react_1.useMemo(function () { return ({
+        formId: props.formId || context.formId,
+        model: props.model || context.model,
+        prefix: [context.prefix, props.prefix]
+            .filter(Boolean)
+            .join('.'),
+        layout: form_1.mergeLayoutProp(context.layout, props.layout),
+        provider: context.provider,
+        reducer: context.reducer
+    }); }, [context.provider, context.reducer, props.formId, props.layout, props.model, props.prefix]);
+    var FieldSetView = props.view || components.ui.getView('form.FieldSetView');
+    return (react_1["default"].createElement(Form_1.FormContext.Provider, { value: contextValue },
+        react_1["default"].createElement(FieldSetView, __assign({ className: props.className, label: props.label }, props),
+            props.children,
+            (props.fields || []).map(function (field, index) { return (react_1["default"].createElement(Field_1["default"], __assign({ key: index }, (isString_1["default"](field) ? { attribute: field } : field), { prefix: contextValue.prefix }))); }))));
+}
 exports["default"] = FieldSet;