From 3a65f24b4b723a097f6f425acc83324fa6cfccf2 Mon Sep 17 00:00:00 2001
From: osloSperian <oslosperian@gmail.com>
Date: Fri, 15 Aug 2025 14:48:32 +0300
Subject: [PATCH] sdfojnsdf

---
 .../map/map_comp/components/popup.vue         | 61 ++++++++++++++++++-
 frontend/src/components/map/map_comp/map.vue  | 14 ++++-
 origin/index.html                             |  2 +-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/map/map_comp/components/popup.vue b/frontend/src/components/map/map_comp/components/popup.vue
index c47fc2e..90832f4 100644
--- a/frontend/src/components/map/map_comp/components/popup.vue
+++ b/frontend/src/components/map/map_comp/components/popup.vue
@@ -1,6 +1,11 @@
 <template>
-    <div class="popup" v-if="isVisible">
-        <div class="popup__content">
+    <div class="popup" v-if="isVisible" @click="handleOutsideClick">
+        <div class="popup__content" @click.stop>
+            <button class="popup__close" @click="handleClose" type="button">
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M18 6L6 18M6 6L18 18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </button>
             <slot />
         </div>
         <div class="popup__arrow"></div>
@@ -11,6 +16,22 @@
 defineProps<{
     isVisible: boolean;
 }>();
+
+const emit = defineEmits<{
+    close: [];
+}>();
+
+const handleClose = (event: Event) => {
+    event.stopPropagation();
+    emit('close');
+};
+
+const handleOutsideClick = (event: Event) => {
+    const target = event.target as HTMLElement;
+    if (!target.closest('.popup__content')) {
+        emit('close');
+    }
+};
 </script>
 
 <style scoped lang="scss">
@@ -30,6 +51,7 @@ defineProps<{
         @include boxsh(0 0 1rem rgba(0, 0, 0, 0.1));
         @include brad(0.5rem);
         @include transition(all);
+        position: relative;
 
         @include dark {
             background: #1a1a1a;
@@ -37,6 +59,41 @@ defineProps<{
         }
     }
 
+    &__close {
+        @include position(absolute);
+        top: 0.5rem;
+        right: 0.5rem;
+        @include size(2.5rem, 2.5rem);
+        @include brad(50%);
+        @include flex();
+        background: rgba(0, 0, 0, 0.15);
+        border: none;
+        cursor: pointer;
+        @include transition(all 0.2s ease);
+        color: #666;
+        z-index: 10;
+
+        &:hover {
+            background: rgba(0, 0, 0, 0.25);
+            color: #333;
+            transform: scale(1.1);
+        }
+
+        &:active {
+            transform: scale(0.95);
+        }
+
+        @include dark {
+            background: rgba(255, 255, 255, 0.15);
+            color: #ccc;
+
+            &:hover {
+                background: rgba(255, 255, 255, 0.25);
+                color: #fff;
+            }
+        }
+    }
+
     &__arrow {
         @include position(absolute);
         @include size(1rem, 1rem);
diff --git a/frontend/src/components/map/map_comp/map.vue b/frontend/src/components/map/map_comp/map.vue
index eee5039..988e315 100644
--- a/frontend/src/components/map/map_comp/map.vue
+++ b/frontend/src/components/map/map_comp/map.vue
@@ -47,7 +47,8 @@
             <Popup
               :is-visible="
                 mapStore.selectedMarkerId === (marker.properties?.uniqueKey || String(id))
-              ">
+              "
+              @close="handlePopupClose">
               <div class="popup-content" @click.stop>
                 <h3>{{ marker.properties?.name || `Точка доставки ${id + 1}` }}</h3>
                 <div class="popup-info">
@@ -151,13 +152,24 @@ const onCameraUpdate = (cameraData: any) => {
 }
 
 const handleMarkerClick = (markerId: string, marker: DeliveryMarker) => {
+  
   if (mapStore.selectedMarkerId === markerId) {
+    mapStore.resetSelection()
     return
   }
 
   mapStore.toggleMarker(markerId, marker)
 }
 
+const handlePopupClose = (event?: Event) => {
+  if (event) {
+    event.stopPropagation()
+  }
+  mapStore.resetSelection()
+}
+
+
+
 const getProviderLogo = (providerKey: string | undefined): string => {
   if (!providerKey) return '/img/providers/default.svg'
 
diff --git a/origin/index.html b/origin/index.html
index 07a699f..4dc934b 100644
--- a/origin/index.html
+++ b/origin/index.html
@@ -27,7 +27,7 @@
     const iframe = document.getElementById('deliveryIframe')
     const payload = {
       to: {
-        addressString: 'Москва'
+        addressString: 'Смоленск'
       },
       from: {
         addressString: 'г Москва, ул Нижняя Красносельская, д 35'
-- 
GitLab