vim-web 1.0.0-alpha.7 → 1.0.0-alpha.9

package/dist/vim-web.js

@@ -74053,8 +74053,6 @@ class MutableState {
     this._value = value;
     this._onChange.dispatch(value);
   }
-  confirm() {
-  }
   get onChange() {
     return this._onChange.asEvent();
   }
@@ -74092,7 +74090,6 @@ function useStateRef(initialValue, isLazy = false, storageKey) {
   }
   const event = useRef(new distExports.SimpleEventDispatcher());
   const validate = useRef((next, current) => next);
-  const confirm = useRef((value) => value);
   const set3 = (value) => {
     const finalValue = validate.current(value, ref.current);
     if (finalValue === ref.current) return;
@@ -74110,12 +74107,6 @@ function useStateRef(initialValue, isLazy = false, storageKey) {
     },
     set: set3,
     onChange: event.current.asEvent(),
-    /**
-     * Confirms the current state by applying the confirm function and updating the state.
-     */
-    confirm() {
-      set3(confirm.current(ref.current));
-    },
     /**
      * Registers a callback to be invoked when the state changes.
      * Accepts a sync function, a cleanup function, or a function returning a Promise<void> (which will be ignored).
@@ -74159,15 +74150,6 @@ function useStateRef(initialValue, isLazy = false, storageKey) {
       useEffect(() => {
         validate.current = on;
       }, []);
-    },
-    /**
-     * Sets a confirmation function to process the state value during confirmation.
-     * @param on - A function that confirms (and optionally transforms) the current state value.
-     */
-    useConfirm(on) {
-      useEffect(() => {
-        confirm.current = on;
-      }, []);
     }
   };
 }
@@ -80019,8 +80001,7 @@ function GenericTextField(props) {
       onChange: (e) => {
         refresher.refresh();
         props.state.set(e.target.value);
-      },
-      onBlur: () => props.state.confirm()
+      }
     }
   );
 }
