npm - @luomus/laji-form - Versions diffs - 15.1.81 → 15.1.83 - Mend

@luomus/laji-form 15.1.81 → 15.1.83

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/lib/components/components/ConfirmButton.d.ts ADDED Viewed

@@ -0,0 +1,40 @@
+import * as React from "react";
+import { ButtonProps } from "../components";
+import { FormContext } from "../LajiForm";
+type Props = ButtonProps & {
+    confirmStyle?: "browser";
+    tooltip?: string;
+    disabled?: boolean;
+    readonly?: boolean;
+    confirm?: boolean;
+    confirmPlacement?: string;
+    onClick: () => void;
+    style?: React.CSSProperties;
+    translations: FormContext["translations"];
+    prompt: string;
+    confirmButtonVariant?: string;
+    confirmButtonText?: string;
+    confirmButtonId?: string;
+    cancelButtonId?: string;
+};
+type State = {
+    show?: boolean;
+};
+export declare class ConfirmButton extends React.Component<Props, State> {
+    static contextType: React.Context<import("../../ReactContext").ContextProps>;
+    buttonRef: React.RefObject<any>;
+    constructor(props: Props);
+    onButtonKeyDown: ({ key }: React.KeyboardEvent) => void;
+    onHideConfirm: () => void;
+    onShowConfirm: (e: React.MouseEvent) => void;
+    onCancelClick: (e: React.MouseEvent) => void;
+    onConfirmedClick: (e?: React.KeyboardEvent | React.MouseEvent) => void;
+    onClick: (e: React.MouseEvent) => void;
+    setConfirmAutofocus: (elem?: React.ReactInstance) => void;
+    render(): JSX.Element;
+    renderConfirm: () => JSX.Element | null;
+    getOverlayTarget: () => Element | Text | null;
+    renderConfirmPopup(): JSX.Element;
+    browserConfirm(): void;
+}
+export {};

package/lib/components/components/ConfirmButton.js ADDED Viewed

