From 40100537ca6f5ccc4a6956924999833c1703527c Mon Sep 17 00:00:00 2001
From: GoodZon <oleg_goodzon@mail.ru>
Date: Wed, 23 Feb 2022 21:23:03 +0200
Subject: [PATCH 1/9] Add Bootstrap 5 Theme support, remove standart css files

---
 README.md                        |  4 ++-
 bower.json                       |  6 ++--
 dist/leaflet.contextmenu.css     | 54 --------------------------------
 dist/leaflet.contextmenu.js      | 27 ++++++++--------
 dist/leaflet.contextmenu.min.css |  1 -
 dist/leaflet.contextmenu.min.js  |  4 +--
 examples/angular.html            |  9 +++---
 examples/index.html              | 11 ++++---
 package-lock.json                | 52 ++++++++++++++++++++++++++++++
 package.json                     | 16 +++++-----
 src/Map.ContextMenu.js           | 25 ++++++++-------
 src/copyright.js                 |  2 +-
 12 files changed, 106 insertions(+), 105 deletions(-)
 delete mode 100644 dist/leaflet.contextmenu.css
 delete mode 100644 dist/leaflet.contextmenu.min.css
 create mode 100644 package-lock.json

diff --git a/README.md b/README.md
index 7eca7e8..d7950c1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@
 [![npm](https://img.shields.io/npm/v/leaflet-contextmenu.svg)](https://www.npmjs.com/package/leaflet-contextmenu)
 [![Bower](https://img.shields.io/bower/v/leaflet.contextmenu.svg)](https://libraries.io/bower/Leaflet.contextmenu)
 
-A context menu for Leaflet. See the [demo](http://aratcliffe.github.io/Leaflet.contextmenu/examples/index.html).
+A context menu for Leaflet. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
+
+## Updated to use Bootstrap dropdown CSS style
 
 Now supporting Leaflet 1.0
 
diff --git a/bower.json b/bower.json
index 7d1b08d..8276496 100644
--- a/bower.json
+++ b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "leaflet.contextmenu",
-  "homepage": "https://github.com/aratcliffe/Leaflet.contextmenu",
-  "description": "A context menu for Leaflet",
-  "main": ["dist/leaflet.contextmenu.js", "dist/leaflet.contextmenu.css"],
+  "homepage": "https://github.com/gunyakov/Leaflet.contextmenu",
+  "description": "A context menu for Leaflet with Bootstrap CSS and Bootstrap Icons support",
+  "main": ["dist/leaflet.contextmenu.js"],
   "keywords": [
     "gis"
   ],
diff --git a/dist/leaflet.contextmenu.css b/dist/leaflet.contextmenu.css
deleted file mode 100644
index 0b5e2de..0000000
--- a/dist/leaflet.contextmenu.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.leaflet-contextmenu {
-    display: none;
-    box-shadow: 0 1px 7px rgba(0,0,0,0.4);
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    padding: 4px 0;
-    background-color: #fff;
-    cursor: default;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
-}
-
-.leaflet-contextmenu a.leaflet-contextmenu-item {
-    display: block;
-    color: #222;
-    font-size: 12px;
-    line-height: 20px;
-    text-decoration: none;
-    padding: 0 12px;
-    border-top: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-    cursor: default;
-    outline: none;
-}
-
-.leaflet-contextmenu a.leaflet-contextmenu-item-disabled {
-    opacity: 0.5;
-}
-
-.leaflet-contextmenu a.leaflet-contextmenu-item.over {
-    background-color: #f4f4f4;
-    border-top: 1px solid #f0f0f0;
-    border-bottom: 1px solid #f0f0f0;
-}
-
-.leaflet-contextmenu a.leaflet-contextmenu-item-disabled.over {
-    background-color: inherit;
-    border-top: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-}
-
-.leaflet-contextmenu-icon {
-    margin: 2px 8px 0 0;
-    width: 16px;
-    height: 16px;
-    float: left;
-    border: 0;
-}
-
-.leaflet-contextmenu-separator {
-    border-bottom: 1px solid #ccc;
-    margin: 5px 0;
-}
diff --git a/dist/leaflet.contextmenu.js b/dist/leaflet.contextmenu.js
index 489da87..4b58bae 100644
--- a/dist/leaflet.contextmenu.js
+++ b/dist/leaflet.contextmenu.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-
+	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
 
@@ -31,7 +31,7 @@ L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
 
     statics: {
-        BASE_CLS: 'leaflet-contextmenu'
+        BASE_CLS: 'dropdown-menu'
     },
 
     initialize: function (map) {
@@ -180,7 +180,7 @@ L.Map.ContextMenu = L.Handler.extend({
 
     setDisabled: function (item, disabled) {
         var container = this._container,
-        itemCls = L.Map.ContextMenu.BASE_CLS + '-item';
+        itemCls = 'dropdown-item';
 
         if (!isNaN(item)) {
             item = container.children[item];
@@ -188,13 +188,13 @@ L.Map.ContextMenu = L.Handler.extend({
 
         if (item && L.DomUtil.hasClass(item, itemCls)) {
             if (disabled) {
-                L.DomUtil.addClass(item, itemCls + '-disabled');
+                L.DomUtil.addClass(item, 'disabled');
                 this._map.fire('contextmenu.disableitem', {
                     contextmenu: this,
                     el: item
                 });
             } else {
-                L.DomUtil.removeClass(item, itemCls + '-disabled');
+                L.DomUtil.removeClass(item, 'disabled');
                 this._map.fire('contextmenu.enableitem', {
                     contextmenu: this,
                     el: item
@@ -222,21 +222,22 @@ L.Map.ContextMenu = L.Handler.extend({
             return this._createSeparator(container, index);
         }
 
-        var itemCls = L.Map.ContextMenu.BASE_CLS + '-item',
-            cls = options.disabled ? (itemCls + ' ' + itemCls + '-disabled') : itemCls,
-            el = this._insertElementAt('a', cls, container, index),
+        var itemCls = 'dropdown-item',
+            cls = options.disabled ? (itemCls + ' disabled') : itemCls,
+            cls = options.class ? (itemCls + ' ' + options.class) : itemCls,
+            el = this._insertElementAt('button', cls, container, index),
             callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect),
             icon = this._getIcon(options),
             iconCls = this._getIconCls(options),
             html = '';
 
         if (icon) {
-            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '-icon" src="' + icon + '"/>';
+            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '" src="' + icon + '"/>';
         } else if (iconCls) {
-            html = '<span class="' + L.Map.ContextMenu.BASE_CLS + '-icon ' + iconCls + '"></span>';
+            html = '<i class="' + iconCls + '"></i>';
         }
 
-        el.innerHTML = html + options.text;
+        el.innerHTML = html + " " + options.text;
         el.href = '#';
 
         L.DomEvent
@@ -299,7 +300,7 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _createSeparator: function (container, index) {
-        var el = this._insertElementAt('div', L.Map.ContextMenu.BASE_CLS + '-separator', container, index);
+        var el = this._insertElementAt('div', 'dropdown-divider', container, index);
 
         return {
             id: L.Util.stamp(el),
@@ -310,7 +311,7 @@ L.Map.ContextMenu = L.Handler.extend({
     _createEventHandler: function (el, func, context, hideOnSelect) {
         var me = this,
             map = this._map,
-            disabledCls = L.Map.ContextMenu.BASE_CLS + '-item-disabled',
+            disabledCls = 'disabled',
             hideOnSelect = (hideOnSelect !== undefined) ? hideOnSelect : true;
 
         return function (e) {
diff --git a/dist/leaflet.contextmenu.min.css b/dist/leaflet.contextmenu.min.css
deleted file mode 100644
index ef6c6a0..0000000
--- a/dist/leaflet.contextmenu.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.leaflet-contextmenu{display:none;box-shadow:0 1px 7px rgba(0,0,0,0.4);-webkit-border-radius:4px;border-radius:4px;padding:4px 0;background-color:#fff;cursor:default;-webkit-user-select:none;-moz-user-select:none;user-select:none}.leaflet-contextmenu a.leaflet-contextmenu-item{display:block;color:#222;font-size:12px;line-height:20px;text-decoration:none;padding:0 12px;border-top:1px solid transparent;border-bottom:1px solid transparent;cursor:default;outline:0}.leaflet-contextmenu a.leaflet-contextmenu-item-disabled{opacity:.5}.leaflet-contextmenu a.leaflet-contextmenu-item.over{background-color:#f4f4f4;border-top:1px solid #f0f0f0;border-bottom:1px solid #f0f0f0}.leaflet-contextmenu a.leaflet-contextmenu-item-disabled.over{background-color:inherit;border-top:1px solid transparent;border-bottom:1px solid transparent}.leaflet-contextmenu-icon{margin:2px 8px 0 0;width:16px;height:16px;float:left;border:0}.leaflet-contextmenu-separator{border-bottom:1px solid #ccc;margin:5px 0}
diff --git a/dist/leaflet.contextmenu.min.js b/dist/leaflet.contextmenu.min.js
index 80a8870..0c15199 100644
--- a/dist/leaflet.contextmenu.min.js
+++ b/dist/leaflet.contextmenu.min.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-
+	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
-(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(t){t.Map.mergeOptions({contextmenuItems:[]});t.Map.ContextMenu=t.Handler.extend({_touchstart:t.Browser.msPointer?"MSPointerDown":t.Browser.pointer?"pointerdown":"touchstart",statics:{BASE_CLS:"leaflet-contextmenu"},initialize:function(e){t.Handler.prototype.initialize.call(this,e);this._items=[];this._visible=false;var n=this._container=t.DomUtil.create("div",t.Map.ContextMenu.BASE_CLS,e._container);n.style.zIndex=1e4;n.style.position="absolute";if(e.options.contextmenuWidth){n.style.width=e.options.contextmenuWidth+"px"}this._createItems();t.DomEvent.on(n,"click",t.DomEvent.stop).on(n,"mousedown",t.DomEvent.stop).on(n,"dblclick",t.DomEvent.stop).on(n,"contextmenu",t.DomEvent.stop)},addHooks:function(){var e=this._map.getContainer();t.DomEvent.on(e,"mouseleave",this._hide,this).on(document,"keydown",this._onKeyDown,this);if(t.Browser.touch){t.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var e=this._map.getContainer();t.DomEvent.off(e,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(t.Browser.touch){t.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(e,n){if(e instanceof t.LatLng){e=this._map.latLngToContainerPoint(e)}this._showAtPoint(e,n)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(e){var n=this._container;if(!isNaN(e)){e=n.children[e]}if(e){this._removeItem(t.Util.stamp(e));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:e});return e}return null},removeAllItems:function(){var e=this._container.children,n;while(e.length){n=e[0];this._removeItem(t.Util.stamp(n))}return e},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(e,n){var i=this._container,o=t.Map.ContextMenu.BASE_CLS+"-item";if(!isNaN(e)){e=i.children[e]}if(e&&t.DomUtil.hasClass(e,o)){if(n){t.DomUtil.addClass(e,o+"-disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:e})}else{t.DomUtil.removeClass(e,o+"-disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:e})}}},isVisible:function(){return this._visible},_createItems:function(){var t=this._map.options.contextmenuItems,e,n,i;for(n=0,i=t.length;n<i;n++){this._items.push(this._createItem(this._container,t[n]))}},_createItem:function(e,n,i){if(n.separator||n==="-"){return this._createSeparator(e,i)}var o=t.Map.ContextMenu.BASE_CLS+"-item",s=n.disabled?o+" "+o+"-disabled":o,h=this._insertElementAt("a",s,e,i),r=this._createEventHandler(h,n.callback,n.context,n.hideOnSelect),a=this._getIcon(n),m=this._getIconCls(n),u="";if(a){u='<img class="'+t.Map.ContextMenu.BASE_CLS+'-icon" src="'+a+'"/>'}else if(m){u='<span class="'+t.Map.ContextMenu.BASE_CLS+"-icon "+m+'"></span>'}h.innerHTML=u+n.text;h.href="#";t.DomEvent.on(h,"mouseover",this._onItemMouseOver,this).on(h,"mouseout",this._onItemMouseOut,this).on(h,"mousedown",t.DomEvent.stopPropagation).on(h,"click",r);if(t.Browser.touch){t.DomEvent.on(h,this._touchstart,t.DomEvent.stopPropagation)}if(!t.Browser.pointer){t.DomEvent.on(h,"click",this._onItemMouseOut,this)}return{id:t.Util.stamp(h),el:h,callback:r}},_removeItem:function(e){var n,i,o,s,h;for(o=0,s=this._items.length;o<s;o++){n=this._items[o];if(n.id===e){i=n.el;h=n.callback;if(h){t.DomEvent.off(i,"mouseover",this._onItemMouseOver,this).off(i,"mouseover",this._onItemMouseOut,this).off(i,"mousedown",t.DomEvent.stopPropagation).off(i,"click",h);if(t.Browser.touch){t.DomEvent.off(i,this._touchstart,t.DomEvent.stopPropagation)}if(!t.Browser.pointer){t.DomEvent.on(i,"click",this._onItemMouseOut,this)}}this._container.removeChild(i);this._items.splice(o,1);return n}}return null},_createSeparator:function(e,n){var i=this._insertElementAt("div",t.Map.ContextMenu.BASE_CLS+"-separator",e,n);return{id:t.Util.stamp(i),el:i}},_createEventHandler:function(e,n,i,o){var s=this,h=this._map,r=t.Map.ContextMenu.BASE_CLS+"-item-disabled",o=o!==undefined?o:true;return function(h){if(t.DomUtil.hasClass(e,r)){return}var a=s._map,m=s._showLocation.containerPoint,u=a.containerPointToLayerPoint(m),l=a.layerPointToLatLng(u),c=s._showLocation.relatedTarget,f={containerPoint:m,layerPoint:u,latlng:l,relatedTarget:c};if(o){s._hide()}if(n){n.call(i||a,f)}s._map.fire("contextmenu.select",{contextmenu:s,el:e})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(e,n){if(this._items.length){var i=this._map,o=t.extend(n||{},{contextmenu:this});this._showLocation={containerPoint:e};if(n&&n.relatedTarget){this._showLocation.relatedTarget=n.relatedTarget}this._setPosition(e);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",o)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(e){return t.Browser.retina&&e.retinaIcon||e.icon},_getIconCls:function(e){return t.Browser.retina&&e.retinaIconCls||e.iconCls},_setPosition:function(e){var n=this._map.getSize(),i=this._container,o=this._getElementSize(i),s;if(this._map.options.contextmenuAnchor){s=t.point(this._map.options.contextmenuAnchor);e=e.add(s)}i._leaflet_pos=e;if(e.x+o.x>n.x){i.style.left="auto";i.style.right=Math.min(Math.max(n.x-e.x,0),n.x-o.x-1)+"px"}else{i.style.left=Math.max(e.x,0)+"px";i.style.right="auto"}if(e.y+o.y>n.y){i.style.top="auto";i.style.bottom=Math.min(Math.max(n.y-e.y,0),n.y-o.y-1)+"px"}else{i.style.top=Math.max(e.y,0)+"px";i.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(e){t.DomUtil.addClass(e.target||e.srcElement,"over")},_onItemMouseOut:function(e){t.DomUtil.removeClass(e.target||e.srcElement,"over")}});t.Map.addInitHook("addHandler","contextmenu",t.Map.ContextMenu);t.Mixin.ContextMenu={bindContextMenu:function(e){t.setOptions(this,e);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(e){var n,i,o,s,h;if(this._map.contextmenu){i=t.extend({relatedTarget:this},e);o=this._map.mouseEventToContainerPoint(e.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}for(s=0,h=this.options.contextmenuItems.length;s<h;s++){n=this.options.contextmenuItems[s];this._items.push(this._map.contextmenu.insertItem(n,n.index))}this._map.once("contextmenu.hide",this._hideContextMenu,this);this._map.contextmenu.showAt(o,i)}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var e=[t.Marker,t.Path],n={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},i,o,s;for(o=0,s=e.length;o<s;o++){i=e[o];if(!i.prototype.options){i.prototype.options=n}else{i.mergeOptions(n)}i.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});i.include(t.Mixin.ContextMenu)}return t.Map.ContextMenu});
\ No newline at end of file
+(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{BASE_CLS:"dropdown-menu"},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._visible=false;var e=this._container=d.DomUtil.create("div",d.Map.ContextMenu.BASE_CLS,t._container);e.style.zIndex=1e4;e.style.position="absolute";if(t.options.contextmenuWidth){e.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(e,"click",d.DomEvent.stop).on(e,"mousedown",d.DomEvent.stop).on(e,"dblclick",d.DomEvent.stop).on(e,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(t,"mouseleave",this._hide,this).on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_createItems:function(){var t=this._map.options.contextmenuItems,e,n,i;for(n=0,i=t.length;n<i;n++){this._items.push(this._createItem(this._container,t[n]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}var i="dropdown-item",o=e.disabled?i+" disabled":i,o=e.class?i+" "+e.class:i,s=this._insertElementAt("button",o,t,n),r=this._createEventHandler(s,e.callback,e.context,e.hideOnSelect),h=this._getIcon(e),a=this._getIconCls(e),m="";if(h){m='<img class="'+d.Map.ContextMenu.BASE_CLS+'" src="'+h+'"/>'}else if(a){m='<i class="'+a+'"></i>'}s.innerHTML=m+" "+e.text;s.href="#";d.DomEvent.on(s,"mouseover",this._onItemMouseOver,this).on(s,"mouseout",this._onItemMouseOut,this).on(s,"mousedown",d.DomEvent.stopPropagation).on(s,"click",r);if(d.Browser.touch){d.DomEvent.on(s,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(s,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(s),el:s,callback:r}},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(h,a,m,u){var l=this,t=this._map,c="disabled",u=u!==undefined?u:true;return function(t){if(d.DomUtil.hasClass(h,c)){return}var e=l._map,n=l._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=l._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(u){l._hide()}if(a){a.call(m||e,r)}l._map.fire("contextmenu.select",{contextmenu:l,el:h})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){d.DomUtil.addClass(t.target||t.srcElement,"over")},_onItemMouseOut:function(t){d.DomUtil.removeClass(t.target||t.srcElement,"over")}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}for(o=0,s=this.options.contextmenuItems.length;o<s;o++){e=this.options.contextmenuItems[o];this._items.push(this._map.contextmenu.insertItem(e,e.index))}this._map.once("contextmenu.hide",this._hideContextMenu,this);this._map.contextmenu.showAt(i,n)}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,i,o;for(i=0,o=t.length;i<o;i++){n=t[i];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
diff --git a/examples/angular.html b/examples/angular.html
index 1f977d0..0ac39c2 100644
--- a/examples/angular.html
+++ b/examples/angular.html
@@ -2,9 +2,8 @@
 <html ng-app="angulardemo">
   <head>
     <title>Angular Leaflet Context Menu</title>
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css"/>
-    <link rel="stylesheet" href="../dist/leaflet.contextmenu.css"/>
-    <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="" />
+    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""></script>
     <script src="../dist/leaflet.contextmenu.js"></script>
     <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js"></script>
     <script src="js/angular-leaflet-directive.min.js"></script>
@@ -33,9 +32,9 @@
 
     function showCoordinates (e) {
         alert(e.latlng);
-    }               
+    }
 
-    </script>    
+    </script>
   </head>
   <body ng-controller="BasicCenterController">
     <leaflet lf-center="auckland" defaults="defaults" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"></leaflet>
diff --git a/examples/index.html b/examples/index.html
index ecd29f6..70f74cc 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -2,12 +2,13 @@
 <html>
   <head>
     <title>Leaflet Context Menu</title>
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.2/dist/leaflet.css"/>
-    <link rel="stylesheet" href="../dist/leaflet.contextmenu.css"/>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="" />
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
   </head>
   <body>
     <div id="map" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></div>
-    <script src="https://unpkg.com/leaflet@1.0.2/dist/leaflet.js"></script>
+    <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""></script>
     <script src="../dist/leaflet.contextmenu.js"></script>
     <script>
       var map,
@@ -44,11 +45,11 @@
 		      callback: centerMap
 	      }, '-', {
 		      text: 'Zoom in',
-		      icon: 'images/zoom-in.png',
+          iconCls: "bi bi-zoom-out",
 		      callback: zoomIn
 	      }, {
 		      text: 'Zoom out',
-		      icon: 'images/zoom-out.png',
+          iconCls: "bi bi-zoom-in",
 		      callback: zoomOut
 	  }]
       });
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..e1d7be2
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,52 @@
+{
+  "name": "leaflet-contextmenu",
+  "version": "1.5.1",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "leaflet-contextmenu",
+      "version": "1.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "uglify-js": "^3.15.1"
+      },
+      "devDependencies": {
+        "uglifycss": "^0.0.25"
+      }
+    },
+    "node_modules/uglify-js": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
+      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglifycss": {
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.25.tgz",
+      "integrity": "sha1-vqcr9JeerO8TowLPR7LRrz80QZc=",
+      "dev": true,
+      "bin": {
+        "uglifycss": "uglifycss"
+      }
+    }
+  },
+  "dependencies": {
+    "uglify-js": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
+      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="
+    },
+    "uglifycss": {
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.25.tgz",
+      "integrity": "sha1-vqcr9JeerO8TowLPR7LRrz80QZc=",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index 4caeddb..8cbbac4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {
@@ -8,12 +8,12 @@
   },
   "scripts": {
     "concat": "cat src/copyright.js src/Map.ContextMenu.js src/Mixin.ContextMenu.js src/end.js > dist/leaflet.contextmenu.js",
-    "compress": "node_modules/uglify-js/bin/uglifyjs dist/leaflet.contextmenu.js -m --comments -o dist/leaflet.contextmenu.min.js; node_modules/uglifycss/uglifycss dist/leaflet.contextmenu.css > dist/leaflet.contextmenu.min.css",
+    "compress": "node_modules/uglify-js/bin/uglifyjs dist/leaflet.contextmenu.js -m --comments -o dist/leaflet.contextmenu.min.js",
     "build": "npm run concat && npm run compress"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/aratcliffe/Leaflet.contextmenu.git"
+    "url": "https://github.com/gunyakov/Leaflet.contextmenu.git"
   },
   "keywords": [
     "leaflet",
@@ -22,14 +22,14 @@
     "context",
     "menu"
   ],
-  "author": "Adam Ratcliffe",
+  "author": "Adam Ratcliffe, Oleg Gunyakov",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/aratcliffe/Leaflet.contextmenu/issues"
+    "url": "https://github.com/gunyakov/Leaflet.contextmenu/issues"
   },
-  "homepage": "https://github.com/aratcliffe/Leaflet.contextmenu",
+  "homepage": "https://github.com/gunyakov/Leaflet.contextmenu",
   "devDependencies": {
-    "uglify-js": "^2.7.4",
-    "uglifycss": "^0.0.25"
+    "uglifycss": "^0.0.25",
+    "uglify-js": "^3.15.1"
   }
 }
diff --git a/src/Map.ContextMenu.js b/src/Map.ContextMenu.js
index 5b7fb77..6036ba9 100644
--- a/src/Map.ContextMenu.js
+++ b/src/Map.ContextMenu.js
@@ -6,7 +6,7 @@ L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
 
     statics: {
-        BASE_CLS: 'leaflet-contextmenu'
+        BASE_CLS: 'dropdown-menu'
     },
 
     initialize: function (map) {
@@ -155,7 +155,7 @@ L.Map.ContextMenu = L.Handler.extend({
 
     setDisabled: function (item, disabled) {
         var container = this._container,
-        itemCls = L.Map.ContextMenu.BASE_CLS + '-item';
+        itemCls = 'dropdown-item';
 
         if (!isNaN(item)) {
             item = container.children[item];
@@ -163,13 +163,13 @@ L.Map.ContextMenu = L.Handler.extend({
 
         if (item && L.DomUtil.hasClass(item, itemCls)) {
             if (disabled) {
-                L.DomUtil.addClass(item, itemCls + '-disabled');
+                L.DomUtil.addClass(item, 'disabled');
                 this._map.fire('contextmenu.disableitem', {
                     contextmenu: this,
                     el: item
                 });
             } else {
-                L.DomUtil.removeClass(item, itemCls + '-disabled');
+                L.DomUtil.removeClass(item, 'disabled');
                 this._map.fire('contextmenu.enableitem', {
                     contextmenu: this,
                     el: item
@@ -197,21 +197,22 @@ L.Map.ContextMenu = L.Handler.extend({
             return this._createSeparator(container, index);
         }
 
-        var itemCls = L.Map.ContextMenu.BASE_CLS + '-item',
-            cls = options.disabled ? (itemCls + ' ' + itemCls + '-disabled') : itemCls,
-            el = this._insertElementAt('a', cls, container, index),
+        var itemCls = 'dropdown-item',
+            cls = options.disabled ? (itemCls + ' disabled') : itemCls,
+            cls = options.class ? (itemCls + ' ' + options.class) : itemCls,
+            el = this._insertElementAt('button', cls, container, index),
             callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect),
             icon = this._getIcon(options),
             iconCls = this._getIconCls(options),
             html = '';
 
         if (icon) {
-            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '-icon" src="' + icon + '"/>';
+            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '" src="' + icon + '"/>';
         } else if (iconCls) {
-            html = '<span class="' + L.Map.ContextMenu.BASE_CLS + '-icon ' + iconCls + '"></span>';
+            html = '<i class="' + iconCls + '"></i>';
         }
 
-        el.innerHTML = html + options.text;
+        el.innerHTML = html + " " + options.text;
         el.href = '#';
 
         L.DomEvent
@@ -274,7 +275,7 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _createSeparator: function (container, index) {
-        var el = this._insertElementAt('div', L.Map.ContextMenu.BASE_CLS + '-separator', container, index);
+        var el = this._insertElementAt('div', 'dropdown-divider', container, index);
 
         return {
             id: L.Util.stamp(el),
@@ -285,7 +286,7 @@ L.Map.ContextMenu = L.Handler.extend({
     _createEventHandler: function (el, func, context, hideOnSelect) {
         var me = this,
             map = this._map,
-            disabledCls = L.Map.ContextMenu.BASE_CLS + '-item-disabled',
+            disabledCls = 'disabled',
             hideOnSelect = (hideOnSelect !== undefined) ? hideOnSelect : true;
 
         return function (e) {
diff --git a/src/copyright.js b/src/copyright.js
index c72686e..8deab1e 100644
--- a/src/copyright.js
+++ b/src/copyright.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-
+	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
 

From 67d4602fca9dd5fd8df756e5e4bb5fbb60f1578c Mon Sep 17 00:00:00 2001
From: GoodZon <oleg_goodzon@mail.ru>
Date: Wed, 23 Feb 2022 21:34:29 +0200
Subject: [PATCH 2/9] Update readme

---
 README.md    | 6 +++---
 package.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d7950c1..0182bc5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Leaflet.contextmenu
-[![CDNJS](https://img.shields.io/cdnjs/v/leaflet-contextmenu.svg)](https://cdnjs.com/libraries/leaflet-contextmenu)
-[![npm](https://img.shields.io/npm/v/leaflet-contextmenu.svg)](https://www.npmjs.com/package/leaflet-contextmenu)
-[![Bower](https://img.shields.io/bower/v/leaflet.contextmenu.svg)](https://libraries.io/bower/Leaflet.contextmenu)
+[![CDNJS](https://img.shields.io/cdnjs/v/leaflet-contextmenu.svg)](https://cdnjs.com/libraries/leaflet-contextmenu-bootstrap)
+[![npm](https://img.shields.io/npm/v/leaflet-contextmenu.svg)](https://www.npmjs.com/package/leaflet-contextmenu-bootstrap)
+[![Bower](https://img.shields.io/bower/v/leaflet.contextmenu.svg)](https://libraries.io/bower/Leaflet.contextmenu-bootstrap)
 
 A context menu for Leaflet. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
 
diff --git a/package.json b/package.json
index 8cbbac4..ac3aa52 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "leaflet-contextmenu",
+  "name": "leaflet-contextmenu-bootstrap",
   "version": "1.5.2",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",

From 96176cdb289279c011a0b4dd768c1128e2dca6f4 Mon Sep 17 00:00:00 2001
From: GoodZon <oleg_goodzon@mail.ru>
Date: Wed, 23 Feb 2022 21:44:30 +0200
Subject: [PATCH 3/9] Readme update

---
 README.md    | 4 +---
 package.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0182bc5..3cc53bf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Leaflet.contextmenu
-[![CDNJS](https://img.shields.io/cdnjs/v/leaflet-contextmenu.svg)](https://cdnjs.com/libraries/leaflet-contextmenu-bootstrap)
-[![npm](https://img.shields.io/npm/v/leaflet-contextmenu.svg)](https://www.npmjs.com/package/leaflet-contextmenu-bootstrap)
-[![Bower](https://img.shields.io/bower/v/leaflet.contextmenu.svg)](https://libraries.io/bower/Leaflet.contextmenu-bootstrap)
+[![npm](https://img.shields.io/npm/v/leaflet-contextmenu-bootstrap.svg)](https://www.npmjs.com/package/leaflet-contextmenu-bootstrap)
 
 A context menu for Leaflet. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
 
diff --git a/package.json b/package.json
index ac3aa52..1cf63ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {

From 2c17092f4cf85e9175e9319573acb68de9d745a6 Mon Sep 17 00:00:00 2001
From: Oleg Gunyakov <oleg_goodzon@ukr.net>
Date: Wed, 3 Aug 2022 18:01:04 +0300
Subject: [PATCH 4/9] Bug with map + polygon menu dont return relatedTarget

---
 dist/leaflet.contextmenu.js     |  6 +++---
 dist/leaflet.contextmenu.min.js |  4 ++--
 package-lock.json               | 16 ++++++++--------
 package.json                    |  2 +-
 src/Map.ContextMenu.js          |  4 ++--
 src/copyright.js                |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 dist/leaflet.contextmenu.js

diff --git a/dist/leaflet.contextmenu.js b/dist/leaflet.contextmenu.js
old mode 100644
new mode 100755
index 4b58bae..e639871
--- a/dist/leaflet.contextmenu.js
+++ b/dist/leaflet.contextmenu.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
+	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
 
@@ -232,12 +232,12 @@ L.Map.ContextMenu = L.Handler.extend({
             html = '';
 
         if (icon) {
-            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '" src="' + icon + '"/>';
+            html = '<img src="' + icon + '"/>';
         } else if (iconCls) {
             html = '<i class="' + iconCls + '"></i>';
         }
 
-        el.innerHTML = html + " " + options.text;
+        el.innerHTML = html + "<span>&nbsp;" + options.text + "</span>";
         el.href = '#';
 
         L.DomEvent
diff --git a/dist/leaflet.contextmenu.min.js b/dist/leaflet.contextmenu.min.js
index 0c15199..3b90e86 100644
--- a/dist/leaflet.contextmenu.min.js
+++ b/dist/leaflet.contextmenu.min.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
+	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
-(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{BASE_CLS:"dropdown-menu"},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._visible=false;var e=this._container=d.DomUtil.create("div",d.Map.ContextMenu.BASE_CLS,t._container);e.style.zIndex=1e4;e.style.position="absolute";if(t.options.contextmenuWidth){e.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(e,"click",d.DomEvent.stop).on(e,"mousedown",d.DomEvent.stop).on(e,"dblclick",d.DomEvent.stop).on(e,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(t,"mouseleave",this._hide,this).on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_createItems:function(){var t=this._map.options.contextmenuItems,e,n,i;for(n=0,i=t.length;n<i;n++){this._items.push(this._createItem(this._container,t[n]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}var i="dropdown-item",o=e.disabled?i+" disabled":i,o=e.class?i+" "+e.class:i,s=this._insertElementAt("button",o,t,n),r=this._createEventHandler(s,e.callback,e.context,e.hideOnSelect),h=this._getIcon(e),a=this._getIconCls(e),m="";if(h){m='<img class="'+d.Map.ContextMenu.BASE_CLS+'" src="'+h+'"/>'}else if(a){m='<i class="'+a+'"></i>'}s.innerHTML=m+" "+e.text;s.href="#";d.DomEvent.on(s,"mouseover",this._onItemMouseOver,this).on(s,"mouseout",this._onItemMouseOut,this).on(s,"mousedown",d.DomEvent.stopPropagation).on(s,"click",r);if(d.Browser.touch){d.DomEvent.on(s,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(s,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(s),el:s,callback:r}},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(h,a,m,u){var l=this,t=this._map,c="disabled",u=u!==undefined?u:true;return function(t){if(d.DomUtil.hasClass(h,c)){return}var e=l._map,n=l._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=l._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(u){l._hide()}if(a){a.call(m||e,r)}l._map.fire("contextmenu.select",{contextmenu:l,el:h})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){d.DomUtil.addClass(t.target||t.srcElement,"over")},_onItemMouseOut:function(t){d.DomUtil.removeClass(t.target||t.srcElement,"over")}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}for(o=0,s=this.options.contextmenuItems.length;o<s;o++){e=this.options.contextmenuItems[o];this._items.push(this._map.contextmenu.insertItem(e,e.index))}this._map.once("contextmenu.hide",this._hideContextMenu,this);this._map.contextmenu.showAt(i,n)}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,i,o;for(i=0,o=t.length;i<o;i++){n=t[i];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
+(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{BASE_CLS:"dropdown-menu"},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._visible=false;var e=this._container=d.DomUtil.create("div",d.Map.ContextMenu.BASE_CLS,t._container);e.style.zIndex=1e4;e.style.position="absolute";if(t.options.contextmenuWidth){e.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(e,"click",d.DomEvent.stop).on(e,"mousedown",d.DomEvent.stop).on(e,"dblclick",d.DomEvent.stop).on(e,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(t,"mouseleave",this._hide,this).on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_createItems:function(){var t=this._map.options.contextmenuItems,e,n,i;for(n=0,i=t.length;n<i;n++){this._items.push(this._createItem(this._container,t[n]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}var i="dropdown-item",o=e.disabled?i+" disabled":i,o=e.class?i+" "+e.class:i,s=this._insertElementAt("button",o,t,n),r=this._createEventHandler(s,e.callback,e.context,e.hideOnSelect),h=this._getIcon(e),a=this._getIconCls(e),m="";if(h){m='<img src="'+h+'"/>'}else if(a){m='<i class="'+a+'"></i>'}s.innerHTML=m+"<span>&nbsp;"+e.text+"</span>";s.href="#";d.DomEvent.on(s,"mouseover",this._onItemMouseOver,this).on(s,"mouseout",this._onItemMouseOut,this).on(s,"mousedown",d.DomEvent.stopPropagation).on(s,"click",r);if(d.Browser.touch){d.DomEvent.on(s,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(s,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(s),el:s,callback:r}},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(h,a,m,u){var l=this,t=this._map,c="disabled",u=u!==undefined?u:true;return function(t){if(d.DomUtil.hasClass(h,c)){return}var e=l._map,n=l._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=l._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(u){l._hide()}if(a){a.call(m||e,r)}l._map.fire("contextmenu.select",{contextmenu:l,el:h})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){d.DomUtil.addClass(t.target||t.srcElement,"over")},_onItemMouseOut:function(t){d.DomUtil.removeClass(t.target||t.srcElement,"over")}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}for(o=0,s=this.options.contextmenuItems.length;o<s;o++){e=this.options.contextmenuItems[o];this._items.push(this._map.contextmenu.insertItem(e,e.index))}this._map.once("contextmenu.hide",this._hideContextMenu,this);this._map.contextmenu.showAt(i,n)}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,i,o;for(i=0,o=t.length;i<o;i++){n=t[i];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index e1d7be2..eac8657 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,15 @@
 {
-  "name": "leaflet-contextmenu",
-  "version": "1.5.1",
+  "name": "leaflet-contextmenu-bootstrap",
+  "version": "1.5.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "leaflet-contextmenu",
-      "version": "1.5.1",
+      "name": "leaflet-contextmenu-bootstrap",
+      "version": "1.5.4",
       "license": "MIT",
-      "dependencies": {
-        "uglify-js": "^3.15.1"
-      },
       "devDependencies": {
+        "uglify-js": "^3.15.1",
         "uglifycss": "^0.0.25"
       }
     },
@@ -19,6 +17,7 @@
       "version": "3.15.1",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
       "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+      "dev": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
       },
@@ -40,7 +39,8 @@
     "uglify-js": {
       "version": "3.15.1",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
-      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="
+      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+      "dev": true
     },
     "uglifycss": {
       "version": "0.0.25",
diff --git a/package.json b/package.json
index 1cf63ea..867d52e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {
diff --git a/src/Map.ContextMenu.js b/src/Map.ContextMenu.js
index 6036ba9..31f5145 100644
--- a/src/Map.ContextMenu.js
+++ b/src/Map.ContextMenu.js
@@ -207,12 +207,12 @@ L.Map.ContextMenu = L.Handler.extend({
             html = '';
 
         if (icon) {
-            html = '<img class="' + L.Map.ContextMenu.BASE_CLS + '" src="' + icon + '"/>';
+            html = '<img src="' + icon + '"/>';
         } else if (iconCls) {
             html = '<i class="' + iconCls + '"></i>';
         }
 
-        el.innerHTML = html + " " + options.text;
+        el.innerHTML = html + "<span>&nbsp;" + options.text + "</span>";
         el.href = '#';
 
         L.DomEvent
diff --git a/src/copyright.js b/src/copyright.js
index 8deab1e..3e2abe8 100644
--- a/src/copyright.js
+++ b/src/copyright.js
@@ -1,7 +1,7 @@
 /*
 	Leaflet.contextmenu, a context menu for Leaflet.
 	(c) 2015, Adam Ratcliffe, GeoSmart Maps Limited
-	(c) 2021, Oleg Gunyakov, Maptorium Tile Downloader
+	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
 

From cf1d2b227672879c5331a9493e451cfde4916f00 Mon Sep 17 00:00:00 2001
From: gunyakov <oleg_goodzon@ukr.net>
Date: Wed, 3 Aug 2022 18:41:20 +0300
Subject: [PATCH 5/9] Bug with map + polygon menu dont return relatedTarget

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3cc53bf..ae7e289 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
 # Leaflet.contextmenu
 [![npm](https://img.shields.io/npm/v/leaflet-contextmenu-bootstrap.svg)](https://www.npmjs.com/package/leaflet-contextmenu-bootstrap)
 
-A context menu for Leaflet. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
+A context menu for Leaflet based on Bootstrap dropdowns. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
 
 ## Updated to use Bootstrap dropdown CSS style
+##Find bug. When activate map menu together with polygon menu, callback functions dont receive relatedTarget object.
 
 Now supporting Leaflet 1.0
 

From cafe223c7972e8379970777248f3610285d20939 Mon Sep 17 00:00:00 2001
From: gunyakov <oleg_goodzon@ukr.net>
Date: Sat, 6 Aug 2022 14:23:27 +0300
Subject: [PATCH 6/9] V2.0.0. Multilevel bootstrap dropdowns

---
 .gitignore                      |   3 +-
 README.md                       |   3 +-
 dist/leaflet.contextmenu.js     | 166 ++++++++++++++++++++++++--------
 dist/leaflet.contextmenu.min.js |   2 +-
 examples/index.html             |  84 ++++++++++++++--
 package-lock.json               |  20 ++--
 package.json                    |   2 +-
 src/Map.ContextMenu.js          | 148 +++++++++++++++++++++-------
 src/Mixin.ContextMenu.js        |  18 ++--
 9 files changed, 345 insertions(+), 101 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c624d5..17cad93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-*.DS_Store
\ No newline at end of file
+*.DS_Store
+.npmrc
diff --git a/README.md b/README.md
index ae7e289..5c28cfc 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,10 @@
 A context menu for Leaflet based on Bootstrap dropdowns. See the [demo](http://gunyakov.github.io/Leaflet.contextmenu/examples/index.html).
 
 ## Updated to use Bootstrap dropdown CSS style
+
 ##Find bug. When activate map menu together with polygon menu, callback functions dont receive relatedTarget object.
 
-Now supporting Leaflet 1.0
+Full compatible with Leaflet 1.7.*
 
 ## Usage
 The context menu is implemented as a map interaction handler.  To use the plugin include the script and enable using the map `contextmenu` option.
diff --git a/dist/leaflet.contextmenu.js b/dist/leaflet.contextmenu.js
index e639871..405e908 100755
--- a/dist/leaflet.contextmenu.js
+++ b/dist/leaflet.contextmenu.js
@@ -31,37 +31,45 @@ L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
 
     statics: {
-        BASE_CLS: 'dropdown-menu'
+      CLS_CONTAINER: 'dropdown-menu',
+      CLS_DISABLED: 'disabled',
+      CLS_TOGGLE: 'dropdown-toggle arrow-none',
+      CLS_ELEMENT: 'dropdown',
+      CLS_INNER: 'dropdown-item',
+      CONTAINER: 'ul',
+      ELEMENT: 'li',
+      INNER: 'a',
+      ZINDEX: 10000
     },
 
     initialize: function (map) {
         L.Handler.prototype.initialize.call(this, map);
 
         this._items = [];
+
+        this._idCounter = 0;
         this._visible = false;
 
-        var container = this._container = L.DomUtil.create('div', L.Map.ContextMenu.BASE_CLS, map._container);
-        container.style.zIndex = 10000;
-        container.style.position = 'absolute';
+        this._container = this._initContainer(map._container);
 
         if (map.options.contextmenuWidth) {
-            container.style.width = map.options.contextmenuWidth + 'px';
+            this._container.style.width = map.options.contextmenuWidth + 'px';
         }
 
         this._createItems();
 
         L.DomEvent
-            .on(container, 'click', L.DomEvent.stop)
-            .on(container, 'mousedown', L.DomEvent.stop)
-            .on(container, 'dblclick', L.DomEvent.stop)
-            .on(container, 'contextmenu', L.DomEvent.stop);
+            .on(this._container, 'click', L.DomEvent.stop)
+            .on(this._container, 'mousedown', L.DomEvent.stop)
+            .on(this._container, 'dblclick', L.DomEvent.stop)
+            .on(this._container, 'contextmenu', L.DomEvent.stop);
     },
 
     addHooks: function () {
         var container = this._map.getContainer();
 
         L.DomEvent
-            .on(container, 'mouseleave', this._hide, this)
+            //.on(container, 'mouseleave', this._hide, this)
             .on(document, 'keydown', this._onKeyDown, this);
 
         if (L.Browser.touch) {
@@ -207,13 +215,21 @@ L.Map.ContextMenu = L.Handler.extend({
         return this._visible;
     },
 
-    _createItems: function () {
-        var itemOptions = this._map.options.contextmenuItems,
-            item,
+    _initContainer: function(_container, subMenu = false) {
+      var container = L.DomUtil.create(L.Map.ContextMenu.CONTAINER, L.Map.ContextMenu.CLS_CONTAINER, _container);
+      container.style.zIndex = L.Map.ContextMenu.ZINDEX;
+      //if(!subMenu) {
+        container.style.position = 'absolute';
+      //}
+      return container;
+    },
+
+    _createItems: function (itemOptions = this._map.options.contextmenuItems, container = this._container) {
+        let item,
             i, l;
 
         for (i = 0, l = itemOptions.length; i < l; i++) {
-            this._items.push(this._createItem(this._container, itemOptions[i]));
+            this._items.push(this._createItem(container, itemOptions[i]));
         }
     },
 
@@ -222,30 +238,65 @@ L.Map.ContextMenu = L.Handler.extend({
             return this._createSeparator(container, index);
         }
 
-        var itemCls = 'dropdown-item',
-            cls = options.disabled ? (itemCls + ' disabled') : itemCls,
-            cls = options.class ? (itemCls + ' ' + options.class) : itemCls,
-            el = this._insertElementAt('button', cls, container, index),
-            callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect),
-            icon = this._getIcon(options),
-            iconCls = this._getIconCls(options),
-            html = '';
+        let subMenu = false;
+        if(options.contextmenuItems) {
+          subMenu = true;
+        }
+
+        let itemCls = L.Map.ContextMenu.CLS_ELEMENT;
+        let  cls = options.disabled ? (itemCls + ' ' + L.Map.ContextMenu.CLS_DISABLED) : itemCls;
+        cls = options.class ? (itemCls + ' ' + options.class) : itemCls;
+        let el = this._insertElementAt(L.Map.ContextMenu.ELEMENT, cls, container, index);
+        this._idCounter++;
+
+        let callback = false;
+        if(!subMenu) {
+          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect);
+        }
+        let icon = this._getIcon(options);
+        let iconCls = this._getIconCls(options);
+
+        let inner = L.DomUtil.create(L.Map.ContextMenu.INNER, L.Map.ContextMenu.CLS_INNER, el);
+        inner.href = '#';
+        //inner.setAttribute('id', 'ctxMenu' + this._idCounter);
+        inner.setAttribute("role", "button");
+        inner.setAttribute("data-toggle", "dropdown");
+        inner.setAttribute("aria-haspopup", "true");
+        inner.setAttribute("aria-expanded", "false");
+
+        if(iconCls) {
+          L.DomUtil.create("i", iconCls, inner);
+        }
 
         if (icon) {
-            html = '<img src="' + icon + '"/>';
-        } else if (iconCls) {
-            html = '<i class="' + iconCls + '"></i>';
+          let iconContainer = L.DomUtil.create("img", '', inner);
+          iconContainer.src = icon;
         }
 
-        el.innerHTML = html + "<span>&nbsp;" + options.text + "</span>";
-        el.href = '#';
+        let textContainer = L.DomUtil.create("span", '', inner);
+        textContainer.innerHTML = "&nbsp;" + options.text;
 
-        L.DomEvent
-            .on(el, 'mouseover', this._onItemMouseOver, this)
-            .on(el, 'mouseout', this._onItemMouseOut, this)
+        if(subMenu) {
+          //L.DomUtil.create("div", "arrow-down", inner);
+          L.DomUtil.addClass(inner, L.Map.ContextMenu.CLS_TOGGLE);
+          if(options.contextmenuItems) {
+            let subContainer = this._initContainer(el, true);
+            //subContainer.setAttribute("aria-labelledby", 'ctxMenu' + this._idCounter);
+            this._createItems(options.contextmenuItems, subContainer);
+          }
+        }
+
+        if(!subMenu) {
+          L.DomEvent
+            //.on(el, 'mouseover', this._onItemMouseOver, this)
             .on(el, 'mousedown', L.DomEvent.stopPropagation)
+            //.on(el, 'mouseout', this._onItemMouseOut, this)
             .on(el, 'click', callback);
-
+        }
+        else {
+            L.DomEvent.on(el, 'click', this._showSubMenu, this);
+            //L.DomEvent.on(el, 'mouseout', this._hideSubMenu, this);
+        }
         if (L.Browser.touch) {
             L.DomEvent.on(el, this._touchstart, L.DomEvent.stopPropagation);
         }
@@ -262,6 +313,31 @@ L.Map.ContextMenu = L.Handler.extend({
         };
     },
 
+    _showSubMenu: function(target) {
+      let container = target.target.closest(".dropdown-menu");
+      let allSubMenu = container.querySelectorAll(".show");
+      for(i = 0; i < allSubMenu.length; i++) {
+        L.DomUtil.removeClass(allSubMenu[i], "show");
+      }
+      let subContainer = target.target.closest("li");
+      subContainer = subContainer.querySelector(".dropdown-menu");
+      if(subContainer) {
+        subContainer.style.top = "0px";
+        subContainer.style.left = container.offsetWidth + "px";
+        if(L.DomUtil.hasClass(subContainer, "show")) {
+          //L.DomUtil.removeClass(subContainer, "show");
+        }
+        else {
+          L.DomUtil.addClass(subContainer, "show");
+        }
+      }
+    },
+
+    _hideSubMenu: function(target) {
+      let subContainer = target.target.closest("li");
+      subContainer = subContainer.querySelector(".dropdown-menu");
+      L.DomUtil.removeClass(subContainer, "show");
+    },
     _removeItem: function (id) {
         var item,
             el,
@@ -366,7 +442,11 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _show: function (e) {
-        this._showAtPoint(e.containerPoint, e);
+      var subContainer = document.querySelectorAll(".show");
+      for (var i = 0; i < subContainer.length; i++) {
+        L.DomUtil.removeClass(subContainer[i], "show");
+      }
+      this._showAtPoint(e.containerPoint, e);
     },
 
     _showAtPoint: function (pt, data) {
@@ -472,11 +552,11 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _onItemMouseOver: function (e) {
-        L.DomUtil.addClass(e.target || e.srcElement, 'over');
+      //L.DomUtil.addClass(e.target || e.srcElement, 'over');
     },
 
     _onItemMouseOut: function (e) {
-        L.DomUtil.removeClass(e.target || e.srcElement, 'over');
+      //L.DomUtil.removeClass(e.target || e.srcElement, 'over');
     }
 });
 
@@ -536,18 +616,24 @@ L.Mixin.ContextMenu = {
             if (!this.options.contextmenuInheritItems) {
                 this._map.contextmenu.hideAllItems();
             }
-
-            for (i = 0, l = this.options.contextmenuItems.length; i < l; i++) {
-                itemOptions = this.options.contextmenuItems[i];
-                this._items.push(this._map.contextmenu.insertItem(itemOptions, itemOptions.index));
-            }
+            this._subMenu(this.options.contextmenuItems);
 
             this._map.once('contextmenu.hide', this._hideContextMenu, this);
-
+            var subContainer = document.querySelectorAll(".show");
+            for (var i = 0; i < subContainer.length; i++) {
+              L.DomUtil.removeClass(subContainer[i], "show");
+            }
             this._map.contextmenu.showAt(pt, data);
         }
     },
 
+    _subMenu: function(contextmenuItems) {
+      for (i = 0, l = contextmenuItems.length; i < l; i++) {
+          itemOptions = contextmenuItems[i];
+          this._items.push(this._map.contextmenu.insertItem(itemOptions, itemOptions.index));
+      }
+    },
+
     _hideContextMenu: function () {
         var i, l;
 
diff --git a/dist/leaflet.contextmenu.min.js b/dist/leaflet.contextmenu.min.js
index 3b90e86..5684fa3 100644
--- a/dist/leaflet.contextmenu.min.js
+++ b/dist/leaflet.contextmenu.min.js
@@ -4,4 +4,4 @@
 	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
-(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{BASE_CLS:"dropdown-menu"},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._visible=false;var e=this._container=d.DomUtil.create("div",d.Map.ContextMenu.BASE_CLS,t._container);e.style.zIndex=1e4;e.style.position="absolute";if(t.options.contextmenuWidth){e.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(e,"click",d.DomEvent.stop).on(e,"mousedown",d.DomEvent.stop).on(e,"dblclick",d.DomEvent.stop).on(e,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(t,"mouseleave",this._hide,this).on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_createItems:function(){var t=this._map.options.contextmenuItems,e,n,i;for(n=0,i=t.length;n<i;n++){this._items.push(this._createItem(this._container,t[n]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}var i="dropdown-item",o=e.disabled?i+" disabled":i,o=e.class?i+" "+e.class:i,s=this._insertElementAt("button",o,t,n),r=this._createEventHandler(s,e.callback,e.context,e.hideOnSelect),h=this._getIcon(e),a=this._getIconCls(e),m="";if(h){m='<img src="'+h+'"/>'}else if(a){m='<i class="'+a+'"></i>'}s.innerHTML=m+"<span>&nbsp;"+e.text+"</span>";s.href="#";d.DomEvent.on(s,"mouseover",this._onItemMouseOver,this).on(s,"mouseout",this._onItemMouseOut,this).on(s,"mousedown",d.DomEvent.stopPropagation).on(s,"click",r);if(d.Browser.touch){d.DomEvent.on(s,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(s,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(s),el:s,callback:r}},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(h,a,m,u){var l=this,t=this._map,c="disabled",u=u!==undefined?u:true;return function(t){if(d.DomUtil.hasClass(h,c)){return}var e=l._map,n=l._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=l._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(u){l._hide()}if(a){a.call(m||e,r)}l._map.fire("contextmenu.select",{contextmenu:l,el:h})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){d.DomUtil.addClass(t.target||t.srcElement,"over")},_onItemMouseOut:function(t){d.DomUtil.removeClass(t.target||t.srcElement,"over")}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}for(o=0,s=this.options.contextmenuItems.length;o<s;o++){e=this.options.contextmenuItems[o];this._items.push(this._map.contextmenu.insertItem(e,e.index))}this._map.once("contextmenu.hide",this._hideContextMenu,this);this._map.contextmenu.showAt(i,n)}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,i,o;for(i=0,o=t.length;i<o;i++){n=t[i];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
+(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{CLS_CONTAINER:"dropdown-menu",CLS_DISABLED:"disabled",CLS_TOGGLE:"dropdown-toggle arrow-none",CLS_ELEMENT:"dropdown",CLS_INNER:"dropdown-item",CONTAINER:"ul",ELEMENT:"li",INNER:"a",ZINDEX:1e4},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._idCounter=0;this._visible=false;this._container=this._initContainer(t._container);if(t.options.contextmenuWidth){this._container.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(this._container,"click",d.DomEvent.stop).on(this._container,"mousedown",d.DomEvent.stop).on(this._container,"dblclick",d.DomEvent.stop).on(this._container,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_initContainer:function(t,e=false){var n=d.DomUtil.create(d.Map.ContextMenu.CONTAINER,d.Map.ContextMenu.CLS_CONTAINER,t);n.style.zIndex=d.Map.ContextMenu.ZINDEX;n.style.position="absolute";return n},_createItems:function(t=this._map.options.contextmenuItems,e=this._container){let n,i,o;for(i=0,o=t.length;i<o;i++){this._items.push(this._createItem(e,t[i]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}let i=false;if(e.contextmenuItems){i=true}let o=d.Map.ContextMenu.CLS_ELEMENT;let s=e.disabled?o+" "+d.Map.ContextMenu.CLS_DISABLED:o;s=e.class?o+" "+e.class:o;let r=this._insertElementAt(d.Map.ContextMenu.ELEMENT,s,t,n);this._idCounter++;let a=false;if(!i){a=this._createEventHandler(r,e.callback,e.context,e.hideOnSelect)}let h=this._getIcon(e);let l=this._getIconCls(e);let m=d.DomUtil.create(d.Map.ContextMenu.INNER,d.Map.ContextMenu.CLS_INNER,r);m.href="#";m.setAttribute("role","button");m.setAttribute("data-toggle","dropdown");m.setAttribute("aria-haspopup","true");m.setAttribute("aria-expanded","false");if(l){d.DomUtil.create("i",l,m)}if(h){let t=d.DomUtil.create("img","",m);t.src=h}let u=d.DomUtil.create("span","",m);u.innerHTML="&nbsp;"+e.text;if(i){d.DomUtil.addClass(m,d.Map.ContextMenu.CLS_TOGGLE);if(e.contextmenuItems){let t=this._initContainer(r,true);this._createItems(e.contextmenuItems,t)}}if(!i){d.DomEvent.on(r,"mousedown",d.DomEvent.stopPropagation).on(r,"click",a)}else{d.DomEvent.on(r,"click",this._showSubMenu,this)}if(d.Browser.touch){d.DomEvent.on(r,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(r,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(r),el:r,callback:a}},_showSubMenu:function(t){let e=t.target.closest(".dropdown-menu");let n=e.querySelectorAll(".show");for(o=0;o<n.length;o++){d.DomUtil.removeClass(n[o],"show")}let i=t.target.closest("li");i=i.querySelector(".dropdown-menu");if(i){i.style.top="0px";i.style.left=e.offsetWidth+"px";if(d.DomUtil.hasClass(i,"show")){}else{d.DomUtil.addClass(i,"show")}}},_hideSubMenu:function(t){let e=t.target.closest("li");e=e.querySelector(".dropdown-menu");d.DomUtil.removeClass(e,"show")},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(a,h,l,m){var u=this,t=this._map,c="disabled",m=m!==undefined?m:true;return function(t){if(d.DomUtil.hasClass(a,c)){return}var e=u._map,n=u._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=u._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(m){u._hide()}if(h){h.call(l||e,r)}u._map.fire("contextmenu.select",{contextmenu:u,el:a})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){var e=document.querySelectorAll(".show");for(var n=0;n<e.length;n++){d.DomUtil.removeClass(e[n],"show")}this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){},_onItemMouseOut:function(t){}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}this._subMenu(this.options.contextmenuItems);this._map.once("contextmenu.hide",this._hideContextMenu,this);var r=document.querySelectorAll(".show");for(var o=0;o<r.length;o++){d.DomUtil.removeClass(r[o],"show")}this._map.contextmenu.showAt(i,n)}},_subMenu:function(t){for(o=0,i=t.length;o<i;o++){itemOptions=t[o];this._items.push(this._map.contextmenu.insertItem(itemOptions,itemOptions.index))}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,o,i;for(o=0,i=t.length;o<i;o++){n=t[o];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
index 70f74cc..cec8bd2 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -7,14 +7,17 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
   </head>
   <body>
-    <div id="map" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></div>
+    <div id="map" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">
+</div>
+
+    </div>
     <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""></script>
     <script src="../dist/leaflet.contextmenu.js"></script>
     <script>
       var map,
           cm,
-          ll = new L.LatLng(-36.852668, 174.762675),
-          ll2 = new L.LatLng(-36.86, 174.77);
+          ll = new L.LatLng(50.08, 36.38),
+          ll2 = new L.LatLng(50.079947, 36.398392);
 
       function showCoordinates (e) {
 	      alert(e.latlng);
@@ -36,12 +39,23 @@
 	      center: ll,
 	      zoom: 15,
 	      contextmenu: true,
-      contextmenuWidth: 140,
+        //contextmenuWidth: 240,
 	      contextmenuItems: [{
 		      text: 'Show coordinates',
-		      callback: showCoordinates
+          iconCls: "bi bi-pin-map",
+		      callback: showCoordinates,
+          contextmenuItems: [{
+    		      text: 'Coordinates sub 1',
+              iconCls: "bi bi-pin-map",
+    		      callback: showCoordinates
+            },
+            {
+    		      text: 'Coordinates sub 2',
+    		      callback: showCoordinates
+          }]
 	      }, {
 		      text: 'Center map here',
+          iconCls: "bi bi-align-center",
 		      callback: centerMap
 	      }, '-', {
 		      text: 'Zoom in',
@@ -51,7 +65,34 @@
 		      text: 'Zoom out',
           iconCls: "bi bi-zoom-in",
 		      callback: zoomOut
-	  }]
+        },
+        {
+          text: "Test of sub menu",
+          contextmenuItems: [{
+    		      text: 'Center map here sub 1',
+              iconCls: "bi bi-align-center",
+              contextmenuItems: [{
+        		      text: 'SubSub11',
+        		      callback: centerMap
+                },
+                {
+        		      text: 'SubSub21',
+                  iconCls: "bi bi-align-center",
+        		      callback: centerMap
+              }]
+            },
+            {
+    		      text: 'Center map here sub 2',
+              contextmenuItems: [{
+        		      text: 'SubSub21',
+        		      callback: centerMap
+                },
+                {
+        		      text: 'SubSub22',
+        		      callback: centerMap
+              }]
+          }]
+        }]
       });
 
 	  L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
@@ -66,6 +107,25 @@
           }, {
               separator: true,
               index: 1
+          },
+          {
+            text: "Test of sub menu marker",
+            index: 2,
+            contextmenuItems: [{
+      		      text: 'Center marker 1',
+      		      callback: centerMap
+              },
+              {
+      		      text: 'Sub',
+                contextmenuItems: [{
+          		      text: 'SubMarker1',
+          		      callback: centerMap
+                  },
+                  {
+          		      text: 'SubMarker2',
+          		      callback: centerMap
+                }]
+            }]
           }]
       }).addTo(map);
 
@@ -73,10 +133,20 @@
           contextmenu: true,
           contextmenuInheritItems: false,
           contextmenuItems: [{
-              text: 'Marker item'
+              text: 'Marker item',
+              /*contextmenuItems: [{
+        		      text: 'Center map here sub 1',
+        		      callback: centerMap
+                },
+                {
+        		      text: 'Center map here sub 2',
+        		      callback: centerMap
+              }]*/
           }]
       }).addTo(map);
 
     </script>
+
+
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
index eac8657..07fe043 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "leaflet-contextmenu-bootstrap",
-      "version": "1.5.4",
+      "version": "1.5.6",
       "license": "MIT",
       "devDependencies": {
         "uglify-js": "^3.15.1",
@@ -14,9 +14,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.15.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
-      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz",
+      "integrity": "sha512-uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw==",
       "dev": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -28,7 +28,7 @@
     "node_modules/uglifycss": {
       "version": "0.0.25",
       "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.25.tgz",
-      "integrity": "sha1-vqcr9JeerO8TowLPR7LRrz80QZc=",
+      "integrity": "sha512-MPfsrz1Cek1uby3nnPbCBjfcu4q4HxdLnWzYPShO+mHYjEO+C1PDAHH4Q7rZLImv3UF5LXOHCdoz4g32+nb5xw==",
       "dev": true,
       "bin": {
         "uglifycss": "uglifycss"
@@ -37,15 +37,15 @@
   },
   "dependencies": {
     "uglify-js": {
-      "version": "3.15.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
-      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz",
+      "integrity": "sha512-uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw==",
       "dev": true
     },
     "uglifycss": {
       "version": "0.0.25",
       "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.25.tgz",
-      "integrity": "sha1-vqcr9JeerO8TowLPR7LRrz80QZc=",
+      "integrity": "sha512-MPfsrz1Cek1uby3nnPbCBjfcu4q4HxdLnWzYPShO+mHYjEO+C1PDAHH4Q7rZLImv3UF5LXOHCdoz4g32+nb5xw==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 867d52e..1075ad0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "1.5.6",
+  "version": "2.0.0",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {
diff --git a/src/Map.ContextMenu.js b/src/Map.ContextMenu.js
index 31f5145..c40144c 100644
--- a/src/Map.ContextMenu.js
+++ b/src/Map.ContextMenu.js
@@ -6,37 +6,45 @@ L.Map.ContextMenu = L.Handler.extend({
     _touchstart: L.Browser.msPointer ? 'MSPointerDown' : L.Browser.pointer ? 'pointerdown' : 'touchstart',
 
     statics: {
-        BASE_CLS: 'dropdown-menu'
+      CLS_CONTAINER: 'dropdown-menu',
+      CLS_DISABLED: 'disabled',
+      CLS_TOGGLE: 'dropdown-toggle arrow-none',
+      CLS_ELEMENT: 'dropdown',
+      CLS_INNER: 'dropdown-item',
+      CONTAINER: 'ul',
+      ELEMENT: 'li',
+      INNER: 'a',
+      ZINDEX: 10000
     },
 
     initialize: function (map) {
         L.Handler.prototype.initialize.call(this, map);
 
         this._items = [];
+
+        this._idCounter = 0;
         this._visible = false;
 
-        var container = this._container = L.DomUtil.create('div', L.Map.ContextMenu.BASE_CLS, map._container);
-        container.style.zIndex = 10000;
-        container.style.position = 'absolute';
+        this._container = this._initContainer(map._container);
 
         if (map.options.contextmenuWidth) {
-            container.style.width = map.options.contextmenuWidth + 'px';
+            this._container.style.width = map.options.contextmenuWidth + 'px';
         }
 
         this._createItems();
 
         L.DomEvent
-            .on(container, 'click', L.DomEvent.stop)
-            .on(container, 'mousedown', L.DomEvent.stop)
-            .on(container, 'dblclick', L.DomEvent.stop)
-            .on(container, 'contextmenu', L.DomEvent.stop);
+            .on(this._container, 'click', L.DomEvent.stop)
+            .on(this._container, 'mousedown', L.DomEvent.stop)
+            .on(this._container, 'dblclick', L.DomEvent.stop)
+            .on(this._container, 'contextmenu', L.DomEvent.stop);
     },
 
     addHooks: function () {
         var container = this._map.getContainer();
 
         L.DomEvent
-            .on(container, 'mouseleave', this._hide, this)
+            //.on(container, 'mouseleave', this._hide, this)
             .on(document, 'keydown', this._onKeyDown, this);
 
         if (L.Browser.touch) {
@@ -182,13 +190,21 @@ L.Map.ContextMenu = L.Handler.extend({
         return this._visible;
     },
 
-    _createItems: function () {
-        var itemOptions = this._map.options.contextmenuItems,
-            item,
+    _initContainer: function(_container, subMenu = false) {
+      var container = L.DomUtil.create(L.Map.ContextMenu.CONTAINER, L.Map.ContextMenu.CLS_CONTAINER, _container);
+      container.style.zIndex = L.Map.ContextMenu.ZINDEX;
+      //if(!subMenu) {
+        container.style.position = 'absolute';
+      //}
+      return container;
+    },
+
+    _createItems: function (itemOptions = this._map.options.contextmenuItems, container = this._container) {
+        let item,
             i, l;
 
         for (i = 0, l = itemOptions.length; i < l; i++) {
-            this._items.push(this._createItem(this._container, itemOptions[i]));
+            this._items.push(this._createItem(container, itemOptions[i]));
         }
     },
 
@@ -197,30 +213,65 @@ L.Map.ContextMenu = L.Handler.extend({
             return this._createSeparator(container, index);
         }
 
-        var itemCls = 'dropdown-item',
-            cls = options.disabled ? (itemCls + ' disabled') : itemCls,
-            cls = options.class ? (itemCls + ' ' + options.class) : itemCls,
-            el = this._insertElementAt('button', cls, container, index),
-            callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect),
-            icon = this._getIcon(options),
-            iconCls = this._getIconCls(options),
-            html = '';
+        let subMenu = false;
+        if(options.contextmenuItems) {
+          subMenu = true;
+        }
+
+        let itemCls = L.Map.ContextMenu.CLS_ELEMENT;
+        let  cls = options.disabled ? (itemCls + ' ' + L.Map.ContextMenu.CLS_DISABLED) : itemCls;
+        cls = options.class ? (itemCls + ' ' + options.class) : itemCls;
+        let el = this._insertElementAt(L.Map.ContextMenu.ELEMENT, cls, container, index);
+        this._idCounter++;
+
+        let callback = false;
+        if(!subMenu) {
+          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect);
+        }
+        let icon = this._getIcon(options);
+        let iconCls = this._getIconCls(options);
+
+        let inner = L.DomUtil.create(L.Map.ContextMenu.INNER, L.Map.ContextMenu.CLS_INNER, el);
+        inner.href = '#';
+        //inner.setAttribute('id', 'ctxMenu' + this._idCounter);
+        inner.setAttribute("role", "button");
+        inner.setAttribute("data-toggle", "dropdown");
+        inner.setAttribute("aria-haspopup", "true");
+        inner.setAttribute("aria-expanded", "false");
+
+        if(iconCls) {
+          L.DomUtil.create("i", iconCls, inner);
+        }
 
         if (icon) {
-            html = '<img src="' + icon + '"/>';
-        } else if (iconCls) {
-            html = '<i class="' + iconCls + '"></i>';
+          let iconContainer = L.DomUtil.create("img", '', inner);
+          iconContainer.src = icon;
         }
 
-        el.innerHTML = html + "<span>&nbsp;" + options.text + "</span>";
-        el.href = '#';
+        let textContainer = L.DomUtil.create("span", '', inner);
+        textContainer.innerHTML = "&nbsp;" + options.text;
+
+        if(subMenu) {
+          //L.DomUtil.create("div", "arrow-down", inner);
+          L.DomUtil.addClass(inner, L.Map.ContextMenu.CLS_TOGGLE);
+          if(options.contextmenuItems) {
+            let subContainer = this._initContainer(el, true);
+            //subContainer.setAttribute("aria-labelledby", 'ctxMenu' + this._idCounter);
+            this._createItems(options.contextmenuItems, subContainer);
+          }
+        }
 
-        L.DomEvent
-            .on(el, 'mouseover', this._onItemMouseOver, this)
-            .on(el, 'mouseout', this._onItemMouseOut, this)
+        if(!subMenu) {
+          L.DomEvent
+            //.on(el, 'mouseover', this._onItemMouseOver, this)
             .on(el, 'mousedown', L.DomEvent.stopPropagation)
+            //.on(el, 'mouseout', this._onItemMouseOut, this)
             .on(el, 'click', callback);
-
+        }
+        else {
+            L.DomEvent.on(el, 'click', this._showSubMenu, this);
+            //L.DomEvent.on(el, 'mouseout', this._hideSubMenu, this);
+        }
         if (L.Browser.touch) {
             L.DomEvent.on(el, this._touchstart, L.DomEvent.stopPropagation);
         }
@@ -237,6 +288,31 @@ L.Map.ContextMenu = L.Handler.extend({
         };
     },
 
+    _showSubMenu: function(target) {
+      let container = target.target.closest(".dropdown-menu");
+      let allSubMenu = container.querySelectorAll(".show");
+      for(i = 0; i < allSubMenu.length; i++) {
+        L.DomUtil.removeClass(allSubMenu[i], "show");
+      }
+      let subContainer = target.target.closest("li");
+      subContainer = subContainer.querySelector(".dropdown-menu");
+      if(subContainer) {
+        subContainer.style.top = "0px";
+        subContainer.style.left = container.offsetWidth + "px";
+        if(L.DomUtil.hasClass(subContainer, "show")) {
+          //L.DomUtil.removeClass(subContainer, "show");
+        }
+        else {
+          L.DomUtil.addClass(subContainer, "show");
+        }
+      }
+    },
+
+    _hideSubMenu: function(target) {
+      let subContainer = target.target.closest("li");
+      subContainer = subContainer.querySelector(".dropdown-menu");
+      L.DomUtil.removeClass(subContainer, "show");
+    },
     _removeItem: function (id) {
         var item,
             el,
@@ -341,7 +417,11 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _show: function (e) {
-        this._showAtPoint(e.containerPoint, e);
+      var subContainer = document.querySelectorAll(".show");
+      for (var i = 0; i < subContainer.length; i++) {
+        L.DomUtil.removeClass(subContainer[i], "show");
+      }
+      this._showAtPoint(e.containerPoint, e);
     },
 
     _showAtPoint: function (pt, data) {
@@ -447,11 +527,11 @@ L.Map.ContextMenu = L.Handler.extend({
     },
 
     _onItemMouseOver: function (e) {
-        L.DomUtil.addClass(e.target || e.srcElement, 'over');
+      //L.DomUtil.addClass(e.target || e.srcElement, 'over');
     },
 
     _onItemMouseOut: function (e) {
-        L.DomUtil.removeClass(e.target || e.srcElement, 'over');
+      //L.DomUtil.removeClass(e.target || e.srcElement, 'over');
     }
 });
 
diff --git a/src/Mixin.ContextMenu.js b/src/Mixin.ContextMenu.js
index 4411b98..ae8a7e0 100644
--- a/src/Mixin.ContextMenu.js
+++ b/src/Mixin.ContextMenu.js
@@ -53,18 +53,24 @@ L.Mixin.ContextMenu = {
             if (!this.options.contextmenuInheritItems) {
                 this._map.contextmenu.hideAllItems();
             }
-
-            for (i = 0, l = this.options.contextmenuItems.length; i < l; i++) {
-                itemOptions = this.options.contextmenuItems[i];
-                this._items.push(this._map.contextmenu.insertItem(itemOptions, itemOptions.index));
-            }
+            this._subMenu(this.options.contextmenuItems);
 
             this._map.once('contextmenu.hide', this._hideContextMenu, this);
-
+            var subContainer = document.querySelectorAll(".show");
+            for (var i = 0; i < subContainer.length; i++) {
+              L.DomUtil.removeClass(subContainer[i], "show");
+            }
             this._map.contextmenu.showAt(pt, data);
         }
     },
 
+    _subMenu: function(contextmenuItems) {
+      for (i = 0, l = contextmenuItems.length; i < l; i++) {
+          itemOptions = contextmenuItems[i];
+          this._items.push(this._map.contextmenu.insertItem(itemOptions, itemOptions.index));
+      }
+    },
+
     _hideContextMenu: function () {
         var i, l;
 

From 4c359c0b88895011de6f378acfa3d5e883eb8387 Mon Sep 17 00:00:00 2001
From: gunyakov <oleg_goodzon@ukr.net>
Date: Sat, 6 Aug 2022 14:23:32 +0300
Subject: [PATCH 7/9] V2.0.0. Multilevel bootstrap dropdowns

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 5c28cfc..016a2e3 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ A context menu for Leaflet based on Bootstrap dropdowns. See the [demo](http://g
 
 ##Find bug. When activate map menu together with polygon menu, callback functions dont receive relatedTarget object.
 
+##Multi level bootstrap dropdowns supported
+
 Full compatible with Leaflet 1.7.*
 
 ## Usage

From 768454c9e203e36ab4c502b86a6c8048c78aba10 Mon Sep 17 00:00:00 2001
From: gunyakov <oleg_goodzon@ukr.net>
Date: Tue, 9 Aug 2022 16:30:40 +0300
Subject: [PATCH 8/9] relatedTarget bug

---
 dist/leaflet.contextmenu.js     | 6 ++++--
 dist/leaflet.contextmenu.min.js | 2 +-
 examples/index.html             | 2 ++
 package.json                    | 2 +-
 src/Map.ContextMenu.js          | 6 ++++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dist/leaflet.contextmenu.js b/dist/leaflet.contextmenu.js
index 405e908..e26e99e 100755
--- a/dist/leaflet.contextmenu.js
+++ b/dist/leaflet.contextmenu.js
@@ -52,6 +52,8 @@ L.Map.ContextMenu = L.Handler.extend({
 
         this._container = this._initContainer(map._container);
 
+        this._relatedTarget = false;
+
         if (map.options.contextmenuWidth) {
             this._container.style.width = map.options.contextmenuWidth + 'px';
         }
@@ -399,7 +401,7 @@ L.Map.ContextMenu = L.Handler.extend({
                 containerPoint = me._showLocation.containerPoint,
                 layerPoint = map.containerPointToLayerPoint(containerPoint),
                 latlng = map.layerPointToLatLng(layerPoint),
-                relatedTarget = me._showLocation.relatedTarget,
+                relatedTarget = me._relatedTarget,
                 data = {
                   containerPoint: containerPoint,
                   layerPoint: layerPoint,
@@ -459,7 +461,7 @@ L.Map.ContextMenu = L.Handler.extend({
             };
 
             if (data && data.relatedTarget){
-                this._showLocation.relatedTarget = data.relatedTarget;
+                this._relatedTarget = data.relatedTarget;
             }
 
             this._setPosition(pt);
diff --git a/dist/leaflet.contextmenu.min.js b/dist/leaflet.contextmenu.min.js
index 5684fa3..6ac8b05 100644
--- a/dist/leaflet.contextmenu.min.js
+++ b/dist/leaflet.contextmenu.min.js
@@ -4,4 +4,4 @@
 	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
-(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{CLS_CONTAINER:"dropdown-menu",CLS_DISABLED:"disabled",CLS_TOGGLE:"dropdown-toggle arrow-none",CLS_ELEMENT:"dropdown",CLS_INNER:"dropdown-item",CONTAINER:"ul",ELEMENT:"li",INNER:"a",ZINDEX:1e4},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._idCounter=0;this._visible=false;this._container=this._initContainer(t._container);if(t.options.contextmenuWidth){this._container.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(this._container,"click",d.DomEvent.stop).on(this._container,"mousedown",d.DomEvent.stop).on(this._container,"dblclick",d.DomEvent.stop).on(this._container,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_initContainer:function(t,e=false){var n=d.DomUtil.create(d.Map.ContextMenu.CONTAINER,d.Map.ContextMenu.CLS_CONTAINER,t);n.style.zIndex=d.Map.ContextMenu.ZINDEX;n.style.position="absolute";return n},_createItems:function(t=this._map.options.contextmenuItems,e=this._container){let n,i,o;for(i=0,o=t.length;i<o;i++){this._items.push(this._createItem(e,t[i]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}let i=false;if(e.contextmenuItems){i=true}let o=d.Map.ContextMenu.CLS_ELEMENT;let s=e.disabled?o+" "+d.Map.ContextMenu.CLS_DISABLED:o;s=e.class?o+" "+e.class:o;let r=this._insertElementAt(d.Map.ContextMenu.ELEMENT,s,t,n);this._idCounter++;let a=false;if(!i){a=this._createEventHandler(r,e.callback,e.context,e.hideOnSelect)}let h=this._getIcon(e);let l=this._getIconCls(e);let m=d.DomUtil.create(d.Map.ContextMenu.INNER,d.Map.ContextMenu.CLS_INNER,r);m.href="#";m.setAttribute("role","button");m.setAttribute("data-toggle","dropdown");m.setAttribute("aria-haspopup","true");m.setAttribute("aria-expanded","false");if(l){d.DomUtil.create("i",l,m)}if(h){let t=d.DomUtil.create("img","",m);t.src=h}let u=d.DomUtil.create("span","",m);u.innerHTML="&nbsp;"+e.text;if(i){d.DomUtil.addClass(m,d.Map.ContextMenu.CLS_TOGGLE);if(e.contextmenuItems){let t=this._initContainer(r,true);this._createItems(e.contextmenuItems,t)}}if(!i){d.DomEvent.on(r,"mousedown",d.DomEvent.stopPropagation).on(r,"click",a)}else{d.DomEvent.on(r,"click",this._showSubMenu,this)}if(d.Browser.touch){d.DomEvent.on(r,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(r,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(r),el:r,callback:a}},_showSubMenu:function(t){let e=t.target.closest(".dropdown-menu");let n=e.querySelectorAll(".show");for(o=0;o<n.length;o++){d.DomUtil.removeClass(n[o],"show")}let i=t.target.closest("li");i=i.querySelector(".dropdown-menu");if(i){i.style.top="0px";i.style.left=e.offsetWidth+"px";if(d.DomUtil.hasClass(i,"show")){}else{d.DomUtil.addClass(i,"show")}}},_hideSubMenu:function(t){let e=t.target.closest("li");e=e.querySelector(".dropdown-menu");d.DomUtil.removeClass(e,"show")},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(a,h,l,m){var u=this,t=this._map,c="disabled",m=m!==undefined?m:true;return function(t){if(d.DomUtil.hasClass(a,c)){return}var e=u._map,n=u._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=u._showLocation.relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(m){u._hide()}if(h){h.call(l||e,r)}u._map.fire("contextmenu.select",{contextmenu:u,el:a})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){var e=document.querySelectorAll(".show");for(var n=0;n<e.length;n++){d.DomUtil.removeClass(e[n],"show")}this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._showLocation.relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){},_onItemMouseOut:function(t){}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}this._subMenu(this.options.contextmenuItems);this._map.once("contextmenu.hide",this._hideContextMenu,this);var r=document.querySelectorAll(".show");for(var o=0;o<r.length;o++){d.DomUtil.removeClass(r[o],"show")}this._map.contextmenu.showAt(i,n)}},_subMenu:function(t){for(o=0,i=t.length;o<i;o++){itemOptions=t[o];this._items.push(this._map.contextmenu.insertItem(itemOptions,itemOptions.index))}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,o,i;for(o=0,i=t.length;o<i;o++){n=t[o];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
+(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{CLS_CONTAINER:"dropdown-menu",CLS_DISABLED:"disabled",CLS_TOGGLE:"dropdown-toggle arrow-none",CLS_ELEMENT:"dropdown",CLS_INNER:"dropdown-item",CONTAINER:"ul",ELEMENT:"li",INNER:"a",ZINDEX:1e4},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._idCounter=0;this._visible=false;this._container=this._initContainer(t._container);this._relatedTarget=false;if(t.options.contextmenuWidth){this._container.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(this._container,"click",d.DomEvent.stop).on(this._container,"mousedown",d.DomEvent.stop).on(this._container,"dblclick",d.DomEvent.stop).on(this._container,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_initContainer:function(t,e=false){var n=d.DomUtil.create(d.Map.ContextMenu.CONTAINER,d.Map.ContextMenu.CLS_CONTAINER,t);n.style.zIndex=d.Map.ContextMenu.ZINDEX;n.style.position="absolute";return n},_createItems:function(t=this._map.options.contextmenuItems,e=this._container){let n,i,o;for(i=0,o=t.length;i<o;i++){this._items.push(this._createItem(e,t[i]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}let i=false;if(e.contextmenuItems){i=true}let o=d.Map.ContextMenu.CLS_ELEMENT;let s=e.disabled?o+" "+d.Map.ContextMenu.CLS_DISABLED:o;s=e.class?o+" "+e.class:o;let r=this._insertElementAt(d.Map.ContextMenu.ELEMENT,s,t,n);this._idCounter++;let a=false;if(!i){a=this._createEventHandler(r,e.callback,e.context,e.hideOnSelect)}let h=this._getIcon(e);let l=this._getIconCls(e);let m=d.DomUtil.create(d.Map.ContextMenu.INNER,d.Map.ContextMenu.CLS_INNER,r);m.href="#";m.setAttribute("role","button");m.setAttribute("data-toggle","dropdown");m.setAttribute("aria-haspopup","true");m.setAttribute("aria-expanded","false");if(l){d.DomUtil.create("i",l,m)}if(h){let t=d.DomUtil.create("img","",m);t.src=h}let u=d.DomUtil.create("span","",m);u.innerHTML="&nbsp;"+e.text;if(i){d.DomUtil.addClass(m,d.Map.ContextMenu.CLS_TOGGLE);if(e.contextmenuItems){let t=this._initContainer(r,true);this._createItems(e.contextmenuItems,t)}}if(!i){d.DomEvent.on(r,"mousedown",d.DomEvent.stopPropagation).on(r,"click",a)}else{d.DomEvent.on(r,"click",this._showSubMenu,this)}if(d.Browser.touch){d.DomEvent.on(r,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(r,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(r),el:r,callback:a}},_showSubMenu:function(t){let e=t.target.closest(".dropdown-menu");let n=e.querySelectorAll(".show");for(o=0;o<n.length;o++){d.DomUtil.removeClass(n[o],"show")}let i=t.target.closest("li");i=i.querySelector(".dropdown-menu");if(i){i.style.top="0px";i.style.left=e.offsetWidth+"px";if(d.DomUtil.hasClass(i,"show")){}else{d.DomUtil.addClass(i,"show")}}},_hideSubMenu:function(t){let e=t.target.closest("li");e=e.querySelector(".dropdown-menu");d.DomUtil.removeClass(e,"show")},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(a,h,l,m){var u=this,t=this._map,c="disabled",m=m!==undefined?m:true;return function(t){if(d.DomUtil.hasClass(a,c)){return}var e=u._map,n=u._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=u._relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(m){u._hide()}if(h){h.call(l||e,r)}u._map.fire("contextmenu.select",{contextmenu:u,el:a})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){var e=document.querySelectorAll(".show");for(var n=0;n<e.length;n++){d.DomUtil.removeClass(e[n],"show")}this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){},_onItemMouseOut:function(t){}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}this._subMenu(this.options.contextmenuItems);this._map.once("contextmenu.hide",this._hideContextMenu,this);var r=document.querySelectorAll(".show");for(var o=0;o<r.length;o++){d.DomUtil.removeClass(r[o],"show")}this._map.contextmenu.showAt(i,n)}},_subMenu:function(t){for(o=0,i=t.length;o<i;o++){itemOptions=t[o];this._items.push(this._map.contextmenu.insertItem(itemOptions,itemOptions.index))}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,o,i;for(o=0,i=t.length;o<i;o++){n=t[o];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
index cec8bd2..7e34df7 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -20,10 +20,12 @@
           ll2 = new L.LatLng(50.079947, 36.398392);
 
       function showCoordinates (e) {
+        console.log(e.relatedTarget);
 	      alert(e.latlng);
       }
 
       function centerMap (e) {
+        console.log(e.relatedTarget);
 	      map.panTo(e.latlng);
       }
 
diff --git a/package.json b/package.json
index 1075ad0..d802b40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {
diff --git a/src/Map.ContextMenu.js b/src/Map.ContextMenu.js
index c40144c..cf60284 100644
--- a/src/Map.ContextMenu.js
+++ b/src/Map.ContextMenu.js
@@ -27,6 +27,8 @@ L.Map.ContextMenu = L.Handler.extend({
 
         this._container = this._initContainer(map._container);
 
+        this._relatedTarget = false;
+
         if (map.options.contextmenuWidth) {
             this._container.style.width = map.options.contextmenuWidth + 'px';
         }
@@ -374,7 +376,7 @@ L.Map.ContextMenu = L.Handler.extend({
                 containerPoint = me._showLocation.containerPoint,
                 layerPoint = map.containerPointToLayerPoint(containerPoint),
                 latlng = map.layerPointToLatLng(layerPoint),
-                relatedTarget = me._showLocation.relatedTarget,
+                relatedTarget = me._relatedTarget,
                 data = {
                   containerPoint: containerPoint,
                   layerPoint: layerPoint,
@@ -434,7 +436,7 @@ L.Map.ContextMenu = L.Handler.extend({
             };
 
             if (data && data.relatedTarget){
-                this._showLocation.relatedTarget = data.relatedTarget;
+                this._relatedTarget = data.relatedTarget;
             }
 
             this._setPosition(pt);

From a054c0d59ea9ba6cf87cccd14670f4be0dfa949b Mon Sep 17 00:00:00 2001
From: gunyakov <oleg_goodzon@ukr.net>
Date: Tue, 9 Aug 2022 22:39:56 +0300
Subject: [PATCH 9/9] Add data to send in callback function

---
 README.md                       |  1 +
 dist/leaflet.contextmenu.js     |  7 ++++---
 dist/leaflet.contextmenu.min.js |  2 +-
 examples/index.html             | 10 ++++++++--
 package.json                    |  2 +-
 src/Map.ContextMenu.js          |  7 ++++---
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 016a2e3..f9d7bd2 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ L.marker(ll, {
 | retinaIconCls | String | `undefined` | A CSS class which sets the background image for a retina version of the icon (exclusive of the `retinaIcon` option).
 | callback | Function | `undefined` | A callback function to be invoked when the menu item is clicked. The callback is passed an object with properties identifying the location the menu was opened at: `latlng`, `layerPoint` and `containerPoint`.
 | context | Object | The map | The scope the callback will be executed in.
+| data| Any | `undefined` | Data whitch be sended to callback function.
 | disabled | Bool | `false` | If `true` the menu item will initially be in a disabled state and will not respond to click events.
 | separator | Bool | `undefined` | If `true` a separator will be created instead of a menu item.
 | hideOnSelect | Bool | `true` | If `true` the context menu will be automatically hidden when a menu item is selected
diff --git a/dist/leaflet.contextmenu.js b/dist/leaflet.contextmenu.js
index e26e99e..a90357d 100755
--- a/dist/leaflet.contextmenu.js
+++ b/dist/leaflet.contextmenu.js
@@ -253,7 +253,7 @@ L.Map.ContextMenu = L.Handler.extend({
 
         let callback = false;
         if(!subMenu) {
-          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect);
+          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect, options.data);
         }
         let icon = this._getIcon(options);
         let iconCls = this._getIconCls(options);
@@ -386,7 +386,7 @@ L.Map.ContextMenu = L.Handler.extend({
         };
     },
 
-    _createEventHandler: function (el, func, context, hideOnSelect) {
+    _createEventHandler: function (el, func, context, hideOnSelect, itemData) {
         var me = this,
             map = this._map,
             disabledCls = 'disabled',
@@ -406,7 +406,8 @@ L.Map.ContextMenu = L.Handler.extend({
                   containerPoint: containerPoint,
                   layerPoint: layerPoint,
                   latlng: latlng,
-                  relatedTarget: relatedTarget
+                  relatedTarget: relatedTarget,
+                  data: itemData
                 };
 
             if (hideOnSelect) {
diff --git a/dist/leaflet.contextmenu.min.js b/dist/leaflet.contextmenu.min.js
index 6ac8b05..47c610d 100644
--- a/dist/leaflet.contextmenu.min.js
+++ b/dist/leaflet.contextmenu.min.js
@@ -4,4 +4,4 @@
 	(c) 2021-2022, Oleg Gunyakov, Maptorium Tile Downloader
 	@preserve
 */
-(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(d){d.Map.mergeOptions({contextmenuItems:[]});d.Map.ContextMenu=d.Handler.extend({_touchstart:d.Browser.msPointer?"MSPointerDown":d.Browser.pointer?"pointerdown":"touchstart",statics:{CLS_CONTAINER:"dropdown-menu",CLS_DISABLED:"disabled",CLS_TOGGLE:"dropdown-toggle arrow-none",CLS_ELEMENT:"dropdown",CLS_INNER:"dropdown-item",CONTAINER:"ul",ELEMENT:"li",INNER:"a",ZINDEX:1e4},initialize:function(t){d.Handler.prototype.initialize.call(this,t);this._items=[];this._idCounter=0;this._visible=false;this._container=this._initContainer(t._container);this._relatedTarget=false;if(t.options.contextmenuWidth){this._container.style.width=t.options.contextmenuWidth+"px"}this._createItems();d.DomEvent.on(this._container,"click",d.DomEvent.stop).on(this._container,"mousedown",d.DomEvent.stop).on(this._container,"dblclick",d.DomEvent.stop).on(this._container,"contextmenu",d.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();d.DomEvent.on(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();d.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(d.Browser.touch){d.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof d.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(d.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(d.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&d.DomUtil.hasClass(t,i)){if(e){d.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{d.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_initContainer:function(t,e=false){var n=d.DomUtil.create(d.Map.ContextMenu.CONTAINER,d.Map.ContextMenu.CLS_CONTAINER,t);n.style.zIndex=d.Map.ContextMenu.ZINDEX;n.style.position="absolute";return n},_createItems:function(t=this._map.options.contextmenuItems,e=this._container){let n,i,o;for(i=0,o=t.length;i<o;i++){this._items.push(this._createItem(e,t[i]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}let i=false;if(e.contextmenuItems){i=true}let o=d.Map.ContextMenu.CLS_ELEMENT;let s=e.disabled?o+" "+d.Map.ContextMenu.CLS_DISABLED:o;s=e.class?o+" "+e.class:o;let r=this._insertElementAt(d.Map.ContextMenu.ELEMENT,s,t,n);this._idCounter++;let a=false;if(!i){a=this._createEventHandler(r,e.callback,e.context,e.hideOnSelect)}let h=this._getIcon(e);let l=this._getIconCls(e);let m=d.DomUtil.create(d.Map.ContextMenu.INNER,d.Map.ContextMenu.CLS_INNER,r);m.href="#";m.setAttribute("role","button");m.setAttribute("data-toggle","dropdown");m.setAttribute("aria-haspopup","true");m.setAttribute("aria-expanded","false");if(l){d.DomUtil.create("i",l,m)}if(h){let t=d.DomUtil.create("img","",m);t.src=h}let u=d.DomUtil.create("span","",m);u.innerHTML="&nbsp;"+e.text;if(i){d.DomUtil.addClass(m,d.Map.ContextMenu.CLS_TOGGLE);if(e.contextmenuItems){let t=this._initContainer(r,true);this._createItems(e.contextmenuItems,t)}}if(!i){d.DomEvent.on(r,"mousedown",d.DomEvent.stopPropagation).on(r,"click",a)}else{d.DomEvent.on(r,"click",this._showSubMenu,this)}if(d.Browser.touch){d.DomEvent.on(r,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(r,"click",this._onItemMouseOut,this)}return{id:d.Util.stamp(r),el:r,callback:a}},_showSubMenu:function(t){let e=t.target.closest(".dropdown-menu");let n=e.querySelectorAll(".show");for(o=0;o<n.length;o++){d.DomUtil.removeClass(n[o],"show")}let i=t.target.closest("li");i=i.querySelector(".dropdown-menu");if(i){i.style.top="0px";i.style.left=e.offsetWidth+"px";if(d.DomUtil.hasClass(i,"show")){}else{d.DomUtil.addClass(i,"show")}}},_hideSubMenu:function(t){let e=t.target.closest("li");e=e.querySelector(".dropdown-menu");d.DomUtil.removeClass(e,"show")},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){d.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",d.DomEvent.stopPropagation).off(n,"click",s);if(d.Browser.touch){d.DomEvent.off(n,this._touchstart,d.DomEvent.stopPropagation)}if(!d.Browser.pointer){d.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:d.Util.stamp(n),el:n}},_createEventHandler:function(a,h,l,m){var u=this,t=this._map,c="disabled",m=m!==undefined?m:true;return function(t){if(d.DomUtil.hasClass(a,c)){return}var e=u._map,n=u._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=u._relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s};if(m){u._hide()}if(h){h.call(l||e,r)}u._map.fire("contextmenu.select",{contextmenu:u,el:a})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){var e=document.querySelectorAll(".show");for(var n=0;n<e.length;n++){d.DomUtil.removeClass(e[n],"show")}this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=d.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return d.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return d.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=d.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){},_onItemMouseOut:function(t){}});d.Map.addInitHook("addHandler","contextmenu",d.Map.ContextMenu);d.Mixin.ContextMenu={bindContextMenu:function(t){d.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=d.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}this._subMenu(this.options.contextmenuItems);this._map.once("contextmenu.hide",this._hideContextMenu,this);var r=document.querySelectorAll(".show");for(var o=0;o<r.length;o++){d.DomUtil.removeClass(r[o],"show")}this._map.contextmenu.showAt(i,n)}},_subMenu:function(t){for(o=0,i=t.length;o<i;o++){itemOptions=t[o];this._items.push(this._map.contextmenu.insertItem(itemOptions,itemOptions.index))}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[d.Marker,d.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,o,i;for(o=0,i=t.length;o<i;o++){n=t[o];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(d.Mixin.ContextMenu)}return d.Map.ContextMenu});
\ No newline at end of file
+(function(t){var e;if(typeof define==="function"&&define.amd){define(["leaflet"],t)}else if(typeof module==="object"&&typeof module.exports==="object"){e=require("leaflet");module.exports=t(e)}else{if(typeof window.L==="undefined"){throw new Error("Leaflet must be loaded first")}t(window.L)}})(function(f){f.Map.mergeOptions({contextmenuItems:[]});f.Map.ContextMenu=f.Handler.extend({_touchstart:f.Browser.msPointer?"MSPointerDown":f.Browser.pointer?"pointerdown":"touchstart",statics:{CLS_CONTAINER:"dropdown-menu",CLS_DISABLED:"disabled",CLS_TOGGLE:"dropdown-toggle arrow-none",CLS_ELEMENT:"dropdown",CLS_INNER:"dropdown-item",CONTAINER:"ul",ELEMENT:"li",INNER:"a",ZINDEX:1e4},initialize:function(t){f.Handler.prototype.initialize.call(this,t);this._items=[];this._idCounter=0;this._visible=false;this._container=this._initContainer(t._container);this._relatedTarget=false;if(t.options.contextmenuWidth){this._container.style.width=t.options.contextmenuWidth+"px"}this._createItems();f.DomEvent.on(this._container,"click",f.DomEvent.stop).on(this._container,"mousedown",f.DomEvent.stop).on(this._container,"dblclick",f.DomEvent.stop).on(this._container,"contextmenu",f.DomEvent.stop)},addHooks:function(){var t=this._map.getContainer();f.DomEvent.on(document,"keydown",this._onKeyDown,this);if(f.Browser.touch){f.DomEvent.on(document,this._touchstart,this._hide,this)}this._map.on({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},removeHooks:function(){var t=this._map.getContainer();f.DomEvent.off(t,"mouseleave",this._hide,this).off(document,"keydown",this._onKeyDown,this);if(f.Browser.touch){f.DomEvent.off(document,this._touchstart,this._hide,this)}this._map.off({contextmenu:this._show,mousedown:this._hide,zoomstart:this._hide},this)},showAt:function(t,e){if(t instanceof f.LatLng){t=this._map.latLngToContainerPoint(t)}this._showAtPoint(t,e)},hide:function(){this._hide()},addItem:function(t){return this.insertItem(t)},insertItem:function(t,e){e=e!==undefined?e:this._items.length;var n=this._createItem(this._container,t,e);this._items.push(n);this._sizeChanged=true;this._map.fire("contextmenu.additem",{contextmenu:this,el:n.el,index:e});return n.el},removeItem:function(t){var e=this._container;if(!isNaN(t)){t=e.children[t]}if(t){this._removeItem(f.Util.stamp(t));this._sizeChanged=true;this._map.fire("contextmenu.removeitem",{contextmenu:this,el:t});return t}return null},removeAllItems:function(){var t=this._container.children,e;while(t.length){e=t[0];this._removeItem(f.Util.stamp(e))}return t},hideAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display="none"}},showAllItems:function(){var t,e,n;for(e=0,n=this._items.length;e<n;e++){t=this._items[e];t.el.style.display=""}},setDisabled:function(t,e){var n=this._container,i="dropdown-item";if(!isNaN(t)){t=n.children[t]}if(t&&f.DomUtil.hasClass(t,i)){if(e){f.DomUtil.addClass(t,"disabled");this._map.fire("contextmenu.disableitem",{contextmenu:this,el:t})}else{f.DomUtil.removeClass(t,"disabled");this._map.fire("contextmenu.enableitem",{contextmenu:this,el:t})}}},isVisible:function(){return this._visible},_initContainer:function(t,e=false){var n=f.DomUtil.create(f.Map.ContextMenu.CONTAINER,f.Map.ContextMenu.CLS_CONTAINER,t);n.style.zIndex=f.Map.ContextMenu.ZINDEX;n.style.position="absolute";return n},_createItems:function(t=this._map.options.contextmenuItems,e=this._container){let n,i,o;for(i=0,o=t.length;i<o;i++){this._items.push(this._createItem(e,t[i]))}},_createItem:function(t,e,n){if(e.separator||e==="-"){return this._createSeparator(t,n)}let i=false;if(e.contextmenuItems){i=true}let o=f.Map.ContextMenu.CLS_ELEMENT;let s=e.disabled?o+" "+f.Map.ContextMenu.CLS_DISABLED:o;s=e.class?o+" "+e.class:o;let r=this._insertElementAt(f.Map.ContextMenu.ELEMENT,s,t,n);this._idCounter++;let a=false;if(!i){a=this._createEventHandler(r,e.callback,e.context,e.hideOnSelect,e.data)}let h=this._getIcon(e);let l=this._getIconCls(e);let m=f.DomUtil.create(f.Map.ContextMenu.INNER,f.Map.ContextMenu.CLS_INNER,r);m.href="#";m.setAttribute("role","button");m.setAttribute("data-toggle","dropdown");m.setAttribute("aria-haspopup","true");m.setAttribute("aria-expanded","false");if(l){f.DomUtil.create("i",l,m)}if(h){let t=f.DomUtil.create("img","",m);t.src=h}let u=f.DomUtil.create("span","",m);u.innerHTML="&nbsp;"+e.text;if(i){f.DomUtil.addClass(m,f.Map.ContextMenu.CLS_TOGGLE);if(e.contextmenuItems){let t=this._initContainer(r,true);this._createItems(e.contextmenuItems,t)}}if(!i){f.DomEvent.on(r,"mousedown",f.DomEvent.stopPropagation).on(r,"click",a)}else{f.DomEvent.on(r,"click",this._showSubMenu,this)}if(f.Browser.touch){f.DomEvent.on(r,this._touchstart,f.DomEvent.stopPropagation)}if(!f.Browser.pointer){f.DomEvent.on(r,"click",this._onItemMouseOut,this)}return{id:f.Util.stamp(r),el:r,callback:a}},_showSubMenu:function(t){let e=t.target.closest(".dropdown-menu");let n=e.querySelectorAll(".show");for(o=0;o<n.length;o++){f.DomUtil.removeClass(n[o],"show")}let i=t.target.closest("li");i=i.querySelector(".dropdown-menu");if(i){i.style.top="0px";i.style.left=e.offsetWidth+"px";if(f.DomUtil.hasClass(i,"show")){}else{f.DomUtil.addClass(i,"show")}}},_hideSubMenu:function(t){let e=t.target.closest("li");e=e.querySelector(".dropdown-menu");f.DomUtil.removeClass(e,"show")},_removeItem:function(t){var e,n,i,o,s;for(i=0,o=this._items.length;i<o;i++){e=this._items[i];if(e.id===t){n=e.el;s=e.callback;if(s){f.DomEvent.off(n,"mouseover",this._onItemMouseOver,this).off(n,"mouseover",this._onItemMouseOut,this).off(n,"mousedown",f.DomEvent.stopPropagation).off(n,"click",s);if(f.Browser.touch){f.DomEvent.off(n,this._touchstart,f.DomEvent.stopPropagation)}if(!f.Browser.pointer){f.DomEvent.on(n,"click",this._onItemMouseOut,this)}}this._container.removeChild(n);this._items.splice(i,1);return e}}return null},_createSeparator:function(t,e){var n=this._insertElementAt("div","dropdown-divider",t,e);return{id:f.Util.stamp(n),el:n}},_createEventHandler:function(a,h,l,m,u){var c=this,t=this._map,d="disabled",m=m!==undefined?m:true;return function(t){if(f.DomUtil.hasClass(a,d)){return}var e=c._map,n=c._showLocation.containerPoint,i=e.containerPointToLayerPoint(n),o=e.layerPointToLatLng(i),s=c._relatedTarget,r={containerPoint:n,layerPoint:i,latlng:o,relatedTarget:s,data:u};if(m){c._hide()}if(h){h.call(l||e,r)}c._map.fire("contextmenu.select",{contextmenu:c,el:a})}},_insertElementAt:function(t,e,n,i){var o,s=document.createElement(t);s.className=e;if(i!==undefined){o=n.children[i]}if(o){n.insertBefore(s,o)}else{n.appendChild(s)}return s},_show:function(t){var e=document.querySelectorAll(".show");for(var n=0;n<e.length;n++){f.DomUtil.removeClass(e[n],"show")}this._showAtPoint(t.containerPoint,t)},_showAtPoint:function(t,e){if(this._items.length){var n=this._map,i=f.extend(e||{},{contextmenu:this});this._showLocation={containerPoint:t};if(e&&e.relatedTarget){this._relatedTarget=e.relatedTarget}this._setPosition(t);if(!this._visible){this._container.style.display="block";this._visible=true}this._map.fire("contextmenu.show",i)}},_hide:function(){if(this._visible){this._visible=false;this._container.style.display="none";this._map.fire("contextmenu.hide",{contextmenu:this})}},_getIcon:function(t){return f.Browser.retina&&t.retinaIcon||t.icon},_getIconCls:function(t){return f.Browser.retina&&t.retinaIconCls||t.iconCls},_setPosition:function(t){var e=this._map.getSize(),n=this._container,i=this._getElementSize(n),o;if(this._map.options.contextmenuAnchor){o=f.point(this._map.options.contextmenuAnchor);t=t.add(o)}n._leaflet_pos=t;if(t.x+i.x>e.x){n.style.left="auto";n.style.right=Math.min(Math.max(e.x-t.x,0),e.x-i.x-1)+"px"}else{n.style.left=Math.max(t.x,0)+"px";n.style.right="auto"}if(t.y+i.y>e.y){n.style.top="auto";n.style.bottom=Math.min(Math.max(e.y-t.y,0),e.y-i.y-1)+"px"}else{n.style.top=Math.max(t.y,0)+"px";n.style.bottom="auto"}},_getElementSize:function(t){var e=this._size,n=t.style.display;if(!e||this._sizeChanged){e={};t.style.left="-999999px";t.style.right="auto";t.style.display="block";e.x=t.offsetWidth;e.y=t.offsetHeight;t.style.left="auto";t.style.display=n;this._sizeChanged=false}return e},_onKeyDown:function(t){var e=t.keyCode;if(e===27){this._hide()}},_onItemMouseOver:function(t){},_onItemMouseOut:function(t){}});f.Map.addInitHook("addHandler","contextmenu",f.Map.ContextMenu);f.Mixin.ContextMenu={bindContextMenu:function(t){f.setOptions(this,t);this._initContextMenu();return this},unbindContextMenu:function(){this.off("contextmenu",this._showContextMenu,this);return this},addContextMenuItem:function(t){this.options.contextmenuItems.push(t)},removeContextMenuItemWithIndex:function(t){var e=[];for(var n=0;n<this.options.contextmenuItems.length;n++){if(this.options.contextmenuItems[n].index==t){e.push(n)}}var i=e.pop();while(i!==undefined){this.options.contextmenuItems.splice(i,1);i=e.pop()}},replaceContextMenuItem:function(t){this.removeContextMenuItemWithIndex(t.index);this.addContextMenuItem(t)},_initContextMenu:function(){this._items=[];this.on("contextmenu",this._showContextMenu,this)},_showContextMenu:function(t){var e,n,i,o,s;if(this._map.contextmenu){n=f.extend({relatedTarget:this},t);i=this._map.mouseEventToContainerPoint(t.originalEvent);if(!this.options.contextmenuInheritItems){this._map.contextmenu.hideAllItems()}this._subMenu(this.options.contextmenuItems);this._map.once("contextmenu.hide",this._hideContextMenu,this);var r=document.querySelectorAll(".show");for(var o=0;o<r.length;o++){f.DomUtil.removeClass(r[o],"show")}this._map.contextmenu.showAt(i,n)}},_subMenu:function(t){for(o=0,i=t.length;o<i;o++){itemOptions=t[o];this._items.push(this._map.contextmenu.insertItem(itemOptions,itemOptions.index))}},_hideContextMenu:function(){var t,e;for(t=0,e=this._items.length;t<e;t++){this._map.contextmenu.removeItem(this._items[t])}this._items.length=0;if(!this.options.contextmenuInheritItems){this._map.contextmenu.showAllItems()}}};var t=[f.Marker,f.Path],e={contextmenu:false,contextmenuItems:[],contextmenuInheritItems:true},n,o,i;for(o=0,i=t.length;o<i;o++){n=t[o];if(!n.prototype.options){n.prototype.options=e}else{n.mergeOptions(e)}n.addInitHook(function(){if(this.options.contextmenu){this._initContextMenu()}});n.include(f.Mixin.ContextMenu)}return f.Map.ContextMenu});
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
index 7e34df7..7fdf323 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -21,7 +21,12 @@
 
       function showCoordinates (e) {
         console.log(e.relatedTarget);
-	      alert(e.latlng);
+        if(e.data) {
+          alert(`Test of data in options. Name: ${e.data.name}`);
+        }
+        else {
+          alert(e.latlng);
+        }
       }
 
       function centerMap (e) {
@@ -49,7 +54,8 @@
           contextmenuItems: [{
     		      text: 'Coordinates sub 1',
               iconCls: "bi bi-pin-map",
-    		      callback: showCoordinates
+    		      callback: showCoordinates,
+              data: {name: "test data"}
             },
             {
     		      text: 'Coordinates sub 2',
diff --git a/package.json b/package.json
index d802b40..2bf4542 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-contextmenu-bootstrap",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A context menu for Leaflet",
   "main": "dist/leaflet.contextmenu.js",
   "directories": {
diff --git a/src/Map.ContextMenu.js b/src/Map.ContextMenu.js
index cf60284..0109de0 100644
--- a/src/Map.ContextMenu.js
+++ b/src/Map.ContextMenu.js
@@ -228,7 +228,7 @@ L.Map.ContextMenu = L.Handler.extend({
 
         let callback = false;
         if(!subMenu) {
-          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect);
+          callback = this._createEventHandler(el, options.callback, options.context, options.hideOnSelect, options.data);
         }
         let icon = this._getIcon(options);
         let iconCls = this._getIconCls(options);
@@ -361,7 +361,7 @@ L.Map.ContextMenu = L.Handler.extend({
         };
     },
 
-    _createEventHandler: function (el, func, context, hideOnSelect) {
+    _createEventHandler: function (el, func, context, hideOnSelect, itemData) {
         var me = this,
             map = this._map,
             disabledCls = 'disabled',
@@ -381,7 +381,8 @@ L.Map.ContextMenu = L.Handler.extend({
                   containerPoint: containerPoint,
                   layerPoint: layerPoint,
                   latlng: latlng,
-                  relatedTarget: relatedTarget
+                  relatedTarget: relatedTarget,
+                  data: itemData
                 };
 
             if (hideOnSelect) {