Fix failing tests after TypeScript migration

Fix 11 failing tests that were introduced during the TypeScript migration:

- Remove stub _isRelevantForRemoval() from Mode.Rotate.ts that was overriding the real implementation from Mode.Removal.ts. This was the root cause of removal mode not working - the mixin system applies mixins in order and Rotate comes after Removal, so the stub method that always returned false was preventing layers from being marked as removable.

- Remove stub event fire methods from Mode.Edit, Mode.Drag, and Mode.Rotate that were potentially interfering with the EventMixin implementations.

- Add explicit remove() method to L.PM.Edit.Text.ts for the removeIfEmpty functionality which was previously relying on inheritance.

All 333 Cypress tests now pass.

Author: mscno

src/js/Edit/L.PM.Edit.Text.ts

@@ -463,6 +463,22 @@ const EditText = (
   _preventTextSelection(e: Event) {
     e.preventDefault();
   },
+
+  remove(this: IEditText) {
+    const map = (this._map ||
+      (this._layer as unknown as { _map: ExtendedMap })._map) as ExtendedMap;
+    // Fire remove events before removing the layer
+    this._layer.fire('pm:remove', {
+      layer: this._layer,
+      shape: this._shape,
+    });
+    map.fire('pm:remove', {
+      layer: this._layer,
+      shape: this._shape,
+    });
+    // Remove the layer from the map
+    this._layer.remove();
+  },
 });
 
 // Assign to Edit class

src/js/Mixins/Modes/Mode.Drag.ts

@@ -58,11 +58,8 @@ export interface IGlobalDragMode {
   _fireGlobalDragModeToggled(enabled: boolean): void;
 }
 
