Merge pull request #70 from equinor/zIndex_fix

Change zIndex target from wellbore to container
equinor · Jun 20, 2023 · a46f1cd · a46f1cd
2 parents 28203fa + 5a14cfc
commit a46f1cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/videx-map",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "description": "Component for Pixi-overlay in Leaflet.",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

diff --git a/src/utils/wellbores/data/WellboreData.ts b/src/utils/wellbores/data/WellboreData.ts
@@ -90,7 +90,9 @@ export class WellboreData {
 
   set zIndex (val: number) {
     this._zIndex = val;
-    if (this.mesh) this.mesh.zIndex = this._zIndex;
+    if (this.container) {
+      this.container.zIndex = this._zIndex;
+    }
   }
 
   get colors(): Colors {
@@ -206,7 +208,7 @@ export class WellboreData {
       if (this.mesh) {
         this.mesh.shader.uniforms.wellboreColor1 = color.col1;
         this.mesh.shader.uniforms.wellboreColor2 = color.col2;
-        this.mesh.zIndex = this._zIndex + 100000;
+        this.container.zIndex = this._zIndex + 100000;
       }
       this.label.container.zIndex = 1;
       this.label.background.tint = color.labelBg;
@@ -216,7 +218,7 @@ export class WellboreData {
       if (this.mesh) {
         this.mesh.shader.uniforms.wellboreColor1 = this.colors.default.col1;
         this.mesh.shader.uniforms.wellboreColor2 = this.colors.default.col2;
-        this.mesh.zIndex = this._zIndex;
+        this.container.zIndex = this._zIndex;
       }
       this.label.container.zIndex = 0;
       this.label.background.tint = this.colors.default.labelBg;
@@ -232,7 +234,7 @@ export class WellboreData {
       if (this.mesh) {
         this.mesh.shader.uniforms.wellboreColor1 = this.colors.selected.col1;
         this.mesh.shader.uniforms.wellboreColor2 = this.colors.selected.col2;
-        this.mesh.zIndex = this._zIndex + 1000000;
+        this.container.zIndex = this._zIndex + 1000000;
       }
       this.label.container.zIndex = 1;
       this.label.background.tint = this.colors.selected.labelBg;
@@ -241,7 +243,7 @@ export class WellboreData {
       if (this.mesh) {
         this.mesh.shader.uniforms.wellboreColor1 = this.colors.default.col1;
         this.mesh.shader.uniforms.wellboreColor2 = this.colors.default.col2;
-        this.mesh.zIndex = this._zIndex;
+        this.container.zIndex = this._zIndex;
       }
       this.label.container.zIndex = 0;
       this.label.background.tint = this.colors.default.labelBg;