From 6cab2c076cc29a157d5c794d732276cf96d861b5 Mon Sep 17 00:00:00 2001
From: Matthew Kalinin <matthew44@mappable.world>
Date: Mon, 10 Jun 2024 16:50:03 +0300
Subject: [PATCH 1/2] Fixed adding extra child just detach

---
 src/controls/MMapGeolocationControl/index.ts         |  2 ++
 src/controls/MMapRotateControl/index.ts              | 12 ++++++------
 .../MMapRotateTiltControl/MMapRotateControl.ts       |  5 ++---
 .../MMapRotateTiltControl/MMapTiltControl.ts         |  5 ++---
 src/controls/MMapRotateTiltControl/index.ts          |  4 +---
 src/controls/MMapSearchControl/index.ts              |  1 +
 src/controls/MMapTiltControl/index.ts                |  3 ---
 src/controls/MMapZoomControl/index.ts                |  1 +
 src/markers/MMapDefaultMarker/index.ts               |  4 ++++
 src/markers/MMapPopupMarker/index.ts                 |  4 ++++
 10 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/controls/MMapGeolocationControl/index.ts b/src/controls/MMapGeolocationControl/index.ts
index 356bd5c..18bf74f 100644
--- a/src/controls/MMapGeolocationControl/index.ts
+++ b/src/controls/MMapGeolocationControl/index.ts
@@ -131,6 +131,8 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
     }
 
     protected override _onDetach() {
+        this._control.removeChild(this._button);
+        this.removeChild(this._control);
         this._unwatchThemeContext?.();
     }
 
