qwc2 2026.8.5 → 2026.8.7

package/components/AppMenu.js

@@ -87,6 +87,13 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       if (_this.menuEl && !_this.menuEl.contains(ev.target) && _this.props.menuDisplayMode === "normal") {
         _this.toggleMenu();
         MiscUtils.killEvent(ev);
+        _this.killClick = true;
+      }
+    });
+    _defineProperty(_this, "checkKillClick", function (ev) {
+      if (_this.killClick) {
+        MiscUtils.killEvent(ev);
+        _this.killClick = undefined;
       }
     });
     _defineProperty(_this, "onSubmenuClicked", function (key, level) {
@@ -242,6 +249,9 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       if (this.props.appMenuShortcut) {
         mousetrap.bind(this.props.appMenuShortcut, this.toggleMenu);
       }
+      document.addEventListener('click', this.checkKillClick, {
+        capture: true
+      });
     }
   }, {
     key: "componentDidUpdate",
@@ -255,10 +265,14 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         }, 400);
         // Delay one cycle
         setTimeout(function () {
-          return document.addEventListener('click', _this2.checkCloseMenu);
+          return document.addEventListener('pointerdown', _this2.checkCloseMenu, {
+            capture: true
+          });
         }, 0);
       } else if (prevState.menuVisible && !this.state.menuVisible) {
-        document.removeEventListener('click', this.checkCloseMenu);
+        document.removeEventListener('pointerdown', this.checkCloseMenu, {
+          capture: true
+        });
       }
     }
   }, {
@@ -270,7 +284,12 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       if (this.props.appMenuShortcut) {
         mousetrap.unbind(this.props.appMenuShortcut, this.toggleMenu);
       }
-      document.removeEventListener('click', this.checkCloseMenu);
+      document.removeEventListener('pointerdown', this.checkCloseMenu, {
+        capture: true
+      });
+      document.removeEventListener('click', this.checkKillClick, {
+        capture: true
+      });
     }
   }, {
     key: "render",

package/components/AttributeForm.js

@@ -575,6 +575,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Ensure numeric values are numbers and not strings
               value = Number(value);
             }
+            if (nrelFieldConfig.type === 'boolean' && value !== null && typeof value === "string") {
+              // Ensure boolean values are bools
+              value = value.trim().toLowerCase() === "true";
+            }
 
             // relationValues for table must exist as rows are either pre-existing or were added
             if (!(field in relationValues[datasetname].features[index].properties)) {
@@ -621,6 +625,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Ensure numeric values are numbers and not strings
               value = Number(value);
             }
+            if (fieldConfig.type === 'boolean' && value !== null && typeof value === "string") {
+              // Ensure boolean values are bools
+              value = value.trim().toLowerCase() === "true";
+            }
             if (!(name in feature.properties)) {
               feature.defaultedProperties = [].concat(_toConsumableArray(feature.defaultedProperties || []), [name]);
             }

package/components/EditUploadField.js

@@ -1,7 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -210,18 +208,21 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$state$imageData2,
+      var _this$props$constrain,
+        _this$props$constrain2,
+        _this$state$imageData2,
         _fileType$startsWith2,
         _this2 = this;
       var isAttachment = this.props.value.startsWith("attachment:");
       var fileValue = isAttachment ? this.props.value.replace(/attachment:\/\//, '') : this.props.value;
       var fileType = mime.lookup(fileValue);
       var fileUrl = isAttachment ? this.props.iface.resolveAttachmentUrl(this.props.dataset, fileValue) : fileValue;
-      var constraints = _objectSpread(_objectSpread({}, this.props.constraints), {}, {
-        accept: (this.props.constraints.accept || "").split(",").map(function (ext) {
+      var constraints = {
+        required: (_this$props$constrain = this.props.constraints) === null || _this$props$constrain === void 0 ? void 0 : _this$props$constrain.required,
+        accept: (((_this$props$constrain2 = this.props.constraints) === null || _this$props$constrain2 === void 0 ? void 0 : _this$props$constrain2.accept) || "").split(",").map(function (ext) {
           return mime.lookup(ext);
         }).join(",")
-      });
+      };
       var mediaSupport = 'mediaDevices' in navigator && constraints.accept.split(",").includes("image/jpeg");
       var imageData = (_this$state$imageData2 = this.state.imageData) !== null && _this$state$imageData2 !== void 0 ? _this$state$imageData2 : fileType !== null && fileType !== void 0 && (_fileType$startsWith2 = fileType.startsWith) !== null && _fileType$startsWith2 !== void 0 && _fileType$startsWith2.call(fileType, 'image/') ? fileUrl : null;
       if (imageData) {

package/components/IdentifyViewer.js

@@ -309,7 +309,8 @@ var BuiltinExporters = [{
         }
         features.forEach(function (feature) {
           var row = exportAttrs.map(function (attr) {
-            return feature.properties[attr];
+            var value = feature.properties[attr];
+            return MiscUtils.isNumeric(value) ? Number(value) : value;
           });
           if (feature.geometry) {
             var geomWkt = VectorLayerUtils.geoJSONGeomToWkt(feature.geometry);
@@ -984,7 +985,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var exporters = Object.fromEntries(_this.getExporters().map(function (exporter) {
         return [exporter.id, exporter];
       }));
-      var enabledExporters = Array.isArray(_this.props.enableExport) ? _this.props.enableExport : Object.keys(exporters);
+      var enabledExporters = Array.isArray(_this.props.enableExport) ? _this.props.enableExport.filter(function (id) {
+        return id in exporters;
+      }) : Object.keys(exporters);
       var clipboardExportDisabled = ((_exporters$_this$stat = exporters[_this.state.exportFormat]) === null || _exporters$_this$stat === void 0 ? void 0 : _exporters$_this$stat.allowClipboard) !== true;
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-settings-menu"

package/components/LinkFeatureForm.js

@@ -31,6 +31,7 @@ import { getFeatureTemplate } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import AttributeForm from './AttributeForm';
+import Icon from './Icon';
 import './style/LinkFeatureForm.css';
 var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
   function LinkFeatureForm() {
@@ -203,7 +204,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
           onClick: this.close
-        }, LocaleUtils.tr("common.close"))));
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }), LocaleUtils.tr("common.close"))));
       } else if (editContext.feature) {
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
         return /*#__PURE__*/React.createElement("div", {
@@ -223,7 +226,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
           onClick: this.close
-        }, editContext.action === 'Draw' ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }), editContext.action === 'Draw' ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
       } else {
         return null;
       }

package/components/QtDesignerForm.js

@@ -5,7 +5,6 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
@@ -78,6 +77,12 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       reevaluate: 0
     });
