@pinuts/bsr-uikit-relaunch 0.4.3 → 0.4.4

package/dist/items/Grid/BSRGridRow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BSRGridRow.d.ts","sourceRoot":"","sources":["../../../src/items/Grid/BSRGridRow.jsx"],"names":[],"mappings":";AAKA;;;sBAUC;;;;;;;kBAfiB,OAAO;sBACH,YAAY"}
+{"version":3,"file":"BSRGridRow.d.ts","sourceRoot":"","sources":["../../../src/items/Grid/BSRGridRow.jsx"],"names":[],"mappings":";AAMA;;;sBAqBC;;;;;;;kBA3BiC,OAAO;sBACnB,YAAY"}

package/dist/items/Grid/BSRGridRow.js

@@ -4,15 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _formBuilder = require("@pinuts/form-builder");
+var _ReviewLayoutContext = _interopRequireDefault(require("../../shared/FormWidget/ReviewLayoutContext.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const BSRGridRow = _ref => {
   let {
     components,
     children
   } = _ref;
+  const {
+    active: isReviewLayout
+  } = (0, _react.useContext)(_ReviewLayoutContext.default);
+
+  // Kontrollseite: einspaltige Liste statt Formular-Raster
+  if (isReviewLayout) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, components && /*#__PURE__*/_react.default.createElement(_formBuilder.ComponentPopulator, {
+      components: components,
+      formId: ''
+    }), children);
+  }
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'row'
   }, components && /*#__PURE__*/_react.default.createElement(_formBuilder.ComponentPopulator, {

package/dist/items/ReviewValue/ReviewValueList.d.ts

@@ -9,7 +9,7 @@ declare function ReviewValueList({ items }: {
 }): React.JSX.Element;
 declare namespace ReviewValueList {
     namespace propTypes {
-        let items: PropTypes.Requireable<NonNullable<string | number>[]>;
+        let items: PropTypes.Requireable<NonNullable<string | number | PropTypes.ReactElementLike>[]>;
     }
 }
 import React from 'react';

package/dist/items/ReviewValue/ReviewValueList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReviewValueList.d.ts","sourceRoot":"","sources":["../../../src/items/ReviewValue/ReviewValueList.jsx"],"names":[],"mappings":";AAIA;;;;GAIG;AACH;;sBAgBC;;;;;;kBAzBiB,OAAO;sBACH,YAAY"}
+{"version":3,"file":"ReviewValueList.d.ts","sourceRoot":"","sources":["../../../src/items/ReviewValue/ReviewValueList.jsx"],"names":[],"mappings":";AAIA;;;;GAIG;AACH;;sBAkBC;;;;;;kBA3BiB,OAAO;sBACH,YAAY"}

package/dist/items/ReviewValue/ReviewValueList.js

@@ -27,10 +27,10 @@ const ReviewValueList = _ref => {
   // Werte können sich wiederholen (gleiche Label-Texte), daher Index im Key
   // eslint-disable-next-line react/no-array-index-key
   _react.default.createElement("li", {
-    key: `${index}-${item}`
-  }, /*#__PURE__*/_react.default.createElement(_HTMLParserSanitized.HTMLParserSanitized, null, String(item)))));
+    key: `${index}-${/*#__PURE__*/_react.default.isValidElement(item) ? '' : item}`
+  }, /*#__PURE__*/_react.default.isValidElement(item) ? item : /*#__PURE__*/_react.default.createElement(_HTMLParserSanitized.HTMLParserSanitized, null, String(item)))));
 };
 ReviewValueList.propTypes = {
-  items: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]))
+  items: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.element]))
 };
 var _default = exports.default = ReviewValueList;

package/dist/locales.d.ts