@@ -0,0 +1,140 @@
+"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;
+    };
+})();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfirmButton = void 0;
+const React = __importStar(require("react"));
+const react_dom_1 = require("react-dom");
+const ReactContext_1 = __importDefault(require("../../ReactContext"));
+const components_1 = require("../components");
+class ConfirmButton extends React.Component {
+    constructor(props) {
+        super(props);
+        this.buttonRef = React.createRef();
+        this.onButtonKeyDown = ({ key }) => {
+            if (key === "Enter")
+                this.onConfirmedClick();
+            else if (key === "Escape")
+                this.setState({ show: false });
+        };
+        this.onHideConfirm = () => {
+            this.setState({ show: false });
+        };
+        this.onShowConfirm = (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            this.setState({ show: true }, () => {
+                if (this.props.confirmStyle === "browser") {
+                    this.browserConfirm();
+                }
+            });
+        };
+        this.onCancelClick = (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            this.onHideConfirm();
+        };
+        this.onConfirmedClick = (e) => {
+            e && e.preventDefault();
+            e && e.stopPropagation();
+            this.props.onClick();
+            this.onHideConfirm();
+        };
+        this.onClick = (e) => {
+            this.props.confirm ? this.onShowConfirm(e) : this.onConfirmedClick(e);
+        };
+        this.setConfirmAutofocus = (elem) => {
+            setTimeout(() => {
+                var _a;
+                (_a = (0, react_dom_1.findDOMNode)(elem)) === null || _a === void 0 ? void 0 : _a.focus();
+            });
+        };
+        this.renderConfirm = () => {
+            const { show } = this.state;
+            if (!show) {
+                return null;
+            }
+            const { confirmStyle = "popup" } = this.props;
+            if (confirmStyle === "popup") {
+                return this.renderConfirmPopup();
+            }
+            return null;
+        };
+        this.getOverlayTarget = () => (0, react_dom_1.findDOMNode)(this.buttonRef.current);
+        this.state = { show: false };
+    }
+    render() {
+        const { props } = this;
+        const { tooltip, disabled, readonly, confirm, confirmPlacement, confirmStyle, prompt, confirmButtonVariant, confirmButtonText, confirmButtonId, cancelButtonId } = props, maybeProps = __rest(props, ["tooltip", "disabled", "readonly", "confirm", "confirmPlacement", "confirmStyle", "prompt", "confirmButtonVariant", "confirmButtonText", "confirmButtonId", "cancelButtonId"]);
+        const button = React.createElement(React.Fragment, null,
+            React.createElement(components_1.Button, Object.assign({}, maybeProps, { disabled: disabled || readonly, style: this.props.style, ref: this.buttonRef, onKeyDown: this.onButtonKeyDown, onClick: this.onClick }), this.props.children),
+            this.renderConfirm());
+        return tooltip ? React.createElement(components_1.TooltipComponent, { tooltip: tooltip }, button) : button;
+    }
+    renderConfirmPopup() {
+        const { translations, confirmPlacement = "left", prompt, confirmButtonVariant, confirmButtonText, confirmButtonId, cancelButtonId } = this.props;
+        const { Overlay, Popover, ButtonGroup } = this.context.theme;
+        return (React.createElement(Overlay, { show: true, placement: confirmPlacement, rootClose: true, onHide: this.onHideConfirm, target: this.getOverlayTarget },
+            React.createElement(Popover, { id: `${this.props.id}-button-confirm` },
+                React.createElement("div", null, prompt),
+                React.createElement(ButtonGroup, null,
+                    React.createElement(components_1.Button, { variant: confirmButtonVariant || "primary", onClick: this.onConfirmedClick, ref: this.setConfirmAutofocus, id: confirmButtonId || `${this.props.id}-confirm-yes` }, confirmButtonText || "OK"),
+                    React.createElement(components_1.Button, { variant: "default", onClick: this.onCancelClick, id: cancelButtonId || `${this.props.id}-confirm-no` }, translations.Cancel)))));
+    }
+    browserConfirm() {
+        const choice = confirm(this.props.prompt);
+        if (choice) {
+            this.onConfirmedClick();
+        }
+        else {
+            this.onHideConfirm();
+        }
+    }
+}
+exports.ConfirmButton = ConfirmButton;
+ConfirmButton.contextType = ReactContext_1.default;

package/lib/components/components/DeleteButton.d.ts CHANGED Viewed

@@ -19,19 +19,6 @@ type State = {
 };
 export declare class DeleteButton extends React.Component<Props, State> {
     static contextType: React.Context<import("../../ReactContext").ContextProps>;
-    buttonRef: React.RefObject<any>;
-    constructor(props: Props);
-    onButtonKeyDown: ({ key }: React.KeyboardEvent) => void;
-    onHideConfirm: () => void;
-    onShowConfirm: (e: React.MouseEvent) => void;
-    onCancelClick: (e: React.MouseEvent) => void;
-    onConfirmedClick: (e?: React.KeyboardEvent | React.MouseEvent) => void;
-    onClick: (e: React.MouseEvent) => void;
-    setConfirmAutofocus: (elem?: React.ReactInstance) => void;
     render(): JSX.Element;
-    renderConfirm: () => JSX.Element | null;
-    getOverlayTarget: () => Element | Text | null;
-    renderConfirmPopup(): JSX.Element;
-    browserConfirm(): void;
 }
 export {};

package/lib/components/components/DeleteButton.js CHANGED Viewed

@@ -49,68 +49,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteButton = void 0;
 const React = __importStar(require("react"));
