Merge pull request #107 from Kitware/detect-external-style

fix(useInteractorStyle): no presets with external styles

Author: floryst

src/core/internal/ParentedView.tsx

@@ -63,14 +63,18 @@ const ParentedView = forwardRef(function ParentedView(
     [renderWindowAPI]
   );
 
-  const [getInteractorStyle, setInteractorStyle] =
+  const [getInteractorStyle, setInteractorStyle, isExternalStyle] =
     useInteractorStyle(getInteractor);
 
   const {
     interactorSettings = DefaultProps.interactorSettings,
     autoCenterOfRotation = DefaultProps.autoCenterOfRotation,
   } = props;
-  useInteractorStyleManipulatorSettings(getInteractorStyle, interactorSettings);
+  useInteractorStyleManipulatorSettings(
+    getInteractorStyle,
+    isExternalStyle,
+    interactorSettings
+  );
 
   useApplyCenterOfRotation(
     rendererRef,

src/core/internal/SingleView.tsx

@@ -54,7 +54,7 @@ const SingleView = forwardRef(function SingleView(props: ViewProps, fwdRef) {
     []
   );
 
-  const [getInteractorStyle, setInteractorStyle] =
+  const [getInteractorStyle, setInteractorStyle, isExternalStyle] =
     useInteractorStyle(getInteractor);
 
   useMount(() => {
@@ -65,7 +65,11 @@ const SingleView = forwardRef(function SingleView(props: ViewProps, fwdRef) {
     interactorSettings = DefaultProps.interactorSettings,
     autoCenterOfRotation = DefaultProps.autoCenterOfRotation,
   } = props;
-  useInteractorStyleManipulatorSettings(getInteractorStyle, interactorSettings);
+  useInteractorStyleManipulatorSettings(
+    getInteractorStyle,
+    isExternalStyle,
+    interactorSettings
+  );
 
   useApplyCenterOfRotation(
     rendererRef,

src/core/modules/useInteractorStyle.ts

@@ -92,11 +92,15 @@ const settingToManipulator = (setting: ManipulatorSettings) => {
 
 export function useInteractorStyleManipulatorSettings(
   getStyle: () => vtkInteractorStyle,
+  isExternalStyle: boolean,
   settings: ManipulatorSettings[]
 ) {
   useComparableEffect(
     () => {
+      // Assumes external styles are externally controlled
+      if (isExternalStyle) return;
       if (!getStyle().isA('vtkInteractorStyleManipulator')) return;
+
       const style = getStyle() as vtkInteractorStyleManipulator;
       style.removeAllManipulators();
       // always add gestures
@@ -139,6 +143,7 @@ export function useInteractorStyle(
   );
 
   const externalStyleRef = useRef<vtkInteractorStyle | null>(null);
+  const isExternalStyle = !!externalStyleRef.current;
 
   const getStyle = useCallback(() => {
     return externalStyleRef.current ?? getInternalStyle();
@@ -177,5 +182,5 @@ export function useInteractorStyle(
     };
   }, [getInteractor, getStyle, internalStyleRef]);
 
-  return [getStyle, setStyle] as const;
+  return [getStyle, setStyle, isExternalStyle] as const;
 }