fix(Polyline): fix ignoring error when uninstall maps. (#326)

uiwjs · Aug 23, 2023 · 3be817b · 3be817b · vercel · Aug 23, 2023
1 parent acb2c73
commit 3be817b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/packages/hawk-eye-control/src/useHawkEyeControl.tsx b/packages/hawk-eye-control/src/useHawkEyeControl.tsx
@@ -17,15 +17,14 @@ export function useHawkEyeControl(props = {} as UseHawkEyeControl) {
         map.addControl(instance);
         setHawkEyeControl(instance);
       });
-
-      return () => {
-        if (instance && map) {
-          map && map.removeControl(instance);
-          setHawkEyeControl(undefined);
-        }
-      };
     }
-  }, [map]);
+    return () => {
+      if (hawkEyeControl && map) {
+        map && map.removeControl(hawkEyeControl);
+        setHawkEyeControl(undefined);
+      }
+    };
+  }, [map, hawkEyeControl]);
 
   useVisiable(hawkEyeControl! as any, visiable);
   return {

diff --git a/packages/info-window/src/useInfoWindow.tsx b/packages/info-window/src/useInfoWindow.tsx
@@ -23,14 +23,14 @@ export const useInfoWindow = (props = {} as UseInfoWindow) => {
       if (isOpen) {
         instance.open(map, position || positionCenter);
       }
-      return () => {
-        if (instance) {
-          map && map.remove(instance);
-          setInfoWindow(undefined);
-        }
-      };
     }
-  }, [map]);
+    return () => {
+      if (infoWindow) {
+        map && map.remove(infoWindow);
+        setInfoWindow(undefined);
+      }
+    };
+  }, [map, infoWindow]);
 
   useEffect(() => {
     if (infoWindow) {

diff --git a/packages/polyline/src/usePolyline.tsx b/packages/polyline/src/usePolyline.tsx
@@ -17,12 +17,15 @@ export function usePolyline(props = {} as UsePolyline) {
     }
     return () => {
       if (polyline) {
-        if (AMap.v) {
+        try {
           map && map.remove(polyline);
-        } else {
-          // 暂不使用这个 API，这个不兼容 v1.4.xx，改用 map.remove API
-          map && map.removeLayer(polyline);
-        }
+        } catch (e) {}
+        // if (AMap.v) {
+        //   map && map.remove(polyline);
+        // } else {
+        //   // 暂不使用这个 API，这个不兼容 v1.4.xx，改用 map.remove API
+        //   map && map.removeLayer(polyline);
+        // }
         setPolyline(undefined);
       }
     };

diff --git a/website/src/components/SideMenu/index.tsx b/website/src/components/SideMenu/index.tsx
@@ -39,7 +39,7 @@ const Side = styled.div`
       color: #eaeaea;
       background-color: #3e3e3e;
     }
-    &:global(.active) {
+    &.active {
       text-decoration: underline;
       background: #333;
       color: #fff;