@luomus/laji-form 15.1.93 → 15.1.94

package/lib/components/fields/GeocoderField.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,15 +41,13 @@ const PropTypes = __importStar(require("prop-types"));
 const immutability_helper_1 = __importDefault(require("immutability-helper"));
 const equals = require("deep-equal");
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
 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 globals_1 = require("@luomus/laji-map/lib/globals");
 const cache = {};
-let GeocoderField = class GeocoderField extends React.Component {
+class GeocoderField extends React.Component {
     static getName() { return "GeocoderField"; }
     constructor(props) {
         super(props);
@@ -127,14 +119,6 @@ let GeocoderField = class GeocoderField extends React.Component {
                 this.mounted && this.setState(this.getStateFromProps(props, false));
                 return;
             }
-            const bounds = L.geoJson({
-                type: "FeatureCollection",
-                features: geometry.geometries.map(geometry => {
-                    return { type: "Feature", properties: {}, geometry };
-                })
-            }).getBounds();
-            const center = bounds.getCenter();
-            const { lat, lng } = center;
             const join = (oldValue, value) => (0, utils_1.isEmptyString)(oldValue) ? value : `${oldValue}, ${value}`;
             const lajiFormInstance = props.formContext.services.rootInstance;
             const timestamp = Date.now();
@@ -158,7 +142,7 @@ let GeocoderField = class GeocoderField extends React.Component {
                         afterFetch(callback, timeout);
                         reject(e);
                     };
-                    const handleResponse = (country, ...fields) => (response) => {
+                    const handleResponse = (...fields) => (response) => {
                         fields = fields.reduce((_fields, field) => {
                             _fields[field] = true;
                             return _fields;
@@ -246,8 +230,6 @@ let GeocoderField = class GeocoderField extends React.Component {
                                 changes[field] = (0, utils_1.getDefaultFormState)(this.props.schema.properties[field]);
                             }
                         });
-                        if (country && this.props.schema.properties.country && fieldByKeys.country)
-                            changes.country = country;
                         success(() => {
                             if (timestamp !== this.promiseTimestamp)
                                 return;
@@ -263,17 +245,6 @@ let GeocoderField = class GeocoderField extends React.Component {
                                 callback();
                         });
                     };
-                    const fetchForeign = () => {
-                        if (!props.formContext.googleApiKey)
-                            return fail("No Google API key", callback);
-                        this.fetch(`https://maps.googleapis.com/maps/api/geocode/json\
-					?latlng=${lat},${lng}\
-					&key=${props.formContext.googleApiKey}\
-					&language=en\
-					&filter=country|administrative_area_level_1|administrative_area_level_2|administrative_area_level_3`).then(handleResponse(undefined, "country", "municipality", "administrativeProvince")).catch((e) => {
-                            fail(e.message, callback, !!"failed");
-                        });
-                    };
                     this.getComponentContext().fetching = true;
                     this.props.formContext.setTimeout(() => {
                         if (timestamp !== this.promiseTimestamp)
@@ -285,11 +256,9 @@ let GeocoderField = class GeocoderField extends React.Component {
                             });
                         }
                     }, 30 * 1000);
-                    !bounds.overlaps(globals_1.FINLAND_BOUNDS)
-                        ? fetchForeign()
-                        : this.props.formContext.apiClient.post("/coordinates/location", undefined, geometry).then().then(handleResponse(props.formContext.translations.Finland, "municipality", "biologicalProvince", "biogeographicalProvince")).catch((e) => {
-                            fail(typeof e === "string" ? e : e.message);
-                        });
+                    this.props.formContext.apiClient.post("/coordinates/location", undefined, geometry).then(handleResponse("country", "municipality", "administrativeProvince", "biologicalProvince", "biogeographicalProvince")).catch(e => {
+                        fail(typeof e === "string" ? e : e.message);
+                    });
                 }));
             };
             if (this.getComponentContext().hook) {
@@ -368,7 +337,7 @@ let GeocoderField = class GeocoderField extends React.Component {
         const { SchemaField } = this.props.registry.fields;
         return React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: this.state.uiSchema }));
     }
-};
+}
 GeocoderField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -390,7 +359,4 @@ GeocoderField.propTypes = {
     formData: PropTypes.object
 };
 GeocoderField.contextType = ReactContext_1.default;
-GeocoderField = __decorate([
-    BaseComponent_1.default
-], GeocoderField);
 exports.default = GeocoderField;

