@opengeoweb/layer-select 9.27.0 → 9.28.0

package/index.esm.js

@@ -3130,7 +3130,6 @@ const KeywordFilterResultsConnect = ({
 
 const LayerAddRemoveButton = ({
   layer,
-  layerIndex,
   serviceUrl,
   addLayer,
   deleteLayer,
@@ -3139,7 +3138,8 @@ const LayerAddRemoveButton = ({
   const {
     t
   } = useLayerSelectTranslation();
-  const foundLayer = mapLayers.find(lr => lr.name === layer.name && lr.service === serviceUrl);
+  const foundLayerIndex = mapLayers.findIndex(lr => lr.name === layer.name && lr.service === serviceUrl);
+  const foundLayer = foundLayerIndex !== -1 && mapLayers[foundLayerIndex];
   return jsx(CustomToggleButton, Object.assign({
     "data-testid": `layerAddRemoveButton-${layer.name}`,
     onClick: () => {
@@ -3148,7 +3148,7 @@ const LayerAddRemoveButton = ({
         layerName: layer.name
       }) : deleteLayer({
         layerId: foundLayer.id,
-        layerIndex
+        layerIndex: foundLayerIndex
       });
     },
     selected: !!foundLayer,
@@ -3303,7 +3303,6 @@ const layerInfoStyle = {
 };
 const LayerListRow = ({
   layer,
-  layerIndex,
   service,
   addLayer,
   deleteLayer,
@@ -3446,7 +3445,6 @@ const LayerListRow = ({
       }, {
         children: jsx(LayerAddRemoveButton, {
           layer: layer,
-          layerIndex: layerIndex,
           serviceUrl: service.serviceUrl,
           addLayer: addLayer,
           deleteLayer: deleteLayer,
@@ -3506,7 +3504,6 @@ const LayerList = ({
         }, {
           children: service && jsx(LayerListRow, {
             layer: filter,
-            layerIndex: index,
             service: service,
             addLayer: addLayer,
             deleteLayer: deleteLayer,
@@ -3562,10 +3559,12 @@ const LayerListConnect = ({
     origin
   })), [dispatch, mapId]);
   const deleteLayer = React.useCallback(({
-    layerId
+    layerId,
+    layerIndex
   }) => dispatch(layerActions.layerDelete({
     mapId,
     layerId,
+    layerIndex,
     origin: layerTypes.LayerActionOrigin.layerManager
   })), [dispatch, mapId]);
   const filteredLayers = useAppSelector(store => getFilteredLayers(store));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.27.0",
+  "version": "9.28.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -22,7 +22,7 @@
     "@redux-eggs/core": "^2.2.0",
     "lodash": "^4.17.21",
     "i18next": "^23.11.5",
-    "@mui/material": "^5.16.0",
+    "@mui/material": "^6.1.1",
     "react-i18next": "^14.1.2"
   },
   "peerDependencies": {

package/src/lib/components/LayerList/LayerAddRemoveButton.d.ts

@@ -4,13 +4,12 @@ interface AddLayerParams {
     serviceUrl: string;
     layerName: string;
 }
-interface DeleteLayerParams {
+export interface DeleteLayerParams {
     layerId: string;
     layerIndex: number;
 }
 interface LayerAddRemoveButtonProps {
     layer: layerTypes.ReduxLayer;
-    layerIndex: number;
     serviceUrl: string;
     addLayer: ({ serviceUrl, layerName }: AddLayerParams) => void;
     deleteLayer: ({ layerId, layerIndex }: DeleteLayerParams) => void;

package/src/lib/components/LayerList/LayerList.d.ts

@@ -1,13 +1,11 @@
 import * as React from 'react';
 import { layerTypes, serviceTypes } from '@opengeoweb/store';
 import { LayerWithServiceName } from '../../store/types';
+import { DeleteLayerParams } from './LayerAddRemoveButton';
 interface AddLayerParams {
     serviceUrl: string;
     layerName: string;
 }
-export interface DeleteLayerParams {
-    layerId: string;
-}
 export interface LayerListProps {
     services: serviceTypes.Services;
     filteredLayers: LayerWithServiceName[];

package/src/lib/components/LayerList/LayerListRow.d.ts

@@ -1,17 +1,13 @@
 import React from 'react';
 import { layerTypes, serviceTypes } from '@opengeoweb/store';
 import { LayerProps } from '@opengeoweb/webmap';
+import { DeleteLayerParams } from './LayerAddRemoveButton';
 interface AddLayerParams {
     serviceUrl: string;
     layerName: string;
 }
-interface DeleteLayerParams {
-    layerId: string;
-    layerIndex: number;
-}
 interface LayerListRowProps {
     layer: LayerProps;
-    layerIndex: number;
     service: serviceTypes.ReduxService;
     addLayer: ({ serviceUrl, layerName }: AddLayerParams) => void;
     deleteLayer: ({ layerId, layerIndex }: DeleteLayerParams) => void;