@opengeoweb/core 9.4.1 → 9.5.0

package/index.esm.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import React__default, { useState, useCallback, useRef, useEffect, useLayoutEffect } from 'react';
 import { Grid, Box, MenuItem, Typography, useTheme, Button, Popper, ListItemText, ListItemIcon, FormControl, InputLabel, Paper, List, ListItemButton, CircularProgress, ListSubheader, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, InputAdornment, DialogActions, LinearProgress, styled, Slider, Checkbox, Card, IconButton, Select, CardContent, RadioGroup, FormControlLabel, Radio, ToggleButtonGroup, ToggleButton, Divider, Tooltip, ButtonGroup } from '@mui/material';
-import { CustomIconButton, TooltipSelect, AlertIcon, useControlledTooltip, CustomTooltip, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, AlertBanner, CustomAccordion, calculateStartSize, ToolContainerDraggable, dateUtils, withEggs } from '@opengeoweb/shared';
+import { CustomIconButton, TooltipSelect, AlertIcon, useControlledTooltip, CustomTooltip, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, renderCounter, AlertBanner, CustomAccordion, calculateStartSize, ToolContainerDraggable, dateUtils, withEggs } from '@opengeoweb/shared';
 import { LayerSelectButtonConnect, LayerInfoButton, LayerInfoButtonConnect, getUserAddedServices, layerSelectConfig } from '@opengeoweb/layer-select';
 import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, Equalizer, DimensionsElevation, Link, LinkOff, List as List$1, ExitDomain, Info, Search, MyLocation, Close, ChevronDown, ChevronUp, StepForward, StepBackward, Pause, Play, Options, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import { useDispatch, useSelector, connect, Provider } from 'react-redux';
@@ -850,7 +850,7 @@ var DimensionSelectValue = function DimensionSelectValue(_ref) {
     return null;
   }
   var isReferenceTimeDimensionAndUseLatestIsAvailable = selectedDimension.name === 'reference_time' && useLatestReferenceTime !== undefined;
