@luomus/laji-form 15.1.97 → 15.1.99

package/lib/components/LajiForm.d.ts

@@ -199,6 +199,7 @@ export default class LajiForm extends React.Component<LajiFormProps, LajiFormSta
         ObjectField: (props: any) => JSX.Element;
         NestField: typeof fields.NestField;
         ArrayPropertySumField: typeof fields.ArrayPropertySumField;
+        ArrayPropertyCountField: typeof fields.ArrayPropertyCountField;
         ScopeField: typeof fields.ScopeField;
         SelectTreeField: typeof fields.SelectTreeField;
         GridLayoutField: {

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

@@ -0,0 +1,21 @@
+import * as React from "react";
+import * as PropTypes from "prop-types";
+import { FieldProps, JSONSchemaObject } from "../../types";
+interface State {
+    count: number;
+}
+export default class ArrayPropertyCountField extends React.Component<FieldProps<JSONSchemaObject[], JSONSchemaObject>, State> {
+    static propTypes: {
+        uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
+            "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
+                propertyField: PropTypes.Validator<string>;
+            }>>;
+            uiSchema: PropTypes.Requireable<object>;
+        }>>>;
+        schema: PropTypes.Validator<object>;
+        formData: PropTypes.Validator<any[]>;
+    };
+    static getName(): string;
+    render(): JSX.Element;
+}
+export {};

package/lib/components/fields/ArrayPropertyCountField.js

@@ -0,0 +1,67 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const React = __importStar(require("react"));
+const PropTypes = __importStar(require("prop-types"));
+const utils_1 = require("../../utils");
+class ArrayPropertyCountField extends React.Component {
+    static getName() { return "ArrayPropertyCountField"; }
+    render() {
+        const SchemaField = this.props.registry.fields.SchemaField;
+        const count = getCount(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,
+                this.props.uiSchema["ui:title"],
+                ": ",
+                count)));
+    }
+}
+ArrayPropertyCountField.propTypes = {
+    uiSchema: PropTypes.shape({
+        "ui:options": PropTypes.shape({
+            propertyField: PropTypes.string.isRequired
+        }),
+        uiSchema: PropTypes.object
+    }).isRequired,
+    schema: PropTypes.object.isRequired,
+    formData: PropTypes.array.isRequired
+};
+exports.default = ArrayPropertyCountField;
+const getCount = (props) => {
+    const formData = props.formData || [];
+    const propertyField = (0, utils_1.getUiOptions)(props.uiSchema).propertyField;
+    return formData.filter(item => item === null || item === void 0 ? void 0 : item[propertyField]).length;
+};

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

@@ -3,6 +3,7 @@ export { default as ArrayField } from "./ArrayField";
 export { default as ObjectField } from "./ObjectField";
 export { default as NestField } from "./NestField";
 export { default as ArrayPropertySumField } from "./ArrayPropertySumField";
+export { default as ArrayPropertyCountField } from "./ArrayPropertyCountField";
 export { default as ScopeField } from "./ScopeField";
 export { default as SelectTreeField } from "./SelectTreeField";
 export { default as GridLayoutField } from "./GridLayoutField";

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.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;
+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.ArrayPropertyCountField = 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 = exports.SectionArrayField = 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");
@@ -15,6 +15,8 @@ var NestField_1 = require("./NestField");
 Object.defineProperty(exports, "NestField", { enumerable: true, get: function () { return __importDefault(NestField_1).default; } });
 var ArrayPropertySumField_1 = require("./ArrayPropertySumField");
 Object.defineProperty(exports, "ArrayPropertySumField", { enumerable: true, get: function () { return __importDefault(ArrayPropertySumField_1).default; } });
+var ArrayPropertyCountField_1 = require("./ArrayPropertyCountField");
+Object.defineProperty(exports, "ArrayPropertyCountField", { enumerable: true, get: function () { return __importDefault(ArrayPropertyCountField_1).default; } });
 var ScopeField_1 = require("./ScopeField");
 Object.defineProperty(exports, "ScopeField", { enumerable: true, get: function () { return __importDefault(ScopeField_1).default; } });
 var SelectTreeField_1 = require("./SelectTreeField");

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

@@ -66,7 +66,7 @@ export class Autosuggest extends React.Component<any, any, any> {
     promiseTimestamp: number | undefined;
     timeout: any;
     onFocus: (e: any) => void;
-    onBlur: (e: any) => void;
+    onBlur: (e: any, blurSelected?: boolean) => void;
     _valueForBlurAndFetch: any;
     afterBlurAndFetch: (suggestions: any, callback: any) => void;
     render(): JSX.Element;

package/lib/components/widgets/AutosuggestWidget.js

@@ -626,10 +626,12 @@ class Autosuggest extends React.Component {
             this.setState({ focused: true });
             (0, utils_1.triggerParentComponent)("onFocus", e, this.props.inputProps);
         };
-        this.onBlur = (e) => {
+        this.onBlur = (e, blurSelected = false) => {
             this.setState({ focused: false }, () => {
-                this._valueForBlurAndFetch = this.state.inputValue;
-                this.afterBlurAndFetch(this.state.suggestions);
+                if (!blurSelected) {
+                    this._valueForBlurAndFetch = this.state.inputValue;
+                    this.afterBlurAndFetch(this.state.suggestions);
+                }
                 (0, utils_1.triggerParentComponent)("onBlur", e, this.props.inputProps);
                 const overlay = this.wrapperRef.current;
                 if (overlay && overlay.overlayTriggerRef && overlay.overlayTriggerRef.hide) {
@@ -1208,7 +1210,7 @@ class ReactAutosuggest extends React.Component {
         const suggestion = (this.props.suggestions || [])[this.state.focusedIdx];
         suggestion && this.onSuggestionSelected(this.props.suggestions[this.state.focusedIdx]);
         this.setState({ focused: false, focusedIdx: undefined, touched: false });
-        (_b = (_a = this.props.inputProps) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+        (_b = (_a = this.props.inputProps) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call(_a, e, !!suggestion);
     }
     renderInput() {
         const { inputProps, renderInputComponent = this.renderDefaultInputComponent } = this.props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.97",
+  "version": "15.1.99",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",