Merge remote-tracking branch 'origin/master' into multi-picking-hook

equinor · Dec 20, 2024 · af138c0 · af138c0
2 parents c6afe15 + 45dcbb4
commit af138c0
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 58 deletions.
diff --git a/typescript/package-lock.json b/typescript/package-lock.json
diff --git a/typescript/package.json b/typescript/package.json
@@ -64,7 +64,7 @@
         "@testing-library/react": "^16.0.1",
         "@testing-library/user-event": "^14.5.2",
         "@theunderscorer/nx-semantic-release": "^2.12.0",
-        "@types/convert-units": "^2.3.9",
+        "@types/convert-units": "^2.3.11",
         "@types/d3": "^7.4.3",
         "@types/d3-color": "^3.1.3",
         "@types/d3-interpolate": "^3.0.4",
@@ -76,8 +76,8 @@
         "@types/react-redux": "^7.1.34",
         "@types/uuid": "^10.0.0",
         "@types/workerpool": "^6.4.7",
-        "@typescript-eslint/eslint-plugin": "^8.15.0",
-        "@typescript-eslint/parser": "^8.15.0",
+        "@typescript-eslint/eslint-plugin": "^8.16.0",
+        "@typescript-eslint/parser": "^8.16.0",
         "assert": "^2.0.0",
         "babel-jest": "^29.6.0",
         "copyfiles": "^2.0.0",

diff --git a/typescript/packages/well-log-viewer/CHANGELOG.md b/typescript/packages/well-log-viewer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.2.2](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@2.2.2) (2024-11-26)
+
+
+### Bug Fixes
+
+* Update title after setting tracks ([#2384](https://github.com/equinor/webviz-subsurface-components/issues/2384)) ([6e0e046](https://github.com/equinor/webviz-subsurface-components/commit/6e0e0465f026bf2389757d3367b24bbb450f1abc))
+
 ## [2.2.1](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@2.2.1) (2024-11-25)
 
 

diff --git a/typescript/packages/well-log-viewer/package.json b/typescript/packages/well-log-viewer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@webviz/well-log-viewer",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

diff --git a/typescript/packages/well-log-viewer/src/components/WellLogView.tsx b/typescript/packages/well-log-viewer/src/components/WellLogView.tsx
@@ -1287,6 +1287,7 @@ class WellLogView
 
     wellLogSets: WellLogSet[];
     container?: HTMLElement;
+    title?: HTMLElement;
     resizeObserver: ResizeObserver;
 
     logController?: LogViewer;
@@ -1570,6 +1571,7 @@ class WellLogView
                 this.props.colorMapFunctions
             );
             addWellPickOverlay(this.logController, this);
+            this._updateWellLogTitle();
         }
         this.setControllerZoom();
         this.setControllerSelection();
@@ -1792,6 +1794,11 @@ class WellLogView
                 element.setAttribute("title", element.textContent);
         }
     }
+    _updateWellLogTitle(): void {
+        if (this.title && this.props.viewTitle === true) {
+            this.title.textContent = this.wellLogSets[0]?.header.well ?? null;
+        }
+    }
 
     scrollTrackBy(delta: number): void {
         this.setState((state: Readonly<State>) => ({
@@ -2082,6 +2089,7 @@ class WellLogView
                         className={
                             horizontal ? "title title-horizontal" : "title"
                         }
+                        ref={(el) => (this.title = el as HTMLElement)}
                     >
                         {this.createViewTitle(viewTitle)}
                     </div>