qwc2 2026.8.2 → 2026.8.6

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/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/QtDesignerForm.js

@@ -900,14 +900,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(4.5), startHeight + (event.clientY - startMouseY)) + 'px';
       };
       ev.view.document.body.style.userSelect = 'none';
       ev.view.addEventListener("pointermove", resizeInput);

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

@@ -86,6 +86,7 @@ div.qt-designer-widget-relation {
     display: flex;
     flex-direction: column;
     position: relative;
+    max-height: 6.5em;
 }
 
 div.qt-designer-widget-relation-resize-handle {
@@ -104,8 +105,10 @@ div.qt-designer-widget-relation-resize-handle {
 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 +131,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 +139,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 {

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.08.02",
+    "version": "2026.08.06",
     "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/Panoramax.js

@@ -56,9 +56,8 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
       currentTooltip: '',
       viewerInitialized: false
     });
-    _defineProperty(_this, "onClose", function () {
+    _defineProperty(_this, "cleanUp", function () {
       var _this$viewer;
-      _this.props.setCurrentTask(null);
       _this.props.removeLayer('panoramax-recordings');
       _this.props.removeLayer('panoramaxselection');
       _this.setState({
@@ -73,6 +72,9 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
       });
       (_this$viewer = _this.viewer) === null || _this$viewer === void 0 || _this$viewer.select(null, null, true);
     });
+    _defineProperty(_this, "onClose", function () {
+      _this.props.setCurrentTask(null);
+    });
     _defineProperty(_this, "initializeViewer", function () {
       var viewerElement = _this.viewerRef.current;
       if (viewerElement) {
@@ -199,6 +201,8 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
             this.addRecordingsMVT();
           }
         }
+      } else if (prevProps.active && !this.props.active) {
+        this.cleanUp();
       } else if (this.state.selectionGeom && this.state.selectionGeom !== prevState.selectionGeom) {
         this.queryPoint(this.state.selectionGeom);
       }

package/plugins/ScratchDrawing.js

@@ -87,49 +87,59 @@ var ScratchDrawing = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "submitGeometry", function () {
       var _this$props$layers$fi;
       var features = ((_this$props$layers$fi = _this.props.layers.find(function (l) {
-        return l.id === _this.props.redlining.layer;
+        return l.id === _this.layerId;
       })) === null || _this$props$layers$fi === void 0 ? void 0 : _this$props$layers$fi.features) || [];
-      _this.submitted = true;
+      if (_this.props.redlining.selectedFeature) {
+        features = features.filter(function (f) {
+          return f.id !== _this.props.redlining.selectedFeature.id;
+        });
+        features.push(_this.props.redlining.selectedFeature);
+      }
       _this.props.task.data.callback(features, _this.props.projection);
+      _this.submitted = true;
       _this.props.setCurrentTask(null);
     });
     _this.submitted = false;
+    _this.layerId = null;
     return _this;
   }
   _inherits(ScratchDrawing, _React$Component);
   return _createClass(ScratchDrawing, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      // Clear when task changes
-      if (this.props.task.id !== "ScratchDrawing" && prevProps.task.id === "ScratchDrawing") {
-        if (!this.submitted) {
-          prevProps.task.data.callback(null, null);
-          this.submitted = true;
-        }
-        this.props.removeLayer(prevProps.redlining.layer);
-        this.props.resetRedliningState();
-      }
-      // Setup redlining state
-      if (this.props.task !== prevProps.task && this.props.task.id === "ScratchDrawing") {
-        if (prevProps.task.id === "ScratchDrawing") {
-          this.props.removeLayer(prevProps.redlining.layer);
-          if (!this.submitted) {
-            prevProps.task.data.callback(null, null);
-            this.submitted = true;
-          }
-        }
-        this.submitted = false;
+      if (this.props.task.id === "ScratchDrawing" && prevProps.task.id !== "ScratchDrawing") {
         var data = this.props.task.data;
-        var layerId = this.createDrawLayer(data);
+        this.layerId = this.createDrawLayer(data);
         this.props.setSnappingConfig(data.snapping, data.snappingActive);
         this.props.changeRedliningState({
           action: 'PickDraw',
           geomType: data.geomType,
-          layer: layerId,
+          layer: this.layerId,
           layerTitle: null,
           drawMultiple: data.drawMultiple,
           style: this.drawingStyle(data.style)
         });
+      } else if (prevProps.task.id === "ScratchDrawing" && this.props.task !== prevProps.task) {
+        this.props.resetRedliningState();
+        if (!this.submitted) {
+          prevProps.task.data.callback(null, null);
+        }
+        this.submitted = false;
+      } else if (this.props.redlining.layer === null && prevProps.redlining.layer === this.layerId) {
+        this.props.removeLayer(this.layerId);
+        if (this.props.task.id === "ScratchDrawing") {
+          var _data = this.props.task.data;
+          this.layerId = this.createDrawLayer(_data);
+          this.props.setSnappingConfig(_data.snapping, _data.snappingActive);
+          this.props.changeRedliningState({
+            action: 'PickDraw',
+            geomType: _data.geomType,
+            layer: this.layerId,
+            layerTitle: null,
+            drawMultiple: _data.drawMultiple,
+            style: this.drawingStyle(_data.style)
+          });
+        }
       }
     }
   }, {

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/plugins/map3d/OverviewMap3D.js

@@ -60,6 +60,7 @@ var OverviewMap3D = /*#__PURE__*/function (_React$Component) {
   return _createClass(OverviewMap3D, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.updateViewCone();
       this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.updateViewCone);
     }
   }, {

package/plugins/style/BackgroundSwitcher.css

@@ -26,7 +26,7 @@ div.background-switcher {
     transform-origin: right;
     transition: transform 0.1s;
     width: calc(var(--buttons-container-width) - 7em);
-    z-index: 1;
+    z-index: 3;
     display: flex;
     justify-content: flex-end;
     flex-wrap: wrap-reverse;

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;

package/utils/SearchProviders.js

@@ -457,11 +457,15 @@ export var FulltextSearch = /*#__PURE__*/function () {
           items: data.results.filter(function (entry) {
             return entry.feature && entry.feature.bbox;
           }).map(function (entry) {
+            var center = entry.feature.center;
+            if (!center) {
+              center = [0.5 * (entry.feature.bbox[0] + entry.feature.bbox[2]), 0.5 * (entry.feature.bbox[1] + entry.feature.bbox[3])];
+            }
             return {
               id: entry.feature.feature_id,
               text: entry.feature.display,
-              x: 0.5 * (entry.feature.bbox[0] + entry.feature.bbox[2]),
-              y: 0.5 * (entry.feature.bbox[1] + entry.feature.bbox[3]),
+              x: center[0],
+              y: center[1],
               crs: entry.feature.srid ? "EPSG:" + String(entry.feature.srid).replace(/^EPSG:/, '') : null,
               bbox: entry.feature.bbox,
               thumbnail: iconPath + entry.feature.dataproduct_id + ".svg",