@@ -84,6 +84,7 @@ export namespace resources {
                     let addressNotFound: string;
                     let loading: string;
                     let checkAddress: string;
+                    let checkAddressRequired: string;
                     let street: string;
                     let houseNumber: string;
                     let resetBtn: string;
@@ -139,6 +140,7 @@ export namespace resources {
                     let readyForUpload: string;
                     let isUploading: string;
                     let uploadSuccessful: string;
+                    let openFileAria: string;
                     namespace errors {
                         let uploadFileTooLarge: string;
                         let uploadFileTooLargeNoLimit: string;

package/dist/locales.js

@@ -79,6 +79,7 @@ const resources = exports.resources = {
           'addressNotFound': 'Die Strasse und/oder Strasse-/ und Hausnummerkombination konnte nicht gefunden werden, bitte Suchen Sie erneut und wählen Sie eine Strasse aus der Autovervollständigung aus.',
           'loading': 'Adresse wird überprüft ...',
           'checkAddress': 'Adresse prüfen',
+          'checkAddressRequired': 'Bitte die Adresse mit „{{button}}“ bestätigen.',
           'street': 'Straße',
           'houseNumber': 'Hausnummer',
           'resetBtn': 'X',
@@ -132,6 +133,7 @@ const resources = exports.resources = {
           readyForUpload: 'Bereit zum Hochladen: {{filename}}',
           isUploading: '{{filename}} wird hochgeladen ...',
           uploadSuccessful: '{{filename}} wurde hochgeladen.',
+          openFileAria: '{{label}} anzeigen (öffnet in neuem Tab)',
           errors: {
             // Fehlercodes des Servers
             uploadFileTooLarge: '{{filename}} ist zu groß. Erlaubt sind maximal {{maxSize}}.',

package/dist/shared/ErrorMessagesInfoBox/ErrorMessagesInfoBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorMessagesInfoBox.d.ts","sourceRoot":"","sources":["../../../src/shared/ErrorMessagesInfoBox/ErrorMessagesInfoBox.jsx"],"names":[],"mappings":";AAgEA;;;;sBAmEC;;;;;;;;kBAnI8D,OAAO;sBAChD,YAAY"}
+{"version":3,"file":"ErrorMessagesInfoBox.d.ts","sourceRoot":"","sources":["../../../src/shared/ErrorMessagesInfoBox/ErrorMessagesInfoBox.jsx"],"names":[],"mappings":";AAmEA;;;;sBAmEC;;;;;;;;kBAtI8D,OAAO;sBAChD,YAAY"}

package/dist/shared/ErrorMessagesInfoBox/ErrorMessagesInfoBox.js

@@ -17,7 +17,9 @@ const {
 } = _formBuilder.formik;
 const focusFieldByName = (formId, name) => {
   const form = formId ? document.getElementById(formId) : document;
-  const field = form?.querySelector(`[name="${name}"]`);
+  // Gruppenfelder ohne eigenes Eingabefeld (BSRAddressSelector): das als ungültig markierte Unterfeld
+  const escapedName = CSS.escape(name);
+  const field = form?.querySelector(`[name="${escapedName}"]`) || form?.querySelector(`[name^="${escapedName}-"][aria-invalid="true"]`);
   if (field) {
     field.scrollIntoView({
       behavior: 'smooth',

package/dist/shared/FormWidget/FormWidgetControlPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormWidgetControlPage.d.ts","sourceRoot":"","sources":["../../../src/shared/FormWidget/FormWidgetControlPage.jsx"],"names":[],"mappings":";AASA;;;;;;;;sBAuDC;;;;;;;;;;;;;;;;;kBAhEwC,OAAO;sBAC1B,YAAY"}
+{"version":3,"file":"FormWidgetControlPage.d.ts","sourceRoot":"","sources":["../../../src/shared/FormWidget/FormWidgetControlPage.jsx"],"names":[],"mappings":";AAWA;;;;;;;;sBA6DC;;;;;;;;;;;;;;;;;kBAxEwC,OAAO;sBAC1B,YAAY"}

package/dist/shared/FormWidget/FormWidgetControlPage.js

@@ -10,10 +10,15 @@ var _formBuilder = require("@pinuts/form-builder");
 var _reactI18next = require("react-i18next");
 var _HTMLParserSanitized = require("../../items/HTMLParserSanitized/HTMLParserSanitized.jsx");
 var _Button = _interopRequireDefault(require("../../items/Button/Button.jsx"));
+var _ReviewLayoutContext = _interopRequireDefault(require("./ReviewLayoutContext.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const noop = () => {};
+const reviewLayout = {
+  active: true,
+  inList: false
+};
 const FormWidgetControlPage = _ref => {
   let {
     captions,
@@ -36,14 +41,16 @@ const FormWidgetControlPage = _ref => {
   return /*#__PURE__*/_react.default.createElement("section", {
     className: "pi-review",
     "aria-labelledby": headingId
-  }, /*#__PURE__*/_react.default.createElement("h1", {
+  }, /*#__PURE__*/_react.default.createElement("h2", {
     className: "pi-review-heading",
     id: headingId,
     tabIndex: -1,
     ref: headingRef
   }, t(captions.header)), captions.text && /*#__PURE__*/_react.default.createElement("div", {
     className: "info-text pi-review-infotext"
-  }, /*#__PURE__*/_react.default.createElement(_HTMLParserSanitized.HTMLParserSanitized, null, t(captions.text))), /*#__PURE__*/_react.default.createElement(_formBuilder.FormBuilder, {
+  }, /*#__PURE__*/_react.default.createElement(_HTMLParserSanitized.HTMLParserSanitized, null, t(captions.text))), /*#__PURE__*/_react.default.createElement(_ReviewLayoutContext.default.Provider, {
+    value: reviewLayout
+  }, /*#__PURE__*/_react.default.createElement(_formBuilder.FormBuilder, {
     key: `${formId}-control`,
     formId: `${formId}-control`,
     formConfig: formConfig,
@@ -51,12 +58,14 @@ const FormWidgetControlPage = _ref => {
     initialValues: formValues,
     readOnly: true,
     flagsToInherit: ['reviewMode']
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "pi-review-actions"
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
-    color: "white",
-    className: "me-2",
+    color: "outline-brick",
     onClick: onBack,
     text: captions.backBtn
   }), /*#__PURE__*/_react.default.createElement(_Button.default, {
+    color: "brick",
     onClick: onSubmit,
     text: captions.submitBtn,
     ariaAttributes: {
@@ -65,7 +74,7 @@ const FormWidgetControlPage = _ref => {
     inputProps: {
       disabled: isSubmitting
     }
-  })));
+  })))));
 };
 FormWidgetControlPage.propTypes = {
   captions: _propTypes.default.shape({

package/dist/shared/FormWidget/ReviewLayoutContext.d.ts

@@ -0,0 +1,11 @@
+export default ReviewLayoutContext;
+/**
+ * Layout der Kontrollseite (FormWidgetControlPage).
+ * active: Raster aus, Fieldsets werden zu Abschnitten mit Überschrift und einer Liste.
+ * inList: innerhalb eines Abschnitts-<dl>, Felder liefern nur ihr dt/dd-Paar.
+ */
+declare const ReviewLayoutContext: import("react").Context<{
+    active: boolean;
+    inList: boolean;
+}>;
+//# sourceMappingURL=ReviewLayoutContext.d.ts.map

package/dist/shared/FormWidget/ReviewLayoutContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReviewLayoutContext.d.ts","sourceRoot":"","sources":["../../../src/shared/FormWidget/ReviewLayoutContext.js"],"names":[],"mappings":";AAEA;;;;GAIG;AACH;;;GAA4E"}

package/dist/shared/FormWidget/ReviewLayoutContext.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = require("react");
+/**
+ * Layout der Kontrollseite (FormWidgetControlPage).
+ * active: Raster aus, Fieldsets werden zu Abschnitten mit Überschrift und einer Liste.
+ * inList: innerhalb eines Abschnitts-<dl>, Felder liefern nur ihr dt/dd-Paar.
+ */
+const ReviewLayoutContext = /*#__PURE__*/(0, _react.createContext)({
+  active: false,
+  inList: false
+});
+var _default = exports.default = ReviewLayoutContext;

package/dist/shared/KehrenbuergerForm/KehrenbuergerForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KehrenbuergerForm.d.ts","sourceRoot":"","sources":["../../../src/shared/KehrenbuergerForm/KehrenbuergerForm.jsx"],"names":[],"mappings":";AA6DA;;;;;;GAMG;AACH;;;;sBAgHC;;;;;;;;kBApL2D,OAAO;sBAC7C,YAAY"}
+{"version":3,"file":"KehrenbuergerForm.d.ts","sourceRoot":"","sources":["../../../src/shared/KehrenbuergerForm/KehrenbuergerForm.jsx"],"names":[],"mappings":";AA6EA;;;;;;GAMG;AACH;;;;sBAmHC;;;;;;;;kBAvM2D,OAAO;sBAC7C,YAAY"}

package/dist/shared/KehrenbuergerForm/KehrenbuergerForm.js

@@ -51,6 +51,30 @@ const transformPayload = values => ({
   data: values
 });
 
+// Der UM liefert die Upload-URL relativ ("/p/…"). Auf der Website zeigt /p nicht auf den UM,
+// deshalb wie Config-Abruf und Absenden über restUrl leiten.
+const RELATIVE_REST_PREFIX = '/p/';
+const withUploadUrlsFromRestUrl = function () {
+  let components = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  let restUrl = arguments.length > 1 ? arguments[1] : undefined;
+  return components.map(component => {
+    const uploadUrl = component.config?.uploadUrl;
+    const config = typeof uploadUrl === 'string' && uploadUrl.startsWith(RELATIVE_REST_PREFIX) ? {
+      ...component.config,
+      uploadUrl: `${restUrl}/${uploadUrl.slice(RELATIVE_REST_PREFIX.length)}`
+    } : component.config;
+    return {
+      ...component,
+      ...(config && {
+        config
+      }),
+      ...(component.components && {
+        components: withUploadUrlsFromRestUrl(component.components, restUrl)
+      })
+    };
+  });
+};
+
 // Bestätigungs-Link (Double-Opt-In): ?c=<aktionId> in der URL.
 // Prod nutzt normale URLs (?c=... vor dem #), die CMS-Vorschau Hash-URLs
 // (#/pfad?c=...) - deshalb beide Stellen prüfen.
@@ -106,7 +130,10 @@ const KehrenbuergerForm = _ref2 => {
       if (!formConfigs?.anmeldung) {
         throw new Error('In der Antwort fehlt data.formConfigs.anmeldung');
       }
-      setFormConfig(formConfigs.anmeldung);
+      setFormConfig({
+        ...formConfigs.anmeldung,
+        components: withUploadUrlsFromRestUrl(formConfigs.anmeldung.components, restUrl)
+      });
       setRawCaptions(formConfigs.captions || {});
     }).catch(() => {
       if (!aborted) {
@@ -116,7 +143,7 @@ const KehrenbuergerForm = _ref2 => {
     return () => {
       aborted = true;
     };
-  }, [configUrl]);
+  }, [configUrl, restUrl]);
 
   // DOI: Anmeldung per PUT bestätigen, sobald die Captions da sind
   const doiConfirmed = (0, _react.useRef)(false);

package/dist/styles/_errorMessagesInfoBox.scss

@@ -7,7 +7,8 @@
   .pi-message-text {
     display: flex;
     flex-direction: column;
-    margin: 0 0 ($base-gap * 4);
+    // oben wie der Abstand des ersten Fieldsets (my-3), sonst klebt die Box am Einleitungstext
+    margin: ($base-gap * 4) 0;
     padding: ($base-gap * 3) ($base-gap * 5); // 12px 20px
     border: $bsr-border-width-l solid $error;
     border-radius: $border-radius;

package/dist/styles/_form.scss

@@ -30,7 +30,6 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0 $base-gap * 4 0 0;
   gap: $base-gap * 2;
   width: 100%;
 
@@ -56,6 +55,12 @@
     }
   }
 
+  .labelWithInfo {
+    display: flex;
+    align-items: center;
+    gap: $base-gap * 2;
+  }
+
   .infoRow {
     display: flex;
     gap: $base-gap;
@@ -99,14 +104,15 @@
           transform: rotate(45deg);
         }
 
+        // ohne das frühere padding-right (16px) der .topRow um 16px angepasst: Tooltip bleibt, wo er war
         &.adjustRight {
           left: auto;
-          right: -40px;
+          right: -24px;
 
           &::after {
             content: "";
             bottom: -10px;
-            right: 40px;
+            right: 24px;
             left: initial;
           }
         }
@@ -182,6 +188,11 @@ textarea {
   }
 }
 
+// Reset-Button unter "Ihre Auswahl" steht in keinem .formInput: gleicher Abstand zum nächsten Feld
+.addressResetBtn {
+  margin-bottom: $base-gap * 5;
+}
+
 /* TEXT INPUT */
 .formInput, fieldset.formInput {
   display: flex;

package/dist/styles/_review.scss

@@ -1,11 +1,43 @@
-// Kontrollseite (reviewMode). Bewusst minimal: die visuelle Feinabstimmung
-// (Kontraste, Abstände) folgt in einem eigenen Schritt.
+// Kontrollseite (reviewMode). Abschnitte aus den Fieldsets, je Abschnitt eine Definitionsliste;
+// ab md Label links, Wert rechts, darunter untereinander.
 .pi-review {
+  .pi-review-heading {
+    margin-bottom: $base-gap * 4;
+  }
+
+  .pi-review-section {
+    margin-top: $base-gap * 10;
+  }
+
+  .pi-review-section-heading {
+    margin-bottom: $base-gap * 2;
+  }
+
+  .pi-review-list,
   .pi-review-item {
     margin: 0;
   }
 
-  .pi-review-pair {
+  .pi-review-list {
+    border-top: $bsr-border-width-s solid $bsr-black-20;
+  }
+
+  .pi-review-list > .pi-review-pair {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr);
+    gap: $base-gap;
+    margin: 0;
+    padding-block: $base-gap * 3;
+    border-bottom: $bsr-border-width-s solid $bsr-black-20;
+
+    @media (min-width: $screen-md-min) {
+      grid-template-columns: minmax(0, 1fr) minmax(0, 2fr);
+      gap: $base-gap * 6;
+    }
+  }
+
+  // Felder außerhalb eines Abschnitts (ein dl je Feld)
+  .pi-review-item > .pi-review-pair {
     margin-bottom: $base-gap * 3;
   }
 
@@ -15,6 +47,11 @@
 
   dd {
     margin: 0;
+    overflow-wrap: anywhere;
+  }
+
+  .pi-review-appendix {
+    margin-top: $base-gap;
   }
 
   // Zeilenumbrüche aus Textarea-Eingaben sichtbar halten
@@ -26,4 +63,16 @@
     margin: 0;
     padding-inline-start: $base-gap * 4;
   }
+
+  .pi-review-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: $base-gap * 4;
+    margin-top: $base-gap * 10;
+
+    // Wie die BSR-Atoms ohne Unterstreichung (UI-Kit-Buttons sind sonst unterstrichen)
+    .btn {
+      text-decoration: none;
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinuts/bsr-uikit-relaunch",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "private": false,
   "description": "BSR UI-KIT Relaunch",
   "main": "dist/index.js",