@luomus/laji-form 15.1.93 → 15.1.95

package/lib/components/fields/TagArrayField.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,16 +41,15 @@ const React = __importStar(require("react"));
 const react_dom_1 = require("react-dom");
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const memoizee_1 = __importDefault(require("memoizee"));
-let TagArrayField = class TagArrayField extends React.Component {
+class TagArrayField extends React.Component {
     render() {
         const { FieldTemplate } = this.props.registry.templates;
         const { uiSchema } = this.props;
         return (React.createElement(FieldTemplate, Object.assign({}, this.props, { forceDisplayLabel: true, rawHelp: uiSchema["ui:help"], description: uiSchema["ui:description"], rawErrors: [], id: this.props.idSchema.$id }),
             React.createElement(TagInputComponent, Object.assign({}, this.props, { id: this.props.idSchema.$id, tags: this.props.formData }))));
     }
-};
+}
 TagArrayField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -75,9 +68,6 @@ TagArrayField.propTypes = {
     }).isRequired,
     formData: PropTypes.array
 };
-TagArrayField = __decorate([
-    BaseComponent_1.default
-], TagArrayField);
 exports.default = TagArrayField;
 class TagInputComponent extends React.Component {
     constructor(props) {

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

@@ -41,7 +41,8 @@ export default class TaxonSetPopulatorField extends React.Component<FieldProps>
         formData: PropTypes.Validator<object>;
     };
     static getName(): string;
-    taxonSets: any[];
+    selectedTaxonSets: string[];
+    unitTaxonSets: Record<string, string[]>;
     getStateFromProps(): {
         onChange: (formData: any) => Promise<void>;
     };

package/lib/components/fields/TaxonSetPopulatorField.js

@@ -80,21 +80,23 @@ const propsPropType = PropTypes.shape({
 let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Component {
     constructor() {
         super(...arguments);
-        this.taxonSets = [];
+        this.selectedTaxonSets = [];
+        this.unitTaxonSets = {};
         this.onChange = (formData) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            const previousTaxonSets = this.taxonSets;
+            const previousTaxonSets = this.selectedTaxonSets;
             const currentTaxonSets = ((_a = formData === null || formData === void 0 ? void 0 : formData.taxonCensus) === null || _a === void 0 ? void 0 : _a.map((item) => item.censusTaxonSetID)) || [];
             const deletedTaxonSets = previousTaxonSets.filter((item) => !currentTaxonSets.includes(item));
             const addedTaxonSets = currentTaxonSets.filter((item) => !previousTaxonSets.includes(item));
-            this.taxonSets = ((_b = formData === null || formData === void 0 ? void 0 : formData.taxonCensus) === null || _b === void 0 ? void 0 : _b.map((item) => item.censusTaxonSetID)) || [];
+            this.selectedTaxonSets = ((_b = formData === null || formData === void 0 ? void 0 : formData.taxonCensus) === null || _b === void 0 ? void 0 : _b.map((item) => item.censusTaxonSetID)) || [];
             if (deletedTaxonSets.length > 0) {
                 deletedTaxonSets.map((deletedTaxonSetId) => {
                     var _a;
                     const currentUnits = Array.isArray((_a = this.props.formData) === null || _a === void 0 ? void 0 : _a.units) ? this.props.formData.units : [];
                     let observationsExist = false;
                     const deletedTaxonSetUnits = currentUnits.filter((unit) => {
-                        return unit.taxonSets && unit.taxonSets.includes(deletedTaxonSetId);
+                        return this.unitTaxonSets[unit.identifications[0].taxonID]
+                            && this.unitTaxonSets[unit.identifications[0].taxonID].includes(deletedTaxonSetId);
                     });
                     deletedTaxonSetUnits.map((unit) => {
                         var _a, _b, _c, _d;
@@ -105,7 +107,9 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                             ((_b = unit.unitFact) === null || _b === void 0 ? void 0 : _b.broodCount) ||
                             ((_c = unit.unitFact) === null || _c === void 0 ? void 0 : _c.femalesWithBroodsCount) ||
                             ((_d = unit.unitFact) === null || _d === void 0 ? void 0 : _d.juvenileCount)) {
-                            window.alert(`Warning: Can't delete taxon set "${deletedTaxonSetId}" because it has observations.`);
+                            window.alert("Tätä lajiryhmää ei voi poistaa, koska siihen on kirjattu havaintoja.\n\n" +
+                                "This taxon set cannot be removed because it contains observations.\n\n" +
+                                "Den här artgruppen kan inte tas bort eftersom det finns observationer i den.");
                             observationsExist = true;
                             const updatedFormData = Object.assign(Object.assign({}, formData), { taxonCensus: [
                                     ...formData.taxonCensus,
@@ -114,7 +118,7 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                                         taxonCensusType: "MY.taxonCensusTypeCounted"
                                     }
                                 ] });
-                            this.taxonSets = [...this.taxonSets, deletedTaxonSetId];
+                            this.selectedTaxonSets = [...this.selectedTaxonSets, deletedTaxonSetId];
                             this.props.onChange(updatedFormData);
                             return;
                         }
@@ -123,7 +127,8 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                         return;
                     }
                     const updatedUnits = currentUnits.filter((unit) => {
-                        return !unit.taxonSets || !unit.taxonSets.includes(deletedTaxonSetId);
+                        return !this.unitTaxonSets[unit.identifications[0].taxonID]
+                            || !this.unitTaxonSets[unit.identifications[0].taxonID].includes(deletedTaxonSetId);
                     });
                     const updatedFormData = Object.assign(Object.assign({}, formData), { units: updatedUnits });
                     this.props.onChange(updatedFormData);
@@ -133,21 +138,22 @@ let TaxonSetPopulatorField = class TaxonSetPopulatorField extends React.Componen
                 const currentUnits = Array.isArray((_c = this.props.formData) === null || _c === void 0 ? void 0 : _c.units) ? this.props.formData.units : [];
                 // if current units include any units with taxon sets that are being added, return to avoid duplicates
                 const duplicateUnits = currentUnits.filter((unit) => {
-                    return unit.taxonSets && unit.taxonSets.some((taxonSetId) => addedTaxonSets.includes(taxonSetId));
+                    return this.unitTaxonSets[unit.identifications[0].taxonID]
+                        && this.unitTaxonSets[unit.identifications[0].taxonID].some((taxonSetId) => addedTaxonSets.includes(taxonSetId));
                 });
                 if (duplicateUnits.length > 0) {
                     return;
                 }
                 const results = yield this.fetchTaxaFromSet(this.props, addedTaxonSets);
                 const newUnits = results.map((result) => {
+                    this.unitTaxonSets[result.id] = result.taxonSets || [];
                     return {
                         identifications: [{
                                 taxon: result.scientificName,
                                 taxonID: result.id,
                                 taxonVerbatim: result.vernacularName
                             }],
-                        informalTaxonGroups: result.informalTaxonGroups || [],
-                        taxonSets: result.taxonSets || []
+                        informalTaxonGroups: result.informalTaxonGroups || []
                     };
                 });
                 const updatedFormData = Object.assign(Object.assign({}, formData), { units: [...currentUnits, ...newUnits] });

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

@@ -16,14 +16,10 @@ export default class ToggleAdditionalArrayFieldsField extends React.Component<an
     };
     constructor(props: any);
     state: {
-        uiSchema: import("../../types").UiSchema<any>;
         visible: {};
     };
     getTogglePersistenceContextKey: (props: any) => string;
     getInitialVisible(props: any): {};
-    getStateFromProps(props: any): {
-        uiSchema: import("../../types").UiSchema<any>;
-    };
     toggleVisibility: () => void;
     render(): JSX.Element;
 }

package/lib/components/fields/ToggleAdditionalArrayFieldsField.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) {
@@ -45,9 +39,8 @@ 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 Context_1 = __importDefault(require("../../Context"));
-let ToggleAdditionalArrayFieldsField = class ToggleAdditionalArrayFieldsField extends React.Component {
+class ToggleAdditionalArrayFieldsField extends React.Component {
     constructor(props) {
         super(props);
         this.getTogglePersistenceContextKey = (props) => `$additional_toggle_persistence_${props.idSchema.$id}`;
@@ -57,7 +50,7 @@ let ToggleAdditionalArrayFieldsField = class ToggleAdditionalArrayFieldsField ex
             context[this.getTogglePersistenceContextKey(this.props)] = visible;
             this.setState({ visible });
         };
-        this.state = Object.assign({ visible: this.getInitialVisible(props) }, this.getStateFromProps(props));
+        this.state = { visible: this.getInitialVisible(props) };
     }
     getInitialVisible(props) {
         const { additionalFields } = (0, utils_1.getUiOptions)(props.uiSchema);
@@ -75,16 +68,12 @@ let ToggleAdditionalArrayFieldsField = class ToggleAdditionalArrayFieldsField ex
         }
         return visible;
     }
-    getStateFromProps(props) {
-        const innerUiSchema = (0, utils_1.getInnerUiSchema)(props.uiSchema);
-        return { uiSchema: innerUiSchema };
-    }
     render() {
         const { CheckboxWidget } = this.props.registry.widgets;
         const { SchemaField } = this.props.registry.fields;
         const { additionalFields = [], toggleLabel, toggleClassName, toggleHelp } = (0, utils_1.getUiOptions)(this.props.uiSchema);
         const shouldShow = Object.values(this.props.errorSchema || {}).some(error => additionalFields.some(field => (0, utils_1.parseJSONPointer)(error, field))) || this.state.visible;
-        let _uiSchema = this.state.uiSchema;
+        let _uiSchema = (0, utils_1.getInnerUiSchema)(this.props.uiSchema);
         if (!shouldShow) {
             additionalFields.forEach(field => {
                 _uiSchema = (0, utils_1.updateSafelyWithJSONPointer)(_uiSchema, { "ui:field": "HiddenField" }, "items/" + field);
@@ -95,7 +84,7 @@ let ToggleAdditionalArrayFieldsField = class ToggleAdditionalArrayFieldsField ex
             React.createElement("div", { className: toggleClassName },
                 React.createElement(CheckboxWidget, Object.assign({}, this.props, { id: this.props.idSchema.$id + "_toggle", schema: { type: "boolean" }, value: this.state.visible, onChange: this.toggleVisibility, label: toggleLabel || "", options: { allowUndefined: false, help: toggleHelp }, required: false })))));
     }
-};
+}
 ToggleAdditionalArrayFieldsField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -111,7 +100,4 @@ ToggleAdditionalArrayFieldsField.propTypes = {
     }).isRequired,
     formData: PropTypes.oneOfType([PropTypes.array]).isRequired
 };
-ToggleAdditionalArrayFieldsField = __decorate([
-    BaseComponent_1.default
-], ToggleAdditionalArrayFieldsField);
 exports.default = ToggleAdditionalArrayFieldsField;

package/lib/components/fields/UnitCountShorthandField.js

@@ -46,7 +46,6 @@ const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const VirtualSchemaField_1 = __importDefault(require("../VirtualSchemaField"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const components_1 = require("../components");
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
@@ -120,7 +119,7 @@ UnitCountShorthandField = __decorate([
     VirtualSchemaField_1.default
 ], UnitCountShorthandField);
 exports.default = UnitCountShorthandField;
-let CodeReader = class CodeReader extends React.Component {
+class CodeReader extends React.Component {
     constructor(props) {
         super(props);
         this.onChange = ({ target: { value } }) => {
@@ -168,7 +167,7 @@ let CodeReader = class CodeReader extends React.Component {
             });
         }
     }
-};
+}
 CodeReader.contextType = ReactContext_1.default;
 CodeReader.propTypes = {
     options: PropTypes.shape({
@@ -180,6 +179,3 @@ CodeReader.propTypes = {
     }),
     value: PropTypes.string
 };
-CodeReader = __decorate([
-    BaseComponent_1.default
-], CodeReader);

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

@@ -11,51 +11,52 @@ export default class UnitListShorthandArrayField extends React.Component<any, an
     };
     constructor(props: any);
     constructor(props: any, context: any);
-    getStateFromProps(props: any): {
-        uiSchema: {
-            "ui:options": 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;
-        };
+    state: {
+        show: boolean;
+    };
+    getUiSchema(props: any): {
+        "ui:options": 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;
     };
     onButtonClick: () => () => void;
     onHide: () => void;

package/lib/components/fields/UnitListShorthandArrayField.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,7 +38,6 @@ 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 components_1 = require("../components");
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
@@ -52,9 +45,10 @@ const TagArrayField_1 = require("./TagArrayField");
 /**
  * Compatible only with unit array.
  */
-let UnitListShorthandArrayField = class UnitListShorthandArrayField extends React.Component {
+class UnitListShorthandArrayField extends React.Component {
     constructor() {
         super(...arguments);
+        this.state = { show: false };
         this.onButtonClick = () => () => {
             this.setState({ show: !this.state.show });
         };
@@ -97,13 +91,13 @@ let UnitListShorthandArrayField = class UnitListShorthandArrayField extends Reac
             this.tagRef = ref;
         };
     }
-    getStateFromProps(props) {
+    getUiSchema(props) {
         const buttonDefinition = {
             fn: this.onButtonClick,
             fnName: "addUnitList",
             glyph: "align-justify",
-            label: this.props.formContext.translations.AddUnitList,
-            id: this.props.idSchema.$id,
+            label: props.formContext.translations.AddUnitList,
+            id: props.idSchema.$id,
             changesFormData: true,
             rules: {
                 canAdd: true
@@ -111,17 +105,16 @@ let UnitListShorthandArrayField = class UnitListShorthandArrayField extends Reac
         };
         const innerUiSchema = (0, utils_1.getInnerUiSchema)(props.uiSchema);
         const options = (0, utils_1.getUiOptions)(innerUiSchema);
-        const uiSchema = Object.assign(Object.assign({}, innerUiSchema), { "ui:options": Object.assign(Object.assign({}, options), { buttons: [
+        return Object.assign(Object.assign({}, innerUiSchema), { "ui:options": Object.assign(Object.assign({}, options), { buttons: [
                     ...(options.buttons || []),
                     buttonDefinition
                 ] }) });
-        return { uiSchema };
     }
     render() {
         const { SchemaField } = this.props.registry.fields;
         const { Modal } = this.context.theme;
         return (React.createElement(React.Fragment, null,
-            React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: this.state.uiSchema })),
+            React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: this.getUiSchema(this.props) })),
             this.state.show && (React.createElement(Modal, { show: true, onHide: this.onHide, dialogClassName: "unit-list-shorthand-modal" },
                 React.createElement(Modal.Body, null,
                     React.createElement(TagArrayField_1.TagInputComponent, { tags: (0, utils_1.isEmptyString)(this.state.value) ? [] : this.state.value.split(",").filter(s => !(0, utils_1.isEmptyString)(s)), onChange: this.onTagFieldChange, schema: {}, idSchema: {}, uiSchema: { "ui:options": { separatorKeys: [","] } }, inputProps: { autoFocus: true }, onKeyDown: this.onKeyDown, ref: this.setTagArrayRef, formContext: this.props.formContext }),
@@ -130,7 +123,7 @@ let UnitListShorthandArrayField = class UnitListShorthandArrayField extends Reac
                     React.createElement("br", null),
                     React.createElement(components_1.Button, { type: "submit", disabled: (0, utils_1.isEmptyString)(this.state.value), onClick: this.onSubmit }, this.props.formContext.translations.Add))))));
     }
-};
+}
 UnitListShorthandArrayField.contextType = ReactContext_1.default;
 UnitListShorthandArrayField.propTypes = {
     schema: PropTypes.shape({
@@ -138,7 +131,4 @@ UnitListShorthandArrayField.propTypes = {
     }).isRequired,
     formData: PropTypes.array.isRequired
 };
-UnitListShorthandArrayField = __decorate([
-    BaseComponent_1.default
-], UnitListShorthandArrayField);
 exports.default = UnitListShorthandArrayField;

package/lib/components/fields/UnitShorthandField.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) {
@@ -45,13 +39,12 @@ 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 Context_1 = __importDefault(require("../../Context"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const components_1 = require("../components");
 const AutosuggestWidget_1 = require("../widgets/AutosuggestWidget");
 const ArrayFieldTemplate_1 = require("../templates/ArrayFieldTemplate");
-let UnitShorthandField = class UnitShorthandField extends React.Component {
+class UnitShorthandField extends React.Component {
     constructor(props) {
         super(props);
         this.getStateFromProps = (props) => {
@@ -142,7 +135,7 @@ let UnitShorthandField = class UnitShorthandField extends React.Component {
             React.createElement(CodeReader, { translations: this.props.formContext.translations, onChange: this.onCodeChange, value: this.props.formData[shorthandField], formID: (0, utils_1.getUiOptions)(this.props.uiSchema).formID || formContext.formID || formContext.uiSchemaContext.formID, help: help, id: id, formContext: formContext, disabled: disabled, readonly: readonly, lineTransect: lineTransect, className: "laji-form-field-template-schema" }),
             React.createElement("div", { className: "laji-form-field-template-buttons" }, (0, ArrayFieldTemplate_1.getButton)(toggleButton)))) : (React.createElement(SchemaField, Object.assign({}, this.props, { uiSchema: innerUiSchema })));
     }
-};
+}
 UnitShorthandField.propTypes = {
     uiSchema: PropTypes.shape({
         "ui:options": PropTypes.shape({
@@ -158,13 +151,13 @@ UnitShorthandField.propTypes = {
     }).isRequired,
     formData: PropTypes.object.isRequired
 };
-UnitShorthandField = __decorate([
-    BaseComponent_1.default
-], UnitShorthandField);
 exports.default = UnitShorthandField;
-let CodeReader = class CodeReader extends React.Component {
+class CodeReader extends React.Component {
     constructor(props) {
         super(props);
+        this.UNSAFE_componentWillReceiveProps = (props) => {
+            this.setState(this.getStateFromProps(props));
+        };
         this.getStateFromProps = (props) => {
             let state = this.state;
             if (this.state.value === "" && !(0, utils_1.isEmptyString)(props.value)) {
@@ -245,8 +238,5 @@ let CodeReader = class CodeReader extends React.Component {
                 ? (React.createElement(HelpBlock, null, translations.InvalidUnitCode)) : null,
             React.createElement("div", { className: "small text-muted", dangerouslySetInnerHTML: { __html: this.props.help } })));
     }
-};
+}
 CodeReader.contextType = ReactContext_1.default;
-CodeReader = __decorate([
-    BaseComponent_1.default
-], CodeReader);

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

@@ -2,7 +2,6 @@ export { default as SchemaField } from "./SchemaField";
 export { default as ArrayField } from "./ArrayField";
 export { default as ObjectField } from "./ObjectField";
 export { default as NestField } from "./NestField";
-export { default as ArrayBulkField } from "./ArrayBulkField";
 export { default as ArrayPropertySumField } from "./ArrayPropertySumField";
 export { default as ScopeField } from "./ScopeField";
 export { default as SelectTreeField } from "./SelectTreeField";

package/lib/components/fields/index.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FakePropertyField = exports.ImageDisplayField = exports.LocalityField = exports.DataLeakerField = exports.LocationChooserField = exports.UnitListShorthandArrayField = exports.EnumRangeArrayField = exports.AnyToBooleanField = exports.PrefillingArrayField = exports.AnnotationField = exports.ConditionalUiSchemaField = exports.ConditionalOnChangeField = exports.StringToArrayField = exports.TagArrayField = exports.GeocoderField = exports.MapField = exports.NamedPlaceSaverField = exports.NamedPlaceChooserField = exports.SumField = exports.ExtraLabelRowField = exports.UiFieldMapperArrayField = exports.CombinedValueDisplayField = exports.UnitShorthandField = exports.SingleItemArrayField = exports.SingleActiveArrayField = exports.FlatField = exports.SplitField = exports.ImageArrayField = exports.ContextInjectionField = exports.InitiallyHiddenField = exports.HiddenWithTextField = exports.HiddenField = exports.AutosuggestField = exports.AutoArrayField = exports.MapArrayField = exports.DependentDisableField = exports.DependentBooleanField = exports.ArrayCombinerField = exports.InjectDefaultValueField = exports.InjectField = exports.TableField = exports.GridLayoutField = exports.SelectTreeField = exports.ScopeField = exports.ArrayPropertySumField = exports.ArrayBulkField = exports.NestField = exports.ObjectField = exports.ArrayField = exports.SchemaField = void 0;
-exports.AccordionArrayField = exports.UnitRapidField = exports.ConditionalField = exports.InputTransformerField = exports.ArraySchemaField = exports.ScientificNameTaxonAutosuggestField = exports.TaxonSetPopulatorField = exports.FillDateRangeField = exports.PrefixArrayField = exports.MultiActiveArrayField = exports.CondensedObjectField = exports.AsArrayField = exports.PdfArrayField = exports.MultiTagArrayField = exports.InputWithDefaultValueButtonField = exports.SortArrayField = exports.MultiLanguageField = exports.UiFieldApplierField = exports.DefaultValueArrayField = exports.ToggleAdditionalArrayFieldsField = exports.UnitCountShorthandField = exports.MultiAnyToBooleanField = exports.FilterArrayField = exports.AudioArrayField = exports.MultiArrayField = exports.SectionArrayField = void 0;
+exports.SectionArrayField = exports.FakePropertyField = exports.ImageDisplayField = exports.LocalityField = exports.DataLeakerField = exports.LocationChooserField = exports.UnitListShorthandArrayField = exports.EnumRangeArrayField = exports.AnyToBooleanField = exports.PrefillingArrayField = exports.AnnotationField = exports.ConditionalUiSchemaField = exports.ConditionalOnChangeField = exports.StringToArrayField = exports.TagArrayField = exports.GeocoderField = exports.MapField = exports.NamedPlaceSaverField = exports.NamedPlaceChooserField = exports.SumField = exports.ExtraLabelRowField = exports.UiFieldMapperArrayField = exports.CombinedValueDisplayField = exports.UnitShorthandField = exports.SingleItemArrayField = exports.SingleActiveArrayField = exports.FlatField = exports.SplitField = exports.ImageArrayField = exports.ContextInjectionField = exports.InitiallyHiddenField = exports.HiddenWithTextField = exports.HiddenField = exports.AutosuggestField = exports.AutoArrayField = exports.MapArrayField = exports.DependentDisableField = exports.DependentBooleanField = exports.ArrayCombinerField = exports.InjectDefaultValueField = exports.InjectField = exports.TableField = exports.GridLayoutField = exports.SelectTreeField = exports.ScopeField = exports.ArrayPropertySumField = exports.NestField = exports.ObjectField = exports.ArrayField = exports.SchemaField = void 0;
+exports.AccordionArrayField = exports.UnitRapidField = exports.ConditionalField = exports.InputTransformerField = exports.ArraySchemaField = exports.ScientificNameTaxonAutosuggestField = exports.TaxonSetPopulatorField = exports.FillDateRangeField = exports.PrefixArrayField = exports.MultiActiveArrayField = exports.CondensedObjectField = exports.AsArrayField = exports.PdfArrayField = exports.MultiTagArrayField = exports.InputWithDefaultValueButtonField = exports.SortArrayField = exports.MultiLanguageField = exports.UiFieldApplierField = exports.DefaultValueArrayField = exports.ToggleAdditionalArrayFieldsField = exports.UnitCountShorthandField = exports.MultiAnyToBooleanField = exports.FilterArrayField = exports.AudioArrayField = exports.MultiArrayField = void 0;
 var SchemaField_1 = require("./SchemaField");
 Object.defineProperty(exports, "SchemaField", { enumerable: true, get: function () { return __importDefault(SchemaField_1).default; } });
 var ArrayField_1 = require("./ArrayField");
@@ -13,8 +13,6 @@ var ObjectField_1 = require("./ObjectField");
 Object.defineProperty(exports, "ObjectField", { enumerable: true, get: function () { return __importDefault(ObjectField_1).default; } });
 var NestField_1 = require("./NestField");
 Object.defineProperty(exports, "NestField", { enumerable: true, get: function () { return __importDefault(NestField_1).default; } });
-var ArrayBulkField_1 = require("./ArrayBulkField");
-Object.defineProperty(exports, "ArrayBulkField", { enumerable: true, get: function () { return __importDefault(ArrayBulkField_1).default; } });
 var ArrayPropertySumField_1 = require("./ArrayPropertySumField");
 Object.defineProperty(exports, "ArrayPropertySumField", { enumerable: true, get: function () { return __importDefault(ArrayPropertySumField_1).default; } });
 var ScopeField_1 = require("./ScopeField");

package/lib/components/widgets/AnyToBooleanWidget.d.ts

@@ -1,20 +1,22 @@
-export function AnyToBoolean(props: any): JSX.Element;
-export default _anyToBoolean;
-declare function _anyToBoolean(props: any): JSX.Element;
-declare namespace _anyToBoolean {
-    namespace propTypes {
-        export let uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
+import * as PropTypes from "prop-types";
+import { FieldProps, WidgetProps } from "src/types";
+export declare const AnyToBoolean: (props: FieldProps | (WidgetProps & {
+    widget: true;
+})) => JSX.Element;
+declare const _anyToBoolean: {
+    (props: WidgetProps): JSX.Element;
+    propTypes: {
+        uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
                 trueValue: PropTypes.Validator<NonNullable<NonNullable<string | number | boolean | null | undefined>>>;
                 falseValue: PropTypes.Requireable<NonNullable<string | number | boolean | null | undefined>>;
                 allowUndefined: PropTypes.Requireable<boolean>;
             }>>;
         }>>;
-        export let schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+        schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
             type: PropTypes.Requireable<string>;
         }>>>;
-        export { valuePropType as formData };
-    }
-}
-import * as PropTypes from "prop-types";
-declare const valuePropType: PropTypes.Requireable<NonNullable<string | number | boolean | null | undefined>>;
+        formData: PropTypes.Requireable<NonNullable<string | number | boolean | null | undefined>>;
+    };
+};
+export default _anyToBoolean;

package/lib/components/widgets/AnyToBooleanWidget.js

@@ -39,9 +39,10 @@ const PropTypes = __importStar(require("prop-types"));
 const utils_1 = require("../../utils");
 const AnyToBoolean = (props) => React.createElement(_AnyToBoolean, Object.assign({}, props));
 exports.AnyToBoolean = AnyToBoolean;
+const isWidgetProps = (props) => props.widget;
 const _AnyToBoolean = (props) => {
     const { widget } = props;
-    const options = (0, utils_1.getUiOptions)(widget ? props : props.uiSchema);
+    const options = (0, utils_1.getUiOptions)(isWidgetProps(props) ? props : props.uiSchema);
     const { trueValue, falseValue } = options;
     const schema = Object.assign(Object.assign({}, props.schema), { type: "boolean" });
     const id = widget ? props.id : props.idSchema.$id;
@@ -61,7 +62,7 @@ const _AnyToBoolean = (props) => {
     }, [_onChange, trueValue, falseValue]);
     const { CheckboxWidget } = props.registry.widgets;
     const { SchemaField } = props.registry.fields;
-    return widget
+    return isWidgetProps(props)
         ? (React.createElement(CheckboxWidget, Object.assign({}, props, { id: props.id, schema: schema, value: value, onChange: onChange, label: "", options: options }))) : (React.createElement(SchemaField, Object.assign({}, props, { schema: schema, uiSchema: (0, utils_1.getInnerUiSchema)(props.uiSchema), formData: value, onChange: onChange, label: "", options: options })));
 };
 const _anyToBoolean = (props) => React.createElement(_AnyToBoolean, Object.assign({ widget: true }, props));

package/lib/components/widgets/DateTimeWidget.d.ts

@@ -39,6 +39,15 @@ export default class DateTimeWidget extends React.Component<any, any, any> {
         time: boolean;
     };
     constructor(props: any);
+    state: {
+        dateFormat: any;
+        timeFormat: string;
+        yearAndMonthDateFormat: any;
+        format: string;
+        inputFormat: any;
+        placeholder: string;
+    };
+    UNSAFE_componentWillReceiveProps(props: any): void;
     componentDidMount(): void;
     componentWillUnmount(): void;
     focus: () => void;