From 44e50d5530a9eb3780d75bf878dd3d1142da14ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Fri, 18 Nov 2022 18:39:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=EA=B4=80=EC=A0=9C=20?= =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=ED=81=B4=EB=A6=AD=20=ED=92=80=EB=A6=BC=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index da98ac5..48198fb 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { useEffect, useState, useLayoutEffect } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; +import { useDispatch, useSelector, shallowEqual } from 'react-redux'; import '../../../../assets/css/custom.css'; import FlightIcon from '../../../../assets/images/airplan_org.svg'; import FlightDetailIcon from '../../../../assets/images/airplan_pp.svg'; @@ -25,7 +25,8 @@ export const DronMarker = props => { state => state.controlGpState ); const { objectId, isClickObject } = useSelector( - state => state.controlMapReducer + state => state.controlMapReducer, + shallowEqual ); // const { controlGroupAuthInfo } = useSelector( // state => state.controlGroupAuthState @@ -332,6 +333,7 @@ export const DronMarker = props => { //데이터가 없는 마커를 모두 삭제 한다. const allRemoveMarkers = () => { + let isUnClick = false; if (arrMarkers && controlGpList) { arrMarkers.map(marker => { const isExists = controlGpList.find( @@ -341,8 +343,9 @@ export const DronMarker = props => { removeMarkers(marker); const arrData = arrMarkers.filter(item => item.id != marker.id); removeArrMarkers(arrData); - - // dispatch(objectUnClickAction()); + if (marker.controlId === objectId) { + dispatch(objectUnClickAction()); + } } }); arrInfos.map(info => { @@ -351,11 +354,10 @@ export const DronMarker = props => { removeInfos(info); const arrData = arrInfos.filter(item => item.id != info._id); removeArrInfos(arrData); - - // dispatch(objectUnClickAction()); } }); } + return isUnClick; }; //마커를 셋팅 한다.