[fix] Temp

Author: dee077

src/js/netjsongraph.core.js

@@ -17,6 +17,7 @@ class NetJSONGraph {
     // if explicitly set it to somthing like L.CRS.Simple.
     this.config.crs = NetJSONGraphDefaultConfig.crs;
     this.JSONParam = this.utils.isArray(JSONParam) ? JSONParam : [JSONParam];
+    this.utils.setupHashChangeHandler(this);
   }
 
   /**

src/js/netjsongraph.util.js

@@ -1203,58 +1203,68 @@ class NetJSONGraphUtil {
     if (!self.config.bookmarkableActions.enabled) return;
     const fragments = this.parseUrlFragments();
     const id = self.config.bookmarkableActions.id;
-    let nodeId, zoom;
+    let nodeId;
+    self.selectedNode = self.selectedNode || {};
     if (params.componentSubType === "graph") {
       nodeId = params.data.id;
+      self.selectedNode[nodeId] = params.data
     }
     if (["scatter", "effectScatter"].includes(params.componentSubType)) {
       nodeId = params.data.node.id;
+      self.selectedNode[nodeId] = params.data.node
     }
-    zoom = self?.leaflet?.getZoom();
-    if (!fragments[id] || !(fragments[id] instanceof URLSearchParams)) {
+    if (!fragments[id]) {
       fragments[id] = new URLSearchParams();
       fragments[id].set("id", id);
     }
     fragments[id].set("nodeId", nodeId);
-    if (zoom != null) {
-      fragments[id].set("zoom", zoom);
-    }
-    window.location.hash = this.generateUrlFragments(fragments);
+    const newHash = this.generateUrlFragments(fragments);
+    const state = { id, nodeId };
+    history.pushState(state, "", `#${newHash}`);
   }
 
-  removeUrlFragment(self, id) {
-    if (!self.config.bookmarkableActions.enabled) return;
-
+  removeUrlFragment(id) {
     const fragments = this.parseUrlFragments();
     if (fragments[id]) {
       delete fragments[id];
     }
-    window.location.hash = this.generateUrlFragments(fragments);
+    const newHash = this.generateUrlFragments(fragments);
+    const state = { id };
+    history.pushState(state, "", `#${newHash}`);
   }
 
   setSelectedNodeFromUrlFragments(self, fragments, node) {
     if (!self.config.bookmarkableActions.enabled || !Object.keys(fragments).length) return;
     const id = self.config.bookmarkableActions.id;
     const nodeId = fragments[id]?.get("nodeId");
-    const zoom = fragments[id]?.get("zoom");
     if (nodeId === node.id) {
-      self.selectedNode = node;
-      if (zoom != null) self.selectedNode.zoom = Number(zoom);
+      self.selectedNode = self.selectedNode || {};
+      self.selectedNode[nodeId] = node;
     }
   }
 
   applyUrlFragmentState(self) {
+    console.log("ApplyUrlFragmentState Called!")
     if (!self.config.bookmarkableActions.enabled) return;
-    const node = self.selectedNode;
-    if (!node) return;
+    const id = self.config.bookmarkableActions.id;
+    const fragments = self.utils.parseUrlFragments();
+    const nodeId = fragments[id]?.get("nodeId") 
+    if (!self.selectedNode || !self.selectedNode[nodeId]) return;
+    const node = self.selectedNode[nodeId];
     const nodeType =
       self.config.graphConfig.series.type || self.config.mapOptions.nodeConfig.type;
-    const { location, zoom } = node;
-    if (["scatter", "effectScatter"].includes(nodeType) && zoom != null) {
-      self.leaflet.setView([location.lat, location.lng], zoom);
+    const { location } = node;
+    if (["scatter", "effectScatter"].includes(nodeType)) {
+      self.leaflet.setView([location.lat, location.lng]);
     }
     self.config.onClickElement.call(self, "node", node);
   }
+
+  setupHashChangeHandler(self) {
+    window.addEventListener('popstate', () => {
+      this.applyUrlFragmentState(self)
+    });
+  }
 }
 
 export default NetJSONGraphUtil;

webpack.config.js

@@ -29,7 +29,7 @@ module.exports = (env, argv) => ({
   },
   devtool: argv.mode === "development" ? "eval-source-map" : "source-map",
   optimization: {
-    minimize: true,
+    minimize: false,
     minimizer: argv.mode === "production" ? minimizer : [],
   },
   module: {