@opengeoweb/core 20.1.0 → 20.2.0

package/dist/index.esm.js

@@ -7530,6 +7530,31 @@ var LocationSearch = function LocationSearch(_ref) {
       document.removeEventListener('keydown', handleKeyDown);
     };
   }, [dropdownOpen, isOpen]);
+  // Always pass groupBy/renderGroup, and only group when the input is empty.
+  // MUI keeps rendering the last open options while the popup closes, so
+  // toggling groupBy in between makes it read flat options as groups and crash.
+  var groupProps = {
+    groupBy: function groupBy(option) {
+      return debouncedInputValue.trim() === '' && 'groupHeader' in option && typeof option.groupHeader === 'string' ? option.groupHeader : '';
+    },
+    renderGroup: function renderGroup(params) {
+      return jsxs(React.Fragment, {
+        children: [params.group ? jsx(ListSubheader, {
+          disableSticky: true,
+          sx: {
+            color: theme.palette.primary.main,
+            fontWeight: 400,
+            fontSize: '16px',
+            py: 1,
+            my: 0,
+            minHeight: '26px',
+            lineHeight: 1
+          },
+          children: params.group
+        }) : null, Array.isArray(params.children) ? params.children : [params.children]]
+      }, params.key);
+    }
+  };
   return isOpen && mapId ? jsxs(Box, {
     sx: {
       display: 'flex',
@@ -7593,28 +7618,7 @@ var LocationSearch = function LocationSearch(_ref) {
           paddingTop: '20px'
         }
       }
-    }, debouncedInputValue.trim() === '' ? {
-      groupBy: function groupBy(option) {
-        return 'groupHeader' in option && typeof option.groupHeader === 'string' ? option.groupHeader : '';
-      },
-      renderGroup: function renderGroup(params) {
-        return jsxs(React.Fragment, {
-          children: [jsx(ListSubheader, {
-            disableSticky: true,
-            sx: {
-              color: theme.palette.primary.main,
-              fontWeight: 400,
-              fontSize: '16px',
-              py: 1,
-              my: 0,
-              minHeight: '26px',
-              lineHeight: 1
-            },
-            children: params.group
-          }), Array.isArray(params.children) ? params.children : [params.children]]
-        }, params.key);
-      }
-    } : {}, {
+    }, groupProps, {
       /* eslint-disable @typescript-eslint/no-explicit-any */
       clearIcon: null,
       inputValue: inputValue,
@@ -8359,18 +8363,35 @@ var OlMapViewLayerConnect = function OlMapViewLayerConnect(layerProps) {
   }), "layer-" + (layer == null ? void 0 : layer.id));
 };
 
