@luomus/laji-form 15.1.65 → 15.1.66

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

@@ -24,6 +24,7 @@ export declare class DeleteButton extends React.Component<Props, State> {
     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;

package/lib/components/components/DeleteButton.js

@@ -74,6 +74,11 @@ class DeleteButton extends React.Component {
                 }
             });
         };
+        this.onCancelClick = (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            this.onHideConfirm();
+        };
         this.onConfirmedClick = (e) => {
             e && e.preventDefault();
             e && e.stopPropagation();
@@ -130,7 +135,7 @@ class DeleteButton extends React.Component {
                 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.onHideConfirm, id: `${this.props.id}-delete-confirm-no` }, translations.Cancel)))));
+                    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);

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

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

package/lib/components/fields/ImageArrayField.js

@@ -184,7 +184,8 @@ function MediaArrayField(ComposedComponent) {
                 const { lang, translations } = this.props.registry.formContext;
                 const metadataForm = this.state.metadataForm || {};
                 if (typeof metadataModalOpen === "number" && !this.state.metadataForm) {
-                    this.apiClient.fetchCached(`/forms/${this.METADATA_FORM_ID}`, { lang, format: "schema" })
+                    const { metadataFormId = this.METADATA_FORM_ID } = (0, utils_1.getUiOptions)(this.props.uiSchema);
+                    this.apiClient.fetchCached(`/forms/${metadataFormId}`, { lang, format: "schema" })
                         .then(metadataForm => {
                         if (this.mounted) {
                             this.setState({ metadataForm });
@@ -684,7 +685,8 @@ function MediaArrayField(ComposedComponent) {
                 autoOpenAddModal: PropTypes.bool,
                 autoOpenMetadataModal: PropTypes.bool,
                 sideEffects: PropTypes.object,
-                exifParsers: PropTypes.arrayOf(PropTypes.object)
+                exifParsers: PropTypes.arrayOf(PropTypes.object),
+                metadataFormId: PropTypes.string
             })
         }),
         schema: PropTypes.shape({

package/package.json

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