+    _defineProperty(_this, "isVertical", function (orientation) {
+      return orientation === "Qt::Vertical" || orientation === "Qt::Orientation::Vertical";
+    });
+    _defineProperty(_this, "isHorizontal", function (orientation) {
+      return orientation === "Qt::Horizontal" || orientation === "Qt::Orientation::Horizontal";
+    });
     _defineProperty(_this, "renderLayout", function (layout, feature, editConfig, updateField) {
       var _this$props$editConfi;
       var nametransform = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : function (name) {
@@ -110,6 +115,9 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         };
       } else if (layout["class"] === "QVBoxLayout") {
         containerClass = "qt-designer-layout-grid";
+        containerStyle = {
+          gridTemplateRows: _this.computeLayoutRows(layout.item, true).join(" ")
+        };
         itemStyle = function itemStyle(item, idx) {
           return {
             gridArea: 1 + idx + "/1/ span 1/ span 1"
@@ -138,7 +146,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         containerStyle.display = 'none';
       }
       if (layout.item.find(function (item) {
-        return item.spacer && (item.spacer.property || {}).orientation === "Qt::Vertical";
+        var _item$spacer$property;
+        return item.spacer && _this.isVertical((_item$spacer$property = item.spacer.property) === null || _item$spacer$property === void 0 ? void 0 : _item$spacer$property.orientation);
       })) {
         containerStyle.height = '100%';
       }
@@ -172,18 +181,14 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       var useIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var columns = [];
       var hasAuto = false;
-      var hasSpacer = items.find(function (item) {
-        var _item$spacer;
-        return ((_item$spacer = item.spacer) === null || _item$spacer === void 0 || (_item$spacer = _item$spacer.property) === null || _item$spacer === void 0 ? void 0 : _item$spacer.orientation) === "Qt::Horizontal";
-      });
       items.forEach(function (item, index) {
-        var _item$spacer2, _item$widget;
+        var _item$spacer, _item$widget;
         var col = useIndex ? index : parseInt(item.column, 10) || 0;
         var colSpan = useIndex ? 1 : parseInt(item.colspan, 10) || 1;
-        if (((_item$spacer2 = item.spacer) === null || _item$spacer2 === void 0 || (_item$spacer2 = _item$spacer2.property) === null || _item$spacer2 === void 0 ? void 0 : _item$spacer2.orientation) === "Qt::Horizontal") {
-          columns[col] = 'auto';
+        if (_this.isHorizontal((_item$spacer = item.spacer) === null || _item$spacer === void 0 || (_item$spacer = _item$spacer.property) === null || _item$spacer === void 0 ? void 0 : _item$spacer.orientation)) {
+          columns[col] = '1fr';
           hasAuto = true;
-        } else if (!hasSpacer && !hFitWidgets.includes((_item$widget = item.widget) === null || _item$widget === void 0 ? void 0 : _item$widget["class"]) && colSpan === 1) {
+        } else if (!hFitWidgets.includes((_item$widget = item.widget) === null || _item$widget === void 0 ? void 0 : _item$widget["class"]) && colSpan === 1) {
           columns[col] = 'auto';
           hasAuto = true;
         } else {
@@ -200,20 +205,18 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "computeLayoutRows", function (items) {
       var useIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var rows = [];
-      var hasSpacer = items.find(function (item) {
-        var _item$spacer3;
-        return ((_item$spacer3 = item.spacer) === null || _item$spacer3 === void 0 || (_item$spacer3 = _item$spacer3.property) === null || _item$spacer3 === void 0 ? void 0 : _item$spacer3.orientation) === "Qt::Vertical";
-      });
       items.forEach(function (item, index) {
-        var _item$spacer4, _item$widget2, _item$widget2$startsW, _item$widget$layout, _item$widget3, _item$widget5;
+        var _item$spacer2, _item$widget$layout, _item$widget2, _item$widget4, _item$widget4$startsW, _item$widget5;
         var row = useIndex ? index : parseInt(item.row, 10) || 0;
         var rowSpan = useIndex ? 1 : parseInt(item.rowspan, 10) || 1;
-        if (((_item$spacer4 = item.spacer) === null || _item$spacer4 === void 0 || (_item$spacer4 = _item$spacer4.property) === null || _item$spacer4 === void 0 ? void 0 : _item$spacer4.orientation) === "Qt::Vertical" || (_item$widget2 = item.widget) !== null && _item$widget2 !== void 0 && (_item$widget2 = _item$widget2.name) !== null && _item$widget2 !== void 0 && (_item$widget2$startsW = _item$widget2.startsWith) !== null && _item$widget2$startsW !== void 0 && _item$widget2$startsW.call(_item$widget2, "nrel_")) {
+        if (_this.isVertical((_item$spacer2 = item.spacer) === null || _item$spacer2 === void 0 || (_item$spacer2 = _item$spacer2.property) === null || _item$spacer2 === void 0 ? void 0 : _item$spacer2.orientation)) {
+          rows[row] = '1fr';
+        } else if ((_item$widget$layout = (_item$widget2 = item.widget) === null || _item$widget2 === void 0 ? void 0 : _item$widget2.layout) !== null && _item$widget$layout !== void 0 ? _item$widget$layout : item.layout) {
+          var _item$widget3, _item$layout;
+          rows[row] = (_item$widget3 = item.widget) !== null && _item$widget3 !== void 0 && (_item$widget3 = _item$widget3.layout) !== null && _item$widget3 !== void 0 && _item$widget3.verticalFill || (_item$layout = item.layout) !== null && _item$layout !== void 0 && _item$layout.verticalFill ? 'auto' : null; // Placeholder replaced by fit-content below
+        } else if ((_item$widget4 = item.widget) !== null && _item$widget4 !== void 0 && (_item$widget4 = _item$widget4.name) !== null && _item$widget4 !== void 0 && (_item$widget4$startsW = _item$widget4.startsWith) !== null && _item$widget4$startsW !== void 0 && _item$widget4$startsW.call(_item$widget4, "nrel_")) {
           rows[row] = 'auto';
-        } else if ((_item$widget$layout = (_item$widget3 = item.widget) === null || _item$widget3 === void 0 ? void 0 : _item$widget3.layout) !== null && _item$widget$layout !== void 0 ? _item$widget$layout : item.layout) {
-          var _item$widget4, _item$layout;
-          rows[row] = (_item$widget4 = item.widget) !== null && _item$widget4 !== void 0 && (_item$widget4 = _item$widget4.layout) !== null && _item$widget4 !== void 0 && _item$widget4.verticalFill || (_item$layout = item.layout) !== null && _item$layout !== void 0 && _item$layout.verticalFill ? 'auto' : null; // Placeholder replaced by fit-content below
-        } else if (!hasSpacer && !vFitWidgets.includes((_item$widget5 = item.widget) === null || _item$widget5 === void 0 ? void 0 : _item$widget5["class"]) && rowSpan === 1) {
+        } else if (!vFitWidgets.includes((_item$widget5 = item.widget) === null || _item$widget5 === void 0 ? void 0 : _item$widget5["class"]) && rowSpan === 1) {
           rows[row] = 'auto';
         } else {
           var _rows$row;
@@ -241,11 +244,10 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       var attr = widget.attribute || {};
       var fieldname = widget.name.replace(/kvrel__/, '').split("__")[isRelWidget ? 1 : 0];
       var field = fields[fieldname];
-      var fieldConstraints = (field === null || field === void 0 ? void 0 : field.constraints) || {};
-      var inputConstraints = {};
-      inputConstraints.readOnly = _this.props.readOnly || String(prop.readOnly) === "true" || String(prop.enabled) === "false" || fieldConstraints.readOnly === true || disabled;
-      inputConstraints.required = !inputConstraints.readOnly && (String(prop.required) === "true" || String(fieldConstraints.required) === "true");
-      inputConstraints.placeholder = prop.placeholderText || fieldConstraints.placeholder || "";
+      var constraints = (field === null || field === void 0 ? void 0 : field.constraints) || {};
+      constraints.readOnly = _this.props.readOnly || constraints.readOnly === true || String(prop.readOnly) === "true" || String(prop.enabled) === "false" || disabled;
+      constraints.required = !constraints.readOnly && (constraints.required || String(prop.required) === "true");
+      constraints.placeholder = prop.placeholderText || constraints.placeholder || "";
       var fontProps = prop.font || {};
       var fontStyle = {
         fontWeight: String(fontProps.bold) === "true" ? "bold" : "normal",
@@ -269,16 +271,16 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       if (widget.name.startsWith("ext__")) {
         updateField = null;
         value = _this.state.formData.externalFields[widget.name.slice(5)];
-        inputConstraints.readOnly = true;
+        constraints.readOnly = true;
       } else {
         elname = nametransform(widget.name);
       }
       if (widget.component) {
         return /*#__PURE__*/React.createElement(widget.component, {
           addRelationRecord: _this.props.addRelationRecord,
+          constraints: constraints,
           editConfigs: _this.props.editConfigs,
           feature: _this.props.feature,
-          inputConstraints: inputConstraints,
           mapPrefix: _this.props.mapPrefix,
           name: elname,
           onChange: function onChange(val) {
@@ -315,7 +317,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         }
       } else if (widget["class"] === "Line") {
         var _widget$property;
-        var linetype = ((_widget$property = widget.property) === null || _widget$property === void 0 ? void 0 : _widget$property.orientation) === "Qt::Vertical" ? "vline" : "hline";
+        var linetype = _this.isVertical((_widget$property = widget.property) === null || _widget$property === void 0 ? void 0 : _widget$property.orientation) ? "vline" : "hline";
         return /*#__PURE__*/React.createElement("div", {
           className: "qt-designer-form-" + linetype
         });
@@ -411,17 +413,19 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           }, value);
         } else {
           var addLinkAnchors = ConfigUtils.getConfigProp("editingAddLinkAnchors") !== false;
-          return /*#__PURE__*/React.createElement(TextInput, _extends({
+          return /*#__PURE__*/React.createElement(TextInput, {
             addLinkAnchors: addLinkAnchors,
             multiline: true,
             name: elname,
             onChange: function onChange(val) {
               return updateField(widget.name, val);
-            }
-          }, inputConstraints, {
+            },
+            placeholder: constraints.placeholder,
+            readOnly: constraints.readOnly,
+            required: constraints.required,
             style: fontStyle,
             value: String(value)
-          }));
+          });
         }
       } else if (widget["class"] === "QLineEdit") {
         if (widget.name.endsWith("__upload")) {
@@ -429,14 +433,14 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           var fieldId = widget.name.replace(/__upload/, '');
           var uploadValue = ((_feature$properties4 = feature.properties) === null || _feature$properties4 === void 0 ? void 0 : _feature$properties4[fieldId]) || "";
           var uploadElName = elname.replace(/__upload/, '');
-          var constraints = {
+          var widgetConstraints = {
             accept: prop.text || "",
-            required: inputConstraints.required
+            required: constraints.required
           };
           return /*#__PURE__*/React.createElement(EditUploadField, {
-            constraints: constraints,
+            constraints: widgetConstraints,
             dataset: editConfig.editDataset,
-            disabled: inputConstraints.readOnly,
+            disabled: constraints.readOnly,
             fieldId: fieldId,
             iface: _this.props.iface,
             name: uploadElName,
@@ -446,8 +450,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           });
         } else {
           var _feature$properties$w4, _feature$properties5;
-          if (fieldConstraints.prec !== undefined && typeof value === 'number') {
-            value = value.toFixed(fieldConstraints.prec);
+          if (constraints.prec !== undefined && typeof value === 'number') {
+            value = value.toFixed(constraints.prec);
           } else if (value === "" && ((_feature$properties$w4 = (_feature$properties5 = feature.properties) === null || _feature$properties5 === void 0 ? void 0 : _feature$properties5[widget.name]) !== null && _feature$properties$w4 !== void 0 ? _feature$properties$w4 : null) === null) {
             var _ConfigUtils$getConfi2;
             value = (_ConfigUtils$getConfi2 = ConfigUtils.getConfigProp("editTextNullValue")) !== null && _ConfigUtils$getConfi2 !== void 0 ? _ConfigUtils$getConfi2 : "";
@@ -455,21 +459,23 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           if (_this.props.report) {
             return /*#__PURE__*/React.createElement("div", {
               style: fontStyle
-            }, value || inputConstraints.placeholder);
+            }, value || constraints.placeholder);
           } else {
             var _addLinkAnchors = ConfigUtils.getConfigProp("editingAddLinkAnchors") !== false;
             var editTextNullValue = ConfigUtils.getConfigProp("editTextNullValue");
-            return /*#__PURE__*/React.createElement(TextInput, _extends({
+            return /*#__PURE__*/React.createElement(TextInput, {
               addLinkAnchors: _addLinkAnchors,
               clearValue: editTextNullValue,
               name: elname,
               onChange: function onChange(val) {
                 return updateField(widget.name, val);
-              }
-            }, inputConstraints, {
+              },
+              placeholder: constraints.placeholder,
+              readOnly: constraints.readOnly,
+              required: constraints.required,
               style: fontStyle,
               value: String(value)
-            }));
+            });
           }
         }
       } else if (widget["class"] === "QCheckBox" || widget["class"] === "QRadioButton") {
@@ -479,17 +485,17 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         var checked = inGroup ? ((_this$props$feature$p = _this.props.feature.properties) === null || _this$props$feature$p === void 0 ? void 0 : _this$props$feature$p[_this.groupOrName(widget)]) === widget.name : value;
         return /*#__PURE__*/React.createElement("label", {
           style: fontStyle
-        }, /*#__PURE__*/React.createElement("input", _extends({
+        }, /*#__PURE__*/React.createElement("input", {
           checked: checked,
-          disabled: inputConstraints.readOnly,
+          disabled: constraints.readOnly,
           name: nametransform(_this.groupOrName(widget)),
           onChange: function onChange(ev) {
             return updateField(_this.groupOrName(widget), inGroup ? widget.name : ev.target.checked);
-          }
-        }, inputConstraints, {
+          },
+          required: constraints.required,
           type: type,
           value: widget.name
-        })), widget.property.text);
+        }), widget.property.text);
       } else if (widget["class"] === "QComboBox") {
         var parts = widget.name.split("__");
         if ((parts.length === 5 || parts.length === 6) && parts[0] === "kvrel") {
@@ -517,33 +523,34 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             mapPrefix: _this.props.mapPrefix,
             multiSelect: widget.property.allowMulti === true || widget.allowMulti === "true",
             name: nametransform(_fieldId),
-            placeholder: inputConstraints.placeholder,
-            readOnly: inputConstraints.readOnly || fieldConstraints.readOnly,
-            required: inputConstraints.required || fieldConstraints.required,
-            showAdd: fieldConstraints.showAdd,
-            showEdit: fieldConstraints.showEdit,
+            placeholder: constraints.placeholder,
+            readOnly: constraints.readOnly,
+            required: constraints.required,
+            showAdd: constraints.showAdd,
+            showEdit: constraints.showEdit,
             style: fontStyle,
             switchEditContext: _this.props.switchEditContext,
             updateField: updateField,
             value: value
           });
         } else {
-          var values = MiscUtils.ensureArray(widget.item || []).map(function (item) {
+          var _constraints$values;
+          var values = widget.item ? MiscUtils.ensureArray(widget.item).map(function (item) {
             var _item$property$value;
             return {
               label: item.property.text,
               value: (_item$property$value = item.property.value) !== null && _item$property$value !== void 0 ? _item$property$value : item.property.text
             };
-          });
+          }) : (_constraints$values = constraints.values) !== null && _constraints$values !== void 0 ? _constraints$values : [];
           return /*#__PURE__*/React.createElement(EditComboField, {
             editIface: _this.props.iface,
             fieldId: widget.name,
             key: widget.name,
             mapPrefix: _this.props.mapPrefix,
             name: elname,
-            placeholder: inputConstraints.placeholder,
-            readOnly: inputConstraints.readOnly || inputConstraints.readOnly,
-            required: inputConstraints.required || inputConstraints.required,
+            placeholder: constraints.placeholder,
+            readOnly: constraints.readOnly,
+            required: constraints.required,
             style: fontStyle,
             updateField: updateField,
             value: value,
@@ -556,67 +563,75 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           var f = parseFloat(x);
           return isNaN(f) ? undefined : f;
         };
-        var min = floatConstraint((_prop$minimum = prop.minimum) !== null && _prop$minimum !== void 0 ? _prop$minimum : fieldConstraints.min);
-        var max = floatConstraint((_prop$maximum = prop.maximum) !== null && _prop$maximum !== void 0 ? _prop$maximum : fieldConstraints.max);
-        var step = (_ref = (_prop$singleStep = prop.singleStep) !== null && _prop$singleStep !== void 0 ? _prop$singleStep : fieldConstraints.step) !== null && _ref !== void 0 ? _ref : 1;
+        var min = floatConstraint((_prop$minimum = prop.minimum) !== null && _prop$minimum !== void 0 ? _prop$minimum : constraints.min);
+        var max = floatConstraint((_prop$maximum = prop.maximum) !== null && _prop$maximum !== void 0 ? _prop$maximum : constraints.max);
+        var step = (_ref = (_prop$singleStep = prop.singleStep) !== null && _prop$singleStep !== void 0 ? _prop$singleStep : constraints.step) !== null && _ref !== void 0 ? _ref : 1;
         var precision = (_prop$decimals = prop.decimals) !== null && _prop$decimals !== void 0 ? _prop$decimals : 0;
         if (widget["class"] === "QSlider") {
-          return /*#__PURE__*/React.createElement("input", _extends({
+          return /*#__PURE__*/React.createElement("input", {
             max: max,
             min: min,
             name: elname,
             onChange: function onChange(ev) {
               return updateField(widget.name, ev.target.value);
-            }
-          }, inputConstraints, {
+            },
+            placeholder: constraints.placeholder,
+            readOnly: constraints.readOnly,
+            required: constraints.required,
             size: 5,
             step: step,
             style: fontStyle,
             type: "range",
             value: value
-          }));
+          });
         } else {
           var _feature$properties6;
-          return /*#__PURE__*/React.createElement(NumberInput, _extends({
+          return /*#__PURE__*/React.createElement(NumberInput, {
             decimals: precision,
             max: max,
             min: min,
             name: elname,
             onChange: function onChange(val) {
               return updateField(widget.name, val);
-            }
-          }, inputConstraints, {
+            },
+            placeholder: constraints.placeholder,
+            readOnly: constraints.readOnly,
+            required: constraints.required,
             step: step,
             style: fontStyle,
             value: (_feature$properties6 = feature.properties) === null || _feature$properties6 === void 0 ? void 0 : _feature$properties6[widget.name]
-          }));
+          });
         }
       } else if (widget["class"] === "QDateEdit") {
         var _min = prop.minimumDate ? _this.dateConstraint(prop.minimumDate) : "1600-01-01";
         var _max = prop.maximumDate ? _this.dateConstraint(prop.maximumDate) : "9999-12-31";
-        return /*#__PURE__*/React.createElement("input", _extends({
+        return /*#__PURE__*/React.createElement("input", {
           max: _max,
           min: _min,
           name: elname,
           onChange: function onChange(ev) {
             return updateField(widget.name, ev.target.value);
-          }
-        }, inputConstraints, {
+          },
+          placeholder: constraints.placeholder,
+          readOnly: constraints.readOnly,
+          required: constraints.required,
           style: fontStyle,
           type: "date",
           value: value.split("T")[0]
-        }));
+        });
       } else if (widget["class"] === "QTimeEdit") {
-        return /*#__PURE__*/React.createElement("input", _extends({
+        return /*#__PURE__*/React.createElement("input", {
           name: elname,
           onChange: function onChange(ev) {
             return updateField(widget.name, ev.target.value);
-          }
-        }, inputConstraints, {
+          },
+          placeholder: constraints.placeholder,
+          readOnly: constraints.readOnly,
+          required: constraints.required,
           style: fontStyle,
           type: "time",
           value: value
-        }));
+        });
       } else if (widget["class"] === "QDateTimeEdit") {
         var _min2 = prop.minimumDate ? _this.dateConstraint(prop.minimumDate) : "1600-01-01";
         var _max2 = prop.maximumDate ? _this.dateConstraint(prop.maximumDate) : "9999-12-31";
@@ -627,8 +642,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           onChange: function onChange(val) {
             return updateField(widget.name, val);
           },
-          readOnly: inputConstraints.readOnly,
-          required: inputConstraints.required,
+          readOnly: constraints.readOnly,
+          required: constraints.required,
           style: fontStyle,
           value: value,
           valueHasTz: field.data_type === "timestamp with time zone"
@@ -638,8 +653,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           onChange: function onChange(val) {
             return updateField(widget.name, val);
           },
-          readOnly: inputConstraints.readOnly,
-          required: inputConstraints.required,
+          readOnly: constraints.readOnly,
+          required: constraints.required,
           type: field.type.slice(0, -2),
           value: value
         });
@@ -655,7 +670,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         if (widget.name.startsWith("btn__") && widget.onClick) {
           return /*#__PURE__*/React.createElement("button", {
             className: "button",
-            disabled: inputConstraints.readOnly,
+            disabled: constraints.readOnly,
             onClick: function onClick() {
               return widget.onClick(_this.props.setFormBusy);
             },
@@ -900,14 +915,17 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       _this.props.addRelationRecord(datasetname);
     });
     _defineProperty(_this, "startRelationTableResize", function (ev) {
-      var container = ev.target.parentElement.parentElement;
+      var container = ev.target.parentElement;
       if (!container) {
         return;
       }
+      // Drop max-height as soon as a manual height is set
       var startHeight = container.offsetHeight;
+      container.style.height = container.offsetHeight + 'px';
+      container.style.maxHeight = 'initial';
       var startMouseY = ev.clientY;
       var resizeInput = function resizeInput(event) {
-        container.style.height = Math.max(30, startHeight + (event.clientY - startMouseY)) + 'px';
+        container.style.height = Math.max(MiscUtils.convertEmToPx(2.5), startHeight + (event.clientY - startMouseY)) + 'px';
       };
       ev.view.document.body.style.userSelect = 'none';
       ev.view.addEventListener("pointermove", resizeInput);
@@ -1063,7 +1081,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
               return key !== "name";
             })]));
           }, {});
