[feature] Added configurable popup on node click #402 #542
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -362,6 +362,46 @@ | |
| font-size: 18px; | ||
| } | ||
|
|
||
| .njg-container .default-popup { | ||
| padding: 18px; | ||
| } | ||
|
|
||
| .njg-container .default-popup a.leaflet-popup-close-button { | ||
| position: absolute; | ||
| top: 4px; | ||
| right: 4px; | ||
| font-size: 18px !important; | ||
| } | ||
|
|
||
| .njg-container .default-popup a.leaflet-popup-close-button:hover { | ||
| color: black !important; | ||
| } | ||
|
dee077 marked this conversation as resolved.
|
||
|
|
||
| .njg-container .default-popup .njg-tooltip-item { | ||
| display: flex; | ||
| align-items: center; | ||
| margin-bottom: 8px; | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| .njg-container .default-popup .njg-tooltip-item:last-child { | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| .njg-container .default-popup .njg-tooltip-key { | ||
| flex-basis: 45%; | ||
| font-weight: 600; | ||
| text-transform: capitalize; | ||
| color: black; | ||
| } | ||
|
|
||
| .njg-container .default-popup .njg-tooltip-value { | ||
| flex: 1; | ||
| overflow-wrap: anywhere; | ||
| word-break: normal; | ||
| color: black; | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| } | ||
|
|
||
| @media only screen and (max-width: 850px) { | ||
| .njg-container .njg-sideBar { | ||
| top: 0; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -245,6 +245,15 @@ const NetJSONGraphDefaultConfig = { | |
| }, | ||
| ], | ||
| }, | ||
| nodePopup: { | ||
| show: false, | ||
| content: null, | ||
| config: { | ||
| autoPan: true, | ||
| autoPanPadding: [25, 25], | ||
| offset: null, | ||
| }, | ||
| }, | ||
| }, | ||
| mapTileConfig: [ | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -278,6 +278,116 @@ class NetJSONGraphGUI { | |
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Load and display a popup for a node on the map using leaflet popup | ||
| * @param {Object} node - The node data containing location and properties | ||
| * @returns {void} | ||
| */ | ||
| async loadNodePopup(node) { | ||
| if (!this.self.leaflet) { | ||
| console.error("Leaflet map not available. Cannot load popup."); | ||
| return; | ||
| } | ||
| if (this.self.echarts) { | ||
| this.self.echarts.dispatchAction({type: "hideTip"}); | ||
| } | ||
| const nodeLocation = node?.properties?.location || node?.location; | ||
| if (!nodeLocation) { | ||
| console.error("Node location not available. Cannot load popup."); | ||
| return; | ||
| } | ||
| let popupContent = this.self.config.mapOptions.nodePopup.content; | ||
| if (popupContent == null) { | ||
| popupContent = this.createDefaultPopupContent(node); | ||
| } else if (popupContent && typeof popupContent === "function") { | ||
| const popupRequest = popupContent.call(this, node, this.self); | ||
| this.self.leaflet.currentPopupRequest = popupRequest; | ||
| try { | ||
| popupContent = await popupRequest; | ||
| } catch (error) { | ||
| if (this.self.leaflet.currentPopupRequest !== popupRequest) { | ||
| return; | ||
| } | ||
| console.error("Failed to build node popup content:", error); | ||
| return; | ||
| } | ||
| if (this.self.leaflet.currentPopupRequest !== popupRequest) { | ||
| return; | ||
| } | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| const popupConfigInput = this.self.config.mapOptions.nodePopup.config || {}; | ||
| const popupConfig = Object.fromEntries( | ||
| Object.entries(popupConfigInput).filter(([, value]) => value != null), | ||
| ); | ||
|
|
||
| const popup = window.L.popup({ | ||
| closeOnClick: false, | ||
| ...popupConfig, | ||
| }) | ||
| .setLatLng(nodeLocation) | ||
| .setContent(popupContent) | ||
| .openOn(this.self.leaflet); | ||
|
|
||
| this.self.leaflet.currentPopup = popup; | ||
| const {onOpen} = this.self.config.mapOptions.nodePopup; | ||
| if (onOpen && typeof onOpen === "function") { | ||
| try { | ||
| onOpen.call(this, this.self); | ||
| } catch (error) { | ||
| console.error("Failed to run popup onOpen callback:", error); | ||
| } | ||
| } | ||
| const popupElement = popup | ||
| .getElement() | ||
| .querySelector(".leaflet-popup-close-button"); | ||
| popupElement.addEventListener("click", () => { | ||
| if (!this.self.config.bookmarkableActions?.enabled) { | ||
| return; | ||
| } | ||
| const fragments = this.self.utils.parseUrlFragments(); | ||
| const {id} = this.self.config.bookmarkableActions; | ||
| const currentNodeId = fragments[id]?.get("nodeId"); | ||
| const popupNodeId = node?.id || node?.properties?.id; | ||
| if (currentNodeId === popupNodeId) { | ||
| fragments[id].delete("nodeId"); | ||
| this.self.utils.updateUrlFragments(fragments); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| createDefaultPopupContent(node) { | ||
| const popupContent = document.createElement("div"); | ||
| popupContent.classList.add("default-popup"); | ||
| const location = node?.location || node?.properties?.location; | ||
| const lat = Number(location?.lat); | ||
| const lng = Number(location?.lng); | ||
| const hasCoords = Number.isFinite(lat) && Number.isFinite(lng); | ||
| const fields = { | ||
| name: node?.name, | ||
| id: node?.id, | ||
| label: node?.label, | ||
| location: hasCoords ? `${lat.toFixed(8)}, ${lng.toFixed(8)}` : null, | ||
| }; | ||
| Object.keys(fields).forEach((key) => { | ||
| const value = fields[key]; | ||
| if (!value) { | ||
| return; | ||
| } | ||
| const item = document.createElement("div"); | ||
| item.classList.add("njg-tooltip-item"); | ||
| const keyLabel = document.createElement("span"); | ||
| keyLabel.classList.add("njg-tooltip-key"); | ||
| keyLabel.textContent = key; | ||
| const valueLabel = document.createElement("span"); | ||
| valueLabel.classList.add("njg-tooltip-value"); | ||
| valueLabel.textContent = String(value); | ||
| item.appendChild(keyLabel); | ||
| item.appendChild(valueLabel); | ||
| popupContent.appendChild(item); | ||
| }); | ||
| return popupContent; | ||
| } | ||
|
|
||
| init() { | ||
| this.sideBar = this.createSideBar(); | ||
| if (this.self.config.switchMode) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I comment out this, I see no difference. What does this do?