-const react_dom_1 = require("react-dom");
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
-const components_1 = require("../components");
+const ConfirmButton_1 = require("./ConfirmButton");
 class DeleteButton extends React.Component {
-    constructor(props) {
-        super(props);
-        this.buttonRef = React.createRef();
-        this.onButtonKeyDown = ({ key }) => {
-            if (key === "Enter")
-                this.onConfirmedClick();
-            else if (key === "Escape")
-                this.setState({ show: false });
-        };
-        this.onHideConfirm = () => {
-            this.setState({ show: false });
-        };
-        this.onShowConfirm = (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            this.setState({ show: true }, () => {
-                if (this.props.confirmStyle === "browser") {
-                    this.browserConfirm();
-                }
-            });
-        };
-        this.onCancelClick = (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            this.onHideConfirm();
-        };
-        this.onConfirmedClick = (e) => {
-            e && e.preventDefault();
-            e && e.stopPropagation();
-            this.props.onClick();
-            this.onHideConfirm();
-        };
-        this.onClick = (e) => {
-            this.props.confirm ? this.onShowConfirm(e) : this.onConfirmedClick(e);
-        };
-        this.setConfirmAutofocus = (elem) => {
-            setTimeout(() => {
-                var _a;
-                (_a = (0, react_dom_1.findDOMNode)(elem)) === null || _a === void 0 ? void 0 : _a.focus();
-            });
-        };
-        this.renderConfirm = () => {
-            const { show } = this.state;
-            if (!show) {
-                return null;
-            }
-            const { confirmStyle = "popup" } = this.props;
-            if (confirmStyle === "popup") {
-                return this.renderConfirmPopup();
-            }
-            return null;
-        };
-        this.getOverlayTarget = () => (0, react_dom_1.findDOMNode)(this.buttonRef.current);
-        this.state = { show: false };
-    }
     render() {
         const { props } = this;
-        const { corner, tooltip, disabled, readonly, glyphButton = true, confirm, confirmPlacement, confirmStyle } = props, maybeProps = __rest(props, ["corner", "tooltip", "disabled", "readonly", "glyphButton", "confirm", "confirmPlacement", "confirmStyle"]);
+        const { corner, glyphButton = true } = props, maybeProps = __rest(props, ["corner", "glyphButton"]);
         let buttonClassName = glyphButton ? "glyph-button" : "";
         buttonClassName += corner ? " button-corner" : "";
         if (props.className) {
@@ -119,32 +63,10 @@ class DeleteButton extends React.Component {
         if (props.id !== undefined) {
             maybeProps.id = `${props.id}-delete`;
         }
-        const button = React.createElement(React.Fragment, null,
-            React.createElement(components_1.Button, Object.assign({}, maybeProps, { disabled: disabled || readonly, variant: "danger", className: buttonClassName, style: this.props.style, ref: this.buttonRef, onKeyDown: this.onButtonKeyDown, onClick: this.onClick }),
-                this.props.children,
-                " ",
-                "✖"),
-            this.renderConfirm());
-        return tooltip ? React.createElement(components_1.TooltipComponent, { tooltip: tooltip }, button) : button;
-    }
-    renderConfirmPopup() {
-        const { translations, confirmPlacement = "left" } = this.props;
-        const { Overlay, Popover, ButtonGroup } = this.context.theme;
-        return (React.createElement(Overlay, { show: true, placement: confirmPlacement, rootClose: true, onHide: this.onHideConfirm, target: this.getOverlayTarget },
-            React.createElement(Popover, { id: `${this.props.id}-button-confirm` },
-                React.createElement("span", null, translations.ConfirmRemove),
-                React.createElement(ButtonGroup, null,
-                    React.createElement(components_1.Button, { variant: "danger", onClick: this.onConfirmedClick, ref: this.setConfirmAutofocus, id: `${this.props.id}-delete-confirm-yes` }, translations.Remove),
-                    React.createElement(components_1.Button, { variant: "default", onClick: this.onCancelClick, id: `${this.props.id}-delete-confirm-no` }, translations.Cancel)))));
-    }
-    browserConfirm() {
-        const choice = confirm(this.props.translations.ConfirmRemove);
-        if (choice) {
-            this.onConfirmedClick();
-        }
-        else {
-            this.onHideConfirm();
-        }
+        return (React.createElement(ConfirmButton_1.ConfirmButton, Object.assign({}, maybeProps, { variant: "danger", className: buttonClassName, prompt: props.translations.ConfirmRemove, confirmButtonVariant: "danger", confirmButtonText: props.translations.Remove, confirmButtonId: `${this.props.id}-delete-confirm-yes`, cancelButtonId: `${this.props.id}-delete-confirm-no` }),
+            this.props.children,
+            " ",
+            "✖"));
     }
 }
 exports.DeleteButton = DeleteButton;

package/lib/components/fields/ConditionalUiSchemaField.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 export const rulePropType: PropTypes.Requireable<NonNullable<string | PropTypes.InferProps<{
-    container: PropTypes.Requireable<string>;
     field: PropTypes.Validator<string>;
     regexp: PropTypes.Requireable<string>;
     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
     valueLengthLessThan: PropTypes.Requireable<number>;
+    prop: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | PropTypes.InferProps<{
     rule: PropTypes.Requireable<string>;
@@ -14,21 +14,21 @@ export const operationPropType: PropTypes.Requireable<PropTypes.InferProps<{
     uiSchema: PropTypes.Validator<object>;
 }>>;
 export const rulesPropType: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-    container: PropTypes.Requireable<string>;
     field: PropTypes.Validator<string>;
     regexp: PropTypes.Requireable<string>;
     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
     valueLengthLessThan: PropTypes.Requireable<number>;
+    prop: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | PropTypes.InferProps<{
     rule: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | null | undefined> | (NonNullable<string | PropTypes.InferProps<{
-    container: PropTypes.Requireable<string>;
     field: PropTypes.Validator<string>;
     regexp: PropTypes.Requireable<string>;
     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
     valueLengthLessThan: PropTypes.Requireable<number>;
+    prop: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | PropTypes.InferProps<{
     rule: PropTypes.Requireable<string>;
@@ -67,21 +67,21 @@ export default class ConditionalUiSchemaField extends React.Component<any, any,
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
                 cases: PropTypes.Requireable<NonNullable<PropTypes.InferProps<{
                     rules: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-                        container: PropTypes.Requireable<string>;
                         field: PropTypes.Validator<string>;
                         regexp: PropTypes.Requireable<string>;
                         valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                         valueLengthLessThan: PropTypes.Requireable<number>;
+                        prop: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | PropTypes.InferProps<{
                         rule: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | null | undefined> | (NonNullable<string | PropTypes.InferProps<{
-                        container: PropTypes.Requireable<string>;
                         field: PropTypes.Validator<string>;
                         regexp: PropTypes.Requireable<string>;
                         valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                         valueLengthLessThan: PropTypes.Requireable<number>;
+                        prop: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | PropTypes.InferProps<{
                         rule: PropTypes.Requireable<string>;
@@ -96,21 +96,21 @@ export default class ConditionalUiSchemaField extends React.Component<any, any,
                     }> | null | undefined)[] | null | undefined>>;
                 }> | (PropTypes.InferProps<{
                     rules: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-                        container: PropTypes.Requireable<string>;
                         field: PropTypes.Validator<string>;
                         regexp: PropTypes.Requireable<string>;
                         valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                         valueLengthLessThan: PropTypes.Requireable<number>;
+                        prop: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | PropTypes.InferProps<{
                         rule: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | null | undefined> | (NonNullable<string | PropTypes.InferProps<{
-                        container: PropTypes.Requireable<string>;
                         field: PropTypes.Validator<string>;
                         regexp: PropTypes.Requireable<string>;
                         valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                         valueLengthLessThan: PropTypes.Requireable<number>;
+                        prop: PropTypes.Requireable<string>;
                         complement: PropTypes.Requireable<boolean>;
                     }> | PropTypes.InferProps<{
                         rule: PropTypes.Requireable<string>;

package/lib/components/fields/ConditionalUiSchemaField.js CHANGED Viewed

@@ -50,11 +50,11 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
 const utils_1 = require("../../utils");
 exports.rulePropType = PropTypes.oneOfType([
     PropTypes.shape({
-        container: PropTypes.string,
         field: PropTypes.string.isRequired,
         regexp: PropTypes.string,
         valueIn: PropTypes.arrayOf(PropTypes.string),
         valueLengthLessThan: PropTypes.number,
+        prop: PropTypes.string,
         complement: PropTypes.bool
     }),
     PropTypes.shape({

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

@@ -1,9 +1,9 @@
 export const arrayRulesPropType: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-    container: PropTypes.Requireable<string>;
     field: PropTypes.Validator<string>;
     regexp: PropTypes.Requireable<string>;
     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
     valueLengthLessThan: PropTypes.Requireable<number>;
+    prop: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | PropTypes.InferProps<{
     rule: PropTypes.Requireable<string>;
@@ -13,11 +13,11 @@ export const arrayRulesPropType: PropTypes.Requireable<NonNullable<NonNullable<s
     isLast: PropTypes.Requireable<number>;
     complement: PropTypes.Requireable<boolean>;
 }> | (NonNullable<NonNullable<string | PropTypes.InferProps<{
-    container: PropTypes.Requireable<string>;
     field: PropTypes.Validator<string>;
     regexp: PropTypes.Requireable<string>;
     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
     valueLengthLessThan: PropTypes.Requireable<number>;
+    prop: PropTypes.Requireable<string>;
     complement: PropTypes.Requireable<boolean>;
 }> | PropTypes.InferProps<{
     rule: PropTypes.Requireable<string>;
@@ -32,11 +32,11 @@ export default class FilterArrayField extends React.Component<any, any, any> {
         uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
                 rules: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-                    container: PropTypes.Requireable<string>;
                     field: PropTypes.Validator<string>;
                     regexp: PropTypes.Requireable<string>;
                     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                     valueLengthLessThan: PropTypes.Requireable<number>;
+                    prop: PropTypes.Requireable<string>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | PropTypes.InferProps<{
                     rule: PropTypes.Requireable<string>;
@@ -46,11 +46,11 @@ export default class FilterArrayField extends React.Component<any, any, any> {
                     isLast: PropTypes.Requireable<number>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | (NonNullable<NonNullable<string | PropTypes.InferProps<{
-                    container: PropTypes.Requireable<string>;
                     field: PropTypes.Validator<string>;
                     regexp: PropTypes.Requireable<string>;
                     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                     valueLengthLessThan: PropTypes.Requireable<number>;
+                    prop: PropTypes.Requireable<string>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | PropTypes.InferProps<{
                     rule: PropTypes.Requireable<string>;

package/lib/components/fields/ImageArrayField.d.ts CHANGED Viewed

@@ -144,6 +144,8 @@ export declare function MediaArrayField<LFC extends Constructor<React.Component<
                 sideEffects: PropTypes.Requireable<object>;
                 exifParsers: PropTypes.Requireable<(object | null | undefined)[]>;
                 metadataFormId: PropTypes.Requireable<string>;
+                hideDeleteButton: PropTypes.Requireable<boolean>;
+                deleteConfirmPlacement: PropTypes.Requireable<string>;
             }>>;
         }>>;
         schema: PropTypes.Validator<NonNullable<PropTypes.InferProps<{

package/lib/components/fields/ImageArrayField.js CHANGED Viewed

@@ -146,10 +146,10 @@ function MediaArrayField(ComposedComponent) {
             });
             this.renderMedias = () => {
                 const { disabled, readonly } = this.props;
-                const { deleteConfirmPlacement = "top" } = (0, utils_1.getUiOptions)(this.props.uiSchema);
+                const { hideDeleteButton = false, deleteConfirmPlacement = "top" } = (0, utils_1.getUiOptions)(this.props.uiSchema);
                 return (this.props.formData || []).map((item, i) => (React.createElement("div", { key: i, className: "media-container" },
                     React.createElement("div", { className: "media-container-link", onClick: this.onMediaClick(i) }, this.renderMedia(item, i)),
-                    React.createElement(components_1.DeleteButton, { corner: true, confirm: true, confirmPlacement: deleteConfirmPlacement, translations: this.props.formContext.translations, onClick: this.onMediaRmClick(i), disabled: disabled || readonly, id: `${this.props.idSchema.$id}_${i}` }))));
+                    !hideDeleteButton && React.createElement(components_1.DeleteButton, { corner: true, confirm: true, confirmPlacement: deleteConfirmPlacement, translations: this.props.formContext.translations, onClick: this.onMediaRmClick(i), disabled: disabled || readonly, id: `${this.props.idSchema.$id}_${i}` }))));
             };
             this.renderLoadingMedias = () => {
                 const containerId = this.getContainerId();
@@ -663,7 +663,9 @@ function MediaArrayField(ComposedComponent) {
                 autoOpenMetadataModal: PropTypes.bool,
                 sideEffects: PropTypes.object,
                 exifParsers: PropTypes.arrayOf(PropTypes.object),
-                metadataFormId: PropTypes.string
+                metadataFormId: PropTypes.string,
+                hideDeleteButton: PropTypes.bool,
+                deleteConfirmPlacement: PropTypes.string
             })
         }),
         schema: PropTypes.shape({

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

@@ -3,11 +3,11 @@ export default class MultiArrayField extends React.Component<any, any, any> {
         uiSchema: PropTypes.Requireable<PropTypes.InferProps<{
             "ui:options": PropTypes.Requireable<PropTypes.InferProps<{
                 rules: PropTypes.Requireable<NonNullable<NonNullable<string | PropTypes.InferProps<{
-                    container: PropTypes.Requireable<string>;
                     field: PropTypes.Validator<string>;
                     regexp: PropTypes.Requireable<string>;
                     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                     valueLengthLessThan: PropTypes.Requireable<number>;
+                    prop: PropTypes.Requireable<string>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | PropTypes.InferProps<{
                     rule: PropTypes.Requireable<string>;
@@ -17,11 +17,11 @@ export default class MultiArrayField extends React.Component<any, any, any> {
                     isLast: PropTypes.Requireable<number>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | (NonNullable<NonNullable<string | PropTypes.InferProps<{
-                    container: PropTypes.Requireable<string>;
                     field: PropTypes.Validator<string>;
                     regexp: PropTypes.Requireable<string>;
                     valueIn: PropTypes.Requireable<(string | null | undefined)[]>;
                     valueLengthLessThan: PropTypes.Requireable<number>;
+                    prop: PropTypes.Requireable<string>;
                     complement: PropTypes.Requireable<boolean>;
                 }> | PropTypes.InferProps<{
                     rule: PropTypes.Requireable<string>;

package/lib/components/widgets/InputWithDefaultValueButtonWidget.d.ts CHANGED Viewed

@@ -9,10 +9,12 @@ export default class InputWithDefaultValueButtonWidget extends React.Component<a
                 apiQueryForDefaultValue: PropTypes.Requireable<PropTypes.InferProps<{
                     path: PropTypes.Validator<string>;
                     query: PropTypes.Requireable<object>;
-                    resultKey: PropTypes.Validator<string>;
+                    resultKey: PropTypes.Requireable<string>;
                     cache: PropTypes.Requireable<boolean>;
                 }>>;
                 disableButtonAfterUse: PropTypes.Requireable<boolean>;
+                confirmClick: PropTypes.Requireable<boolean>;
+                confirmMessage: PropTypes.Requireable<string>;
                 onClick: PropTypes.Requireable<(...args: any[]) => any>;
             }>>>;
         }>>>;

package/lib/components/widgets/InputWithDefaultValueButtonWidget.js CHANGED Viewed

@@ -42,10 +42,12 @@ const BaseInputTemplate_1 = __importDefault(require("../templates/BaseInputTempl
 const ReactContext_1 = __importDefault(require("../../ReactContext"));
 const utils_1 = require("../../utils");
 const react_spinner_1 = __importDefault(require("react-spinner"));
+const ConfirmButton_1 = require("../components/ConfirmButton");
 class InputWithDefaultValueButtonWidget extends React.Component {
     constructor(props) {
         super(props);
         this.onClick = () => {
+            var _a;
             if (this.fetching || this.disabled) {
                 return;
             }
@@ -60,7 +62,7 @@ class InputWithDefaultValueButtonWidget extends React.Component {
                 const apiClient = this.props.formContext.apiClient;
                 this.fetching = true;
                 this.setState({ fetching: true });
-                return apiClient.get(path, { query: Object.assign({ value: this.props.value }, query) }, cache).then(result => {
+                return apiClient.get(path, { query: Object.assign({ value: (_a = this.props.value) !== null && _a !== void 0 ? _a : "" }, query) }, cache).then(result => {
                     result = resultKey ? result === null || result === void 0 ? void 0 : result[resultKey] : result;
                     this.changeValue(result);
                 }).catch(() => {
@@ -86,15 +88,16 @@ class InputWithDefaultValueButtonWidget extends React.Component {
         this.state = { fetching: false, disabled: false };
     }
     render() {
-        const { InputGroup, Button } = this.context.theme;
-        const { buttonLabel, buttonVariant } = (0, utils_1.getUiOptions)(this.props);
-        const { disabled, readonly } = this.props;
+        const { InputGroup } = this.context.theme;
+        const { buttonLabel, buttonVariant, confirmClick, confirmMessage } = (0, utils_1.getUiOptions)(this.props);
+        const { disabled, readonly, id } = this.props;
+        const { translations } = this.props.formContext;
         return (React.createElement(InputGroup, null,
             React.createElement(BaseInputTemplate_1.default, Object.assign({}, this.props)),
             React.createElement(InputGroup.Button, { className: "input-group-button" },
-                React.createElement(Button, { onClick: this.onClick, disabled: disabled || readonly || this.state.fetching || this.state.disabled, variant: buttonVariant },
-                    buttonLabel,
-                    this.state.fetching && React.createElement(react_spinner_1.default, null)))));
+                React.createElement(ConfirmButton_1.ConfirmButton, { id: `${id}-default-value-button`, translations: translations, confirm: confirmClick, onClick: this.onClick, disabled: disabled || readonly || this.state.fetching || this.state.disabled, variant: buttonVariant, prompt: confirmMessage },
+                    this.state.fetching && React.createElement(react_spinner_1.default, null),
+                    buttonLabel))));
     }
 }
 InputWithDefaultValueButtonWidget.contextType = ReactContext_1.default;
@@ -107,10 +110,12 @@ InputWithDefaultValueButtonWidget.propTypes = {
             apiQueryForDefaultValue: PropTypes.shape({
                 path: PropTypes.string.isRequired,
                 query: PropTypes.object,
-                resultKey: PropTypes.string.isRequired,
+                resultKey: PropTypes.string,
                 cache: PropTypes.bool
             }),
             disableButtonAfterUse: PropTypes.bool,
+            confirmClick: PropTypes.bool,
+            confirmMessage: PropTypes.string,
             onClick: PropTypes.func
         }).isRequired
     }).isRequired,

package/lib/utils.js CHANGED Viewed

@@ -827,7 +827,7 @@ function checkRules(rules, props, cache, prop = "formData") {
     const passes = (Array.isArray(rules) ? rules : [rules]).every((rule, idx) => {
         let passes;
         // BW compatibility for old string  rule
-        if (["isAdmin", "isEdit", "isReadonly"].includes(rule)) {
+        if (["isAdmin", "isLoggedIn", "isEdit", "isReadonly"].includes(rule)) {
             rule = { rule };
         }
         const { field, regexp, valueIn, valueIncludes, valueLengthLessThan, rule: _rule } = rule;
@@ -846,7 +846,7 @@ function checkRules(rules, props, cache, prop = "formData") {
             }
         }
         else {
-            let value = parseJSONPointer(props[prop] || {}, field);
+            let value = parseJSONPointer(props[rule.prop || prop] || {}, field);
             if (value === undefined)
                 value = "";
             if (regexp) {

package/package.json CHANGED Viewed

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