-          if (item.spacer.property.orientation === "Qt::Vertical") {
+          if (_this.isVertical(item.spacer.property.orientation)) {
             verticalFill = true;
           }
         } else if (item.layout) {

package/components/SearchBox.js

@@ -1067,7 +1067,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }
       // Add highlight features and markers
       var mapCrs = _this.props.map.projection;
-      var showMarkers = !response.hidemarker && _this.props.searchOptions.showHighlightMarker;
+      var showMarkers = !(response !== null && response !== void 0 && response.hidemarker) && _this.props.searchOptions.showHighlightMarker;
       var label = ((_ref0 = (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.text) !== null && _ref0 !== void 0 ? _ref0 : '').replace(/<\/?\w+\s*\/?>/g, '');
       var layer = {
         id: "searchselection",

package/components/map3d/Map3D.js

@@ -1361,17 +1361,22 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
   return _createClass(Map3D, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _this3 = this;
       this.props.innerRef(this);
+      window.qwc2.__3dscenecontext = function () {
+        return _this3.state.sceneContext;
+      };
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       unregisterPermalinkDataStoreHook("map3d");
+      window.qwc2.__3dscenecontext = undefined;
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      var _this3 = this;
+      var _this4 = this;
       if (this.props.theme !== prevProps.theme) {
         if (this.props.theme.map3d) {
           this.setState(function (state) {
@@ -1386,7 +1391,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         this.setState(function (state) {
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
-              colorLayers: _this3.collectColorLayers(state.sceneContext.colorLayers, prevProps.layers)
+              colorLayers: _this4.collectColorLayers(state.sceneContext.colorLayers, prevProps.layers)
             })
           };
         });
@@ -1398,7 +1403,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
               collisionObjects: Object.keys(state.sceneContext.objectTree).reduce(function (res, objectId) {
-                var obj = _this3.objectMap[objectId];
+                var obj = _this4.objectMap[objectId];
                 if (obj !== null && obj !== void 0 && obj.visible) {
                   var _obj$tiles$group, _obj$tiles;
                   res.push((_obj$tiles$group = (_obj$tiles = obj.tiles) === null || _obj$tiles === void 0 ? void 0 : _obj$tiles.group) !== null && _obj$tiles$group !== void 0 ? _obj$tiles$group : obj);
@@ -1409,7 +1414,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
                 var _ref1 = _slicedToArray(_ref0, 2),
                   objectId = _ref1[0],
                   entry = _ref1[1];
-                var obj = _this3.objectMap[objectId];
+                var obj = _this4.objectMap[objectId];
                 if (obj !== null && obj !== void 0 && obj.visible && entry.snap) {
                   var _obj$tiles$group2, _obj$tiles2;
                   res.push((_obj$tiles$group2 = (_obj$tiles2 = obj.tiles) === null || _obj$tiles2 === void 0 ? void 0 : _obj$tiles2.group) !== null && _obj$tiles$group2 !== void 0 ? _obj$tiles$group2 : obj);
@@ -1426,10 +1431,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
       if (this.state.sceneContext.settings.pointSize !== prevState.sceneContext.settings.pointSize) {
         Object.values(this.state.sceneContext.objectTree).map(function (entry) {
-          var obj = _this3.state.sceneContext.getSceneObject(entry.objectId);
-          if (_this3.objectContainsPoints(obj)) {
-            obj.pointSize = _this3.state.sceneContext.settings.pointSize;
-            _this3.instance.notifyChange(obj);
+          var obj = _this4.state.sceneContext.getSceneObject(entry.objectId);
+          if (_this4.objectContainsPoints(obj)) {
+            obj.pointSize = _this4.state.sceneContext.settings.pointSize;
+            _this4.instance.notifyChange(obj);
           }
         });
       }
@@ -1442,14 +1447,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           return (_entity$tiles2 = entity.tiles) === null || _entity$tiles2 === void 0 ? void 0 : _entity$tiles2.lruCache;
         }).forEach(function (entity) {
           var gigabyteBytes = Math.pow(2, 30);
-          entity.tiles.lruCache.maxBytesSize = 0.5 * gigabyteBytes * (1 + _this3.state.sceneContext.settings.sceneQuality / 100);
+          entity.tiles.lruCache.maxBytesSize = 0.5 * gigabyteBytes * (1 + _this4.state.sceneContext.settings.sceneQuality / 100);
         });
       }
     }
   }, {
     key: "render",
     value: function render() {
-      var _this4 = this;
+      var _this5 = this;
       return [/*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement("div", {
         className: "map3d-map",
         id: "map3d",
@@ -1476,16 +1481,16 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         return /*#__PURE__*/React.createElement(Suspense, {
           key: name
         }, /*#__PURE__*/React.createElement(Component, _extends({
-          sceneContext: _this4.state.sceneContext
-        }, _this4.props.pluginOptions[name])));
+          sceneContext: _this5.state.sceneContext
+        }, _this5.props.pluginOptions[name])));
       }), this.renderBaseLayer(), Object.values(this.state.sceneContext.colorLayers).map(function (options, idx) {
-        var _this4$state$sceneCon, _this4$state$sceneCon2;
+        var _this5$state$sceneCon, _this5$state$sceneCon2;
         return /*#__PURE__*/React.createElement(ColorLayer3D, {
           key: options.id,
-          map: _this4.map,
+          map: _this5.map,
           options: options,
-          prevLayerId: (_this4$state$sceneCon = (_this4$state$sceneCon2 = _this4.state.sceneContext.colorLayers[idx - 1]) === null || _this4$state$sceneCon2 === void 0 ? void 0 : _this4$state$sceneCon2.id) !== null && _this4$state$sceneCon !== void 0 ? _this4$state$sceneCon : "__baselayer",
-          sceneContext: _this4.state.sceneContext
+          prevLayerId: (_this5$state$sceneCon = (_this5$state$sceneCon2 = _this5.state.sceneContext.colorLayers[idx - 1]) === null || _this5$state$sceneCon2 === void 0 ? void 0 : _this5$state$sceneCon2.id) !== null && _this5$state$sceneCon !== void 0 ? _this5$state$sceneCon : "__baselayer",
+          sceneContext: _this5.state.sceneContext
         });
       }))) : null];
     }

