Make controls selectable again; select interaction needs to be after …

…modify Fixes #12.
perliedman · Aug 27, 2022 · f0c6198 · f0c6198
1 parent 67d4f34
commit f0c6198
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/tools/EditControls.js b/src/tools/EditControls.js
@@ -80,27 +80,6 @@ export default function EditControls() {
     highlightFeatureRef,
   });
 
-  const [selectedControlId, setSelectedControlId] = useState();
-  const selectOptions = useMemo(
-    () => ({
-      style,
-      layers: (layer) => layer.getSource() === controlsSource,
-    }),
-    [style, controlsSource]
-  );
-  const selectedFeature =
-    controlsSource && selectedControlId
-      ? controlsSource
-          .getFeatures()
-          .find((feature) => feature.get("id") === selectedControlId)
-      : null;
-  useSelect(
-    map,
-    selectedFeature,
-    (feature) => setSelectedControlId(feature?.get("id")),
-    selectOptions
-  );
-
   useEffect(() => {
     if (map && controlsSource) {
       const styleFunction = (_, resolution) =>
@@ -178,6 +157,27 @@ export default function EditControls() {
     allControls,
   ]);
 
+  const [selectedControlId, setSelectedControlId] = useState();
+  const selectOptions = useMemo(
+    () => ({
+      style,
+      layers: (layer) => layer.getSource() === controlsSource,
+    }),
+    [style, controlsSource]
+  );
+  const selectedFeature =
+    controlsSource && selectedControlId
+      ? controlsSource
+          .getFeatures()
+          .find((feature) => feature.get("id") === selectedControlId)
+      : null;
+  useSelect(
+    map,
+    selectedFeature,
+    (feature) => setSelectedControlId(feature?.get("id")),
+    selectOptions
+  );
+
   useHotkeys("delete,backspace", deleteSelected, [selectedFeature]);
   useHotkeys("up", () => moveSelected(0, 1), [
     selectedFeature,