qwc2 2026.6.17 → 2026.6.24

package/actions/theme.js

@@ -125,11 +125,9 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
   } finally {
     _iterator.f();
   }
-  if (!actuallyVisibleBgLayer) {
-    UrlParams.updateParams({
-      bl: ""
-    });
-  }
+  UrlParams.updateParams({
+    bl: actuallyVisibleBgLayer !== null && actuallyVisibleBgLayer !== void 0 ? actuallyVisibleBgLayer : ""
+  });
   var _iterator2 = _createForOfIteratorHelper(layers.reverse()),
     _step2;
   try {

package/components/AttributeForm.js

@@ -168,9 +168,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         action: "",
         className: "attrib-form-parent-form",
         onSubmit: _this.onSubmit,
-        ref: function ref(el) {
-          _this.form = el;
-        }
+        ref: _this.setRef
       }, editConfig.form ? /*#__PURE__*/React.createElement(QtDesignerForm, {
         addRelationRecord: _this.addRelationRecord,
         editConfig: editConfig,
@@ -199,6 +197,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         values: _this.props.editContext.feature.properties
       }), captchaButton, commitBar), deleteBar, busyDiv, childAttributeForm);
     });
+    _defineProperty(_this, "setRef", function (el) {
+      _this.form = el;
+    });
     _defineProperty(_this, "setFormBusy", function (busy) {
       _this.setState({
         busy: busy
@@ -441,6 +442,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "validateForm", function (feature) {
       var validCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var invalidCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+      if (!_this.form) {
+        return;
+      }
       var constraintExpressions = _this.props.editContext.editConfig.fields.reduce(function (res, cur) {
         var _cur$constraints;
         if ((_cur$constraints = cur.constraints) !== null && _cur$constraints !== void 0 && _cur$constraints.expression) {

package/components/LayerInfoWindow.js

@@ -93,7 +93,7 @@ var LayerInfoWindow = /*#__PURE__*/function (_React$Component) {
       }
       var legend = null;
       var scale = MapUtils.computeForZoom(this.props.map.scales, this.props.map.zoom);
-      var legendUrl = LayerUtils.getLegendUrl(this.props.layer, this.props.sublayer, scale, this.props.map, this.props.bboxDependentLegend, this.props.scaleDependentLegend);
+      var legendUrl = LayerUtils.getLegendUrl(this.props.layer, this.props.sublayer, scale, this.props.map, this.props.bboxDependentLegend, this.props.scaleDependentLegend, this.props.extraLegendParameters);
       if (legendUrl) {
         legend = /*#__PURE__*/React.createElement(Image, {
           className: "layer-info-window-legend",
@@ -130,6 +130,7 @@ var LayerInfoWindow = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 _defineProperty(LayerInfoWindow, "propTypes", {
   bboxDependentLegend: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
+  extraLegendParameters: PropTypes.string,
   layer: PropTypes.object,
   layerInfoGeometry: PropTypes.object,
   map: PropTypes.object,

package/components/MapButton.js

@@ -56,6 +56,8 @@ var MapButton = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("button", {
         className: "".concat(className, " ").concat(this.props.className || ""),
         onClick: this.props.onClick,
+        onMouseEnter: this.props.onMouseEnter,
+        onMouseLeave: this.props.onMouseLeave,
         ref: this.props.buttonRef,
         title: this.props.tooltip
       }, this.props.busy ? /*#__PURE__*/React.createElement(Spinner, null) : /*#__PURE__*/React.createElement(Icon, {
@@ -77,6 +79,8 @@ _defineProperty(MapButton, "propTypes", {
   icon: PropTypes.string,
   iconSize: PropTypes.string,
   onClick: PropTypes.func,
+  onMouseEnter: PropTypes.func,
+  onMouseLeave: PropTypes.func,
   position: PropTypes.number,
   tooltip: PropTypes.string
 });

package/components/widgets/GroupSelect.js

@@ -55,8 +55,7 @@ var GroupSelect = /*#__PURE__*/function (_Component) {
         value: this.props.value
       }, this.props.placeholder !== null ? /*#__PURE__*/React.createElement("option", {
         disabled: true,
-        hidden: true,
-        selected: true
+        value: ""
       }, this.props.placeholder) : null, this.props.defaultOption !== null ? /*#__PURE__*/React.createElement("option", {
         key: this.props.defaultOption[0],
         value: this.props.defaultOption[0]

package/components/widgets/PopupMenu.js

@@ -29,6 +29,7 @@ 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;
     _classCallCheck(this, PopupMenu);
     _this = _callSuper(this, PopupMenu, [props]);
@@ -66,7 +67,7 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
         var childCount = _this.menuEl.children.length;
         var delta = ev.key === 'ArrowUp' ? -1 : 1;
         var currentIndex = Array.from(_this.menuEl.children).findIndex(function (el) {
-          return document.activeElement === el || el.contains(document.activeElement);
+          return ev.view.document.activeElement === el || el.contains(ev.view.document.activeElement);
         });
         if (currentIndex === -1) {
           currentIndex = delta === 1 ? childCount - 1 : 0;
@@ -91,7 +92,7 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
         (_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);
       }
     });
-    _this.container = document.createElement("div");
+    _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");
     _this.container.id = 'popup-container';
     _this.container.style.position = 'fixed';
     _this.container.style.left = 0;
@@ -102,7 +103,8 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
     if (_this.props.anchor) {
       _this.shields = [];
       var _loop = function _loop(i) {
-        _this.shields[i] = document.createElement("div");
+        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";
@@ -131,27 +133,27 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
       }, 0);
     }
     _this.menuEl = null;
-    document.body.appendChild(_this.container);
+    ((_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);
     return _this;
   }
   _inherits(PopupMenu, _React$PureComponent);
   return _createClass(PopupMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props$anchor5;
-      if (((_this$props$anchor5 = this.props.anchor) === null || _this$props$anchor5 === void 0 ? void 0 : _this$props$anchor5.nodeName) === "INPUT") {
+      var _this$props$anchor8;
+      if (((_this$props$anchor8 = this.props.anchor) === null || _this$props$anchor8 === void 0 ? void 0 : _this$props$anchor8.nodeName) === "INPUT") {
         this.props.anchor.addEventListener('keydown', this.keyNav);
       }
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$props$anchor6, _this$props$anchor7, _this$props$anchor7$f;
-      document.body.removeChild(this.container);
-      if (((_this$props$anchor6 = this.props.anchor) === null || _this$props$anchor6 === void 0 ? void 0 : _this$props$anchor6.nodeName) === "INPUT") {
+      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") {
         this.props.anchor.removeEventListener('keydown', this.keyNav);
       }
-      (_this$props$anchor7 = this.props.anchor) === null || _this$props$anchor7 === void 0 || (_this$props$anchor7$f = _this$props$anchor7.focus) === null || _this$props$anchor7$f === void 0 || _this$props$anchor7$f.call(_this$props$anchor7);
+      (_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);
     }
   }, {
     key: "render",

package/package.json

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

package/plugins/BackgroundSwitcher.js

@@ -364,6 +364,12 @@ export var BackgroundSwitcher = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             return _this2.buttonClicked(nextLayer);
           },
+          onMouseEnter: this.props.buttonClickAction === "cycle" ? function () {
+            return _this2.setSwitcherVisible(true);
+          } : null,
+          onMouseLeave: this.props.buttonClickAction === "cycle" ? function () {
+            return _this2.setSwitcherVisible(false);
+          } : null,
           position: this.props.position,
           tooltip: LocaleUtils.tr("tooltip.background")
         }, this.renderSwitcher(backgroundLayers, visibleBgLayer));

package/plugins/FeatureForm.js

@@ -152,7 +152,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "onWindowClose", function () {
       if (!_this.props.editContext.changed) {
         _this.clearResults();
-        if (_this.props.exitTaskOnResultsClose) {
+        if (_this.props.exitTaskOnResultsClose && _this.props.currentTask === "FeatureForm") {
           _this.props.setCurrentTask(null);
         }
       }
@@ -314,6 +314,7 @@ _defineProperty(FeatureForm, "propTypes", {
   clearEditContext: PropTypes.func,
   click: PropTypes.object,
   currentEditContext: PropTypes.string,
+  currentTask: PropTypes.string,
   editConfigs: PropTypes.object,
   editContext: PropTypes.object,
   enabled: PropTypes.bool,
@@ -356,8 +357,9 @@ _defineProperty(FeatureForm, "defaultState", {
 export default (function () {
   var iface = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : EditingInterface;
   return connect(function (state) {
-    var enabled = state.task.id === "FeatureForm" || state.task.identifyEnabled && ConfigUtils.getConfigProp("identifyTool", state.theme.current, "Identify") === "FeatureForm";
+    var enabled = state.task.id === "FeatureForm" || (!state.task.id || state.task.identifyEnabled) && ConfigUtils.getConfigProp("identifyTool", state.theme.current, "Identify") === "FeatureForm";
     return {
+      currentTask: state.task.id,
       click: state.map.click || {
         modifiers: {}
       },

package/plugins/Identify.js

@@ -579,7 +579,7 @@ _defineProperty(Identify, "defaultProps", {
 });
 export default connect(function (state) {
   var _state$layers$filter;
-  var enabled = state.task.id === "Identify" || state.task.identifyEnabled && ConfigUtils.getConfigProp("identifyTool", state.theme.current, "Identify") === "Identify";
+  var enabled = state.task.id === "Identify" || (!state.task.id || state.task.identifyEnabled) && ConfigUtils.getConfigProp("identifyTool", state.theme.current, "Identify") === "Identify";
   return {
     click: state.map.click || {
       modifiers: {}

package/plugins/LayerTree.js

@@ -1139,6 +1139,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
         };
       }), legendTooltip, this.renderLegendPrintWindow(), /*#__PURE__*/React.createElement(LayerInfoWindow, {
         bboxDependentLegend: this.props.bboxDependentLegend,
+        extraLegendParameters: this.props.extraLegendParameters,
         layerInfoGeometry: this.props.layerInfoGeometry,
         scaleDependentLegend: this.props.scaleDependentLegend
       }), /*#__PURE__*/React.createElement(ServiceInfoWindow, {

package/plugins/ThemeBrowser.js

@@ -354,14 +354,14 @@ var ThemeBrowser = /*#__PURE__*/function (_React$Component) {
         var resizeOverlay = document.createElement('div');
         resizeOverlay.className = 'themebrowser-resize-overlay';
         ev.view.document.body.appendChild(resizeOverlay);
-        // ev.view.document.body.style.userSelect = 'none';
+        ev.view.document.body.style.userSelect = 'none';
         // ev.view.document.body.style.setProperty('cursor', 'ew-resize', 'important');
         arrowsEl.style.display = 'none';
         opacityEl.innerText = Math.round(startOpacity / 255 * 100) + "%";
         ev.view.addEventListener("pointermove", computeNewOpacity);
         ev.view.addEventListener("pointerup", function () {
           ev.view.document.body.removeChild(resizeOverlay);
-          // ev.view.document.body.style.userSelect = '';
+          ev.view.document.body.style.userSelect = '';
           // ev.view.document.body.style.removeProperty('cursor');
           arrowsEl.style.display = '';
           opacityEl.innerText = '';

package/plugins/map3d/BackgroundSwitcher3D.js

@@ -1,4 +1,12 @@
 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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(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 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; }
@@ -37,8 +45,11 @@ var BackgroundSwitcher3D = /*#__PURE__*/function (_React$Component) {
   return _createClass(BackgroundSwitcher3D, [{
     key: "render",
     value: function render() {
+      var backgroundLayers = Object.values(this.props.sceneContext.baseLayers.reduce(function (res, l) {
+        return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, "_" + (l.group || l.name), l.group ? [].concat(_toConsumableArray(res["_" + l.group] || []), [l]) : l));
+      }, {}));
       return /*#__PURE__*/React.createElement(BackgroundSwitcher, {
-        backgroundLayers: this.props.sceneContext.baseLayers,
+        backgroundLayers: backgroundLayers,
         buttonClickAction: this.props.buttonClickAction,
         buttonDisplayMode: this.props.buttonDisplayMode,
         changeLayerVisibility: this.props.sceneContext.setBaseLayer,

package/scripts/updateTranslations.js

@@ -89,7 +89,7 @@ var _listDir = function listDir(dir, pattern) {
 var updateTsConfig = function updateTsConfig(topdir, tsconfig) {
   var collectedMsgIds = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   var files = _listDir(topdir, /^.*\.[jt]sx?$/);
-  var trRegEx = /LocaleUtils\.tr(?:msg)?\((['"])([A-Za-z0-9._]+)\1/g;
+  var trRegEx = /LocaleUtils\.tr(?:msg)?\((['"])([A-Za-z0-9._-]+)\1/g;
   var msgIds = new Set();
   var _iterator2 = _createForOfIteratorHelper(files),
     _step2;