package/components/style/QtDesignerForm.css

@@ -2,16 +2,6 @@ div.qt-designer-form {
     overflow: auto;
     margin-bottom: 0.25em;
 }
-
-div.qt-designer-form textarea {
-    height: 100%;
-}
-
-div.qt-designer-form div.text-input-wrapper-multiline,
-div.qt-designer-form div.text-input-wrapper-multiline > pre {
-    height: 100%;
-}
-
 div.qt-designer-form label > input {
     margin-right: 0.25em;
 }
@@ -86,13 +76,14 @@ div.qt-designer-widget-relation {
     display: flex;
     flex-direction: column;
     position: relative;
+    max-height: 6.5em;
 }
 
 div.qt-designer-widget-relation-resize-handle {
     touch-action: none;
     position: absolute;
-    right: -0.25em;
-    bottom: -0.25em;
+    right: 1px;
+    bottom: 1px;
     width: 0;
     height: 0;
     border-bottom: 10px solid var(--border-color);
@@ -101,11 +92,18 @@ div.qt-designer-widget-relation-resize-handle {
     cursor: ns-resize;
 }
 
+div.qt-designer-form-frame > div.qt-designer-widget-relation > div.qt-designer-widget-relation-resize-handle {
+    right: calc(-0.25em + 1px);
+    bottom: calc(-0.25em + 1px);
+}
+
 div.qt-designer-widget-relation-table-container {
     overflow-y: auto;
     flex: 1 1 auto;
-    height: 4.5em;
     position: relative;
+    border-top: 1px solid var(--border-color);
+    border-left: 1px solid var(--border-color);
+    border-right: 1px solid var(--border-color);
 }
 
 div.qt-designer-widget-relation-table-loading {
@@ -128,7 +126,6 @@ div.qt-designer-widget-relation-table-loading > div.spinner {
 
 div.qt-designer-widget-relation-table-container > table {
     width: 100%;
-    border: 1px solid var(--border-color);
 }
 
 div.qt-designer-widget-relation-table-container > table td {
@@ -137,7 +134,7 @@ div.qt-designer-widget-relation-table-container > table td {
 }
 
 div.qt-designer-widget-relation-table-container > table td.qt-designer-widget-relation-record-icon {
-    width: 1px;
+    width: 1.5em;
 }
 
 td.qt-designer-widget-relation-record-icon > span.icon-trash:hover {
@@ -180,6 +177,10 @@ div.qt-designer-form label {
     align-items: center;
 }
 
+div.qt-designer-form div.text-input-wrapper-multiline {
+    height: 100%;
+}
+
 div.qt-designer-form-featurelink-buttons {
     display: flex;
 }
@@ -197,7 +198,6 @@ div.qt-designer-report {
 }
 
 div.qt-designer-report input,
-div.qt-designer-report textarea,
 div.qt-designer-report select {
     border: none!important;
     outline: none!important;

package/components/style/SearchBox.css

@@ -10,12 +10,15 @@ div.searchbox-field {
 button.searchbox-filter-button {
     flex: 0 0 auto;
     border-left-width: 0;
-    padding: 0 0.25em 0 0.5em;
+    padding: 0 1em 0 0.5em;
+    position: relative;
 }
 
-button.searchbox-filter-button > span.icon:last-child {
-    font-size: 75%;
-    margin-top: 1em;
+button.searchbox-filter-button > span.icon-chevron-down {
+    font-size: 80%;
+    position: absolute;
+    bottom: 0.25em;
+    right: 0.25em;
 }
 
 div.searchbox-field > div.spinner {

package/components/widgets/MenuButton.js

@@ -37,8 +37,7 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    _defineProperty(_this, "onButtonClicked", function (ev) {
-      ev.stopPropagation();
+    _defineProperty(_this, "onButtonClicked", function () {
       if (_this.state.selected) {
         var _this$props$onActivat, _this$props;
         (_this$props$onActivat = (_this$props = _this.props).onActivate) === null || _this$props$onActivat === void 0 || _this$props$onActivat.call(_this$props, _this.state.selected);
@@ -112,7 +111,6 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         className: classes
       }, /*#__PURE__*/React.createElement("div", {
         className: buttonClassnames,
-        onClick: this.onMenuClicked,
         onKeyDown: MiscUtils.checkKeyActivate,
         ref: function ref(el) {
           _this2.el = el;
@@ -122,7 +120,8 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         className: "menubutton-button-content",
         onClick: this.onButtonClicked
       }, buttonContents), /*#__PURE__*/React.createElement("span", {
-        className: "menubotton-button-arrow"
+        className: "menubotton-button-arrow",
+        onClick: this.onMenuClicked
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "chevron-down"
       })), this.props.tooltip ? /*#__PURE__*/React.createElement("span", {

package/components/widgets/PopupMenu.js

@@ -29,20 +29,37 @@ import MiscUtils from '../../utils/MiscUtils';
 import './style/PopupMenu.css';
 var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
   function PopupMenu(props) {
-    var _this$props$anchor$ow, _this$props$anchor5, _this$props$anchor$ow3, _this$props$anchor7;
+    var _this$props$anchor$ow, _this$props$anchor6;
     var _this;
     _classCallCheck(this, PopupMenu);
     _this = _callSuper(this, PopupMenu, [props]);
+    _defineProperty(_this, "checkCloseMenu", function (ev) {
+      var _this$props$anchor, _this$props$anchor$co;
+      if (_this.menuEl && !_this.menuEl.contains(ev.target) && !((_this$props$anchor = _this.props.anchor) !== null && _this$props$anchor !== void 0 && (_this$props$anchor$co = _this$props$anchor.contains) !== null && _this$props$anchor$co !== void 0 && _this$props$anchor$co.call(_this$props$anchor, ev.target))) {
+        _this.props.onClose();
+        MiscUtils.killEvent(ev);
+        _this.killClick = true;
+      }
+    });
+    _defineProperty(_this, "checkKillClick", function (ev) {
+      if (_this.killClick) {
+        MiscUtils.killEvent(ev);
+        _this.killClick = undefined;
+        ev.currentTarget.removeEventListener('click', _this.checkKillClick, {
+          capture: true
+        });
+      }
+    });
     _defineProperty(_this, "setFocus", function (el) {
-      var _this$props$anchor;
+      var _this$props$anchor2;
       _this.menuEl = el;
-      if (el && ((_this$props$anchor = _this.props.anchor) === null || _this$props$anchor === void 0 ? void 0 : _this$props$anchor.nodeName) !== "INPUT") {
+      if (el && ((_this$props$anchor2 = _this.props.anchor) === null || _this$props$anchor2 === void 0 ? void 0 : _this$props$anchor2.nodeName) !== "INPUT") {
         _this.menuEl.focus();
       }
     });
     _defineProperty(_this, "clearFocus", function () {
-      var _this$props$anchor2;
-      if (((_this$props$anchor2 = _this.props.anchor) === null || _this$props$anchor2 === void 0 ? void 0 : _this$props$anchor2.nodeName) === "INPUT") {
+      var _this$props$anchor3;
+      if (((_this$props$anchor3 = _this.props.anchor) === null || _this$props$anchor3 === void 0 ? void 0 : _this$props$anchor3.nodeName) === "INPUT") {
         _this.props.anchor.focus();
       } else {
         _this.menuEl.focus();
@@ -81,18 +98,19 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
         }
         MiscUtils.killEvent(ev);
       } else if (ev.key === 'Escape') {
-        var _this$props$onClose2, _this$props2, _this$props$anchor3, _this$props$anchor3$f;
+        var _this$props$onClose2, _this$props2, _this$props$anchor4, _this$props$anchor4$f;
         (_this$props$onClose2 = (_this$props2 = _this.props).onClose) === null || _this$props$onClose2 === void 0 || _this$props$onClose2.call(_this$props2);
-        (_this$props$anchor3 = _this.props.anchor) === null || _this$props$anchor3 === void 0 || (_this$props$anchor3$f = _this$props$anchor3.focus) === null || _this$props$anchor3$f === void 0 || _this$props$anchor3$f.call(_this$props$anchor3);
+        (_this$props$anchor4 = _this.props.anchor) === null || _this$props$anchor4 === void 0 || (_this$props$anchor4$f = _this$props$anchor4.focus) === null || _this$props$anchor4$f === void 0 || _this$props$anchor4$f.call(_this$props$anchor4);
         MiscUtils.killEvent(ev);
       } else if (ev.key === 'Enter' || ev.key === ' ' && _this.props.spaceKeyActivation) {
         MiscUtils.killEvent(ev);
       } else if (ev.key !== 'Tab' && ev.key !== 'Shift') {
-        var _this$props$anchor4, _this$props$anchor4$f;
-        (_this$props$anchor4 = _this.props.anchor) === null || _this$props$anchor4 === void 0 || (_this$props$anchor4$f = _this$props$anchor4.focus) === null || _this$props$anchor4$f === void 0 || _this$props$anchor4$f.call(_this$props$anchor4);
+        var _this$props$anchor5, _this$props$anchor5$f;
+        (_this$props$anchor5 = _this.props.anchor) === null || _this$props$anchor5 === void 0 || (_this$props$anchor5$f = _this$props$anchor5.focus) === null || _this$props$anchor5$f === void 0 || _this$props$anchor5$f.call(_this$props$anchor5);
       }
     });
-    _this.container = ((_this$props$anchor$ow = (_this$props$anchor5 = _this.props.anchor) === null || _this$props$anchor5 === void 0 ? void 0 : _this$props$anchor5.ownerDocument) !== null && _this$props$anchor$ow !== void 0 ? _this$props$anchor$ow : document).createElement("div");
+    var doc = (_this$props$anchor$ow = (_this$props$anchor6 = _this.props.anchor) === null || _this$props$anchor6 === void 0 ? void 0 : _this$props$anchor6.ownerDocument) !== null && _this$props$anchor$ow !== void 0 ? _this$props$anchor$ow : document;
+    _this.container = doc.createElement("div");
     _this.container.id = 'popup-container';
     _this.container.style.position = 'fixed';
     _this.container.style.left = 0;
@@ -100,60 +118,47 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
     _this.container.style.top = 0;
     _this.container.style.bottom = 0;
     _this.container.style.zIndex = 100000;
-    if (_this.props.anchor) {
-      _this.shields = [];
-      var _loop = function _loop(i) {
-        var _this$props$anchor$ow2, _this$props$anchor6;
-        _this.shields[i] = ((_this$props$anchor$ow2 = (_this$props$anchor6 = _this.props.anchor) === null || _this$props$anchor6 === void 0 ? void 0 : _this$props$anchor6.ownerDocument) !== null && _this$props$anchor$ow2 !== void 0 ? _this$props$anchor$ow2 : document).createElement("div");
-        _this.shields[i].style.position = 'absolute';
-        _this.shields[i].style.left = "0px";
-        _this.shields[i].style.right = "0px";
-        _this.shields[i].style.top = "0px";
-        _this.shields[i].style.bottom = "0px";
-        _this.shields[i].style.pointerEvents = 'initial';
-        _this.shields[i].style.zIndex = 0;
-        setTimeout(function () {
-          return _this.shields[i].addEventListener('click', function () {
-            var _this$props$onClose3, _this$props3;
-            (_this$props$onClose3 = (_this$props3 = _this.props).onClose) === null || _this$props$onClose3 === void 0 || _this$props$onClose3.call(_this$props3);
-          });
-        }, 0);
-        _this.container.appendChild(_this.shields[i]);
-      };
-      for (var i = 0; i < 4; ++i) {
-        _loop(i);
-      }
-      _this.container.style.pointerEvents = 'none';
-    } else {
-      setTimeout(function () {
-        return _this.container.addEventListener('click', function () {
-          var _this$props$onClose4, _this$props4;
-          (_this$props$onClose4 = (_this$props4 = _this.props).onClose) === null || _this$props$onClose4 === void 0 || _this$props$onClose4.call(_this$props4);
-        });
-      }, 0);
-    }
+    _this.container.style.pointerEvents = 'none';
     _this.menuEl = null;
-    ((_this$props$anchor$ow3 = (_this$props$anchor7 = _this.props.anchor) === null || _this$props$anchor7 === void 0 ? void 0 : _this$props$anchor7.ownerDocument) !== null && _this$props$anchor$ow3 !== void 0 ? _this$props$anchor$ow3 : document).body.appendChild(_this.container);
+    doc.body.appendChild(_this.container);
+    // Delay one cycle
+    setTimeout(function () {
+      return doc.addEventListener('pointerdown', _this.checkCloseMenu, {
+        capture: true
+      });
+    }, 0);
+    doc.addEventListener('click', _this.checkKillClick, {
+      capture: true
+    });
     return _this;
   }
   _inherits(PopupMenu, _React$PureComponent);
   return _createClass(PopupMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props$anchor8;
-      if (((_this$props$anchor8 = this.props.anchor) === null || _this$props$anchor8 === void 0 ? void 0 : _this$props$anchor8.nodeName) === "INPUT") {
+      var _this$props$anchor7;
+      if (((_this$props$anchor7 = this.props.anchor) === null || _this$props$anchor7 === void 0 ? void 0 : _this$props$anchor7.nodeName) === "INPUT") {
         this.props.anchor.addEventListener('keydown', this.keyNav);
       }
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$props$anchor$ow4, _this$props$anchor9, _this$props$anchor0, _this$props$anchor1, _this$props$anchor1$f;
-      ((_this$props$anchor$ow4 = (_this$props$anchor9 = this.props.anchor) === null || _this$props$anchor9 === void 0 ? void 0 : _this$props$anchor9.ownerDocument) !== null && _this$props$anchor$ow4 !== void 0 ? _this$props$anchor$ow4 : document).body.removeChild(this.container);
-      if (((_this$props$anchor0 = this.props.anchor) === null || _this$props$anchor0 === void 0 ? void 0 : _this$props$anchor0.nodeName) === "INPUT") {
+      var _this$props$anchor$ow2, _this$props$anchor8, _this$props$anchor9, _this$props$anchor0, _this$props$anchor0$f;
+      var doc = (_this$props$anchor$ow2 = (_this$props$anchor8 = this.props.anchor) === null || _this$props$anchor8 === void 0 ? void 0 : _this$props$anchor8.ownerDocument) !== null && _this$props$anchor$ow2 !== void 0 ? _this$props$anchor$ow2 : document;
+      doc.body.removeChild(this.container);
+      if (((_this$props$anchor9 = this.props.anchor) === null || _this$props$anchor9 === void 0 ? void 0 : _this$props$anchor9.nodeName) === "INPUT") {
         this.props.anchor.removeEventListener('keydown', this.keyNav);
       }
-      (_this$props$anchor1 = this.props.anchor) === null || _this$props$anchor1 === void 0 || (_this$props$anchor1$f = _this$props$anchor1.focus) === null || _this$props$anchor1$f === void 0 || _this$props$anchor1$f.call(_this$props$anchor1);
+      (_this$props$anchor0 = this.props.anchor) === null || _this$props$anchor0 === void 0 || (_this$props$anchor0$f = _this$props$anchor0.focus) === null || _this$props$anchor0$f === void 0 || _this$props$anchor0$f.call(_this$props$anchor0);
+      doc.removeEventListener('pointerdown', this.checkCloseMenu, {
+        capture: true
+      });
+      if (!this.killClick) {
+        doc.removeEventListener('click', this.checkKillClick, {
+          capture: true
+        });
+      }
     }
   }, {
     key: "render",
@@ -178,12 +183,6 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
         } else {
           rect = this.props.anchor.getBoundingClientRect();
         }
-        this.shields[0].style.height = rect.top + "px";
-        this.shields[0].style.bottom = 0;
-        this.shields[1].style.width = rect.left + "px";
-        this.shields[1].style.right = 0;
-        this.shields[2].style.left = rect.right + "px";
-        this.shields[3].style.top = rect.bottom + "px";
       }
       var x = (_ref = this.props.align === 'right' ? (_rect = rect) === null || _rect === void 0 ? void 0 : _rect.right : (_rect2 = rect) === null || _rect2 === void 0 ? void 0 : _rect2.left) !== null && _ref !== void 0 ? _ref : this.props.x;
       var y = ((_rect$bottom = (_rect3 = rect) === null || _rect3 === void 0 ? void 0 : _rect3.bottom) !== null && _rect$bottom !== void 0 ? _rect$bottom : this.props.y) - 1;

package/components/widgets/TextInput.js

@@ -196,11 +196,6 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
         (_this$props$onNoChang = (_this$props = _this.props).onNoChange) === null || _this$props$onNoChang === void 0 || _this$props$onNoChang.call(_this$props);
       }
     });
-    _defineProperty(_this, "storeInitialHeight", function (el) {
-      if (el) {
-        _this.initialHeight = el.offsetHeight;
-      }
-    });
     _defineProperty(_this, "startResize", function (ev) {
       var container = ev.target.parentElement;
       if (!container) {
@@ -209,7 +204,7 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       var startHeight = container.offsetHeight;
       var startMouseY = ev.clientY;
       var resizeInput = function resizeInput(event) {
-        container.style.height = Math.max(_this.initialHeight, startHeight + (event.clientY - startMouseY)) + 'px';
+        container.style.height = Math.max(MiscUtils.convertEmToPx(2), startHeight + (event.clientY - startMouseY)) + 'px';
       };
       document.body.style.userSelect = 'none';
       ev.view.addEventListener("pointermove", resizeInput);
@@ -221,7 +216,6 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       });
     });
     _this.focusEnterClick = false;
-    _this.initialHeight = null;
     _this.input = null;
     _this.tooltipEl = null;
     _this.tooltipTimeout = null;
@@ -246,6 +240,7 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       var _this2 = this;
       var wrapperClassName = classNames({
         "TextInput": true,
+        "text-input-wrapper-multiline": this.props.multiline,
         "text-input-wrapper": true,
         "text-input-wrapper-focused": this.state.focus
       });
@@ -263,8 +258,7 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       }
       return /*#__PURE__*/React.createElement("div", {
         className: wrapperClassName + " " + (this.props.className || ""),
-        onClick: MiscUtils.killEvent,
-        ref: this.storeInitialHeight
+        onClick: MiscUtils.killEvent
       }, this.props.name ? /*#__PURE__*/React.createElement("textarea", {
         className: "text-input-form-el",
         name: this.props.name,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.08.05",
+    "version": "2026.08.07",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/API.js

@@ -536,6 +536,13 @@ var API = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "getState", function () {
       return _this.props.state;
     });
+    /**
+     * Return the current 3d view scene context, if a 3D view is active.
+     */
+    _defineProperty(_this, "get3dSceneContext", function () {
+      var _window$qwc2$__3dscen, _window$qwc;
+      return (_window$qwc2$__3dscen = (_window$qwc = window.qwc2).__3dscenecontext) === null || _window$qwc2$__3dscen === void 0 ? void 0 : _window$qwc2$__3dscen.call(_window$qwc);
+    });
     /** Fires the callback on the next click on the map.
      *
      * *NOTE*: when calling `onMapClick` through the `postMessage` interface, omit the `callback` parameter. The response will be sent via the response message.
@@ -577,6 +584,7 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.qwc2.drawScratch = this.drawScratch;
       window.qwc2.drawGeometry = this.drawGeometry;
       window.qwc2.getState = this.getState;
+      window.qwc2.get3dSceneContext = this.get3dSceneContext;
       window.qwc2.ConfigUtils = ConfigUtils;
       window.qwc2.CoordinatesUtils = CoordinatesUtils;
       window.qwc2.EditingInterface = EditingInterface;

package/plugins/map/EditingSupport.js

@@ -78,13 +78,13 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         } else if (f.getGeometry().getType() === "LineString") {
           return new ol.geom.MultiPoint(f.getGeometry().getCoordinates());
         } else if (f.getGeometry().getType() === "Polygon") {
-          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0]);
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates().flat());
         } else if (f.getGeometry().getType() === "MultiPoint") {
           return f.getGeometry();
         } else if (f.getGeometry().getType() === "MultiLineString") {
-          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0]);
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates().flat());
         } else if (f.getGeometry().getType() === "MultiPolygon") {
-          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0][0]);
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates().flat(2));
         }
         return f.getGeometry();
       };
@@ -135,7 +135,6 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "setEditInteraction", function () {
-      var _this$props$editConte;
       _this.reset();
       _this.setCurrentLayer();
       var format = new ol.format.GeoJSON();
@@ -178,7 +177,7 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         _this.props.map.addInteraction(_this.interaction);
         _this.interaction.setSelection([_this.currentFeature]);
       }
-      _this.interaction.setActive(_this.props.editContext.geomType && _this.props.editContext.permissions.updatable && ((_this$props$editConte = _this.props.editContext.editConfig) === null || _this$props$editConte === void 0 || (_this$props$editConte = _this$props$editConte.permissions) === null || _this$props$editConte === void 0 ? void 0 : _this$props$editConte.updatable) === true && !_this.props.editContext.geomReadOnly && !_this.props.editContext.geomNonZeroZ);
+      _this.interaction.setActive(_this.props.editContext.geomType && _this.props.editContext.permissions.updatable && !_this.props.editContext.geomReadOnly && !_this.props.editContext.geomNonZeroZ);
     });
     _defineProperty(_this, "updateMeasurements", function () {
       var _this$state$measureme;
@@ -285,11 +284,14 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$editConte2, _this$props$editConte3;
+      var _this$props$editConte, _this$props$editConte2;
+      if (!this.props.editContext.geomType || this.props.editContext.geomReadOnly || this.props.editContext.geomNonZeroZ) {
+        return null;
+      }
       var toolbar = null;
       var locationRecorder = null;
       var measureSwitcher = null;
-      if ((_this$props$editConte2 = this.props.editContext.feature) !== null && _this$props$editConte2 !== void 0 && _this$props$editConte2.geometry) {
+      if ((_this$props$editConte = this.props.editContext.feature) !== null && _this$props$editConte !== void 0 && _this$props$editConte.geometry) {
         var editButtons = [{
           key: "Node",
           tooltip: LocaleUtils.tr("redlining.draw"),
@@ -307,7 +309,7 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
           tooltipPos: "top"
         }), this.context);
       }
-      if (this.state.showRecordLocation && this.props.editContext.geomType) {
+      if (this.state.showRecordLocation) {
         var geomType = this.props.editContext.geomType.replace(/Z$/, '');
         locationRecorder = /*#__PURE__*/React.createElement(LocationRecorder, {
           drawInteraction: this.interaction,
@@ -316,7 +318,7 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
           map: this.props.map
         });
       }
-      if (this.props.editContext.action === "Draw" || (_this$props$editConte3 = this.props.editContext.feature) !== null && _this$props$editConte3 !== void 0 && _this$props$editConte3.geometry) {
+      if (this.props.editContext.action === "Draw" || (_this$props$editConte2 = this.props.editContext.feature) !== null && _this$props$editConte2 !== void 0 && _this$props$editConte2.geometry) {
         measureSwitcher = /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
           changeMeasureState: this.changeMeasurementState,
           geomType: this.props.editContext.geomType,

package/utils/MiscUtils.js

@@ -194,6 +194,9 @@ var MiscUtils = {
   capitalizeFirst: function capitalizeFirst(text) {
     return text.slice(0, 1).toUpperCase() + text.slice(1);
   },
+  isNumeric: function isNumeric(value) {
+    return typeof value === 'string' && value.trim() !== '' && String(Number(value)) === value.trim();
+  },
   isBrightColor: function isBrightColor(color) {
     var r;
     var g;