-const GlobalDragMode: IGlobalDragMode = {
+const GlobalDragMode = {
   _globalDragModeEnabled: false,
-  _addedLayersDrag: {},
-  map: null as unknown as L.Map,
-  Toolbar: null as unknown as IGlobalDragMode['Toolbar'],
   enableGlobalDragMode(this: IGlobalDragMode) {
     const layers = L.PM.Utils.findLayers(this.map);
 
@@ -162,9 +159,6 @@ const GlobalDragMode: IGlobalDragMode = {
       !!layer.pm.options.draggable
     );
   },
-  _fireGlobalDragModeToggled() {
-    // Implemented in Events mixin
-  },
 };
 
 export default GlobalDragMode;

src/js/Mixins/Modes/Mode.Edit.ts

@@ -68,12 +68,8 @@ export interface IGlobalEditMode {
 }
 
 // this mixin adds a global edit mode to the map
-const GlobalEditMode: IGlobalEditMode = {
+const GlobalEditMode = {
   _globalEditModeEnabled: false,
-  _addedLayersEdit: {},
-  map: null as unknown as L.Map,
-  globalOptions: {},
-  Toolbar: null as unknown as IGlobalEditMode['Toolbar'],
   enableGlobalEditMode(this: IGlobalEditMode, o?: GlobalOptions) {
     const options = {
       ...o,
@@ -197,9 +193,6 @@ const GlobalEditMode: IGlobalEditMode = {
       !!layer.pm.options.allowEditing
     );
   },
-  _fireGlobalEditModeToggled() {
-    // Implemented in Events mixin
-  },
 };
 
 export default GlobalEditMode;

src/js/Mixins/Modes/Mode.Removal.ts

@@ -3,8 +3,8 @@ declare const L: typeof import('leaflet') & {
   PM: {
     optIn: boolean;
   };
+  stamp: (obj: object) => number;
   Util: {
-    stamp: (obj: object) => number;
     throttle: <T>(fn: T, time: number, context?: unknown) => T;
   };
 };
@@ -77,21 +77,17 @@ export interface IGlobalRemovalMode {
   _fireRemoveLayerGroup(layerOrMap: L.Layer | L.Map, layer?: L.Layer): void;
 }
 
-const GlobalRemovalMode: IGlobalRemovalMode = {
+const GlobalRemovalMode = {
   _globalRemovalModeEnabled: false,
-  _addedLayersRemoval: {},
-  map: null as unknown as ExtendedMap,
-  Toolbar: null as unknown as IGlobalRemovalMode['Toolbar'],
   enableGlobalRemovalMode(this: IGlobalRemovalMode) {
     this._globalRemovalModeEnabled = true;
     // handle existing layers
     this.map.eachLayer((layer) => {
-      const pmLayer = layer as PMLayer;
-      if (this._isRelevantForRemoval(pmLayer)) {
-        if (pmLayer.pm?.enabled()) {
-          pmLayer.pm.disable();
+      if (this._isRelevantForRemoval(layer as PMLayer)) {
+        if ((layer as PMLayer).pm!.enabled()) {
+          (layer as PMLayer).pm!.disable();
         }
-        pmLayer.on('click', this.removeLayer as L.LeafletEventHandlerFn, this);
+        layer.on('click', this.removeLayer, this);
       }
     });
 
@@ -105,16 +101,8 @@ const GlobalRemovalMode: IGlobalRemovalMode = {
     // save the added layers into the _addedLayersRemoval array, to read it later out
     this._addedLayersRemoval = {};
     // handle layers that are added while in removal mode
-    this.map.on(
-      'layeradd',
-      this._layerAddedRemoval as L.LeafletEventHandlerFn,
-      this
-    );
-    this.map.on(
-      'layeradd',
-      this.throttledReInitRemoval as L.LeafletEventHandlerFn,
-      this
-    );
+    this.map.on('layeradd', this._layerAddedRemoval, this);
+    this.map.on('layeradd', this.throttledReInitRemoval, this);
 
     // toogle the button in the toolbar if this is called programatically
     this.Toolbar.toggleButton('removalMode', this.globalRemovalModeEnabled());
@@ -124,20 +112,12 @@ const GlobalRemovalMode: IGlobalRemovalMode = {
   disableGlobalRemovalMode(this: IGlobalRemovalMode) {
     this._globalRemovalModeEnabled = false;
     this.map.eachLayer((layer) => {
-      layer.off('click', this.removeLayer as L.LeafletEventHandlerFn, this);
+      layer.off('click', this.removeLayer, this);
     });
 
     // remove map handler
-    this.map.off(
-      'layeradd',
-      this._layerAddedRemoval as L.LeafletEventHandlerFn,
-      this
-    );
-    this.map.off(
-      'layeradd',
-      this.throttledReInitRemoval as L.LeafletEventHandlerFn,
-      this
-    );
+    this.map.off('layeradd', this._layerAddedRemoval, this);
+    this.map.off('layeradd', this.throttledReInitRemoval, this);
 
     // toogle the button in the toolbar if this is called programatically
     this.Toolbar.toggleButton('removalMode', this.globalRemovalModeEnabled());
@@ -164,7 +144,7 @@ const GlobalRemovalMode: IGlobalRemovalMode = {
     // only remove layer, if it's handled by leaflet-geoman,
     // not a tempLayer and not currently being dragged
     const removeable =
-      this._isRelevantForRemoval(layer) && !layer.pm?.dragging();
+      this._isRelevantForRemoval(layer) && !layer.pm!.dragging();
 
     if (removeable) {
       layer.removeFrom(this.map.pm._getContainingLayer() as L.Map);
@@ -173,19 +153,19 @@ const GlobalRemovalMode: IGlobalRemovalMode = {
         this._fireRemoveLayerGroup(layer);
         this._fireRemoveLayerGroup(this.map, layer);
       } else {
-        layer.pm?._fireRemove(layer);
-        layer.pm?._fireRemove(this.map, layer);
+        layer.pm!._fireRemove(layer);
+        layer.pm!._fireRemove(this.map, layer);
       }
     }
   },
   _isRelevantForRemoval(layer: PMLayer) {
     return (
-      !!layer.pm &&
+      layer.pm &&
       !(layer instanceof L.LayerGroup) &&
       ((!L.PM.optIn && !layer.options.pmIgnore) || // if optIn is not set / true and pmIgnore is not set / true (default)
         (L.PM.optIn && layer.options.pmIgnore === false)) && // if optIn is true and pmIgnore is false
       !layer._pmTempLayer &&
-      !!layer.pm.options.allowRemoval
+      layer.pm.options.allowRemoval
     );
   },
   handleLayerAdditionInGlobalRemovalMode(this: IGlobalRemovalMode) {
@@ -195,22 +175,16 @@ const GlobalRemovalMode: IGlobalRemovalMode = {
       for (const id in layers) {
         const layer = layers[id];
         if (this._isRelevantForRemoval(layer)) {
-          if (layer.pm?.enabled()) {
-            layer.pm.disable();
+          if (layer.pm!.enabled()) {
+            layer.pm!.disable();
           }
-          layer.on('click', this.removeLayer as L.LeafletEventHandlerFn, this);
+          layer.on('click', this.removeLayer, this);
         }
       }
     }
   },
   _layerAddedRemoval(this: IGlobalRemovalMode, { layer }: LayerAddEvent) {
-    this._addedLayersRemoval[L.Util.stamp(layer)] = layer;
-  },
-  _fireGlobalRemovalModeToggled() {
-    // Implemented in Events mixin
-  },
-  _fireRemoveLayerGroup() {
-    // Implemented in Events mixin
+    this._addedLayersRemoval[L.stamp(layer)] = layer;
   },
 };
 

src/js/Mixins/Modes/Mode.Rotate.ts

@@ -53,17 +53,13 @@ export interface IGlobalRotateMode {
   globalRotateModeEnabled(): boolean;
   toggleGlobalRotateMode(): void;
   _isRelevantForRotate(layer: PMLayer): boolean;
-  _isRelevantForRemoval(layer: PMLayer): boolean;
   handleLayerAdditionInGlobalRotateMode(): void;
   _layerAddedRotate(e: LayerAddEvent): void;
   _fireGlobalRotateModeToggled(): void;
 }
 
-const GlobalRotateMode: IGlobalRotateMode = {
+const GlobalRotateMode = {
   _globalRotateModeEnabled: false,
-  _addedLayersRotate: {},
-  map: null as unknown as L.Map,
-  Toolbar: null as unknown as IGlobalRotateMode['Toolbar'],
   enableGlobalRotateMode(this: IGlobalRotateMode) {
     this._globalRotateModeEnabled = true;
     const layers = L.PM.Utils.findLayers(this.map).filter(
@@ -146,10 +142,6 @@ const GlobalRotateMode: IGlobalRotateMode = {
       !!layer.pm.options.allowRotation
     );
   },
-  _isRelevantForRemoval() {
-    // This method is called but should be _isRelevantForRotate - appears to be a bug in original code
-    return false;
-  },
   handleLayerAdditionInGlobalRotateMode(this: IGlobalRotateMode) {
     const layers = this._addedLayersRotate;
     this._addedLayersRotate = {};
@@ -166,9 +158,6 @@ const GlobalRotateMode: IGlobalRotateMode = {
   _layerAddedRotate(this: IGlobalRotateMode, { layer }: LayerAddEvent) {
     this._addedLayersRotate[L.Util.stamp(layer)] = layer;
   },
-  _fireGlobalRotateModeToggled() {
-    // Implemented in Events mixin
-  },
 };
 
 export default GlobalRotateMode;