Merge branch 'master' into ArtefactFix

equinor · Jul 8, 2024 · 88a019f · 88a019f
2 parents 920e665 + a2390e2
commit 88a019f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/typescript/packages/well-log-viewer/src/SyncLogViewer.stories.tsx b/typescript/packages/well-log-viewer/src/SyncLogViewer.stories.tsx
@@ -162,7 +162,8 @@ const Template = (args) => {
         if (infoRef.current) infoRef.current.innerHTML = info;
     };
 
-    const [controller, setController] = React.useState(null); // the first WellLog
+    const [controller, setController] =
+        React.useState<WellLogController | null>(null); // the first WellLog
     const [controllers, setControllers] = React.useState<WellLogController[]>(
         []
     ); // all WellLogs

diff --git a/typescript/packages/well-log-viewer/src/WellLogViewer.stories.tsx b/typescript/packages/well-log-viewer/src/WellLogViewer.stories.tsx
@@ -38,6 +38,7 @@ import { getDiscreteMeta, indexOfElementByName } from "./utils/tracks";
 
 import type WellLogView from "./components/WellLogView";
 import type {
+    WellLogController,
     WellLogViewOptions,
     TrackMouseEvent,
 } from "./components/WellLogView";
@@ -118,7 +119,8 @@ const StoryTemplate = (args) => {
     const setInfo = function (info) {
         if (infoRef.current) infoRef.current.innerHTML = info;
     };
-    const [controller, setController] = React.useState(null);
+    const [controller, setController] =
+        React.useState<WellLogController | null>(null);
     const onCreateController = React.useCallback(
         (controller) => {
             setController(controller);

diff --git a/typescript/packages/well-log-viewer/src/components/WellLogView.tsx b/typescript/packages/well-log-viewer/src/components/WellLogView.tsx
@@ -931,6 +931,7 @@ export interface WellLogController {
     getContentSelection(): [number | undefined, number | undefined]; // [current, pinned]
     setContentScale(value: number): void;
     getContentScale(): number;
+    setControllerDefaultZoom(): void;
 
     scrollTrackTo(pos: number): void;
     scrollTrackBy(delta: number): void;