@@ -84347,7 +84328,7 @@ const BimTree = forwardRef((props, ref) => {
       children: /* @__PURE__ */ jsxRuntimeExports.jsx(
         ControlledTreeEnvironment,
         {
-          renderDepthOffset: div.current ? Math.min(div.current.clientWidth * 0.04, 10) : 10,
+          renderDepthOffset: 10,
           items: props.treeData.nodes,
           getItemTitle: (item) => item.title,
           showLiveDescription: false,
@@ -87164,7 +87145,7 @@ function getDefaultSettings() {
     },
     isolation: {
       autoIsolate: false,
-      showGhost: false,
+      showGhost: true,
       transparency: true,
       showRooms: false
     },
@@ -87360,19 +87341,12 @@ function getIsolationSettings(isolation) {
     }
   ];
 }
-function makeInitialUiState(ui) {
-  return Object.fromEntries(
-    Object.entries(ui).map(([k, v]) => [k, isTrue(v)])
-  );
-}
-function tog(id2, label, key, src, uiState, setUiKey) {
+function tog(id2, label, key, src, refs) {
   if (src[key] === "AlwaysTrue" || src[key] === "AlwaysFalse") return [];
-  const state = createState(uiState[key]);
-  state.onChange.subscribe((v) => setUiKey(key, v));
-  return [{ type: "bool", id: id2, label, state }];
+  return [{ type: "bool", id: id2, label, state: refs[key] }];
 }
-function getWebglSettingsContent(viewer, isolation, uiState, setUiKey, srcUi) {
-  const t = (id2, label, key) => tog(id2, label, key, srcUi, uiState, setUiKey);
+function getWebglSettingsContent(viewer, isolation, refs, srcUi) {
+  const t = (id2, label, key) => tog(id2, label, key, srcUi, refs);
   const scrollSpeedState = createState(viewer.inputs.scrollSpeed);
   scrollSpeedState.onChange.subscribe((v) => {
     viewer.inputs.scrollSpeed = v;
@@ -87433,6 +87407,110 @@ function getWebglSettingsContent(viewer, isolation, uiState, setUiKey, srcUi) {
     ...t(SettingsPanelKeys.ControlBarMiscShowMaximiseButtonToggle, "Maximise", "miscMaximise")
   ];
 }
+function useWebglUiState(initialSettings) {
+  const { refs, values } = useUiRefs(initialSettings);
+  const ui = useMemo(() => ({
+    // Panels
+    logo: refs.panelLogo,
+    controlBar: refs.panelControlBar,
+    bimTree: refs.panelBimTree,
+    bimInfo: refs.panelBimInfo,
+    axes: refs.panelAxes,
+    performance: refs.panelPerformance,
+    // Axes panel
+    axesOrthographic: refs.axesOrthographic,
+    axesHome: refs.axesHome,
+    // Cursors
+    cursorOrbit: refs.cursorOrbit,
+    cursorLookAround: refs.cursorLookAround,
+    cursorPan: refs.cursorPan,
+    cursorZoom: refs.cursorZoom,
+    // Camera
+    cameraAuto: refs.cameraAuto,
+    cameraFrameScene: refs.cameraFrameScene,
+    cameraFrameSelection: refs.cameraFrameSelection,
+    // Section box
+    sectioningEnable: refs.sectioningEnable,
+    sectioningFitToSelection: refs.sectioningFitToSelection,
+    sectioningReset: refs.sectioningReset,
+    sectioningShow: refs.sectioningShow,
+    sectioningAuto: refs.sectioningAuto,
+    sectioningSettings: refs.sectioningSettings,
+    // Measure
+    measureEnable: refs.measureEnable,
+    // Visibility
+    visibilityClearSelection: refs.visibilityClearSelection,
+    visibilityShowAll: refs.visibilityShowAll,
+    visibilityToggle: refs.visibilityToggle,
+    visibilityIsolate: refs.visibilityIsolate,
+    visibilityAutoIsolate: refs.visibilityAutoIsolate,
+    visibilitySettings: refs.visibilitySettings,
+    // Misc
+    miscProjectInspector: refs.miscProjectInspector,
+    miscSettings: refs.miscSettings,
+    miscHelp: refs.miscHelp,
+    miscMaximise: refs.miscMaximise
+  }), []);
+  return { ui, refs, uiValues: values };
+}
+function useUltraUiState(initialSettings) {
+  const { refs, values } = useUiRefs(initialSettings);
+  const ui = useMemo(() => ({
+    // Panels
+    logo: refs.panelLogo,
+    controlBar: refs.panelControlBar,
+    // Cursors
+    cursorOrbit: refs.cursorOrbit,
+    cursorLookAround: refs.cursorLookAround,
+    cursorPan: refs.cursorPan,
+    cursorZoom: refs.cursorZoom,
+    // Camera
+    cameraAuto: refs.cameraAuto,
+    cameraFrameScene: refs.cameraFrameScene,
+    cameraFrameSelection: refs.cameraFrameSelection,
+    // Section box
+    sectioningEnable: refs.sectioningEnable,
+    sectioningFitToSelection: refs.sectioningFitToSelection,
+    sectioningReset: refs.sectioningReset,
+    sectioningShow: refs.sectioningShow,
+    sectioningAuto: refs.sectioningAuto,
+    sectioningSettings: refs.sectioningSettings,
+    // Visibility
+    visibilityClearSelection: refs.visibilityClearSelection,
+    visibilityShowAll: refs.visibilityShowAll,
+    visibilityToggle: refs.visibilityToggle,
+    visibilityIsolate: refs.visibilityIsolate,
+    visibilityAutoIsolate: refs.visibilityAutoIsolate,
+    visibilitySettings: refs.visibilitySettings,
+    // Misc
+    miscSettings: refs.miscSettings,
+    miscHelp: refs.miscHelp
+  }), []);
+  return { ui, refs, uiValues: values };
+}
+function useUiRefs(initialSettings) {
+  const [values, setValues] = useState(
+    () => Object.fromEntries(
+      Object.entries(initialSettings).map(([k, v]) => [k, isTrue(v)])
+    )
+  );
+  const refs = useMemo(() => {
+    const result = {};
+    for (const [key, initial] of Object.entries(initialSettings)) {
+      result[key] = createState(isTrue(initial));
+    }
+    return result;
+  }, []);
+  useEffect(() => {
+    const unsubs = Object.keys(refs).map(
+      (key) => refs[key].onChange.subscribe((v) => {
+        setValues((prev) => ({ ...prev, [key]: v }));
+      })
+    );
+    return () => unsubs.forEach((u) => u());
+  }, []);
+  return { refs, values };
+}
 function createWebglViewer(container, settings2 = {}, coreSettings = {}) {
   const cmpContainer = container instanceof HTMLElement ? createContainer(container) : container ?? createContainer();
   const viewer = createCoreWebglViewer(coreSettings);
@@ -87464,8 +87542,7 @@ function createWebglViewer(container, settings2 = {}, coreSettings = {}) {
 const WebglViewerComponent = forwardRef((props, ref) => {
   const settings2 = createSettings(props.settings ?? {}, getDefaultSettings());
   const modal = useRef(null);
-  const [uiState, setUiState] = useState(() => makeInitialUiState(settings2.ui));
-  const setUiKey = (key, value) => setUiState((prev) => ({ ...prev, [key]: value }));
+  const { ui: uiApi, refs: uiRefs, uiValues: uiState } = useWebglUiState(settings2.ui);
   const effectiveSettings = { ...settings2, ui: { ...settings2.ui, ...uiState } };
   useEffect(() => {
     if (!settings2.capacity.canReadLocalStorage) disableLocalStorage();
@@ -87518,6 +87595,7 @@ const WebglViewerComponent = forwardRef((props, ref) => {
       return modal.current;
     },
     bimInfo: bimInfoRef,
+    ui: uiApi,
     dispose: () => {
     }
   }), []);
@@ -87547,7 +87625,7 @@ const WebglViewerComponent = forwardRef((props, ref) => {
       SettingsPanel,
       {
         visible: side.getContent() === "settings",
-        content: getWebglSettingsContent(props.viewer, isolationRef, uiState, setUiKey, settings2.ui)
+        content: getWebglSettingsContent(props.viewer, isolationRef, uiRefs, settings2.ui)
       }
     )
   ] });
@@ -87954,6 +88032,7 @@ async function createUltraViewer(container, settings2) {
 }
 const UltraViewerComponent = forwardRef((props, ref) => {
   const settings2 = createSettings(props.settings ?? {}, getDefaultUltraSettings());
+  const { ui: uiApi, uiValues: uiState } = useUltraUiState(settings2.ui);
   const sectionBoxRef = useUltraSectionBox(props.core, settings2.sectionBox);
   const framing = useUltraFraming(props.core, sectionBoxRef, settings2.camera.autoCamera);
   const isolationPanelHandle = useRef(null);
@@ -87993,6 +88072,7 @@ const UltraViewerComponent = forwardRef((props, ref) => {
     },
     dispose: () => {
     },
+    ui: uiApi,
     controlBar: controlBarApi,
     load: patchLoad(props.core, modalHandle),
     unload: (vim) => props.core.unload(vim)
@@ -88024,13 +88104,13 @@ const UltraViewerComponent = forwardRef((props, ref) => {
     ),
     /* @__PURE__ */ jsxRuntimeExports.jsx(RestOfScreen, { side, content: () => {
       return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-        whenTrue(settings2.ui.panelLogo, /* @__PURE__ */ jsxRuntimeExports.jsx(LogoMemo, {})),
+        uiState.panelLogo && /* @__PURE__ */ jsxRuntimeExports.jsx(LogoMemo, {}),
         /* @__PURE__ */ jsxRuntimeExports.jsx(Overlay, { canvas: props.core.viewport.canvas }),
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           ControlBar,
           {
             content: controlBar,
-            show: isTrue(settings2.ui.panelControlBar)
+            show: uiState.panelControlBar
           }
         ),
         /* @__PURE__ */ jsxRuntimeExports.jsx(SectionBoxPanel$1, { ref: sectionBoxPanelHandle, state: sectionBoxRef }),