diff --git a/src/controls/MMapRotateControl/index.ts b/src/controls/MMapRotateControl/index.ts
index 6d1da29..0e7637c 100644
--- a/src/controls/MMapRotateControl/index.ts
+++ b/src/controls/MMapRotateControl/index.ts
@@ -32,14 +32,11 @@ type DefaultProps = typeof defaultProps;
 export class MMapRotateControl extends mappable.MMapComplexEntity<MMapRotateControlProps, DefaultProps> {
     static defaultProps = defaultProps;
     static [mappable.optionsKeyVuefy] = MMapRotateControlVuefyOptions;
-    private _control!: MMapControl;
-    private _rotateControl!: InternalRotateControl;
+    private _control: MMapControl;
+    private _rotateControl: InternalRotateControl;
 
     constructor(props: MMapRotateControlProps) {
         super(props);
-    }
-
-    protected _onAttach(): void {
         this._control = new mappable.MMapControl({transparent: true});
         this._rotateControl = new InternalRotateControl(this._props);
 
@@ -64,12 +61,15 @@ export class InternalRotateControl extends mappable.MMapComplexEntity<MMapRotate
     private _startMovePosition?: Position;
     private _startAzimuth?: number;
 
-    protected _onAttach(): void {
+    constructor(props: MMapRotateControlProps) {
+        super(props);
         this._listener = new mappable.MMapListener({
             onUpdate: (event) => this._onMapUpdate(event.camera)
         });
         this.addChild(this._listener);
+    }
 
+    protected _onAttach(): void {
         this._element = document.createElement('mappable');
         this._element.textContent = 'N';
         this._element.classList.add(ROTATE_CONTROL_CLASS);
diff --git a/src/controls/MMapRotateTiltControl/MMapRotateControl.ts b/src/controls/MMapRotateTiltControl/MMapRotateControl.ts
index 0c45166..4d2b3a6 100644
--- a/src/controls/MMapRotateTiltControl/MMapRotateControl.ts
+++ b/src/controls/MMapRotateTiltControl/MMapRotateControl.ts
@@ -22,14 +22,13 @@ export class MMapRotateControl extends mappable.MMapGroupEntity<MMapRotateTiltCo
 
     constructor(props: MMapRotateTiltControlProps) {
         super(props);
-    }
-
-    protected _onAttach(): void {
         this._listener = new mappable.MMapListener({
             onUpdate: (event) => this._onMapUpdate(event.camera)
         });
         this.addChild(this._listener);
+    }
 
+    protected _onAttach(): void {
         this._element = document.createElement('mappable');
         this._element.classList.add(ROTATE_CONTROL_CLASS);
 
diff --git a/src/controls/MMapRotateTiltControl/MMapTiltControl.ts b/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
index edd9e15..2f2f281 100644
--- a/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
+++ b/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
@@ -19,14 +19,13 @@ export class MMapTiltControl extends mappable.MMapComplexEntity<MMapRotateTiltCo
 
     constructor(props: MMapRotateTiltControlProps) {
         super(props);
-    }
-
-    protected _onAttach(): void {
         this._listener = new mappable.MMapListener({
             onUpdate: (event) => this._onMapUpdate(event.camera)
         });
         this.addChild(this._listener);
+    }
 
+    protected _onAttach(): void {
         this._element = document.createElement('mappable');
         this._element.classList.add(TILT_CONTROL_CLASS);
         const {tilt, tiltRange} = this.root;
diff --git a/src/controls/MMapRotateTiltControl/index.ts b/src/controls/MMapRotateTiltControl/index.ts
index 7a3bbc1..4874fef 100644
--- a/src/controls/MMapRotateTiltControl/index.ts
+++ b/src/controls/MMapRotateTiltControl/index.ts
@@ -37,9 +37,6 @@ export class MMapRotateTiltControl extends mappable.MMapComplexEntity<MMapRotate
 
     constructor(props: MMapRotateTiltControlProps) {
         super(props);
-    }
-
-    protected _onAttach(): void {
         this._control = new mappable.MMapControl({transparent: true});
         this._rotateControl = new MMapRotateControl(this._props);
         this._tiltControl = new MMapTiltControl(this._props);
@@ -48,6 +45,7 @@ export class MMapRotateTiltControl extends mappable.MMapComplexEntity<MMapRotate
         this._control.addChild(this._rotateControl);
         this.addChild(this._control);
     }
+
     protected _onUpdate(): void {
         this._rotateControl.update(this._props);
         this._tiltControl.update(this._props);
diff --git a/src/controls/MMapSearchControl/index.ts b/src/controls/MMapSearchControl/index.ts
index 2c860ca..5747d69 100644
--- a/src/controls/MMapSearchControl/index.ts
+++ b/src/controls/MMapSearchControl/index.ts
@@ -252,6 +252,7 @@ class MMapSearchControl extends mappable.MMapComplexEntity<MMapSearchControlProp
     }
 
     protected override _onDetach(): void {
+        this._control.removeChild(this._search);
         this.removeChild(this._control);
     }
 }
diff --git a/src/controls/MMapTiltControl/index.ts b/src/controls/MMapTiltControl/index.ts
index 9b721ad..941fcc9 100644
--- a/src/controls/MMapTiltControl/index.ts
+++ b/src/controls/MMapTiltControl/index.ts
@@ -37,9 +37,6 @@ export class MMapTiltControl extends mappable.MMapComplexEntity<MMapTiltControlP
 
     constructor(props: MMapTiltControlProps) {
         super(props);
-    }
-
-    protected _onAttach(): void {
         this._control = new mappable.MMapControl({transparent: true});
         this._tiltControl = new InternalTiltControl(this._props);
 
diff --git a/src/controls/MMapZoomControl/index.ts b/src/controls/MMapZoomControl/index.ts
index eef9bdf..6d6e503 100644
--- a/src/controls/MMapZoomControl/index.ts
+++ b/src/controls/MMapZoomControl/index.ts
@@ -192,6 +192,7 @@ class MMapZoomControl extends mappable.MMapComplexEntity<MMapZoomControlProps, D
     }
 
     protected override _onDetach(): void {
+        this._control.removeChild(this._zoom);
         this.removeChild(this._control);
     }
 }
diff --git a/src/markers/MMapDefaultMarker/index.ts b/src/markers/MMapDefaultMarker/index.ts
index 6b81aa1..61807f0 100644
--- a/src/markers/MMapDefaultMarker/index.ts
+++ b/src/markers/MMapDefaultMarker/index.ts
@@ -196,6 +196,10 @@ export class MMapDefaultMarker extends mappable.MMapComplexEntity<MMapDefaultMar
         this._marker.update({...this._props, onClick: this._onMarkerClick});
     }
 
+    protected override _onDetach(): void {
+        this.removeChild(this._marker);
+    }
+
     private _createPopupMarker() {
         return new MMapPopupMarker({
             ...this._props,
diff --git a/src/markers/MMapPopupMarker/index.ts b/src/markers/MMapPopupMarker/index.ts
index e1e52f5..8b76c53 100644
--- a/src/markers/MMapPopupMarker/index.ts
+++ b/src/markers/MMapPopupMarker/index.ts
@@ -138,6 +138,10 @@ export class MMapPopupMarker extends mappable.MMapComplexEntity<MMapPopupMarkerP
         this._marker.update(this._props);
     }
 
+    protected _onDetach(): void {
+        this.removeChild(this._marker);
+    }
+
     private _updateTheme() {
         const themeCtx = this._consumeContext(mappable.ThemeContext);
         const {theme} = themeCtx;

From d2670ca0049a1cc8e273ea84c59c4c68e20d57e6 Mon Sep 17 00:00:00 2001
From: Matthew Kalinin <matthew44@mappable.world>
Date: Thu, 13 Jun 2024 15:32:26 +0300
Subject: [PATCH 2/2] fix issues

---
 src/controls/MMapZoomControl/index.ts  | 1 -
 src/markers/MMapDefaultMarker/index.ts | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/controls/MMapZoomControl/index.ts b/src/controls/MMapZoomControl/index.ts
index 6d6e503..eef9bdf 100644
--- a/src/controls/MMapZoomControl/index.ts
+++ b/src/controls/MMapZoomControl/index.ts
@@ -192,7 +192,6 @@ class MMapZoomControl extends mappable.MMapComplexEntity<MMapZoomControlProps, D
     }
 
     protected override _onDetach(): void {
-        this._control.removeChild(this._zoom);
         this.removeChild(this._control);
     }
 }
diff --git a/src/markers/MMapDefaultMarker/index.ts b/src/markers/MMapDefaultMarker/index.ts
index 61807f0..2568a4f 100644
--- a/src/markers/MMapDefaultMarker/index.ts
+++ b/src/markers/MMapDefaultMarker/index.ts
@@ -197,6 +197,9 @@ export class MMapDefaultMarker extends mappable.MMapComplexEntity<MMapDefaultMar
     }
 
     protected override _onDetach(): void {
+        if (this._popup) {
+            this.removeChild(this._popup);
+        }
         this.removeChild(this._marker);
     }