-  var latestValue = hideLatestDuplicate && isReferenceTimeDimensionAndUseLatestIsAvailable ? dimensionValuesRaw.shift() : dimensionValuesRaw[0];
+  var latestValue = dimensionValuesRaw[0];
   var setDimensionValue = function setDimensionValue(dimensionValue) {
     if (isReferenceTimeDimensionAndUseLatestIsAvailable) {
       if (dimensionValue === 'Latest') {
@@ -862,7 +862,7 @@ var DimensionSelectValue = function DimensionSelectValue(_ref) {
     }
     onLayerChangeDimension(selectedDimension.name, dimensionValue, layerTypes.LayerActionOrigin.layerManager);
   };
-  var dimensionValues = isReferenceTimeDimensionAndUseLatestIsAvailable ? ['Latest'].concat(_toConsumableArray(dimensionValuesRaw)) : dimensionValuesRaw.slice(0, 100).reverse();
+  var dimensionValues = isReferenceTimeDimensionAndUseLatestIsAvailable ? ['Latest'].concat(_toConsumableArray(dimensionValuesRaw.slice(hideLatestDuplicate ? 1 : 0, 100))) : dimensionValuesRaw.slice(0, 100).reverse();
   var isLatest = isReferenceTimeDimensionAndUseLatestIsAvailable && useLatestReferenceTime && selectedDimension.maxValue === selectedDimension.currentValue;
   return /*#__PURE__*/React__default.createElement(TooltipSelect, {
     disableUnderline: true,
@@ -1877,6 +1877,7 @@ var LayerRow = function LayerRow(_ref7) {
       layerId: layerId
     });
   };
+  renderCounter.count(LayerRow.name);
   return /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     container: true,
@@ -2963,7 +2964,7 @@ var LayerRowConnect = function LayerRowConnect(_ref) {
     return serviceSelectors.getLayerFromService(store, layerServiceUrl, layerName);
   });
   var currentlySelectedLayer = useSelector(function (store) {
-    return layerSelectors.getLayerById(store, layerId);
+    return layerSelectors.getLayerByIdWithoutTimeDimension(store, layerId);
   });
   var layerWithAllData = useSelector(function (store) {
     return serviceSelectors.getLayerFromService(store, currentlySelectedLayer === null || currentlySelectedLayer === void 0 ? void 0 : currentlySelectedLayer.service, currentlySelectedLayer === null || currentlySelectedLayer === void 0 ? void 0 : currentlySelectedLayer.name);
@@ -2975,6 +2976,7 @@ var LayerRowConnect = function LayerRowConnect(_ref) {
     serviceName: currentService === null || currentService === void 0 ? void 0 : currentService.name
   });
   var fullLayerName = serviceLayer === null || serviceLayer === void 0 ? void 0 : serviceLayer.title;
+  renderCounter.count(LayerRowConnect.name);
   return /*#__PURE__*/React.createElement(LayerRow, {
     isEnabled: isEnabled,
     mapId: mapId,
@@ -4505,6 +4507,7 @@ var LayerManager = function LayerManager(_ref) {
     sizeInState = _React$useState2[0],
     setSizeInState = _React$useState2[1];
   var theme = useTheme();
+  renderCounter.count(LayerManager.name);
   return /*#__PURE__*/React.createElement(ToolContainerDraggable, {
     title: title,
     startSize: sizeInState,
@@ -4718,7 +4721,7 @@ var LayerManagerConnect = function LayerManagerConnect(_ref) {
     setFocused = _useSetupDialog.setFocused;
   // Only fetch services for floating layer manager, not for docked!
   useFetchServices(dialogType, preloadedMapServices, isDocked);
-  var onToggleDock = function onToggleDock() {
+  var onToggleDock = React.useCallback(function () {
     onCloseDialog();
     if (isDocked) {
       // Close docked layer manager and open the floating layer manager
@@ -4735,36 +4738,38 @@ var LayerManagerConnect = function LayerManagerConnect(_ref) {
         setOpen: true
       }));
     }
-  };
-  var shownTitle = showMapIdInTitle ? "".concat(title, " ").concat(mapId) : title;
-  return /*#__PURE__*/React.createElement(LayerManager, {
-    mapId: mapId || initialMapId,
-    preloadedAvailableBaseLayers: preloadedAvailableBaseLayers,
-    preloadedBaseServices: preloadedBaseServices,
-    bounds: bounds,
-    isOpen: isDialogOpen,
-    onClose: onCloseDialog,
-    title: shownTitle,
-    onMouseDown: setDialogOrder,
-    order: dialogOrder,
-    source: uiSource,
-    size: isDocked ? returnCorrectSize(dockedLayerManagerSize) : sizeLarge,
-    leftHeaderComponent: leftHeaderComponent,
-    isLoading: uiIsLoading,
-    error: uiError,
-    onToggleDock: onToggleDock,
-    setFocused: setFocused,
-    headerSize: "xs",
-    isMultiMap: isMultiMap,
-    isDockedLayerManager: isDocked,
-    startPosition: isDocked ? {
-      top: 60,
-      right: 16
-    } : {
-      top: 85,
-      left: 50
-    }
-  });
+  }, [dispatch, isDocked, mapId, onCloseDialog, source]);
+  return React.useMemo(function () {
+    var shownTitle = showMapIdInTitle ? "".concat(title, " ").concat(mapId) : title;
+    return /*#__PURE__*/React.createElement(LayerManager, {
+      mapId: mapId || initialMapId,
+      preloadedAvailableBaseLayers: preloadedAvailableBaseLayers,
+      preloadedBaseServices: preloadedBaseServices,
+      bounds: bounds,
+      isOpen: isDialogOpen,
+      onClose: onCloseDialog,
+      title: shownTitle,
+      onMouseDown: setDialogOrder,
+      order: dialogOrder,
+      source: uiSource,
+      size: isDocked ? returnCorrectSize(dockedLayerManagerSize) : sizeLarge,
+      leftHeaderComponent: leftHeaderComponent,
+      isLoading: uiIsLoading,
+      error: uiError,
+      onToggleDock: onToggleDock,
+      setFocused: setFocused,
+      headerSize: "xs",
+      isMultiMap: isMultiMap,
+      isDockedLayerManager: isDocked,
+      startPosition: isDocked ? {
+        top: 60,
+        right: 16
+      } : {
+        top: 85,
+        left: 50
+      }
+    });
+  }, [bounds, dialogOrder, dockedLayerManagerSize, initialMapId, isDialogOpen, isDocked, isMultiMap, leftHeaderComponent, mapId, onCloseDialog, onToggleDock, preloadedAvailableBaseLayers, preloadedBaseServices, setDialogOrder, setFocused, showMapIdInTitle, title, uiError, uiIsLoading, uiSource]);
 };
 
 /* *
@@ -6779,67 +6784,70 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var mapControlsPositionTop = title ? 24 : 8;
-  return /*#__PURE__*/React__default.createElement(Box, {
-    sx: {
-      width: '100%',
-      height: '100%',
-      position: 'relative',
-      overflow: 'hidden'
-    },
-    "data-testid": "ConfigurableMap"
-  }, title && ( /*#__PURE__*/React__default.createElement(Typography, {
-    "data-testid": "mapTitle",
-    sx: titleStyle
-  }, title)), /*#__PURE__*/React__default.createElement(MapControls, {
-    "data-testid": "mapControls",
-    style: {
-      top: mapControlsPositionTop
-    }
-  }, displaySearchButtonInMap && ( /*#__PURE__*/React__default.createElement(SearchControlButtonConnect, {
-    mapId: mapId
-  })), /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
-    mapId: id
-  }), displayLayerManagerAndLegendButtonInMap && ( /*#__PURE__*/React__default.createElement(LayerManagerMapButtonConnect, {
-    mapId: mapId
-  })), displayLayerManagerAndLegendButtonInMap && ( /*#__PURE__*/React__default.createElement(LegendMapButtonConnect, {
-    mapId: mapId,
-    multiLegend: multiLegend
-  })), displayDimensionSelectButtonInMap && ( /*#__PURE__*/React__default.createElement(MultiDimensionSelectMapButtonsConnect, {
-    mapId: mapId
-  })), displayGetFeatureInfoButtonInMap && ( /*#__PURE__*/React__default.createElement(GetFeatureInfoButtonConnect, {
-    mapId: mapId
-  })), mapControls), !disableTimeSlider && ( /*#__PURE__*/React__default.createElement(Box, {
-    sx: {
-      position: 'absolute',
-      left: '0px',
-      bottom: '0px',
-      zIndex: 1000,
-      width: '100%'
-    }
-  }, /*#__PURE__*/React__default.createElement(TimeSliderConnect, {
-    mapId: id,
-    sourceId: id
-  }))), /*#__PURE__*/React__default.createElement(MapViewConnect, {
-    controls: {},
-    displayTimeInMap: displayTimeInMap,
-    showScaleBar: false,
-    mapId: mapId
-  }, children), multiLegend && ( /*#__PURE__*/React__default.createElement(LegendConnect, {
-    showMapId: true,
-    mapId: mapId,
-    multiLegend: multiLegend
-  })), /*#__PURE__*/React__default.createElement(SearchControlConnect, {
-    mapId: mapId
-  }), showClock && /*#__PURE__*/React__default.createElement(TimeSliderClockConnect, {
-    mapId: mapId
-  }), displayGetFeatureInfoButtonInMap && ( /*#__PURE__*/React__default.createElement(GetFeatureInfoConnect, {
-    showMapId: true,
-    mapId: mapId
-  })), /*#__PURE__*/React__default.createElement(LayerManagerConnect, {
-    mapId: mapId,
-    bounds: "parent",
-    isDocked: true
-  }));
+  return React__default.useMemo(function () {
+    renderCounter.count("".concat(ConfigurableMapConnect.name, "_").concat(mapId));
+    return /*#__PURE__*/React__default.createElement(Box, {
+      sx: {
+        width: '100%',
+        height: '100%',
+        position: 'relative',
+        overflow: 'hidden'
+      },
+      "data-testid": "ConfigurableMap"
+    }, title && ( /*#__PURE__*/React__default.createElement(Typography, {
+      "data-testid": "mapTitle",
+      sx: titleStyle
+    }, title)), /*#__PURE__*/React__default.createElement(MapControls, {
+      "data-testid": "mapControls",
+      style: {
+        top: mapControlsPositionTop
+      }
+    }, displaySearchButtonInMap && ( /*#__PURE__*/React__default.createElement(SearchControlButtonConnect, {
+      mapId: mapId
+    })), /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
+      mapId: id
+    }), displayLayerManagerAndLegendButtonInMap && ( /*#__PURE__*/React__default.createElement(LayerManagerMapButtonConnect, {
+      mapId: mapId
+    })), displayLayerManagerAndLegendButtonInMap && ( /*#__PURE__*/React__default.createElement(LegendMapButtonConnect, {
+      mapId: mapId,
+      multiLegend: multiLegend
+    })), displayDimensionSelectButtonInMap && ( /*#__PURE__*/React__default.createElement(MultiDimensionSelectMapButtonsConnect, {
+      mapId: mapId
+    })), displayGetFeatureInfoButtonInMap && ( /*#__PURE__*/React__default.createElement(GetFeatureInfoButtonConnect, {
+      mapId: mapId
+    })), mapControls), !disableTimeSlider && ( /*#__PURE__*/React__default.createElement(Box, {
+      sx: {
+        position: 'absolute',
+        left: '0px',
+        bottom: '0px',
+        zIndex: 1000,
+        width: '100%'
+      }
+    }, /*#__PURE__*/React__default.createElement(TimeSliderConnect, {
+      mapId: id,
+      sourceId: id
+    }))), /*#__PURE__*/React__default.createElement(MapViewConnect, {
+      controls: {},
+      displayTimeInMap: displayTimeInMap,
+      showScaleBar: false,
+      mapId: mapId
+    }, children), multiLegend && ( /*#__PURE__*/React__default.createElement(LegendConnect, {
+      showMapId: true,
+      mapId: mapId,
+      multiLegend: multiLegend
+    })), /*#__PURE__*/React__default.createElement(SearchControlConnect, {
+      mapId: mapId
+    }), showClock && /*#__PURE__*/React__default.createElement(TimeSliderClockConnect, {
+      mapId: mapId
+    }), displayGetFeatureInfoButtonInMap && ( /*#__PURE__*/React__default.createElement(GetFeatureInfoConnect, {
+      showMapId: true,
+      mapId: mapId
+    })), /*#__PURE__*/React__default.createElement(LayerManagerConnect, {
+      mapId: mapId,
+      bounds: "parent",
+      isDocked: true
+    }));
+  }, [children, disableTimeSlider, displayDimensionSelectButtonInMap, displayGetFeatureInfoButtonInMap, displayLayerManagerAndLegendButtonInMap, displaySearchButtonInMap, displayTimeInMap, id, mapControls, mapControlsPositionTop, mapId, multiLegend, showClock, title]);
 };
 
 /* *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {