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

package/dist/vim-web.js

@@ -56912,7 +56912,6 @@ class CoreInputHandler extends InputHandler {
     this._adapter.init();
   }
   get moveSpeed() {
-    console.log("get moveSpeed", this._moveSpeed);
     return this._moveSpeed;
   }
   set moveSpeed(value) {
@@ -57034,7 +57033,6 @@ function createAdapter$1(viewer) {
       viewer.selection.clear();
     },
     frameCamera: () => {
-      console.log("frameCamera");
       if (viewer.selection.count > 0) {
         viewer.camera.lerp(0.75).frame(viewer.selection.getBoundingBox());
       } else {
@@ -61316,7 +61314,11 @@ function createAdapter(viewer) {
       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);
@@ -61366,13 +61368,6 @@ function createAdapter(viewer) {
     }
   };
 }
-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;
@@ -66366,6 +66361,55 @@ function hidden({ height, width, fill: fill2, className = "" }) {
     }
   );
 }
+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" }),
@@ -66914,6 +66958,7 @@ const icons = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   close,
   collapse,
   frameRect,
+  frameScene,
   frameSelection,
   fullArrowLeft,
   fullsScreen,
@@ -66959,7 +67004,7 @@ function anyUiAxesButton(settings2) {
   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);
@@ -66997,7 +67042,10 @@ const defaultSettings = {
     pan: true,
     zoom: true,
     zoomWindow: true,
-    zoomToFit: true,
+    // Control bar - camera
+    autoCamera: true,
+    frameScene: true,
+    frameSelection: true,
     // Control bar - tools
     sectioningMode: true,
     measuringMode: true,
@@ -67156,7 +67204,10 @@ const ids = {
   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",
@@ -67169,16 +67220,15 @@ const ids = {
   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) {
@@ -67411,7 +67461,7 @@ function controlBarSectionBox(section, hasSelection) {
         icon: sectionBox
       },
       {
-        id: ids.buttonSectionBoxShrinkToSelection,
+        id: ids.buttonSectionBoxToSelection,
         tip: "Fit Section",
         enabled: () => section.enable.get(),
         isOn: () => hasSelection,
@@ -67420,7 +67470,7 @@ function controlBarSectionBox(section, hasSelection) {
         icon: sectionBoxShrink
       },
       {
-        id: ids.buttonSectionBoxReset,
+        id: ids.buttonSectionBoxToScene,
         tip: "Reset Section",
         enabled: () => section.enable.get(),
         style: (on) => buttonDefaultStyle(on),
@@ -67520,15 +67570,6 @@ function controlBarActions(camera2, settings2, isolation, measure$1) {
     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),
@@ -67604,6 +67645,24 @@ function controlBarCamera(camera2) {
         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
       }
     ]
   };
@@ -74023,9 +74082,9 @@ function MenuSettings(props) {
             (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(
@@ -75522,7 +75581,7 @@ function useCamera(adapter, section) {
     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);
   });
@@ -75532,7 +75591,7 @@ function useCamera(adapter, section) {
     autoCamera: autoCamera2,
     reset,
     frameSelection: frameSelection2,
-    frameScene
+    frameScene: frameScene2
   };
 }
 function frame(adapter, section, box) {
@@ -75557,6 +75616,11 @@ function useWebglCamera(viewer, section) {
     getSceneBox: () => Promise.resolve(viewer.renderer.getBoundingBox())
   }, section);
 }
+function useViewerInput(handler, camera2) {
+  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();
@@ -75592,6 +75656,7 @@ function VimComponent(props) {
   const camera2 = useWebglCamera(props.viewer, sectionBox2);
   const cursor = useMemo(() => new CursorManager(props.viewer), []);
   const loader = useRef(new ComponentLoader(props.viewer, modal));
+  useViewerInput(props.viewer.inputs, camera2);
   const [isolation] = useState(() => new Isolation(props.viewer, camera2, settings2.value));
   useEffect(() => isolation.applySettings(settings2.value), [settings2]);
   const side = useSideState(
@@ -76058,29 +76123,10 @@ function useUltraSectionBox(viewer) {
 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,
@@ -76123,6 +76169,7 @@ function UltraComponent(props) {
   const [_, setSelectState] = useState(0);
   const [controlBarCustom, setControlBarCustom] = useState(() => (c) => c);
   const controlBar2 = useUltraControlBar(props.viewer, sectionBox2, camera2, (_2) => _2);
+  useViewerInput(props.viewer.inputs, camera2);
   useEffect(() => {
     props.viewer.onStateChanged.subscribe((state) => updateModal(modal, state));
     props.viewer.selection.onValueChanged.subscribe(() => {