@viamrobotics/motion-tools 1.15.1 → 1.15.3

package/dist/components/Lasso/Tool.svelte

@@ -93,7 +93,6 @@
 			isOpen
 			exitable={false}
 			title="Lasso"
-			strategy="absolute"
 			defaultSize={{ width: 445, height: 100 }}
 			defaultPosition={{ x: rect.width / 2 - 200, y: rect.height - 10 - 100 }}
 		>

package/dist/components/StaticGeometries.svelte

@@ -51,8 +51,9 @@
 
 	keys.onKeys('-', () => {
 		if (selectedCustomGeometry) {
-			selectedCustomGeometry.destroy()
-			entities.delete(selectedCustomGeometry)
+			const entity = selectedCustomGeometry
+			entity.destroy()
+			entities.delete(entity)
 			selectedEntity.set()
 		}
 	})

package/dist/components/overlay/FloatingPanel.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte'
 
+	import { useThrelte } from '@threlte/core'
 	import { Icon } from '@viamrobotics/prime-core'
 	import * as floatingPanel from '@zag-js/floating-panel'
 	import { normalizeProps, useMachine } from '@zag-js/svelte'
@@ -12,7 +13,6 @@
 		exitable?: boolean
 		resizable?: boolean
 		persistRect?: boolean
-		strategy?: 'absolute' | 'fixed'
 		isOpen?: boolean
 		children: Snippet
 	}
@@ -20,10 +20,7 @@
 	let {
 		title = '',
 		defaultSize = { width: 700, height: 500 },
-		defaultPosition = {
-			x: globalThis.innerWidth / 2 - defaultSize.width / 2,
-			y: globalThis.innerHeight / 2 - defaultSize.height / 2,
-		},
+		defaultPosition,
 		exitable = true,
 		resizable = false,
 		persistRect = true,
@@ -32,13 +29,19 @@
 		...props
 	}: Props = $props()
 