+// OpenLayers counterpart of layerUtils.isHiddenFeature
+var isHiddenOlFeature = function isHiddenOlFeature(feature) {
+  return feature.get('isHidden') === true;
+};
+var hideHiddenFeatures = function hideHiddenFeatures(style) {
+  return function (feature, resolution) {
+    if (isHiddenOlFeature(feature)) {
+      return undefined;
+    }
+    return typeof style === 'function' ? style(feature, resolution) : style;
+  };
+};
 /** Escape drops a multi selection only. A sole selection is kept, matching the
- * plain click behaviour, and edit mode keeps its own Escape handling. */
-var shouldDeselectAllOnEscape = function shouldDeselectAllOnEscape(selectedFeatureCount, isInEditMode, hasRegisteredDrawTool) {
-  return hasRegisteredDrawTool && !isInEditMode && selectedFeatureCount > 1;
+ * plain click behaviour, unless the drawing tool is open. Edit mode keeps the
+ * map's own Escape handling, after which onDrawEscape drops the selection. */
+var shouldDeselectAllOnEscape = function shouldDeselectAllOnEscape(selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, isDrawToolOpen) {
+  if (isDrawToolOpen === void 0) {
+    isDrawToolOpen = false;
+  }
+  return hasRegisteredDrawTool && !isInEditMode && selectedFeatureCount > (isDrawToolOpen ? 0 : 1);
 };
 var useDeselectAllOnEscape = function useDeselectAllOnEscape(_ref) {
   var selectedFeatureCount = _ref.selectedFeatureCount,
     isInEditMode = _ref.isInEditMode,
     hasRegisteredDrawTool = _ref.hasRegisteredDrawTool,
+    isDrawToolOpen = _ref.isDrawToolOpen,
     onDeselectAll = _ref.onDeselectAll;
   React.useEffect(function () {
-    if (!shouldDeselectAllOnEscape(selectedFeatureCount, isInEditMode, hasRegisteredDrawTool)) {
+    if (!shouldDeselectAllOnEscape(selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, isDrawToolOpen)) {
       return undefined;
     }
     var onKeyDown = function onKeyDown(event) {
@@ -8383,7 +8404,7 @@ var useDeselectAllOnEscape = function useDeselectAllOnEscape(_ref) {
     return function () {
       return window.removeEventListener('keydown', onKeyDown);
     };
-  }, [selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, onDeselectAll]);
+  }, [selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, isDrawToolOpen, onDeselectAll]);
 };
 var shouldClearSelectionOnEmptyClick = function shouldClearSelectionOnEmptyClick(activeDrawToolId, hasRegisteredDrawTool) {
   return !activeDrawToolId && hasRegisteredDrawTool;
@@ -8418,9 +8439,7 @@ var findFeatureIndexByKey = function findFeatureIndexByKey(geojson, feature) {
   if (key === undefined || !geojson) {
     return -1;
   }
-  return geojson.features.findIndex(function (feat) {
-    return layerUtils.getFeatureSelectionKey(feat) === key;
-  });
+  return layerUtils.findFeatureIndexById(geojson, key);
 };
 var getMovableSelectedFeatureIds = function getMovableSelectedFeatureIds(geojson, selectedFeatureIds) {
   if (!(geojson != null && geojson.features.length) || !(selectedFeatureIds != null && selectedFeatureIds.length)) {
@@ -8467,10 +8486,14 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
   var dispatch = useDispatch();
   var activeDrawToolId = useSelector(drawingToolSelectors.getActiveDrawToolId);
   var hasRegisteredDrawTool = useSelector(function (state) {
-    return drawingToolSelectors.selectAllDrawingTools(state).some(function (tool) {
-      return tool.geoJSONLayerId === layerId;
-    });
+    return drawingToolSelectors.getHasDrawToolForLayer(state, layerId);
+  });
+  var isDrawToolOpen = useSelector(function (state) {
+    return drawingToolSelectors.getIsDrawToolOpenForLayer(state, layerId);
   });
+  var layerStyle = React.useMemo(function () {
+    return isDrawToolOpen ? hideHiddenFeatures(style) : style;
+  }, [isDrawToolOpen, style]);
   var activeDrawMode = useSelector(function (store) {
     return drawingToolSelectors.getActiveDrawMode(store, activeDrawToolId);
   });
@@ -8535,7 +8558,7 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
     });
   }, [layer.geojson, layer.hoveredFeatureIds, layer.originalId, layer.selectedFeatureIds, usesIdSelection]);
   var clearSelection = React.useCallback(function () {
-    if (!shouldClearSelectionOnEmptyClick(activeDrawToolId, hasRegisteredDrawTool)) {
+    if (!shouldClearSelectionOnEmptyClick(drawingToolSelectors.getActiveDrawToolId(store.getState()), hasRegisteredDrawTool)) {
       return;
     }
     dispatch(layerActions.setSelectedFeatures({
@@ -8547,7 +8570,13 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
       isInEditMode: false,
       drawMode: ''
     }));
-  }, [activeDrawToolId, hasRegisteredDrawTool, dispatch, layerId]);
+  }, [store, hasRegisteredDrawTool, dispatch, layerId]);
+  var onDrawEscape = React.useCallback(function () {
+    // the map already ended its own edit or draw mode for this Escape
+    if (document.activeElement === document.body && drawingToolSelectors.getIsDrawToolOpenForLayer(store.getState(), layerId)) {
+      clearSelection();
+    }
+  }, [store, layerId, clearSelection]);
   var onFeatureClick = React.useCallback(function (feature, isShiftClick) {
     var _clickedFeature$prope;
     if (!feature.length) {
@@ -8599,7 +8628,9 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
     if (!((_layer$geojson3 = layer.geojson) != null && _layer$geojson3.features.length)) {
       return;
     }
-    var boxSelectedIndices = features.map(function (feature) {
+    var boxSelectedIndices = features.filter(function (feature) {
+      return !(isDrawToolOpen && isHiddenOlFeature(feature));
+    }).map(function (feature) {
       return findFeatureIndexByKey(layer.geojson, feature);
     }).filter(function (idx) {
       return idx !== -1;
@@ -8628,7 +8659,7 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
         drawMode: ''
       }));
     }
-  }, [dispatch, layer.geojson, layer.selectedFeatureIds, layerId]);
+  }, [dispatch, layer.geojson, layer.selectedFeatureIds, layerId, isDrawToolOpen]);
   var boxSelectConfig = React.useMemo(function () {
     return usesIdSelection && !layer.isInEditMode ? {
       onBoxSelect: onBoxSelect,
@@ -8652,6 +8683,7 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
     selectedFeatureCount: selectedFeatureIndices.length,
     isInEditMode: layer.isInEditMode,
     hasRegisteredDrawTool: hasRegisteredDrawTool,
+    isDrawToolOpen: isDrawToolOpen,
     onDeselectAll: clearSelection
   });
   var movableSelectedFeatureIds = React.useMemo(function () {
@@ -8727,7 +8759,7 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
       modifyFeatures: modifyFeaturesConfig,
       moveFeatures: moveFeaturesConfig,
       opacity: layer.opacity,
-      style: style,
+      style: layerStyle,
       visible: layer.enabled,
       zIndex: zIndex
     }), jsx(OpenLayersMapDraw, {
@@ -8736,12 +8768,13 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref3
       exitDrawModeCallback: exitFeatureDrawMode,
       geojson: layer.geojson,
       isInEditMode: layer.isInEditMode || false,
+      onEscape: onDrawEscape,
       onNoFeatureClick: onNoFeatureClick,
       onViewOnlyFeatureClick: onViewOnlyFeatureClick,
       selectedFeatureIndex: activeFeatureIndex,
       selectedFeatureIndices: selectedFeatureIndices,
       updateGeojson: updateFeature,
-      viewOnlyStyle: style
+      viewOnlyStyle: layerStyle
     })]
   });
 };
