@luomus/laji-form 15.1.93 → 15.1.94

package/lib/components/LajiForm.d.ts

@@ -198,7 +198,6 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
         ArrayField: typeof fields.ArrayField;
         ObjectField: (props: any) => JSX.Element;
         NestField: typeof fields.NestField;
-        ArrayBulkField: typeof fields.ArrayBulkField;
         ArrayPropertySumField: typeof fields.ArrayPropertySumField;
         ScopeField: typeof fields.ScopeField;
         SelectTreeField: typeof fields.SelectTreeField;
@@ -272,7 +271,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
         AnnotationField: typeof fields.AnnotationField;
         PrefillingArrayField: typeof fields.PrefillingArrayField;
         AnyToBooleanField: {
-            (props: any): JSX.Element;
+            (props: FieldProps): JSX.Element;
             propTypes: {
                 uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
                     "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
@@ -387,7 +386,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
         TextSelectWidget: typeof widgets.TextSelectWidget;
         ImageSelectWidget: typeof widgets.ImageSelectWidget;
         AnyToBooleanWidget: {
-            (props: any): JSX.Element;
+            (props: import("../types").WidgetProps): JSX.Element;
             propTypes: {
                 uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
                     "ui:options": PropTypes.Requireable<PropTypes.InferProps<{

package/lib/components/VirtualSchemaField.d.ts

@@ -11,6 +11,7 @@ interface LajiFormComponentForVirtualSchemaField extends Omit<React.Component<Fi
  */
 export default function VirtualSchemaField<LFC extends Constructor<LajiFormComponentForVirtualSchemaField>>(ComposedComponent: LFC): {
     new (...args: any[]): {
+        UNSAFE_componentWillReceiveProps: (props: any, nextContext: any) => void;
         getUiOptions(): any;
         getStateFromProps: (props: FieldProps) => any;
         render: () => React.ReactNode;
@@ -33,7 +34,6 @@ export default function VirtualSchemaField<LFC extends Constructor<LajiFormCompo
         componentWillMount?: (() => void) | undefined;
         UNSAFE_componentWillMount?: (() => void) | undefined;
         componentWillReceiveProps?: ((nextProps: Readonly<FieldProps>, nextContext: any) => void) | undefined;
-        UNSAFE_componentWillReceiveProps?: ((nextProps: Readonly<FieldProps>, nextContext: any) => void) | undefined;
         componentWillUpdate?: ((nextProps: Readonly<FieldProps>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
         UNSAFE_componentWillUpdate?: ((nextProps: Readonly<FieldProps>, nextState: Readonly<{}>, nextContext: any) => void) | undefined;
     };

package/lib/components/VirtualSchemaField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -46,7 +40,6 @@ exports.getPropsWithInnerUiSchema = getPropsWithInnerUiSchema;
 exports.default = VirtualSchemaField;
 const React = __importStar(require("react"));
 const utils_1 = require("../utils");
-const BaseComponent_1 = __importDefault(require("./BaseComponent"));
 const Context_1 = __importDefault(require("../Context"));
 function getPropsWithInnerUiSchema(props) {
     return Object.assign(Object.assign({}, props), { uiSchema: (0, utils_1.getInnerUiSchema)(props.uiSchema) });
@@ -55,9 +48,19 @@ function getPropsWithInnerUiSchema(props) {
  * Virtual SchemaFields are components which are just state transforming machines.
  */
 function VirtualSchemaField(ComposedComponent) {
-    let VirtualSchemaField = class VirtualSchemaField extends ComposedComponent {
+    class VirtualSchemaField extends ComposedComponent {
         constructor(...args) {
             super(...args);
+            this.UNSAFE_componentWillReceiveProps = (props, nextContext) => {
+                if (super.UNSAFE_componentWillReceiveProps) {
+                    super.UNSAFE_componentWillReceiveProps(props, nextContext);
+                }
+                else if (this.getStateFromProps) {
+                    const state = this.getStateFromProps(props);
+                    if (state)
+                        this.setState(state);
+                }
+            };
             this.getStateFromProps = (props) => {
                 const propsWithInnerUiSchema = getPropsWithInnerUiSchema(props);
                 const state = super.getStateFromProps ? super.getStateFromProps(propsWithInnerUiSchema, props) : propsWithInnerUiSchema;
@@ -86,16 +89,14 @@ function VirtualSchemaField(ComposedComponent) {
                 return (React.createElement(SchemaField, Object.assign({}, filterProps(Object.assign(Object.assign({}, this.props), this.state)))));
             };
             this.getStateFromProps = this.getStateFromProps.bind(this);
+            this.state = this.getStateFromProps(args[0]);
             this.render = this.render.bind(this);
         }
         getUiOptions() {
             return (0, utils_1.getUiOptions)(this.props.uiSchema);
         }
-    };
+    }
     VirtualSchemaField.displayName = (0, utils_1.getReactComponentName)(ComposedComponent);
-    VirtualSchemaField = __decorate([
-        BaseComponent_1.default
-    ], VirtualSchemaField);
     if (ComposedComponent.getName) {
         const name = ComposedComponent.getName();
         (0, Context_1.default)("VIRTUAL_SCHEMA_NAMES")[name] = true;

package/lib/components/components/Button.d.ts

@@ -11,4 +11,4 @@ export declare const Button: React.ForwardRefExoticComponent<Pick<ThemedButtonPr
     tooltipPlacement?: string;
     tooltipTrigger?: string;
     tooltipClass?: string;
-}, "small" | "variant" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;
+}, "small" | "variant" | "type" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;

package/lib/components/components/GlyphButton.d.ts

@@ -7,4 +7,4 @@ export declare const GlyphButton: React.ForwardRefExoticComponent<Pick<import(".
     tooltipClass?: string;
 } & {
     glyph: Glyph;
-}, "small" | "variant" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "glyph" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;
+}, "small" | "variant" | "type" | "key" | "block" | "id" | "active" | "style" | "className" | "children" | "disabled" | "tooltip" | "onKeyDown" | "onClick" | "glyph" | "tooltipPlacement" | "tooltipTrigger" | "tooltipClass"> & React.RefAttributes<unknown>>;

package/lib/components/fields/AnnotationField.d.ts

@@ -1,4 +1,11 @@
-export default class AnnotationField extends React.Component<any, any, any> {
+import * as React from "react";
+import * as PropTypes from "prop-types";
+import { FieldProps } from "../../types";
+import memoize from "memoizee";
+type State = {
+    show: boolean;
+};
+export default class AnnotationField extends React.Component<FieldProps, State> {
     static contextType: React.Context<import("../../ReactContext").ContextProps>;
     static propTypes: {
         uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
@@ -18,21 +25,19 @@ export default class AnnotationField extends React.Component<any, any, any> {
         }>>>;
         formData: PropTypes.Validator<object>;
     };
-    constructor(props: any);
     state: {
         show: boolean;
     };
     getButton: () => {
         glyph: string;
-        tooltip: any;
+        tooltip: string;
         tooltipPlacement: string;
-        fn: () => () => void;
+        fn: (() => () => void) & memoize.Memoized<() => () => void>;
         variant: string;
     };
-    onClick: () => () => void;
+    onClick: (() => () => void) & memoize.Memoized<() => () => void>;
     onHide: () => void;
     getAnnotations: () => any;
     render(): JSX.Element;
 }
-import * as React from "react";
-import * as PropTypes from "prop-types";
+export {};

package/lib/components/fields/AnnotationField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -55,15 +49,16 @@ const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const LajiForm_1 = __importDefault(require("../LajiForm"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const Context_1 = __importDefault(require("../../Context"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const components_1 = require("../components");
 const react_spinner_1 = __importDefault(require("react-spinner"));
 const utils_2 = require("@luomus/laji-map/lib/utils");
-let AnnotationField = class AnnotationField extends React.Component {
-    constructor(props) {
-        super(props);
+const memoizee_1 = __importDefault(require("memoizee"));
+class AnnotationField extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = { show: false };
         this.getButton = () => {
             const annotations = this.getAnnotations();
             return {
@@ -74,9 +69,9 @@ let AnnotationField = class AnnotationField extends React.Component {
                 variant: annotations && annotations.length ? "primary" : "default"
             };
         };
-        this.onClick = () => () => {
+        this.onClick = (0, memoizee_1.default)(() => () => {
             this.setState({ show: !this.state.show });
-        };
+        });
         this.onHide = () => {
             this.setState({ show: false });
         };
@@ -85,7 +80,6 @@ let AnnotationField = class AnnotationField extends React.Component {
             const { id } = this.props.formData;
             return (0, Context_1.default)(`${this.props.formContext.contextId}_ANNOTATIONS`)[id] || annotations[id];
         };
-        this.state = { show: false };
     }
     render() {
         const { adminOnly, container, add, filter, uiSchema: annotationUiSchema, buttonsPath = "/", formId } = (0, utils_1.getUiOptions)(this.props.uiSchema);
@@ -115,7 +109,7 @@ let AnnotationField = class AnnotationField extends React.Component {
                 React.createElement(Container, null,
                     React.createElement(AnnotationBox, { id: this.props.formData.id, annotations: this.getAnnotations(), lang: this.props.formContext.lang, formContext: this.props.formContext, add: add, uiSchema: annotationUiSchema, filter: filter, formId: formId }))));
     }
-};
+}
 AnnotationField.contextType = ReactContext_1.default;
 AnnotationField.propTypes = {
     uiSchema: PropTypes.shape({
@@ -135,9 +129,6 @@ AnnotationField.propTypes = {
     }).isRequired,
     formData: PropTypes.object.isRequired
 };
-AnnotationField = __decorate([
-    BaseComponent_1.default
-], AnnotationField);
 exports.default = AnnotationField;
 (0, Context_1.default)("SCHEMA_FIELD_WRAPPERS").AnnotationField = true;
 class AnnotationBox extends React.Component {
@@ -173,6 +164,9 @@ class AnnotationBox extends React.Component {
             state.addFormData = formData;
             this.setState(state);
         };
+        this.onAnnotationSubmitClick = () => {
+            this.onAnnotationSubmit({ formData: this.state.addFormData });
+        };
         this.getAddOptions = () => {
             const { add, formContext: { uiSchemaContext: { isAdmin } } } = this.props;
             let addOptions = (0, utils_2.isObject)(add) ? add : {};
@@ -194,7 +188,7 @@ class AnnotationBox extends React.Component {
             let submitOnChange = undefined;
             let addFormData = undefined;
             if (add && metadataForm && metadataForm.schema) {
-                const { adminOnly, filter: _filter, uiSchema: _addUiSchema, _submitOnChange, formData } = this.getAddOptions();
+                const { adminOnly, filter: _filter, uiSchema: _addUiSchema, submitOnChange: _submitOnChange, formData } = this.getAddOptions();
                 if (adminOnly && !formContext.uiSchemaContext.isAdmin) {
                     return null;
                 }
@@ -217,12 +211,12 @@ class AnnotationBox extends React.Component {
             return add && addSchema ? (React.createElement(LajiForm_1.default, Object.assign({}, metadataForm, { schema: addSchema, uiSchema: addUiSchema || _uiSchema, onSubmit: this.onAnnotationSubmit, onChange: this.onAnnotationChange, renderSubmit: renderSubmit, formData: addFormData, lang: lang, apiClient: this.props.formContext.apiClient.apiClient, uiSchemaContext: this.props.formContext.uiSchemaContext }), React.createElement("div", null,
                 this.state.fail !== undefined &&
                     React.createElement(Alert, { variant: this.state.fail ? "danger" : "success" }, translations[this.state.fail ? "SaveFail" : "SaveSuccess"]),
-                renderSubmit && React.createElement(components_1.Button, { id: "submit", type: "submit", onClick: this.onAnnotationSubmit }, translations.Submit)))) : null;
+                renderSubmit && React.createElement(components_1.Button, { id: "submit", type: "submit", onClick: this.onAnnotationSubmitClick }, translations.Submit)))) : null;
         };
         this.getUiSchema = () => {
             const { uiSchema } = this.props;
-            const { metadataForm = {} } = this.state;
-            return uiSchema || Object.assign(Object.assign({}, metadataForm.uiSchema), { "ui:shortcuts": Object.assign(Object.assign({}, ((metadataForm.uiSchema || {})["ui:shorcuts"] || {})), (this.props.formContext.services.keyHandler.shortcuts)), "ui:showShortcutsButton": false });
+            const metadataForm = this.state.metadataForm || {};
+            return uiSchema || Object.assign(Object.assign({}, (metadataForm.uiSchema || {})), { "ui:shortcuts": Object.assign(Object.assign({}, ((metadataForm.uiSchema || {})["ui:shorcuts"] || {})), (this.props.formContext.services.keyHandler.shortcuts)), "ui:showShortcutsButton": false });
         };
         this.onDelete = (id) => () => __awaiter(this, void 0, void 0, function* () {
             try {
@@ -240,7 +234,7 @@ class AnnotationBox extends React.Component {
     }
     componentDidMount() {
         this.mounted = true;
-        this.props.formContext.apiClient.get(`/forms/${this.props.formId}`, { query: { format: "schema" } })
+        this.props.formContext.apiClient.get("/forms/{id}", { path: { id: this.props.formId }, query: { format: "schema" } })
             .then(metadataForm => {
             if (!this.mounted)
                 return;

package/lib/components/fields/AnyToBooleanField.d.ts

@@ -1,18 +1,19 @@
-export default _anyToBoolean;
-declare function _anyToBoolean(props: any): JSX.Element;
-declare namespace _anyToBoolean {
-    namespace propTypes {
-        let uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+import * as PropTypes from "prop-types";
+import { FieldProps } from "src/types";
+declare const _anyToBoolean: {
+    (props: FieldProps): JSX.Element;
+    propTypes: {
+        uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
                 trueValue: PropTypes.Validator<object>;
                 falseValue: PropTypes.Requireable<object>;
                 allowUndefined: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
-        let schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+        schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
             type: PropTypes.Requireable<string>;
         }>>>;
-        let formData: PropTypes.Requireable<object>;
-    }
-}
-import * as PropTypes from "prop-types";
+        formData: PropTypes.Requireable<object>;
+    };
+};
+export default _anyToBoolean;

package/lib/components/fields/ArrayField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -47,7 +41,6 @@ exports.onArrayFieldChange = onArrayFieldChange;
 const React = __importStar(require("react"));
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const ArrayFieldTemplate_1 = require("../templates/ArrayFieldTemplate");
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const core_1 = require("@rjsf/core");
@@ -123,7 +116,7 @@ class ArrayFieldPatched extends ArrayField {
     }
 }
 exports.ArrayFieldPatched = ArrayFieldPatched;
-let _ArrayField = class _ArrayField extends React.Component {
+class _ArrayField extends React.Component {
     constructor() {
         super(...arguments);
         this.onChange = (formData) => {
@@ -176,9 +169,6 @@ let _ArrayField = class _ArrayField extends React.Component {
                         ? (0, deepmerge_1.default)(this.buttonDefinitions, (0, utils_1.getUiOptions)(props.uiSchema).buttonDefinitions)
                         : this.buttonDefinitions }) }), onChange: this.onChange }));
     }
-};
+}
 _ArrayField.contextType = ReactContext_1.default;
-_ArrayField = __decorate([
-    BaseComponent_1.default
-], _ArrayField);
 exports.default = _ArrayField;

package/lib/components/fields/ArrayPropertySumField.d.ts

@@ -16,7 +16,6 @@ export default class ArrayPropertySumField extends React.Component<FieldProps<JS
         formData: PropTypes.Validator<any[]>;
     };
     static getName(): string;
-    getStateFromProps(props: FieldProps): State;
     render(): JSX.Element;
 }
 export {};

package/lib/components/fields/ArrayPropertySumField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -38,26 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const utils_1 = require("../../utils");
-let ArrayPropertySumField = class ArrayPropertySumField extends React.Component {
+class ArrayPropertySumField extends React.Component {
     static getName() { return "ArrayPropertySumField"; }
-    getStateFromProps(props) {
-        const { formData = [] } = props;
-        const state = { sum: 0 };
-        const propertyField = (0, utils_1.getUiOptions)(this.props.uiSchema).propertyField;
-        state.sum = formData.reduce((acc, item) => acc + (Number(item[propertyField]) || 0), 0);
-        return state;
-    }
     render() {
         const SchemaField = this.props.registry.fields.SchemaField;
-        const { sum } = this.state;
+        const sum = getSum(this.props);
         return (React.createElement(React.Fragment, null,
             React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: (0, utils_1.getInnerUiSchema)(this.props.uiSchema) })),
             React.createElement("h4", null,
@@ -65,7 +48,7 @@ let ArrayPropertySumField = class ArrayPropertySumField extends React.Component
                 ": ",
                 sum)));
     }
-};
+}
 ArrayPropertySumField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -76,7 +59,9 @@ ArrayPropertySumField.propTypes = {
     schema: PropTypes.object.isRequired,
     formData: PropTypes.array.isRequired
 };
-ArrayPropertySumField = __decorate([
-    BaseComponent_1.default
-], ArrayPropertySumField);
 exports.default = ArrayPropertySumField;
+const getSum = (props) => {
+    const formData = props.formData || [];
+    const propertyField = (0, utils_1.getUiOptions)(props.uiSchema).propertyField;
+    return formData.reduce((acc, item) => acc + (Number(item[propertyField]) || 0), 0);
+};

package/lib/components/fields/ExtraLabelRowField.d.ts

@@ -18,7 +18,7 @@ export default class ExtraLabelRowField extends React.Component<any, any, any> {
     };
     constructor(props: any);
     constructor(props: any, context: any);
-    getStateFromProps(props: any): {
+    getNextProps(props: any): {
         schema: any;
         uiSchema: import("../../types").UiSchema<any>;
         options: any;

package/lib/components/fields/ExtraLabelRowField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -46,10 +40,9 @@ const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const components_1 = require("../components");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const utils_2 = require("@rjsf/utils");
-let ExtraLabelRowField = class ExtraLabelRowField extends React.Component {
+class ExtraLabelRowField extends React.Component {
     constructor() {
         super(...arguments);
         this.containerRef = React.createRef();
@@ -80,7 +73,7 @@ let ExtraLabelRowField = class ExtraLabelRowField extends React.Component {
             return cols;
         };
     }
-    getStateFromProps(props) {
+    getNextProps(props) {
         return {
             schema: Object.assign(Object.assign({}, props.schema), { title: "" }),
             uiSchema: (0, utils_1.getInnerUiSchema)(props.uiSchema),
@@ -105,9 +98,9 @@ let ExtraLabelRowField = class ExtraLabelRowField extends React.Component {
             title
                 ? (React.createElement(TitleFieldTemplate, { title: title, schema: this.props.schema, uiSchema: this.props.uiSchema, id: this.props.idSchema.$id, registry: this.props.registry })) : null,
             labelRow,
-            React.createElement(SchemaField, Object.assign({}, this.props, this.state))));
+            React.createElement(SchemaField, Object.assign({}, this.props, this.getNextProps(this.props)))));
     }
-};
+}
 ExtraLabelRowField.contextType = ReactContext_1.default;
 ExtraLabelRowField.propTypes = {
     uiSchema: PropTypes.shape({
@@ -125,7 +118,4 @@ ExtraLabelRowField.propTypes = {
     }).isRequired,
     formData: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired
 };
-ExtraLabelRowField = __decorate([
-    BaseComponent_1.default
-], ExtraLabelRowField);
 exports.default = ExtraLabelRowField;

package/lib/components/fields/FilterArrayField.d.ts

@@ -70,7 +70,7 @@ export default class FilterArrayField extends React.Component<any, any, any> {
     };
     constructor(props: any);
     constructor(props: any, context: any);
-    getStateFromProps(props: any): any;
+    getNextProps(props: any): any;
     cache: any;
     filteredIdxs: {} | undefined;
     filteredToOffsets: {} | undefined;

package/lib/components/fields/FilterArrayField.js

@@ -15,12 +15,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 () {
     var ownKeys = function(o) {
         ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -38,16 +32,12 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrayRulesPropType = void 0;
 const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const ConditionalUiSchemaField_1 = require("./ConditionalUiSchemaField");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const arrayRulePropType = PropTypes.shape({
     idx: PropTypes.number,
     isLast: PropTypes.number,
@@ -58,7 +48,7 @@ exports.arrayRulesPropType = PropTypes.oneOfType([
     arrayRulePropType,
     PropTypes.arrayOf(PropTypes.oneOfType([ConditionalUiSchemaField_1.rulePropType, arrayRulePropType]))
 ]);
-let FilterArrayField = class FilterArrayField extends React.Component {
+class FilterArrayField extends React.Component {
     constructor() {
         super(...arguments);
         this.getOnActiveChange = (idx, prop, callback) => {
@@ -77,7 +67,7 @@ let FilterArrayField = class FilterArrayField extends React.Component {
             }, formData));
         };
     }
-    getStateFromProps(props) {
+    getNextProps(props) {
         if (props.schema.items.type !== "object") {
             throw new Error("Can't use FilterArrayField if items aren't objects");
         }
@@ -136,9 +126,9 @@ let FilterArrayField = class FilterArrayField extends React.Component {
     }
     render() {
         const SchemaField = this.props.registry.fields.SchemaField;
-        return React.createElement(SchemaField, Object.assign({}, this.props, this.state));
+        return React.createElement(SchemaField, Object.assign({}, this.props, this.getNextProps(this.props)));
     }
-};
+}
 FilterArrayField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -151,7 +141,4 @@ FilterArrayField.propTypes = {
     }).isRequired,
     formData: PropTypes.array
 };
-FilterArrayField = __decorate([
-    BaseComponent_1.default
-], FilterArrayField);
 exports.default = FilterArrayField;