+	const { dom } = useThrelte()
+
 	const id = $props.id()
 	const floatingPanelService = useMachine(floatingPanel.machine, () => ({
 		id,
 		defaultSize,
-		defaultPosition,
+		defaultPosition: defaultPosition ?? {
+			x: dom.clientWidth / 2 - defaultSize.width / 2 + dom.clientLeft,
+			y: dom.clientHeight / 2 - defaultSize.width / 2 + dom.clientTop,
+		},
 		resizable,
 		allowOverflow: false,
+		strategy: 'absolute' as const,
 		persistRect,
 		open: isOpen,
 		...props,

package/dist/components/overlay/FloatingPanel.svelte.d.ts

@@ -12,7 +12,6 @@ interface Props {
     exitable?: boolean;
     resizable?: boolean;
     persistRect?: boolean;
-    strategy?: 'absolute' | 'fixed';
     isOpen?: boolean;
     children: Snippet;
 }

package/dist/components/xr/useAnchors.svelte.js

@@ -6,7 +6,7 @@ const key = Symbol('anchors-context');
 export const provideAnchors = () => {
     const matrix4 = new Matrix4();
     const { renderer } = useThrelte();
-    const { xrFrame, isPresenting } = useXR();
+    const { isPresenting } = useXR();
     const map = new WeakMap();
     let space = renderer.xr.getReferenceSpace();
     const createAnchor = (position, orientation) => {
@@ -14,14 +14,14 @@ export const provideAnchors = () => {
         if (space === null)
             return;
         const pose = new XRRigidTransform(position, orientation);
-        return xrFrame.current.createAnchor?.(pose, space);
+        return renderer.xr.getFrame().createAnchor?.(pose, space);
     };
     const { start, stop } = useTask(() => {
         space ??= renderer.xr.getReferenceSpace();
         if (!space) {
             return;
         }
-        const frame = xrFrame.current;
+        const frame = renderer.xr.getFrame();
         if (!frame.trackedAnchors) {
             return;
         }

package/dist/ecs/useQuery.svelte.d.ts

@@ -1,4 +1,4 @@
 import { type QueryParameter, type QueryResult } from 'koota';
-export declare function useQuery<T extends QueryParameter[]>(...parameters: T): {
+export declare const useQuery: <T extends QueryParameter[]>(...parameters: T) => {
     current: QueryResult<T>;
 };

package/dist/ecs/useQuery.svelte.js

@@ -1,49 +1,56 @@
-import { createQuery, $internal as internal } from 'koota';
-import { untrack } from 'svelte';
+import { createQuery, $internal as internalKey } from 'koota';
+import { createSubscriber } from 'svelte/reactivity';
 import { useWorld } from './useWorld';
-export function useQuery(...parameters) {
+export const useQuery = (...parameters) => {
     const world = useWorld();
-    const createdQuery = createQuery(...parameters);
-    // Using internals to get the query data.
-    const query = world[internal].queriesHashMap.get(createdQuery.hash);
-    const initialQueryVersion = query?.version;
-    let version = $state.raw(0);
-    let entities = $state.raw(world.query(createdQuery));
-    $effect(() => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        version;
-        // Compare the initial version to the current version to
-        // see it the query has changed.
-        const query = world[internal].queriesHashMap.get(createdQuery.hash);
-        if (query?.version !== initialQueryVersion) {
-            entities = world.query(createdQuery);
-        }
-        return untrack(() => {
-            const unsubAdd = world.onQueryAdd(createdQuery, () => {
-                entities = world.query(createdQuery);
-            });
-            const unsubRemove = world.onQueryRemove(createdQuery, () => {
-                entities = world.query(createdQuery);
-            });
-            return () => {
-                unsubAdd();
-                unsubRemove();
-            };
-        });
-    });
-    const handler = () => {
-        version += 1;
-    };
-    // Force reattaching event listeners when the world is reset.
-    $effect(() => {
-        world[internal].resetSubscriptions.add(handler);
+    const queryRef = createQuery(...parameters);
+    let cache = null;
+    const subscribe = createSubscriber((update) => {
+        let unsubAdd = () => { };
+        let unsubRemove = () => { };
+        const subscribe = () => {
+            unsubAdd = world.onQueryAdd(queryRef, update);
+            unsubRemove = world.onQueryRemove(queryRef, update);
+            // Check if query changed before subscriptions were attached
+            const query = world[internalKey].queriesHashMap.get(queryRef.hash);
+            if (query && cache && query.version !== cache.version) {
+                update();
+            }
+        };
+        const handleReset = () => {
+            cache = null;
+            unsubAdd();
+            unsubRemove();
+            subscribe();
+            update();
+        };
+        subscribe();
+        world[internalKey].resetSubscriptions.add(handleReset);
         return () => {
-            world[internal].resetSubscriptions.delete(handler);
+            world[internalKey].resetSubscriptions.delete(handleReset);
+            unsubAdd();
+            unsubRemove();
         };
     });
+    const getResult = () => {
+        const query = world[internalKey].queriesHashMap.get(queryRef.hash);
+        if (query && cache?.hash === queryRef.hash && cache.version === query.version) {
+            return cache.result;
+        }
+        // eslint-disable-next-line unicorn/no-array-sort
+        const result = world.query(queryRef).sort();
+        const registeredQuery = world[internalKey].queriesHashMap.get(queryRef.hash);
+        cache = {
+            hash: queryRef.hash,
+            version: registeredQuery.version,
+            result,
+        };
+        return result;
+    };
     return {
         get current() {
-            return entities;
+            subscribe();
+            return getResult();
         },
     };
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/motion-tools",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "description": "Motion visualization with Viam",
   "license": "Apache-2.0",
   "type": "module",
@@ -25,10 +25,10 @@
     "@testing-library/jest-dom": "6.8.0",
     "@testing-library/svelte": "5.2.8",
     "@testing-library/user-event": "^14.6.1",
-    "@threlte/core": "8.3.0",
-    "@threlte/extras": "9.7.0",
-    "@threlte/rapier": "3.2.0",
-    "@threlte/xr": "1.0.8",
+    "@threlte/core": "8.5.0",
+    "@threlte/extras": "9.9.0",
+    "@threlte/rapier": "3.4.0",
+    "@threlte/xr": "1.4.0",
     "@types/bun": "1.2.21",
     "@types/earcut": "^3.0.0",
     "@types/lodash-es": "4.17.12",