package/lib/components/fields/ImageArrayField.js

@@ -72,7 +72,6 @@ const react_dropzone_1 = __importDefault(require("react-dropzone"));
 const components_1 = require("../components");
 const LajiForm_1 = __importDefault(require("../LajiForm"));
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const react_spinner_1 = __importDefault(require("react-spinner"));
 const exifreader_1 = __importDefault(require("exifreader"));
 const utils_2 = require("@luomus/laji-map/lib/utils");
@@ -111,7 +110,7 @@ ImageArrayField = __decorate([
 ], ImageArrayField);
 exports.default = ImageArrayField;
 function MediaArrayField(ComposedComponent) {
-    let MediaArrayField = class MediaArrayField extends ComposedComponent {
+    class MediaArrayField extends ComposedComponent {
         constructor(...args) {
             super(...args);
             this.deprecatedOptions = {
@@ -645,7 +644,7 @@ function MediaArrayField(ComposedComponent) {
                 }
             });
         }
-    };
+    }
     MediaArrayField.contextType = ReactContext_1.default;
     MediaArrayField.propTypes = {
         uiSchema: PropTypes.shape({
@@ -677,9 +676,6 @@ function MediaArrayField(ComposedComponent) {
         formData: PropTypes.array
     };
     MediaArrayField.displayName = (0, utils_1.getReactComponentName)(ComposedComponent);
-    MediaArrayField = __decorate([
-        BaseComponent_1.default
-    ], MediaArrayField);
     return MediaArrayField;
 }
 class Thumbnail extends React.PureComponent {

package/lib/components/fields/ImageDisplayField.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) {
@@ -44,11 +38,10 @@ var __importDefault = (this && this.__importDefault) || function (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");
 const immutability_helper_1 = __importDefault(require("immutability-helper"));
 // TODO should work as widget also
-let ImageDisplayField = class ImageDisplayField extends React.Component {
+class ImageDisplayField extends React.Component {
     render() {
         const { SchemaField } = this.props.registry.fields;
         let uiSchema = (0, utils_1.getInnerUiSchema)(this.props.uiSchema);
@@ -61,7 +54,7 @@ let ImageDisplayField = class ImageDisplayField extends React.Component {
         return (React.createElement(React.Fragment, null,
             React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: uiSchema }))));
     }
-};
+}
 ImageDisplayField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -74,7 +67,4 @@ ImageDisplayField.propTypes = {
     }).isRequired,
     formData: PropTypes.oneOfType([PropTypes.array, PropTypes.object])
 };
-ImageDisplayField = __decorate([
-    BaseComponent_1.default
-], ImageDisplayField);
 exports.default = ImageDisplayField;

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

@@ -12,13 +12,10 @@ export default class InitiallyHiddenField extends React.Component<any, any, any>
         formData: PropTypes.Validator<object>;
     };
     constructor(props: any);
+    constructor(props: any, context: any);
     state: {
-        uiSchema: import("../../types").UiSchema<any>;
         visible: boolean;
     };
-    getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema<any>;
-    };
     toggleVisibility: () => void;
     render(): JSX.Element;
 }

package/lib/components/fields/InitiallyHiddenField.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,18 +40,14 @@ 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"));
-let InitiallyHiddenField = class InitiallyHiddenField extends React.Component {
-    constructor(props) {
-        super(props);
+class InitiallyHiddenField extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = { visible: false };
         this.toggleVisibility = () => {
             this.setState({ visible: !this.state.visible });
         };
-        this.state = Object.assign({ visible: false }, this.getStateFromProps(props));
-    }
-    getStateFromProps(props) {
-        return { uiSchema: (0, utils_1.getInnerUiSchema)(props.uiSchema) };
     }
     render() {
         let shouldShow = this.state.visible;
@@ -73,9 +63,9 @@ let InitiallyHiddenField = class InitiallyHiddenField extends React.Component {
                             React.createElement("span", { className: "caret" }))))),
             React.createElement(Collapse, { in: shouldShow },
                 React.createElement("div", null,
-                    React.createElement(SchemaField, Object.assign({}, this.props, this.state))))));
+                    React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: (0, utils_1.getInnerUiSchema)(this.props.uiSchema) }))))));
     }
