@luomus/laji-form 15.1.93 → 15.1.95

package/lib/components/widgets/DateTimeWidget.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) {
@@ -41,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var DateTimeWidget_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YEAR_MONTH_MATCH = exports.YEAR_MATCH = void 0;
 const React = __importStar(require("react"));
@@ -52,12 +45,11 @@ const moment_1 = __importDefault(require("moment"));
 const react_widgets_moment_1 = __importDefault(require("react-widgets-moment"));
 const localizers_1 = require("react-widgets/lib/util/localizers");
 const utils_1 = require("../../utils");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const DATE_TIME_SEPARATOR = ", ";
 exports.YEAR_MATCH = /^\d{4}$/;
 exports.YEAR_MONTH_MATCH = /^\d{4}-\d{1,2}$/;
-let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Component {
+class DateTimeWidget extends React.Component {
     constructor(props) {
         super(props);
         this.focus = () => {
@@ -165,6 +157,10 @@ let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Compo
             }
         };
         (0, react_widgets_moment_1.default)(moment_1.default);
+        this.state = this.getStateFromProps(props);
+    }
+    UNSAFE_componentWillReceiveProps(props) {
+        this.setState(this.getStateFromProps(props));
     }
     componentDidMount() {
         this.props.formContext.services.focus.addFocusHandler(this.props.id, this.focus);
@@ -284,7 +280,7 @@ let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Compo
     formatValue(value, options, props) {
         if (!value)
             return value;
-        const { inputFormat: format } = DateTimeWidget_1.prototype.getStateFromProps(Object.assign(Object.assign({}, props), { date: true, time: true, value }));
+        const { inputFormat: format } = DateTimeWidget.prototype.getStateFromProps(Object.assign(Object.assign({}, props), { date: true, time: true, value }));
         return localizers_1.date.format(value, format, props.formContext.lang);
     }
     getCurrentDateOrPathDate(path) {
@@ -298,7 +294,7 @@ let DateTimeWidget = DateTimeWidget_1 = class DateTimeWidget extends React.Compo
             return date;
         }
     }
-};
+}
 DateTimeWidget.contextType = ReactContext_1.default;
 DateTimeWidget.propTypes = {
     uiSchema: PropTypes.shape({
@@ -348,7 +344,4 @@ DateTimeWidget.defaultProps = {
     calendar: true,
     time: true
 };
-DateTimeWidget = DateTimeWidget_1 = __decorate([
-    BaseComponent_1.default
-], DateTimeWidget);
 exports.default = DateTimeWidget;

package/lib/components/widgets/ImageSelectWidget.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) {
@@ -48,8 +42,7 @@ const Context_1 = __importDefault(require("../../Context"));
 const utils_1 = require("../../utils");
 const react_inlinesvg_1 = __importDefault(require("react-inlinesvg"));
 const SelectWidget_1 = __importDefault(require("./SelectWidget"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
-let ImageSelectWidget = class ImageSelectWidget extends React.Component {
+class ImageSelectWidget extends React.Component {
     constructor(props) {
         super(props);
         this.renderImg = (enumName, fallback) => {
@@ -79,7 +72,7 @@ let ImageSelectWidget = class ImageSelectWidget extends React.Component {
                     React.createElement("span", null, item.label))
             } })));
     }
-};
+}
 ImageSelectWidget.propTypes = {
     options: PropTypes.object.isRequired,
     schema: PropTypes.shape({
@@ -87,7 +80,4 @@ ImageSelectWidget.propTypes = {
     }),
     value: PropTypes.string
 };
-ImageSelectWidget = __decorate([
-    BaseComponent_1.default
-], ImageSelectWidget);
 exports.default = ImageSelectWidget;

package/lib/components/widgets/InformalTaxonGroupChooserWidget.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) {
@@ -50,9 +44,8 @@ const components_1 = require("../components");
 const Context_1 = __importDefault(require("../../Context"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const react_spinner_1 = __importDefault(require("react-spinner"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const utils_1 = require("../../utils");
-let InformalTaxonGroupChooserWidget = class InformalTaxonGroupChooserWidget extends React.Component {
+class InformalTaxonGroupChooserWidget extends React.Component {
     constructor(props) {
         super(props);
         this.getDefaultOptions = (props) => {
@@ -129,7 +122,7 @@ let InformalTaxonGroupChooserWidget = class InformalTaxonGroupChooserWidget exte
             return InformalTaxonGroupChooserComponent;
         }
     }
-};
+}
 InformalTaxonGroupChooserWidget.contextType = ReactContext_1.default;
 InformalTaxonGroupChooserWidget.propTypes = {
     schema: PropTypes.shape({
@@ -137,9 +130,6 @@ InformalTaxonGroupChooserWidget.propTypes = {
     }),
     value: PropTypes.string
 };
-InformalTaxonGroupChooserWidget = __decorate([
-    BaseComponent_1.default
-], InformalTaxonGroupChooserWidget);
 exports.default = InformalTaxonGroupChooserWidget;
 function walk(allGroups, _group, parent) {
     _group.forEach(group => {

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

@@ -7,7 +7,11 @@ export default class SeparatedDateTimeWidget extends React.Component<any, any, a
         value: PropTypes.Requireable<string>;
     };
     constructor(props: any);
-    constructor(props: any, context: any);
+    state: {
+        date: any;
+        time: string | undefined;
+    };
+    UNSAFE_componentWillReceiveProps(props: any): void;
     getStateFromProps(props: any): {
         date: any;
         time: string | undefined;

package/lib/components/widgets/SeparatedDateTimeWidget.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,17 +40,20 @@ const React = __importStar(require("react"));
 const PropTypes = __importStar(require("prop-types"));
 const DateWidget_1 = __importDefault(require("./DateWidget"));
 const TimeWidget_1 = __importDefault(require("./TimeWidget"));
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
-let SeparatedDateTimeWidget = class SeparatedDateTimeWidget extends React.Component {
-    constructor() {
-        super(...arguments);
+class SeparatedDateTimeWidget extends React.Component {
+    constructor(props) {
+        super(props);
         this.onDateChange = (value) => {
             this.props.onChange(value ? (this.state.time ? value + this.state.time : value) : null);
         };
         this.onTimeChange = (value) => {
             this.props.onChange(value ? this.state.date + value : this.state.date);
         };
+        this.state = this.getStateFromProps(props);
+    }
+    UNSAFE_componentWillReceiveProps(props) {
+        this.setState(this.getStateFromProps(props));
     }
     getStateFromProps(props) {
         let { value } = props;
@@ -81,7 +78,7 @@ let SeparatedDateTimeWidget = class SeparatedDateTimeWidget extends React.Compon
                 React.createElement(FormGroup, null,
                     React.createElement(TimeWidget_1.default, Object.assign({}, this.props, { onChange: this.onTimeChange, value: this.state.time }))))) : null));
     }
-};
+}
 SeparatedDateTimeWidget.contextType = ReactContext_1.default;
 SeparatedDateTimeWidget.propTypes = {
     schema: PropTypes.shape({
@@ -89,7 +86,4 @@ SeparatedDateTimeWidget.propTypes = {
     }).isRequired,
     value: PropTypes.string
 };
-SeparatedDateTimeWidget = __decorate([
-    BaseComponent_1.default
-], SeparatedDateTimeWidget);
 exports.default = SeparatedDateTimeWidget;

package/lib/themes/theme.d.ts

@@ -38,6 +38,7 @@ export interface ButtonProps extends JSX.IntrinsicAttributes, HasMaybeChildren,
     id?: string;
     small?: boolean;
     onKeyDown?: (e: React.KeyboardEvent<any>) => void;
+    type?: any;
 }
 export type ButtonGroupProps = JSX.IntrinsicAttributes & HasMaybeChildren;
 export interface ButtonToolbarProps extends JSX.IntrinsicAttributes, HasMaybeChildren, HasMaybeClassName {

package/lib/types.d.ts

@@ -41,7 +41,7 @@ export type FieldProps<T = any, S extends JSONSchemaObject | JSONSchemaArray = J
     registry: RJSFFieldProps<any, JSONSchema, FormContext>["registry"];
 };
 export type WidgetProps<T = any, S extends JSONSchema = JSONSchema> = WithNonNullableKeys<RJSFWidgetProps<T, S, FormContext>, "errorSchema" | "formContext"> & {
-    registry: RJSFFieldProps<any, JSONSchema, FormContext>["registry"];
+    registry: RJSFWidgetProps<any, JSONSchema, FormContext>["registry"];
 };
 export type UiSchema<S extends JSONSchema = JSONSchemaObject> = RJSFUiSchema<any, S, FormContext>;
 export interface HasMaybeChildren {

package/lib/utils.d.ts

@@ -87,7 +87,7 @@ export declare function applyFunction(props: FieldProps): any;
 export declare function getWindowScrolled(): number;
 export declare function getScrollPositionForScrollIntoViewIfNeeded(elem: Element, topOffset?: number, bottomOffset?: number): number;
 export declare function scrollIntoViewIfNeeded(elem: HTMLElement, topOffset?: number, bottomOffset?: number): void;
-export declare function filter(properties: any[], filter: string[], filterType: string | undefined, getValue: (s: string) => any): any[];
+export declare function filter(properties: any[], filter: string[], filterType?: "blacklist" | "whitelist", getValue?: (s: string) => any): any[];
 export declare function updateSafelyWithJSONPath(obj: any, value: any, path: string, immutably: boolean, createNew: (obj: any, split: string) => any): any;
 export declare function updateSafelyWithJSONPointer(obj: any, value: any, path: string, immutably?: boolean, createNew?: (obj: any, split: string, o?: any, _split?: string) => any): any;
 export declare function injectButtons(uiSchema: any, buttons: any[], buttonsPath: string): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.93",
+  "version": "15.1.95",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,7 @@
     "test:lightweight": "npx playwright test --project chromium",
     "test:docker:build": "docker build -t laji-form-test -f test.Dockerfile .",
     "test:docker:run": "docker run laji-form-test",
-    "generate:api-client": "openapi-typescript https://apitest.laji.fi/openapi-json -o ./generated/api.d.ts --properties-required-by-default"
+    "generate:api-client": "openapi-typescript http://apitest.laji.fi/openapi-json -o ./generated/api.d.ts --properties-required-by-default"
   },
   "keywords": [
     "react-jsonschema-form",
@@ -41,7 +41,7 @@
   "license": "MIT",
   "dependencies": {
     "@luomus/laji-map": "^5.1.19",
-    "@luomus/laji-validate": "^0.0.127",
+    "@luomus/laji-validate": "^0.0.128",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",
     "@rjsf/validator-ajv6": "~5.1.0",

package/lib/components/BaseComponent.d.ts

@@ -1,8 +0,0 @@
-import { FieldProps, WidgetProps } from "../types";
-type Constructor<T> = new (...args: any[]) => T;
-interface LajiFormComponentForBaseComponent<P, S> extends React.Component<P, S> {
-    getStateFromProps?(props: P): S;
-    UNSAFE_componentWillReceiveProps?(props: Readonly<P>, nextContext?: any): void;
-}
-export declare function BaseComponent<P extends FieldProps | WidgetProps, S, LFC extends Constructor<LajiFormComponentForBaseComponent<P, S>>>(ComposedComponent: LFC): any;
-export default BaseComponent;

package/lib/components/BaseComponent.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseComponent = BaseComponent;
-const utils_1 = require("../utils");
-function BaseComponent(ComposedComponent) {
-    var _a;
-    return _a = class BaseComponent extends ComposedComponent {
-            constructor(...args) {
-                const props = args[0];
-                super(props);
-                if (!this.state && this.getStateFromProps)
-                    this.state = this.getStateFromProps(props);
-            }
-            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);
-                }
-            }
-        },
-        _a.displayName = (0, utils_1.getReactComponentName)(ComposedComponent),
-        _a;
-}
-exports.default = BaseComponent;

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

@@ -1,28 +0,0 @@
-export default class ArrayBulkField extends React.Component<any, any, any> {
-    static propTypes: {
-        uiSchema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
-            "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
-                rowAddAmount: PropTypes.Requireable<number>;
-            }>>;
-        }>>>;
-        schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
-            type: PropTypes.Requireable<string>;
-        }>>>;
-        formData: PropTypes.Validator<any[]>;
-    };
-    constructor(props: any);
-    state: {
-        rowAddAmount: any;
-        rowAmount: number;
-    };
-    getStateFromProps: (props: any) => {
-        rowAddAmount: any;
-        rowAmount: number;
-    };
-    render(): JSX.Element;
-    renderItems: () => any[];
-    onChangeForIdx: (idx: any) => (itemFormData: any) => void;
-    onAddClick: (event: any) => void;
-}
-import * as React from "react";
-import * as PropTypes from "prop-types";

package/lib/components/fields/ArrayBulkField.js

@@ -1,118 +0,0 @@
-"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 __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) {
-            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;
-    };
-})();
-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 utils_1 = require("../../utils");
-const components_1 = require("../components");
-const BaseComponent_1 = __importDefault(require("../BaseComponent"));
-const utils_2 = require("@rjsf/utils");
-let ArrayBulkField = class ArrayBulkField extends React.Component {
-    constructor(props) {
-        super(props);
-        this.getStateFromProps = (props) => {
-            let state = {};
-            const { rowAddAmount } = (0, utils_1.getUiOptions)(props.uiSchema);
-            state.rowAddAmount = 10;
-            if (rowAddAmount > 0)
-                state.rowAddAmount = rowAddAmount;
-            if (props.formData && props.formData.length > this.state.rowAmount) {
-                state.rowAmount = props.formData.length + state.rowAddAmount - (props.formData.length % state.rowAddAmount);
-            }
-            return state;
-        };
-        this.renderItems = () => {
-            let rows = [];
-            let idx = 0;
-            let data = this.props.formData || [];
-            while (data.length < this.state.rowAmount) {
-                data.push({});
-            }
-            const SchemaField = this.props.registry.fields.SchemaField;
-            if (data)
-                data.forEach((item) => {
-                    rows.push(React.createElement(SchemaField, { key: idx, formData: item, onChange: this.onChangeForIdx(idx), schema: this.props.schema.items, uiSchema: this.props.uiSchema.items, idSchema: { $id: this.props.idSchema.$id + "_" + idx }, registry: this.props.registry, errorSchema: this.props.errorSchema[idx] }));
-                    idx++;
-                });
-            return rows;
-        };
-        this.onChangeForIdx = (idx) => {
-            return (itemFormData) => {
-                let formData = this.props.formData;
-                if (!formData)
-                    formData = [];
-                formData[idx] = itemFormData;
-                this.props.onChange(formData.filter(item => { return Object.keys(item).length; }));
-            };
-        };
-        this.onAddClick = (event) => {
-            event.preventDefault();
-            this.setState({ rowAmount: this.state.rowAmount + this.state.rowAddAmount });
-        };
-        this.state = Object.assign({ rowAmount: 0 }, this.getStateFromProps(props));
-    }
-    render() {
-        const TitleFieldTemplate = (0, utils_2.getTemplate)("TitleFieldTemplate", this.props.registry, (0, utils_1.getUiOptions)(this.props.uiSchema));
-        return (React.createElement("fieldset", null,
-            React.createElement(TitleFieldTemplate, { title: this.props.schema.title || this.props.name, schema: this.props.schema, uiSchema: this.props.uiSchema, registry: this.props.registry }),
-            this.renderItems(),
-            React.createElement(components_1.Button, { onClick: this.onAddClick }, "Lis\u00E4\u00E4 havaintorivej\u00E4"),
-            React.createElement("br", null)));
-    }
-};
-ArrayBulkField.propTypes = {
-    uiSchema: PropTypes.shape({
-        "ui:options": PropTypes.shape({
-            rowAddAmount: PropTypes.number
-        })
-    }).isRequired,
-    schema: PropTypes.shape({
-        type: PropTypes.oneOf(["array"])
-    }).isRequired,
-    formData: PropTypes.array.isRequired
-};
-ArrayBulkField = __decorate([
-    BaseComponent_1.default
-], ArrayBulkField);
-exports.default = ArrayBulkField;