@devgateway/dvz-ui-react 1.6.20 → 1.7.0

package/dist/esm/embeddable/d3Map/BaseLayer.js

@@ -1,67 +1,64 @@
 import { jsx as x } from "react/jsx-runtime";
 import R from "react";
 import * as c from "d3";
-import v from "./Layer.js";
-class F extends v {
+import A from "./Layer.js";
+class F extends A {
   constructor() {
     super(), this.gRef = R.createRef();
   }
-  createPaths(e) {
+  createPaths(t) {
     const {
       path: s,
       fillColor: r,
-      borderColor: o,
-      projection: i
+      borderColor: i,
+      projection: o
     } = this.props;
-    this.gRef && this.gRef.current && (this.g = c.select(this.gRef.current), this.g.attr("class", "base-layer zoomable"), this.g.selectAll(".borders").remove(), this.g.selectAll(".feature-label").remove(), this.g.selectAll(".borders").data(e.features).enter().append("path").attr("fill", r).attr("stroke", o).attr("id", "state-borders").attr("class", "borders").attr("d", s).style("vector-effect", "non-scaling-stroke"));
+    this.gRef && this.gRef.current && (this.g = c.select(this.gRef.current), this.g.attr("class", "base-layer zoomable"), this.g.selectAll(".borders").remove(), this.g.selectAll(".feature-label").remove(), this.g.selectAll(".borders").data(t.features).enter().append("path").attr("fill", r).attr("stroke", i).attr("id", "state-borders").attr("class", "borders").attr("d", s).style("vector-effect", "non-scaling-stroke"));
   }
-  createLabels(e) {
+  createLabels(t) {
     const {
       path: s,
       labelFilter: r = [],
-      labelSettings: o = {},
-      labelField: i,
+      labelSettings: i = {},
+      labelField: o,
       labelFontSize: f,
-      labelColor: l,
+      labelColor: a,
       projection: h,
       initialPosition: d,
       minLabelZoomVisible: b
     } = this.props;
     if (this.gRef && this.gRef.current) {
       this.g = c.select(this.gRef.current);
-      const a = h.scale(), n = this.props.transform ? this.props.transform.k : d.k;
-      this.g.selectAll(".feature-label").data(e.features.filter((t) => r.indexOf(t.properties[i]) == -1)).enter().append("text").attr("class", "feature-label").attr("font-size", (t) => Math.max(0.5, f / n) + "px").style("pointer-events", "none").text(function(t) {
-        return t.properties[i];
-      }).attr("color", l).attr("fill", l).attr("transform", function(t) {
-        const p = o[t.properties[i] + "_rotation"] || 0, m = o[t.properties[i] + "_offsetX"] || 0, g = o[t.properties[i] + "_offsetY"] || 0, u = s.centroid(t)[0] + m / a, y = s.centroid(t)[1] + g / a;
-        return "translate(" + [u, y] + "),rotate(" + (p || 0) + ")";
-      }).attr("text-anchor", "middle").attr("dominant-baseline", "middle"), n < b ? (console.log("remove layers"), this.g.selectAll(".feature-label").transition().style("display", "none")) : this.g.selectAll(".feature-label").style("display", "");
+      const l = h.scale(), n = this.props.transform ? this.props.transform.k : d.k;
+      this.g.selectAll(".feature-label").data(t.features.filter((e) => r.indexOf(e.properties[o]) == -1)).enter().append("text").attr("class", "feature-label").attr("font-size", (e) => Math.max(0.5, f / n) + "px").style("pointer-events", "none").text(function(e) {
+        return e.properties[o];
+      }).attr("color", a).attr("fill", a).attr("transform", function(e) {
+        const p = i[e.properties[o] + "_rotation"] || 0, m = i[e.properties[o] + "_offsetX"] || 0, u = i[e.properties[o] + "_offsetY"] || 0, g = s.centroid(e)[0] + m / l, y = s.centroid(e)[1] + u / l;
+        return "translate(" + [g, y] + "),rotate(" + (p || 0) + ")";
+      }).attr("text-anchor", "middle").attr("dominant-baseline", "middle"), n < b ? this.g.selectAll(".feature-label").transition().style("display", "none") : this.g.selectAll(".feature-label").style("display", "");
     }
   }
   resize() {
     const {
-      labelFontSize: e,
+      labelFontSize: t,
       minLabelZoomVisible: s = -1
     } = this.props, r = this.props.transform ? this.props.transform.k : 1;
-    console.log("minLabelZoomVisible", s, r), r < s ? (console.log("remove layers"), this.g.selectAll(".feature-label").transition().style("display", "none")) : this.g.selectAll(".feature-label").style("display", ""), this.g.selectAll(".feature-label").attr("font-size", (o) => Math.max(0.5, e / r) + "px");
+    r < s ? this.g.selectAll(".feature-label").transition().style("display", "none") : this.g.selectAll(".feature-label").style("display", ""), this.g.selectAll(".feature-label").attr("font-size", (i) => Math.max(0.5, t / r) + "px");
   }
-  createLayer(e) {
-    if (this.createPaths(e), this.createLabels(e), this.props.onReady) {
-      debugger;
-      this.props.onReady();
-    }
+  createLayer(t) {
+    this.createPaths(t), this.createLabels(t), this.props.onReady && this.props.onReady();
   }
   componentDidMount() {
     super.componentDidMount();
   }
-  componentDidUpdate(e, s, r) {
+  componentDidUpdate(t, s, r) {
     const {
-      editing: o
+      editing: i
     } = this.props;
-    o && this.create(), e.visible != this.props.visible && this.g.style("display", this.props.visible ? "block" : "none"), this.g && this.resize();
+    (i || t.path !== this.props.path) && this.create(), t.visible != this.props.visible && this.g.style("display", this.props.visible ? "block" : "none"), this.g && this.resize();
   }
   render() {
-    const { name: e, height: s, width: r } = this.props;
+    const { name: t, height: s, width: r } = this.props;
     return /* @__PURE__ */ x("g", { ref: this.gRef });
   }
 }

package/dist/esm/embeddable/d3Map/BreaksStyles.js

@@ -1,16 +1,23 @@
-import * as s from "d3";
+import * as a from "d3";
 class d {
-  constructor(e) {
-    const { breaks: r, defaultFillColor: l, defaultBorderColor: h, defaultSize: o } = e;
-    this.breaks = r, this.defaultFillColor = l, this.defaultBorderColor = h, this.defaultSize = o;
-    const i = r.filter((t) => t.type !== "graterThan"), a = r.filter((t) => t.type === "graterThan");
-    a.length > 0 && (this.graterThanStyle = a[0]), this.domain = i.map((t) => Number(t.end)), this.sizeScale = s.scaleThreshold().domain(this.domain).range(i.map((t) => t.size)), this.colorScale = s.scaleThreshold().domain(i.map((t) => t.end)).range(r.map((t) => t.color)), this.getSize = this.getSize.bind(this), this.getColor = this.getColor.bind(this);
+  constructor(i) {
+    const { breaks: t, defaultFillColor: l, defaultBorderColor: o, defaultSize: h } = i;
+    this.breaks = t, this.defaultFillColor = l, this.defaultBorderColor = o, this.defaultSize = h;
+    const r = t.filter((e) => e.type !== "graterThan"), s = t.filter((e) => e.type === "graterThan");
+    s.length > 0 && (this.graterThanStyle = s[0]), this.domain = r.map((e) => Number(e.end)), this.sizeScale = a.scaleThreshold().domain(this.domain).range(r.map((e) => e.size)), this.colorScale = a.scaleThreshold().domain(r.map((e) => e.end)).range(t.map((e) => e.color)), this.getSize = this.getSize.bind(this), this.getColor = this.getColor.bind(this);
   }
-  getSize(e) {
-    return this.breaks.length > 0 ? e > Math.max(...this.domain) ? this.graterThanStyle.size : this.defaultSize + this.sizeScale(e) : this.defaultSize;
+  getSize(i) {
+    let t = 0;
+    if (this.breaks.length > 0) {
+      if (i > Math.max(...this.domain))
+        return this.graterThanStyle.size;
+      t = this.defaultSize + this.sizeScale(i);
+    } else
+      t = this.defaultSize;
+    return console.log("size", t), t;
   }
-  getColor(e, r) {
-    return this.breaks.length > 0 ? e > Math.max(...this.domain) ? this.graterThanStyle.color : this.colorScale(e) : this.defaultFillColor;
+  getColor(i, t) {
+    return this.breaks.length > 0 ? i > Math.max(...this.domain) ? this.graterThanStyle.color : this.colorScale(i) : this.defaultFillColor;
   }
 }
 export {