qwc2 2026.5.11 → 2026.5.25

package/actions/theme.js

@@ -39,7 +39,6 @@ import { showNotification, NotificationType } from './windows';
 export var THEMES_LOADED = 'THEMES_LOADED';
 export var SET_THEME_LAYERS_LIST = 'SET_THEME_LAYERS_LIST';
 export var SET_CURRENT_THEME = 'SET_CURRENT_THEME';
-export var SWITCHING_THEME = 'SWITCHING_THEME';
 export function themesLoaded(themes) {
   return {
     type: THEMES_LOADED,
@@ -89,7 +88,7 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
       dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
     }
   }
-  var _iterator = _createForOfIteratorHelper(bgLayers),
+  var _iterator = _createForOfIteratorHelper(bgLayers.reverse()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -144,10 +143,6 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
     type: SET_CURRENT_THEME,
     theme: theme
   });
-  dispatch({
-    type: SWITCHING_THEME,
-    switching: false
-  });
   var section = ConfigUtils.isMobile() ? "mobile" : "desktop";
   var task = initialTask || ((_theme$config$section = theme === null || theme === void 0 || (_theme$config = theme.config) === null || _theme$config === void 0 || (_theme$config = _theme$config[section]) === null || _theme$config === void 0 ? void 0 : _theme$config.startupTask) !== null && _theme$config$section !== void 0 ? _theme$config$section : theme === null || theme === void 0 || (_theme$config2 = theme.config) === null || _theme$config2 === void 0 ? void 0 : _theme$config2.startupTask) || (initialTheme ? ConfigUtils.getConfigProp("startupTask") : null);
   if (task) {
@@ -173,10 +168,6 @@ export function setCurrentTheme(theme, themes) {
       return;
     }
     var initialTheme = !getState().theme.current;
-    dispatch({
-      type: SWITCHING_THEME,
-      switching: true
-    });
 
     // Get current background layer if it needs to be preserved
     if (preserve && visibleBgLayer === null && ConfigUtils.getConfigProp("preserveBackgroundOnThemeSwitch", theme) === true) {
@@ -215,10 +206,6 @@ export function setCurrentTheme(theme, themes) {
     }
     dispatch(setSwipe(null));
     if (!theme) {
-      dispatch({
-        type: SWITCHING_THEME,
-        switching: false
-      });
       return;
     }
 

package/components/AttributeForm.js

@@ -597,6 +597,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Convert text NULL to null
               value = null;
             }
+            if (nrelFieldConfig.type === 'number' && value !== null) {
+              // Ensure numeric values are numbers and not strings
+              value = Number(value);
+            }
 
             // relationValues for table must exist as rows are either pre-existing or were added
             if (!(field in relationValues[datasetname].features[index].properties)) {
@@ -639,6 +643,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Convert text NULL to null
               value = null;
             }
+            if (fieldConfig.type === 'number' && value !== null) {
+              // Ensure numeric values are numbers and not strings
+              value = Number(value);
+            }
             if (!(name in feature.properties)) {
               feature.defaultedProperties = [].concat(_toConsumableArray(feature.defaultedProperties || []), [name]);
             }

package/components/MapButton.js

@@ -35,18 +35,6 @@ var MapButton = /*#__PURE__*/function (_React$Component) {
   }
   _inherits(MapButton, _React$Component);
   return _createClass(MapButton, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.componentDidUpdate({});
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (this.context && this.props.position !== prevProps.position) {
-        this.context.recomputeSpacers();
-      }
-    }
-  }, {
     key: "render",
     value: function render() {
       if (!this.context) {

package/components/PluginsContainer.js

@@ -171,6 +171,7 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
                 // Reorder child nodes for natural tab focus order
                 var children = _toConsumableArray(el.children);
                 var slots = {};
+                var usedSlots = new Set();
                 children.forEach(function (child) {
                   if (child.dataset.subslot === undefined) {
                     var _slots$child$dataset$;
@@ -178,12 +179,35 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
                     slots[child.dataset.slot] = child.dataset.subslot = subslot;
                     child.style.order = 100 * parseInt(child.style.order, 10) + subslot;
                   }
+                  if (child.dataset.slot !== undefined) {
+                    usedSlots.add(child.dataset.slot);
+                  }
                 });
                 children.sort(function (a, b) {
                   return b.style.order - a.style.order;
                 }).forEach(function (node) {
                   return el.appendChild(node);
                 });
+                var slotString = _toConsumableArray(usedSlots).sort().join(":");
+                if (slotString !== el.dataset.slotString) {
+                  // Recompute spacers
+                  children.forEach(function (child) {
+                    if (child.dataset.spacer) {
+                      el.removeChild(child);
+                    }
+                  });
+                  var maxSlot = Math.max.apply(Math, _toConsumableArray(usedSlots));
+                  for (var i = 0; i < maxSlot; ++i) {
+                    if (!usedSlots.has(String(i))) {
+                      var child = document.createElement("div");
+                      child.className = "map-buttons-spacer";
+                      child.dataset.spacer = 1;
+                      child.style.order = 100 * i;
+                      el.appendChild(child);
+                    }
+                  }
+                  el.dataset.slotString = slotString;
+                }
               }
             };
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -202,26 +226,6 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
           childList: true
         });
         resizeObserver.observe(el);