-};
+}
 InitiallyHiddenField.contextType = ReactContext_1.default;
 InitiallyHiddenField.propTypes = {
     uiSchema: PropTypes.shape({
@@ -88,7 +78,4 @@ InitiallyHiddenField.propTypes = {
     }).isRequired,
     formData: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired
 };
-InitiallyHiddenField = __decorate([
-    BaseComponent_1.default
-], InitiallyHiddenField);
 exports.default = InitiallyHiddenField;

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

@@ -8,6 +8,7 @@ export default class LocalityField extends React.Component<any, any, any> {
         formData: PropTypes.Validator<object>;
     };
     constructor(props: any);
+    constructor(props: any, context: any);
     state: {};
     render(): JSX.Element;
     showEditor: () => void;

package/lib/components/fields/LocalityField.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) {
@@ -56,14 +50,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const components_1 = require("../components");
 const LajiForm_1 = __importDefault(require("../LajiForm"));
 const MapField_1 = require("./MapField");
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
-let LocalityField = class LocalityField extends React.Component {
-    constructor(props) {
-        super(props);
+class LocalityField extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = {};
         this.showEditor = () => {
             this.setState({ modal: true });
         };
@@ -90,7 +84,6 @@ let LocalityField = class LocalityField extends React.Component {
             this.props.onChange(formData);
             this.hideEditor();
         };
-        this.state = {};
     }
     render() {
         const { radius: _radius, geometry } = (0, utils_1.getUiOptions)(this.props.uiSchema);
@@ -115,7 +108,7 @@ let LocalityField = class LocalityField extends React.Component {
                         React.createElement(components_1.GlyphButton, { onClick: this.showEditor, glyph: "pencil", variant: "default", className: "pull-right" })))),
             this.state.modal && this.renderModal()));
     }
-};
+}
 LocalityField.contextType = ReactContext_1.default;
 LocalityField.propTypes = {
     uiSchema: PropTypes.object,
@@ -124,7 +117,4 @@ LocalityField.propTypes = {
     }).isRequired,
     formData: PropTypes.object.isRequired
 };
-LocalityField = __decorate([
-    BaseComponent_1.default
-], LocalityField);
 exports.default = LocalityField;

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

@@ -19,8 +19,50 @@ export default class LocationChooserField extends React.Component<any, any, any>
     };
     constructor(props: any);
     constructor(props: any, context: any);
-    getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema<any>;
+    getUiSchema(props: any): {
+        "ui:buttons": any[];
+        "ui:ArrayFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:ArrayFieldDescriptionTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldDescriptionProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:ArrayFieldItemTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTemplateItemType<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:ArrayFieldTitleTemplate"?: React.ComponentType<import("@rjsf/utils").ArrayFieldTitleProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:BaseInputTemplate"?: React.ComponentType<import("@rjsf/utils").WidgetProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:DescriptionFieldTemplate"?: React.ComponentType<import("@rjsf/utils").DescriptionFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:ErrorListTemplate"?: React.ComponentType<import("@rjsf/utils").ErrorListProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:FieldErrorTemplate"?: React.ComponentType<import("@rjsf/utils").FieldErrorProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:FieldHelpTemplate"?: React.ComponentType<import("@rjsf/utils").FieldHelpProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:FieldTemplate"?: React.ComponentType<import("@rjsf/utils").FieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:ObjectFieldTemplate"?: React.ComponentType<import("@rjsf/utils").ObjectFieldTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:TitleFieldTemplate"?: React.ComponentType<import("@rjsf/utils").TitleFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:UnsupportedFieldTemplate"?: React.ComponentType<import("@rjsf/utils").UnsupportedFieldProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:WrapIfAdditionalTemplate"?: React.ComponentType<import("@rjsf/utils").WrapIfAdditionalTemplateProps<any, any, import("../LajiForm").FormContext>> | undefined;
+        "ui:classNames"?: string | undefined;
+        "ui:style"?: React.StyleHTMLAttributes<any> | undefined;
+        "ui:title"?: string | undefined;
+        "ui:description"?: string | undefined;
+        "ui:placeholder"?: string | undefined;
+        "ui:help"?: string | undefined;
+        "ui:autofocus"?: boolean | undefined;
+        "ui:autocomplete"?: AutoFill | undefined;
+        "ui:disabled"?: boolean | undefined;
+        "ui:emptyValue"?: any;
+        "ui:enumDisabled"?: (string | number | boolean)[] | undefined;
+        "ui:hideError"?: boolean | undefined;
+        "ui:readonly"?: boolean | undefined;
+        "ui:order"?: string[] | undefined;
+        "ui:addable"?: boolean | undefined;
+        "ui:orderable"?: boolean | undefined;
+        "ui:removable"?: boolean | undefined;
+        "ui:inline"?: boolean | undefined;
+        "ui:inputType"?: string | undefined;
+        "ui:label"?: boolean | undefined;
+        "ui:rows"?: number | undefined;
+        "ui:submitButtonOptions"?: import("@rjsf/utils").UISchemaSubmitButtonOptions | undefined;
+        "ui:widget"?: string | import("@rjsf/utils").Widget<any, any, import("../LajiForm").FormContext> | undefined;
+        "ui:duplicateKeySuffixSeparator"?: string | undefined;
+        "ui:rootFieldId"?: string;
+        "ui:field"?: string | import("@rjsf/utils").Field<any, any, import("../LajiForm").FormContext> | undefined;
+        "ui:fieldReplacesAnyOrOneOf"?: boolean;
+        "ui:options"?: import("@rjsf/utils").UIOptionsType<any, any, import("../LajiForm").FormContext> | undefined;
     };
     render(): JSX.Element;
 }

