qwc2 2026.7.8 → 2026.7.9

package/components/EditUploadField.js

@@ -40,7 +40,8 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       camera: false,
       imageData: null,
-      imageFilename: null
+      imageFilename: null,
+      fileSelected: false
     });
     _defineProperty(_this, "fileSelected", function (ev) {
       if (ev.target.files[0].type.startsWith("image/")) {
@@ -57,6 +58,9 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
           _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
         };
       } else {
+        _this.setState({
+          fileSelected: true
+        });
         _this.props.updateFile(_this.props.fieldId, ev.target.files[0]);
         _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
       }
@@ -277,7 +281,7 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
             onClick: this.props.disabled ? null : this.clearImage
           }));
         }
-      } else if (fileValue) {
+      } else if (fileValue && !this.state.fileSelected) {
         return /*#__PURE__*/React.createElement("span", {
           className: "edit-upload-field edit-upload-field-imagelink" + (this.props.disabled ? " edit-upload-field-disabled" : "")
         }, /*#__PURE__*/React.createElement("a", {

package/components/ExportSelection.js

@@ -128,10 +128,25 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
       }
       if (this.props.frameRatio !== prevProps.frameRatio) {
         this.setState(function (state) {
+          var maxWidth = _this2.exportContainer.offsetWidth;
+          var maxHeight = _this2.exportContainer.offsetHeight;
           var newheight = _this2.props.frameRatio ? Math.round(state.width * _this2.props.frameRatio) : state.height;
+          var newwidth = state.width;
+          if (_this2.props.frameRatio) {
+            if (newwidth > maxWidth) {
+              newwidth = maxWidth;
+              newheight = Math.round(newwidth * _this2.props.frameRatio);
+            }
+            if (newheight > maxHeight) {
+              newheight = maxHeight;
+              newwidth = Math.round(newheight / _this2.props.frameRatio);
+            }
+          }
           return {
             frameRatio: _this2.props.frameRatio,
-            y: state.y + 0.5 * (state.height - newheight),
+            x: 0.5 * (maxWidth - newwidth),
+            y: 0.5 * (maxHeight - newheight),
+            width: newwidth,
             height: newheight
           };
         }, function () {
@@ -150,7 +165,10 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
         height: this.state.height + 'px'
       };
       return /*#__PURE__*/React.createElement("div", {
-        className: "export-selection-container"
+        className: "export-selection-container",
+        ref: function ref(el) {
+          _this3.exportContainer = el;
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: "export-selection",
         onContextMenu: MiscUtils.killEvent,

package/components/widgets/LayerCatalogWidget.js

@@ -162,7 +162,7 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       var _collectSublayers = function collectSublayers(entry) {
         var _entry$resource2;
         var entryParams = LayerUtils.splitLayerUrlParam((_entry$resource2 = entry.resource) !== null && _entry$resource2 !== void 0 ? _entry$resource2 : "");
-        if (stripQuery(entryParams.url) === groupUrl) {
+        if (isEmpty(entry.sublayers) && stripQuery(entryParams.url) === groupUrl) {
           sublayers[entryParams.name] = entryParams;
         }
         (entry.sublayers || []).forEach(_collectSublayers);
@@ -214,10 +214,12 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
             } else if (sublayerSubset) {
               var _filterSublayers = function filterSublayers(sublayers) {
                 return sublayers.map(function (sublayer) {
-                  if (sublayer.sublayers) {
-                    return _filterSublayers(sublayer.sublayers);
-                  } else if (sublayer.name in sublayerSubset) {
-                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset);
+                  if (sublayer.name in sublayerSubset) {
+                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset[sublayer.name]);
+                  } else if (sublayer.sublayers) {
+                    return _objectSpread(_objectSpread({}, sublayer), {}, {
+                      sublayers: _filterSublayers(sublayer.sublayers)
+                    });
                   } else {
                     return null;
                   }

package/package.json

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