-        el.recomputeSpacers = function () {
-          var slots = new Set();
-          Array.from(el.childNodes).forEach(function (child) {
-            if (child.dataset.spacer) {
-              el.removeChild(child);
-            } else {
-              slots.add(child.dataset.slot);
-            }
-          });
-          var maxSlot = Math.max.apply(Math, _toConsumableArray(slots));
-          for (var i = 0; i < maxSlot; ++i) {
-            if (!slots.has(String(i))) {
-              var child = document.createElement("div");
-              child.className = "map-buttons-spacer";
-              child.dataset.spacer = 1;
-              child.style.order = 100 * i;
-              el.appendChild(child);
-            }
-          }
-        };
       }
     });
     return _this;

package/components/QtDesignerForm.js

@@ -612,7 +612,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           readOnly: inputConstraints.readOnly,
           required: inputConstraints.required,
           style: fontStyle,
-          value: value
+          value: value,
+          valueHasTz: field.data_type === "timestamp with time zone"
         });
       } else if (widget["class"] === "QListWidget") {
         return /*#__PURE__*/React.createElement(ListInput, {

package/components/ResizeableWindow.js

@@ -54,7 +54,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       ev.stopPropagation();
     });
     _defineProperty(_this, "renderTitleBar", function () {
-      if (_this.props.fullscreen) {
+      if (_this.props.fullscreen || _this.props.hideTitleBar) {
         return null;
       }
       var maximized = _this.state.geometry.maximized ? true : false;
@@ -118,7 +118,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
           onClick: entry.callback,
           title: entry.title
         });
-      }), !maximized && dockable ? /*#__PURE__*/React.createElement(Icon, {
+      }), !maximized && dockable && !_this.props.hideDockIcon ? /*#__PURE__*/React.createElement(Icon, {
         className: iconClasses,
         icon: dockIcon,
         onClick: _this.toggleDock,
@@ -549,6 +549,8 @@ _defineProperty(ResizeableWindow, "propTypes", {
   })),
   fitHeight: PropTypes.bool,
   fullscreen: PropTypes.bool,
+  hideDockIcon: PropTypes.bool,
+  hideTitleBar: PropTypes.bool,
   icon: PropTypes.string,
   initialHeight: PropTypes.number,
   initialWidth: PropTypes.number,

package/components/widgets/DateTimeInput.js

@@ -1,6 +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 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _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; }
@@ -34,14 +40,42 @@ var DateTimeInput = /*#__PURE__*/function (_React$Component) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, DateTimeInput, [].concat(args));
-    _defineProperty(_this, "valueChanged", function (date, time) {
-      if (time && time.length === 5) {
-        time += ":00";
+    _defineProperty(_this, "valueChanged", function (datestr, timestr) {
+      var date = new Date();
+      if (datestr) {
+        var _datestr$split$map = datestr.split("-").map(Number),
+          _datestr$split$map2 = _slicedToArray(_datestr$split$map, 3),
+          year = _datestr$split$map2[0],
+          month = _datestr$split$map2[1],
+          day = _datestr$split$map2[2];
+        date.setFullYear(year);
+        date.setMonth(month - 1);
+        date.setDate(day);
       }
-      if (date && time) {
-        _this.props.onChange(date + "T" + time);
-      } else if (date) {
-        _this.props.onChange(date);
+      if (timestr) {
+        timestr = timestr + ":00:00";
+        var _timestr$split$slice$ = timestr.split(":").slice(0, 3).map(Number),
+          _timestr$split$slice$2 = _slicedToArray(_timestr$split$slice$, 3),
+          hours = _timestr$split$slice$2[0],
+          minutes = _timestr$split$slice$2[1],
+          seconds = _timestr$split$slice$2[2];
+        date.setHours(hours);
+        date.setMinutes(minutes);
+        date.setSeconds(seconds);
+      } else {
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+      }
+      if (datestr || timestr) {
+        if (_this.props.valueHasTz) {
+          _this.props.onChange(date.toISOString());
+        } else {
+          var pad = function pad(n) {
+            return String(n).padStart(2, "0");
+          };
+          _this.props.onChange(date.getFullYear() + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + "T" + pad(date.getHours()) + ":" + pad(date.getMinutes()) + ":" + pad(date.getSeconds()));
+        }
       } else {
         _this.props.onChange("");
       }
@@ -53,27 +87,33 @@ var DateTimeInput = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var parts = (this.props.value || "T").split("T");
-      parts[1] = (parts[1] || "").replace(/\+[0-9:]+$/, ''); // Strip timezone
-      parts[1] = (parts[1] || "").replace(/\.\d+$/, ''); // Strip milliseconds
+      var date = new Date(this.props.valueHasTz ? this.props.value : this.props.value.slice(0, 19));
+      var datestr = "";
+      var timestr = "";
+      if (!Number.isNaN(date.getTime())) {
+        var pad = function pad(n) {
+          return String(n).padStart(2, "0");
+        };
+        datestr = "".concat(date.getFullYear(), "-").concat(pad(date.getMonth() + 1), "-").concat(pad(date.getDate()));
+        timestr = "".concat(pad(date.getHours()), ":").concat(pad(date.getMinutes()), ":").concat(pad(date.getSeconds()));
+      }
       return /*#__PURE__*/React.createElement(InputContainer, {
         className: "DateTimeInput"
       }, /*#__PURE__*/React.createElement("input", {
         max: this.props.maxDate,
         min: this.props.minDate,
         onChange: function onChange(ev) {
-          return _this2.valueChanged(ev.target.value, parts[1]);
+          return _this2.valueChanged(ev.target.value, timestr);
         },
         readOnly: this.props.readOnly,
         required: this.props.required,
         role: "input",
         style: this.props.style,
         type: "date",
-        value: parts[0]
+        value: datestr
       }), /*#__PURE__*/React.createElement("input", {
-        disabled: !parts[0],
         onChange: function onChange(ev) {
-          return _this2.valueChanged(parts[0], ev.target.value);
+          return _this2.valueChanged(datestr, ev.target.value);
         },
         readOnly: this.props.readOnly,
         required: this.props.required,
@@ -83,7 +123,7 @@ var DateTimeInput = /*#__PURE__*/function (_React$Component) {
           maxWidth: '8em'
         }),
         type: "time",
-        value: parts[1]
+        value: timestr
       }), /*#__PURE__*/React.createElement("input", {
         name: this.props.name,
         role: "input",
@@ -101,6 +141,7 @@ _defineProperty(DateTimeInput, "propTypes", {
   readOnly: PropTypes.bool,
   required: PropTypes.bool,
   style: PropTypes.object,
-  value: PropTypes.string
+  value: PropTypes.string,
+  valueHasTz: PropTypes.bool
 });
 export { DateTimeInput as default };

package/package.json

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