@@ -10490,6 +10523,7 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
   var activeLayerTimeDimension = useSelector(function (store) {
     return layerSelectors.getLayerTimeDimension(store, autoTimeStepLayerId);
   });
+  var hasActiveLayerTimeDimension = Boolean(activeLayerTimeDimension);
   var timeSliderWidth = useSelector(function (store) {
     return mapSelectors.getMapTimeSliderWidth(store, mapId);
   });
@@ -10508,6 +10542,24 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
   var isAnimating = useSelector(function (store) {
     return mapSelectors.isAnimating(store, mapId);
   });
+  var _React$useState = React.useState(function () {
+      return Math.floor(Date.now() / 1000);
+    }),
+    now = _React$useState[0],
+    setNow = _React$useState[1];
+  var updateNow = React.useCallback(function () {
+    setNow(Math.floor(Date.now() / 1000));
+  }, []);
+  React.useEffect(function () {
+    if (!isTimeSpanAuto || !autoTimeStepLayerId || !hasActiveLayerTimeDimension) {
+      return undefined;
+    }
+    updateNow();
+    var intervalId = window.setInterval(updateNow, 60 * 1000);
+    return function () {
+      return window.clearInterval(intervalId);
+    };
+  }, [autoTimeStepLayerId, hasActiveLayerTimeDimension, isTimeSpanAuto, updateNow]);
   var updateTimeSliderSpan = React.useCallback(function (spanInSeconds, newCenterTime) {
     // Do not dispatch actions if values are the same
     if (spanInSeconds !== undefined && newCenterTime !== undefined && (currentTimeSpan !== spanInSeconds || centerTime !== newCenterTime)) {
@@ -10515,14 +10567,28 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
     }
   }, [centerTime, currentTimeSpan, myOnSetTimeSliderSpan]);
   React.useEffect(function () {
+    if (isTimeSpanAuto && isAnimating) {
+      return;
+    }
     if (isTimeSpanAuto && autoTimeStepLayerId && activeLayerTimeDimension && !isAnimating) {
       var _getTimeBounds = getTimeBounds([activeLayerTimeDimension]),
         startTime = _getTimeBounds.startTime,
         endTime = _getTimeBounds.endTime;
-      var minimumStartTime = selectedTime - 24 * 3600;
-      var slicedStartTime = startTime < minimumStartTime ? minimumStartTime : startTime;
-      var spanInSeconds = endTime - slicedStartTime;
-      var newCenterTime = (slicedStartTime + endTime) / 2;
+      var oneDayInSeconds = 24 * 3600;
+      var slicedStartTime;
+      var slicedEndTime;
+      if (now < startTime) {
+        slicedStartTime = now;
+        slicedEndTime = now + oneDayInSeconds;
+      } else if (now > endTime) {
+        slicedStartTime = now - oneDayInSeconds;
+        slicedEndTime = now;
+      } else {
+        slicedStartTime = Math.max(startTime, now - oneDayInSeconds);
+        slicedEndTime = now;
+      }
+      var spanInSeconds = slicedEndTime - slicedStartTime;
+      var newCenterTime = (slicedStartTime + slicedEndTime) / 2;
       updateTimeSliderSpan(spanInSeconds, newCenterTime);
     } else {
       var _spanInSeconds = currentTimeSpan || defaultTimeSpan;
@@ -10530,7 +10596,7 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
       updateTimeSliderSpan(_spanInSeconds, _newCenterTime);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [autoTimeStepLayerId, isTimeSpanAuto, mapId, activeLayerTimeDimension == null ? void 0 : activeLayerTimeDimension.name]);
+  }, [autoTimeStepLayerId, isAnimating, isTimeSpanAuto, mapId, activeLayerTimeDimension == null ? void 0 : activeLayerTimeDimension.name, now]);
 };
 var timeToIso = function timeToIso(selectedTime) {
   return handleDateUtilsISOString(dateUtils.fromUnix(selectedTime).toISOString());
@@ -10604,9 +10670,9 @@ var TimeSliderConnect = function TimeSliderConnect(_ref) {
   useUpdateTimestep(mapId);
   useUpdateTimeSpan(mapId, onSetTimeSliderSpan);
   // Local state for unfiltered selected time
-  var _React$useState = React.useState(selectedTime),
-    unfilteredSelectedTime = _React$useState[0],
-    setUnfilteredSelectedTime = _React$useState[1];
+  var _React$useState2 = React.useState(selectedTime),
+    unfilteredSelectedTime = _React$useState2[0],
+    setUnfilteredSelectedTime = _React$useState2[1];
   // Store unfilteredSelectedTime in a ref for callbacks
   var unfilteredSelectedTimeRef = React.useRef(unfilteredSelectedTime);
   React.useEffect(function () {

package/dist/src/lib/components/MapDrawToolRedux/OpenLayersFeatureLayerConnect.d.ts

@@ -1,20 +1,23 @@
 import type { Feature } from 'ol';
-import type { StyleLike } from 'ol/style/Style';
+import type { StyleFunction, StyleLike } from 'ol/style/Style';
 import React from 'react';
 import type { layerTypes } from '@opengeoweb/store';
 import type { HoverSelect } from '@opengeoweb/webmap-react';
 import { getAffectedIndices } from '@opengeoweb/webmap-react';
 export { getAffectedIndices };
+export declare const hideHiddenFeatures: (style: StyleLike) => StyleFunction;
 /** Escape drops a multi selection only. A sole selection is kept, matching the
- * plain click behaviour, and edit mode keeps its own Escape handling. */
-export declare const shouldDeselectAllOnEscape: (selectedFeatureCount: number, isInEditMode: boolean | undefined, hasRegisteredDrawTool: boolean) => boolean;
+ * plain click behaviour, unless the drawing tool is open. Edit mode keeps the
+ * map's own Escape handling, after which onDrawEscape drops the selection. */
+export declare const shouldDeselectAllOnEscape: (selectedFeatureCount: number, isInEditMode: boolean | undefined, hasRegisteredDrawTool: boolean, isDrawToolOpen?: boolean) => boolean;
 interface DeselectAllOnEscapeOptions {
     selectedFeatureCount: number;
     isInEditMode: boolean | undefined;
     hasRegisteredDrawTool: boolean;
+    isDrawToolOpen?: boolean;
     onDeselectAll: () => void;
 }
-export declare const useDeselectAllOnEscape: ({ selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, onDeselectAll, }: DeselectAllOnEscapeOptions) => void;
+export declare const useDeselectAllOnEscape: ({ selectedFeatureCount, isInEditMode, hasRegisteredDrawTool, isDrawToolOpen, onDeselectAll, }: DeselectAllOnEscapeOptions) => void;
 export declare const shouldClearSelectionOnEmptyClick: (activeDrawToolId: string | undefined, hasRegisteredDrawTool: boolean) => boolean;
 export declare const isSketchInProgress: (isInEditMode: boolean | undefined, drawMode: string | undefined, activeFeature: GeoJSON.Feature | undefined) => boolean;
 /** Soundings and time series set their own highlight, so they must stay out of this. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/core",
-    "version": "20.1.0",
+    "version": "20.2.0",
     "description": "GeoWeb Core library for the opengeoweb project",
     "license": "Apache-2.0",
     "repository": {
@@ -20,28 +20,28 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/shared": "20.1.0",
+        "@opengeoweb/shared": "20.2.0",
         "react-redux": "^9.2.0",
-        "@opengeoweb/store": "20.1.0",
-        "@opengeoweb/time-slider": "20.1.0",
+        "@opengeoweb/store": "20.2.0",
+        "@opengeoweb/time-slider": "20.2.0",
         "@reduxjs/toolkit": "^2.6.1",
-        "@opengeoweb/webmap-react": "20.1.0",
-        "@opengeoweb/webmap": "20.1.0",
-        "@opengeoweb/theme": "20.1.0",
-        "@opengeoweb/layer-select": "20.1.0",
+        "@opengeoweb/webmap-react": "20.2.0",
+        "@opengeoweb/webmap": "20.2.0",
+        "@opengeoweb/theme": "20.2.0",
+        "@opengeoweb/layer-select": "20.2.0",
         "lodash": "^4.18.1",
         "ol": "^10.4.0",
         "react-sortablejs": "^6.1.4",
         "sortablejs": "^1.15.1",
         "@mui/system": "^9.0.1",
-        "@opengeoweb/snackbar": "20.1.0",
+        "@opengeoweb/snackbar": "20.2.0",
         "react-draggable": "^4.4.6",
         "i18next": "^25.0.1",
         "react-i18next": "^15.1.1",
         "dompurify": "^3.4.13",
         "@mui/material": "^9.0.1",
         "@tanstack/react-query": "^5.85.5",
-        "@opengeoweb/api": "20.1.0",
+        "@opengeoweb/api": "20.2.0",
         "@types/geojson": "^7946.0.14",
         "@turf/turf": "^7.2.0",
         "proj4": "^2.15.0",