Merge pull request #3771 from ahennr/wfs-hook

Feature: Combine WfsSearch and WfsSearchInput to WfsSearchField using `useWfs` hook
terrestris · Mar 11, 2024 · bdaef7f · bdaef7f
2 parents 5890569 + 347c624
commit bdaef7f
Show file tree

Hide file tree

Showing 15 changed files with 397 additions and 1,564 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@terrestris/base-util": "^1.1.0",
     "@terrestris/ol-util": "^14.0.0",
-    "@terrestris/react-util": "^4.0.0-beta.2",
+    "@terrestris/react-util": "^4.0.0-beta.3",
     "@types/geojson": "^7946.0.12",
     "@types/lodash": "^4.14.200",
     "ag-grid-community": "^28.2.1",

diff --git a/src/Button/MeasureButton/MeasureButton.tsx b/src/Button/MeasureButton/MeasureButton.tsx
@@ -2,6 +2,7 @@ import './MeasureButton.less';
 
 import MeasureUtil from '@terrestris/ol-util/dist/MeasureUtil/MeasureUtil';
 import {useMap, useOlInteraction, useOlLayer} from '@terrestris/react-util';
+import _isNil from 'lodash/isNil';
 import OlCollection from 'ol/Collection';
 import {Coordinate as OlCoordinate} from 'ol/coordinate';
 import OlFeature from 'ol/Feature';
@@ -503,8 +504,12 @@ export const MeasureButton: FC<MeasureButtonProps> = ({
     const onMapClickKey = map?.on('click', onMapClick);
 
     return () => {
-      unByKey(onDrawStartKey);
-      unByKey(onDrawEndKey);
+      if (!_isNil(onDrawStartKey)) {
+        unByKey(onDrawStartKey);
+      }
+      if (!_isNil(onDrawEndKey)) {
+        unByKey(onDrawEndKey);
+      }
       if (onMapPointerMoveKey) {
         unByKey(onMapPointerMoveKey);
       }

diff --git a/src/Field/WfsSearch/WfsSearch.example.md b/src/Field/WfsSearch/WfsSearch.example.md
diff --git a/src/Field/WfsSearch/WfsSearch.spec.tsx b/src/Field/WfsSearch/WfsSearch.spec.tsx