umap-project 2.7.0b0__tar.gz → 2.7.0b2__tar.gz

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.0b0
+Version: 2.7.0b2
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

umap_project-2.7.0b2/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.7.0b2"

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/css/contextmenu.css

@@ -1,7 +1,7 @@
 .umap-contextmenu {
     background-color: var(--background-color);
     padding: calc(var(--box-padding) / 2) var(--box-padding);
-    position: absolute;
+    position: fixed;
     z-index: var(--zindex-contextmenu);
     border-radius: var(--border-radius);
     box-shadow: var(--block-shadow);

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/js/modules/rendering/ui.js

@@ -88,10 +88,7 @@ const FeatureMixin = {
     DomEvent.stop(event)
     const items = this._map.getContextMenuItems(event)
     items.push('-', ...this.feature.getContextMenuItems(event))
-    this._map.contextmenu.open(
-      [event.originalEvent.clientX, event.originalEvent.clientY],
-      items
-    )
+    this._map.contextmenu.open(event.originalEvent, items)
   },
 
   onCommit: function () {

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/js/modules/tableeditor.js

@@ -64,7 +64,7 @@ export default class TableEditor extends WithTemplate {
         action: () => this.deleteProperty(property),
       })
     }
-    this.contextmenu.open([event.clientX, event.clientY], actions)
+    this.contextmenu.open(event, actions)
   }
 
   renderHeaders() {

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/js/modules/ui/contextmenu.js

@@ -15,7 +15,13 @@ export default class ContextMenu extends Positioned {
     })
   }
 
-  open([left, top], items) {
+  open(event, items) {
+    const left = event.clientX
+    const top = event.clientY
+    this.openAt([left, top], items)
+  }
+
+  openAt([left, top], items) {
     this.container.innerHTML = ''
     for (const item of items) {
       if (item === '-') {
@@ -36,7 +42,12 @@ export default class ContextMenu extends Positioned {
         this.container.appendChild(li)
       }
     }
-    document.body.appendChild(this.container)
+    // When adding contextmenu below the map container, clicking on any link will send the
+    // "focusout" element on link click, preventing to trigger the click action
+    const parent = document
+      .elementFromPoint(left, top)
+      .closest('.leaflet-container').parentNode
+    parent.appendChild(this.container)
     if (this.options.fixed) {
       this.setPosition({ left, top })
     } else {

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/js/umap.controls.js

@@ -663,7 +663,7 @@ const ControlsMixin = {
       button.addEventListener('click', () => {
         const x = button.offsetLeft
         const y = button.offsetTop + button.offsetHeight
-        menu.open([x, y], actions)
+        menu.openAt([x, y], actions)
       })
     }
     this.help.getStartedLink(rightContainer)

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/static/umap/js/umap.js

@@ -1726,8 +1726,10 @@ U.Map = L.Map.extend({
         })
       }
     }
+    if (items.length) {
+      items.push('-')
+    }
     items.push(
-      '-',
       {
         label: L._('Open browser'),
         action: () => this.openBrowser('layers'),
@@ -1770,10 +1772,7 @@ U.Map = L.Map.extend({
 
   onContextMenu: function (event) {
     const items = this.getContextMenuItems(event)
-    this.contextmenu.open(
-      [event.originalEvent.clientX, event.originalEvent.clientY],
-      items
-    )
+    this.contextmenu.open(event.originalEvent, items)
   },
 
   editInOSM: function (e) {

{umap_project-2.7.0b0 → umap_project-2.7.0b2}/umap/templates/umap/css.html

@@ -10,8 +10,6 @@
       href="{% static 'umap/vendors/editinosm/Leaflet.EditInOSM.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/minimap/Control.MiniMap.min.css' %}" />
-<link rel="stylesheet"
-      href="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/toolbar/leaflet.toolbar.css' %}" />
 <link rel="stylesheet"

umap_project-2.7.0b0/umap/__init__.py

@@ -1 +0,0 @@
-VERSION = "2.7.0b0"