package/lib/components/fields/LocationChooserField.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) {
@@ -56,26 +50,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
 const react_dom_1 = require("react-dom");
 const PropTypes = __importStar(require("prop-types"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const components_1 = require("../components");
 const Context_1 = __importDefault(require("../../Context"));
 const utils_1 = require("../../utils");
 const MapArrayField_1 = require("./MapArrayField");
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
-let LocationChooserField = class LocationChooserField extends React.Component {
-    getStateFromProps(props) {
+class LocationChooserField extends React.Component {
+    getUiSchema(props) {
         let uiSchema = (0, utils_1.getInnerUiSchema)(props.uiSchema);
-        uiSchema = Object.assign(Object.assign({}, uiSchema), { "ui:buttons": [
+        return Object.assign(Object.assign({}, uiSchema), { "ui:buttons": [
                 ...(uiSchema["ui:buttons"] || []),
                 React.createElement(LocationButton, { key: `$${this.props.idSchema.$id}-location`, that: this })
             ] });
-        return { uiSchema };
     }
     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, { uiSchema: this.getUiSchema(this.props) }));
     }
-};
+}
 LocationChooserField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -94,9 +86,6 @@ LocationChooserField.propTypes = {
     }).isRequired,
     formData: PropTypes.object.isRequired
 };
-LocationChooserField = __decorate([
-    BaseComponent_1.default
-], LocationChooserField);
 exports.default = LocationChooserField;
 class LocationButton extends React.Component {
     constructor(props) {

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

@@ -21,6 +21,7 @@ export default class MultiActiveArrayField extends React.Component<FieldProps<JS
     deleteButtonRefs: {};
     deleteButtonRefSetters: {};
     constructor(props: FieldProps<JSONSchemaObject>);
+    UNSAFE_componentWillReceiveProps(props: FieldProps<JSONSchemaObject>): void;
     getInitialActiveIdx: (props: FieldProps<JSONSchemaObject>) => number[];
     getStateFromProps(props: FieldProps<JSONSchemaObject>): State | null;
     render(): JSX.Element;

package/lib/components/fields/MultiActiveArrayField.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) {
@@ -42,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const React = __importStar(require("react"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const PropTypes = __importStar(require("prop-types"));
@@ -51,7 +44,7 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
 const ArrayFieldTemplate_1 = require("../templates/ArrayFieldTemplate");
 const ArrayField_1 = require("./ArrayField");
 const SingleActiveArrayField_1 = require("./SingleActiveArrayField");
-let MultiActiveArrayField = class MultiActiveArrayField extends React.Component {
+class MultiActiveArrayField extends React.Component {
     constructor(props) {
         super(props);
         // these are required by the AccordionArrayFieldTemplate
@@ -113,6 +106,9 @@ let MultiActiveArrayField = class MultiActiveArrayField extends React.Component
         this.deleteButtonRefSetters = {};
         this.state = Object.assign({ activeIdx: this.getInitialActiveIdx(props) }, this.getStateFromProps(props));
     }
+    UNSAFE_componentWillReceiveProps(props) {
+        this.setState(this.getStateFromProps(props));
+    }
     getStateFromProps(props) {
         let activeIdx;
         const options = (0, utils_1.getUiOptions)(props.uiSchema);
@@ -146,7 +142,7 @@ let MultiActiveArrayField = class MultiActiveArrayField extends React.Component
         uiSchema["ui:ArrayFieldTemplate"] = ArrayFieldTemplate;
         return (React.createElement(ArrayField, Object.assign({}, this.props, { formContext: formContext, registry: Object.assign(Object.assign({}, this.props.registry), { formContext }), schema: this.props.schema, uiSchema: uiSchema, idSchema: this.props.idSchema, errorSchema: this.props.errorSchema, onChange: this.props.onChange, onBlur: this.props.onBlur, onFocus: this.props.onFocus, disabled: this.props.disabled, readonly: this.props.readonly, name: this.props.name })));
     }
-};
+}
 MultiActiveArrayField.contextType = ReactContext_1.default;
 MultiActiveArrayField.propTypes = {
     uiSchema: PropTypes.shape({
@@ -160,7 +156,4 @@ MultiActiveArrayField.propTypes = {
     }).isRequired,
     formData: PropTypes.array
 };
-MultiActiveArrayField = __decorate([
-    BaseComponent_1.default
-], MultiActiveArrayField);
 exports.default = MultiActiveArrayField;

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

@@ -19,13 +19,8 @@ export default class MultiAnyToBooleanField extends React.Component<any, any, an
     state: {
         groupsFormData: any[];
     };
-    getInitialState(props: any): {
-        groupsFormData: any[];
-    };
-    getStateFromProps(props: any): {
-        groupsFormData: any[];
-    };
-    initializeGroups: (props: any) => {
+    UNSAFE_componentWillReceiveProps(props: any): void;
+    getStateFromProps: (props: any) => {
         groupsFormData: any[];
     };
     onChange: (index: any) => (value: any) => void;

package/lib/components/fields/MultiAnyToBooleanField.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) {
@@ -54,15 +48,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const React = __importStar(require("react"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const AnyToBooleanField_1 = __importDefault(require("./AnyToBooleanField"));
 const utils_2 = require("@rjsf/utils");
-let MultiAnyToBooleanField = class MultiAnyToBooleanField extends React.Component {
+class MultiAnyToBooleanField extends React.Component {
     constructor(props) {
         super(props);
-        this.initializeGroups = (props) => {
+        this.getStateFromProps = (props) => {
             let { groups } = (0, utils_1.getUiOptions)(props.uiSchema) || [];
             const { formData } = props;
             const trueValues = groups.map(group => group.trueValue);
@@ -99,13 +92,10 @@ let MultiAnyToBooleanField = class MultiAnyToBooleanField extends React.Componen
             }, []);
             this.props.onChange(formData);
         };
-        this.state = this.getInitialState(props);
-    }
-    getInitialState(props) {
-        return this.initializeGroups(props);
+        this.state = this.getStateFromProps(props);
     }
-    getStateFromProps(props) {
-        return this.initializeGroups(props);
+    UNSAFE_componentWillReceiveProps(props) {
+        this.setState(this.getStateFromProps(props));
     }
     render() {
         const TitleFieldTemplate = (0, utils_2.getTemplate)("TitleFieldTemplate", this.props.registry, (0, utils_1.getUiOptions)(this.props.uiSchema));
@@ -120,7 +110,7 @@ let MultiAnyToBooleanField = class MultiAnyToBooleanField extends React.Componen
                     React.createElement(AnyToBooleanField_1.default, Object.assign({}, groupProps))));
             }))));
     }
-};
+}
 MultiAnyToBooleanField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -137,7 +127,4 @@ MultiAnyToBooleanField.propTypes = {
     }).isRequired,
     formData: PropTypes.array
 };
-MultiAnyToBooleanField = __decorate([
-    BaseComponent_1.default
-], MultiAnyToBooleanField);
 exports.default = MultiAnyToBooleanField;

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

@@ -54,7 +54,8 @@ export default class MultiArrayField extends React.Component<any, any, any> {
     arrayKeyFunctions: any[] | undefined;
     groupItemIds: {} | {}[] | undefined;
     groupedItems: any;
-    onChange: (idx: any) => (formData: any) => void;
+    onChange: ((idx: any) => (formData: any) => void) & memoize.Memoized<(idx: any) => (formData: any) => void>;
 }
 import * as React from "react";
+import memoize from "memoizee";
 import * as PropTypes from "prop-types";