@wandelbots/wandelbots-js-react-components 1.44.2 → 1.44.3-pr.fix-jogging-initial-lock-state.152.855e6db

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "1.44.2",
+  "version": "v1.44.3-pr.fix-jogging-initial-lock-state.152.855e6db",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/jogging/JoggingJointRotationControl.tsx

@@ -74,9 +74,6 @@ export const JoggingJointRotationControl = externalizeComponent(
       }
 
       function onPointerOut(ev: React.PointerEvent) {
-        // Prevent subelements of button from stopping jogging
-        if (ev.target !== ev.currentTarget) return
-
         state.stopJogging()
       }
 
@@ -137,7 +134,11 @@ export const JoggingJointRotationControl = externalizeComponent(
               ...(state.activeJoggingDir === "-" ? pressedButtonStyle : {}),
             }}
           >
-            <ChevronLeft />
+            <ChevronLeft
+              sx={{
+                "pointer-events": "none",
+              }}
+            />
           </IconButton>
 
           <Stack
@@ -228,7 +229,11 @@ export const JoggingJointRotationControl = externalizeComponent(
               ...(state.activeJoggingDir === "+" ? pressedButtonStyle : {}),
             }}
           >
-            <ChevronRight />
+            <ChevronRight
+              sx={{
+                "pointer-events": "none",
+              }}
+            />
           </IconButton>
         </Stack>
       )

package/src/components/jogging/JoggingPanel.tsx

@@ -84,11 +84,11 @@ export const JoggingPanel = externalizeComponent(
       if (!store) return
 
       if (props.locked) {
-        store.locks.add("external")
+        store.lock("external")
       } else {
-        store.locks.delete("external")
+        store.unlock("external")
       }
-    }, [props.locked])
+    }, [state.joggingStore, props.locked])
 
     return (
       <Stack

package/src/components/jogging/JoggingStore.ts

@@ -463,15 +463,23 @@ export class JoggingStore {
     this.selectedCartesianMotionType = type
   }
 
+  lock(id: string) {
+    this.locks.add(id)
+  }
+
+  unlock(id: string) {
+    this.locks.delete(id)
+  }
+
   /** Lock the UI until the given async callback resolves */
   async withMotionLock(fn: () => Promise<void>) {
     const lockId = uniqueId()
-    this.locks.add(lockId)
+    this.lock(lockId)
 
     try {
       return await fn()
     } finally {
-      this.locks.delete(lockId)
+      this.unlock(lockId)
     }
   }
 }