vim-web 0.3.44-dev.45 → 0.3.44-dev.47

package/dist/types/react-viewers/controlbar/controlBarIds.d.ts

@@ -6,6 +6,8 @@ export declare const ids: {
     sectionSettings: string;
     sectionMeasure: string;
     sectionSectionBox: string;
+    buttonCameraFrameSelection: string;
+    buttonCameraFrameScene: string;
     buttonCameraAuto: string;
     buttonCameraOrbit: string;
     buttonCameraLook: string;
@@ -17,13 +19,12 @@ export declare const ids: {
     buttonHelp: string;
     buttonMaximize: string;
     buttonToggleIsolation: string;
-    buttonZoomToFit: string;
     buttonSectionBox: string;
     buttonMeasure: string;
     buttonSectionBoxEnable: string;
     buttonSectionBoxVisible: string;
-    buttonSectionBoxShrinkToSelection: string;
+    buttonSectionBoxToSelection: string;
+    buttonSectionBoxToScene: string;
     buttonSectionBoxAuto: string;
-    buttonSectionBoxReset: string;
     buttonSectionBoxSettings: string;
 };

package/dist/types/react-viewers/panels/icons.d.ts

@@ -27,6 +27,7 @@ export declare function arrowLeft({ height, width, fill, className }: IconOption
 export declare function fullArrowLeft({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
 export declare function visible({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
 export declare function hidden({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
+export declare function frameScene({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
 export declare function autoCamera({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
 export declare function orbit({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;
 export declare function look({ height, width, fill, className }: IconOptions): import("react/jsx-runtime").JSX.Element;

package/dist/types/react-viewers/settings/settings.d.ts

@@ -61,7 +61,9 @@ export type ComponentSettings = {
         pan: UserBoolean;
         zoom: UserBoolean;
         zoomWindow: UserBoolean;
-        zoomToFit: UserBoolean;
+        autoCamera: UserBoolean;
+        frameSelection: UserBoolean;
+        frameScene: UserBoolean;
         sectioningMode: UserBoolean;
         measuringMode: UserBoolean;
         toggleIsolation: UserBoolean;

package/dist/types/react-viewers/state/controlBarState.d.ts

@@ -35,19 +35,7 @@ export declare function controlBarActions(camera: CameraRef, settings: Component
         style: typeof ControlBar.buttonDefaultStyle;
     })[];
 };
-export declare function controlBarCamera(camera: CameraRef): {
-    id: string;
-    enable: () => boolean;
-    style: string;
-    buttons: {
-        id: string;
-        tip: string;
-        isOn: () => boolean;
-        action: () => void;
-        icon: typeof Icons.autoCamera;
-        style: typeof ControlBar.buttonDefaultStyle;
-    }[];
-};
+export declare function controlBarCamera(camera: CameraRef): ControlBar.IControlBarSection;
 /**
  * Combines all control bar sections into one control bar.
  */
@@ -72,16 +60,4 @@ export declare function useControlBar(viewer: VIM.Viewer, camera: CameraRef, mod
         icon: typeof Icons.measure;
         style: typeof ControlBar.buttonDefaultStyle;
     })[];
-} | {
-    id: string;
-    enable: () => boolean;
-    style: string;
-    buttons: {
-        id: string;
-        tip: string;
-        isOn: () => boolean;
-        action: () => void;
-        icon: typeof Icons.autoCamera;
-        style: typeof ControlBar.buttonDefaultStyle;
-    }[];
 })[];

package/dist/types/react-viewers/state/viewerInputs.d.ts

@@ -0,0 +1,3 @@
+import { CoreInputHandler } from "../../core-viewers/webgl";
+import { CameraRef } from "./cameraState";
+export declare function useViewerInput(handler: CoreInputHandler, camera: CameraRef): void;

package/dist/types/react-viewers/ultra/ultraControlBarState.d.ts

@@ -2,19 +2,7 @@ import { ControlBarCustomization } from '../controlbar/controlBar';
 import { SectionBoxRef } from '../state/sectionBoxState';
 import * as Ultra from '../../core-viewers/ultra/index';
 import { CameraRef } from '../state/cameraState';
-import { ControlBar, Icons } from '..';
+import { ControlBar } from '..';
 export { buttonDefaultStyle, buttonBlueStyle } from '../controlbar/controlBarButton';
 export { sectionDefaultStyle, sectionBlueStyle } from '../controlbar/controlBarSection';
-export declare function useUltraControlBar(viewer: Ultra.UltraCoreViewer, section: SectionBoxRef, camera: CameraRef, customization: ControlBarCustomization | undefined): (ControlBar.IControlBarSection | {
-    id: string;
-    enable: () => boolean;
-    style: string;
-    buttons: {
-        id: string;
-        tip: string;
-        isOn: () => boolean;
-        action: () => void;
-        icon: typeof Icons.autoCamera;
-        style: typeof ControlBar.buttonDefaultStyle;
-    }[];
-})[];
+export declare function useUltraControlBar(viewer: Ultra.UltraCoreViewer, section: SectionBoxRef, camera: CameraRef, customization: ControlBarCustomization | undefined): ControlBar.IControlBarSection[];

package/dist/vim-web.iife.js

@@ -56928,7 +56928,6 @@ void main() {
       this._adapter.init();
     }
     get moveSpeed() {
-      console.log("get moveSpeed", this._moveSpeed);
       return this._moveSpeed;
     }
     set moveSpeed(value) {
@@ -57050,7 +57049,6 @@ void main() {
         viewer.selection.clear();
       },
       frameCamera: () => {
-        console.log("frameCamera");
         if (viewer.selection.count > 0) {
           viewer.camera.lerp(0.75).frame(viewer.selection.getBoundingBox());
         } else {
@@ -61332,7 +61330,11 @@ Averrage Date/Second ${avgDataRatePS} kb
         viewer.selection.clear();
       },
       frameCamera: () => {
-        frameContext(viewer);
+        if (viewer.selection.count > 0) {
+          frameSelection$1(viewer);
+        } else {
+          viewer.camera.frameAll();
+        }
       },
       selectAtPointer: async (pos, add) => {
         const hit = await viewer.selection.hitTest(pos);
@@ -61382,13 +61384,6 @@ Averrage Date/Second ${avgDataRatePS} kb
       }
     };
   }
-  async function frameContext(viewer) {
-    if (viewer.selection.count > 0) {
-      frameSelection$1(viewer);
-    } else {
-      viewer.camera.frameAll();
-    }
-  }
   async function frameSelection$1(viewer) {
     const box = await viewer.selection.getBoundingBox();
     if (!box) return;
@@ -66382,6 +66377,55 @@ Averrage Date/Second ${avgDataRatePS} kb
       }
     );
   }
+  function frameScene({ height, width, fill: fill2, className }) {
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs(
+      "svg",
+      {
+        className,
+        height,
+        width,
+        viewBox: "0 0 256 256",
+        children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("path", { fill: "none", d: "M0 0h256v256H0z" }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              fill: fill2,
+              d: "M236,12H20C9,12,0,21,0,32V224c0,11,9,20,20,20H236c11,0,20-9,20-20V32c0-11-9-20-20-20Zm-4,200c0,4.418-3.582,8-8,8H32c-4.418,0-8-3.582-8-8V44c0-4.418,3.582-8,8-8H224c4.418,0,8,3.582,8,8V212Z"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              fill: fill2,
+              d: "M210,204h-42c-6.627,0-12-5.373-12-12h0c0-6.627,5.373-12,12-12h24s0-24,0-24c0-6.627,5.373-12,12-12h0\r\n           c6.627,0,12,5.373,12,12v42c0,3.314-2.686,6-6,6Z"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              fill: fill2,
+              d: "M40,198v-42c0-6.627,5.373-12,12-12h0c6.627,0,12,5.373,12,12v24s24,0,24,0\r\n           c6.627,0,12,5.373,12,12h0c0,6.627-5.373,12-12,12H46c-3.314,0-6-2.686-6-6Z"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              fill: fill2,
+              d: "M46,52h42c6.627,0,12,5.373,12,12h0c0,6.627-5.373,12-12,12h-24s0,24,0,24\r\n           c0,6.627-5.373,12-12,12h0c-6.627,0-12-5.373-12-12V58c0-3.314,2.686-6,6-6Z"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "path",
+            {
+              fill: fill2,
+              d: "M216,58v42c0,6.627-5.373,12-12,12h0c-6.627,0-12-5.373-12-12v-24s-24,0-24,0\r\n           c-6.627,0-12-5.373-12-12h0c0-6.627,5.373-12,12-12h42c3.314,0,6,2.686,6,6Z"
+            }
+          )
+        ]
+      }
+    );
+  }
   function autoCamera({ height, width, fill: fill2 = "", className }) {
     return /* @__PURE__ */ jsxRuntimeExports.jsxs("svg", { className, height, width, viewBox: "0 0 256 256", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("path", { fill: "none", d: "M0 0h256v256H0z" }),
@@ -66930,6 +66974,7 @@ Averrage Date/Second ${avgDataRatePS} kb
     close,
     collapse,
     frameRect,
+    frameScene,
     frameSelection,
     fullArrowLeft,
     fullsScreen,
@@ -66975,7 +67020,7 @@ Averrage Date/Second ${avgDataRatePS} kb
     return settings2.ui.orthographic || settings2.ui.resetCamera || settings2.ui.enableGhost;
   }
   function anyUiCursorButton(settings2) {
-    return isTrue(settings2.ui.orbit) || isTrue(settings2.ui.lookAround) || isTrue(settings2.ui.pan) || isTrue(settings2.ui.zoom) || isTrue(settings2.ui.zoomWindow) || isTrue(settings2.ui.zoomToFit);
+    return isTrue(settings2.ui.orbit) || isTrue(settings2.ui.lookAround) || isTrue(settings2.ui.pan) || isTrue(settings2.ui.zoom) || isTrue(settings2.ui.zoomWindow);
   }
   function anyUiSettingButton(settings2) {
     return isTrue(settings2.ui.projectInspector) || isTrue(settings2.ui.settings) || isTrue(settings2.ui.help) || isTrue(settings2.ui.maximise);
@@ -67013,7 +67058,10 @@ Averrage Date/Second ${avgDataRatePS} kb
       pan: true,
       zoom: true,
       zoomWindow: true,
-      zoomToFit: true,
+      // Control bar - camera
+      autoCamera: true,
+      frameScene: true,
+      frameSelection: true,
       // Control bar - tools
       sectioningMode: true,
       measuringMode: true,
@@ -67172,7 +67220,10 @@ Averrage Date/Second ${avgDataRatePS} kb
     sectionMeasure: "controlBar.sectionMeasure",
     sectionSectionBox: "controlBar.sectionSectionBox",
     // Camera buttons
+    buttonCameraFrameSelection: "controlBar.camera.frameSelection",
+    buttonCameraFrameScene: "controlBar.camera.frameScene",
     buttonCameraAuto: "controlBar.camera.auto",
+    // Camera Control buttons
     buttonCameraOrbit: "controlBar.camera.orbit",
     buttonCameraLook: "controlBarcamera.look",
     buttonCameraPan: "controlBar.camera.pan",
@@ -67185,16 +67236,15 @@ Averrage Date/Second ${avgDataRatePS} kb
     buttonMaximize: "controlBar.maximize",
     // Action Buttons
     buttonToggleIsolation: "controlBar.action.toggleIsolation",
-    buttonZoomToFit: "controlBar.action.zoomToFit",
     // Tools buttons
     buttonSectionBox: "controlBar.sectionBox",
     buttonMeasure: "controlBar.measure",
     // Section box buttons
     buttonSectionBoxEnable: "controlBar.sectionBox.enable",
     buttonSectionBoxVisible: "controlBar.sectionBox.visible",
-    buttonSectionBoxShrinkToSelection: "controlBar.sectionBox.shrinkToSelection",
+    buttonSectionBoxToSelection: "controlBar.sectionBox.sectionSelection",
+    buttonSectionBoxToScene: "controlBar.sectionBox.sectionScene",
     buttonSectionBoxAuto: "controlBar.sectionBox.auto",
-    buttonSectionBoxReset: "controlBar.sectionBox.reset",
     buttonSectionBoxSettings: "controlBar.sectionBox.settings"
   };
   function ControlBar(props) {
@@ -67427,7 +67477,7 @@ Averrage Date/Second ${avgDataRatePS} kb
           icon: sectionBox
         },
         {
-          id: ids.buttonSectionBoxShrinkToSelection,
+          id: ids.buttonSectionBoxToSelection,
           tip: "Fit Section",
           enabled: () => section.enable.get(),
           isOn: () => hasSelection,
@@ -67436,7 +67486,7 @@ Averrage Date/Second ${avgDataRatePS} kb
           icon: sectionBoxShrink
         },
         {
-          id: ids.buttonSectionBoxReset,
+          id: ids.buttonSectionBoxToScene,
           tip: "Reset Section",
           enabled: () => section.enable.get(),
           style: (on) => buttonDefaultStyle(on),
@@ -67536,15 +67586,6 @@ Averrage Date/Second ${avgDataRatePS} kb
       enable: () => true,
       style: sectionDefaultStyle,
       buttons: [
-        {
-          id: ids.buttonZoomToFit,
-          enabled: () => isTrue(settings2.ui.zoomToFit),
-          tip: "Frame Camera",
-          action: () => camera2.frameSelection.call(),
-          icon: frameSelection,
-          isOn: () => false,
-          style: buttonDefaultStyle
-        },
         {
           id: ids.buttonToggleIsolation,
           enabled: () => isTrue(settings2.ui.toggleIsolation),
@@ -67620,6 +67661,24 @@ Averrage Date/Second ${avgDataRatePS} kb
           action: () => camera2.autoCamera.set(!camera2.autoCamera.get()),
           icon: autoCamera,
           style: buttonDefaultStyle
+        },
+        {
+          id: ids.buttonCameraFrameSelection,
+          // enabled: () => isTrue(settings.ui.zoomToFit), TODO: Implement ui toggles in Ultra
+          tip: "Frame Selection",
+          action: () => camera2.frameSelection.call(),
+          icon: frameSelection,
+          isOn: () => false,
+          style: buttonDefaultStyle
+        },
+        {
+          id: ids.buttonCameraFrameScene,
+          // enabled: () => isTrue(settings.ui.zoomToFit), TODO: Implement ui toggles in Ultra
+          tip: "Frame All",
+          action: () => camera2.frameScene.call(),
+          icon: frameScene,
+          isOn: () => false,
+          style: buttonDefaultStyle
         }
       ]
     };
@@ -74039,9 +74098,9 @@ Averrage Date/Second ${avgDataRatePS} kb
               (settings2, value) => settings2.ui.zoomWindow = value
             ),
             settingsToggle(
-              "Show Zoom To Fit Button",
-              (settings2) => settings2.ui.zoomToFit,
-              (settings2, value) => settings2.ui.zoomToFit = value
+              "Show Zoom Frame Selection Button",
+              (settings2) => settings2.ui.frameSelection,
+              (settings2, value) => settings2.ui.frameSelection = value
             ),
             settingsSubtitle("Control Bar - Tools"),
             settingsToggle(
@@ -75538,7 +75597,7 @@ Averrage Date/Second ${avgDataRatePS} kb
       const box = await getSelectionBox.call() ?? await getSceneBox.call();
       frame(adapter, section, box);
     });
-    const frameScene = useAsyncFuncRef(async () => {
+    const frameScene2 = useAsyncFuncRef(async () => {
       const box = await getSceneBox.call();
       frame(adapter, section, box);
     });
@@ -75548,7 +75607,7 @@ Averrage Date/Second ${avgDataRatePS} kb
       autoCamera: autoCamera2,
       reset,
       frameSelection: frameSelection2,
-      frameScene
+      frameScene: frameScene2
     };
   }
   function frame(adapter, section, box) {
@@ -75573,6 +75632,11 @@ Averrage Date/Second ${avgDataRatePS} kb
       getSceneBox: () => Promise.resolve(viewer.renderer.getBoundingBox())
     }, section);
   }
+  function useViewerInput(handler, camera2) {
+    React2.useEffect(() => {
+      handler.keyboard.registerKeyUp("KeyF", "replace", () => camera2.frameSelection.call());
+    }, []);
+  }
   function createWebglComponent(container, componentSettings = {}, viewerSettings = {}) {
     const promise2 = new DeferredPromise();
     const cmpContainer = container instanceof HTMLElement ? createContainer(container) : container ?? createContainer();
@@ -75608,6 +75672,7 @@ Averrage Date/Second ${avgDataRatePS} kb
     const camera2 = useWebglCamera(props.viewer, sectionBox2);
     const cursor = React2.useMemo(() => new CursorManager(props.viewer), []);
     const loader = React2.useRef(new ComponentLoader(props.viewer, modal));
+    useViewerInput(props.viewer.inputs, camera2);
     const [isolation] = React2.useState(() => new Isolation(props.viewer, camera2, settings2.value));
     React2.useEffect(() => isolation.applySettings(settings2.value), [settings2]);
     const side = useSideState(
@@ -76074,29 +76139,10 @@ Averrage Date/Second ${avgDataRatePS} kb
   function useUltraControlBar(viewer, section, camera2, customization) {
     const sectionSectionBox = controlBarSectionBox(section, viewer.selection.count > 0);
     const sectionCamera = controlBarCamera(camera2);
-    const frame2 = frameSection(camera2);
-    let bar = [sectionCamera, frame2, sectionSectionBox];
+    let bar = [sectionCamera, sectionSectionBox];
     bar = (customization == null ? void 0 : customization(bar)) ?? bar;
     return bar;
   }
-  function frameSection(camera2) {
-    return {
-      id: ids.sectionActions,
-      enable: () => true,
-      style: sectionDefaultStyle,
-      buttons: [
-        {
-          id: ids.buttonZoomToFit,
-          enabled: () => true,
-          tip: "Frame Camera",
-          action: () => camera2.frameSelection.call(),
-          icon: frameSelection,
-          isOn: () => false,
-          style: buttonDefaultStyle
-        }
-      ]
-    };
-  }
   function useUltraCamera(viewer, section) {
     return useCamera({
       onSelectionChanged: viewer.selection.onValueChanged,
@@ -76139,6 +76185,7 @@ Averrage Date/Second ${avgDataRatePS} kb
     const [_, setSelectState] = React2.useState(0);
     const [controlBarCustom, setControlBarCustom] = React2.useState(() => (c) => c);
     const controlBar2 = useUltraControlBar(props.viewer, sectionBox2, camera2, (_2) => _2);
+    useViewerInput(props.viewer.inputs, camera2);
     React2.useEffect(() => {
       props.viewer.onStateChanged.subscribe((state) => updateModal(modal, state));
       props.viewer.selection.onValueChanged.subscribe(() => {