@wandelbots/wandelbots-js-react-components 1.24.0 → 1.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "1.24.0",
+  "version": "1.24.2",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/jogging/JoggingCartesianAxisControl.tsx

@@ -39,11 +39,15 @@ export const JoggingCartesianAxisControl = externalizeComponent(
       const valueContainerRef = useRef<HTMLParagraphElement>(null)
 
       function onPointerDownMinus(ev: React.PointerEvent) {
+        if (disabled) return
+
         // Stop right click from triggering jog
         if (ev.button === 0) startJogging("-")
       }
 
       function onPointerDownPlus(ev: React.PointerEvent) {
+        if (disabled) return
+
         if (ev.button === 0) startJogging("+")
       }
 
@@ -62,7 +66,6 @@ export const JoggingCartesianAxisControl = externalizeComponent(
             onPointerDown={onPointerDownMinus}
             onPointerUp={stopJogging}
             onPointerOut={stopJogging}
-            disabled={disabled}
             size="large"
             sx={{
               width: "55px",
@@ -118,7 +121,6 @@ export const JoggingCartesianAxisControl = externalizeComponent(
             onPointerDown={onPointerDownPlus}
             onPointerUp={stopJogging}
             onPointerOut={stopJogging}
-            disabled={disabled}
             size="large"
             sx={{
               width: "55px",

package/src/components/jogging/JoggingPanel.tsx

@@ -128,13 +128,13 @@ const JoggingPanelInner = observer(
     // Update jogging mode on jogger based on user selections
     useReaction(
       () => [
-        store.currentTab,
+        store.currentTab.id,
         store.selectedTcpId,
         store.activeCoordSystemId,
         store.activeDiscreteIncrement,
       ],
       () => {
-        if (store.activationState === "active") store.activate()
+        if (store.activationState !== "inactive") store.activate()
       },
     )
 

package/src/components/jogging/JoggingStore.ts

@@ -49,6 +49,9 @@ export class JoggingStore {
    */
   activationError: unknown | null = null
 
+  /** To avoid activation race conditions */
+  activationCounter: number = 0
+
   /** Locks to prevent UI interactions during certain operations */
   locks = new Set<string>()
 
@@ -195,16 +198,7 @@ export class JoggingStore {
 
   /** Activate the jogger with current settings */
   async activate(opts: { manual?: boolean } = {}) {
-    const {
-      currentTab,
-      selectedTcpId,
-      activeCoordSystemId,
-      activeDiscreteIncrement,
-      jogger,
-    } = this
-
-    if (this.activationState === "loading") return
-
+    console.log("activate!!")
     if (this.manualActivationRequired && !opts.manual) return
 
     runInAction(() => {
@@ -224,25 +218,25 @@ export class JoggingStore {
       console.error(err)
     }
 
-    if (currentTab.id === "cartesian") {
+    if (this.currentTab.id === "cartesian") {
       const cartesianJoggingOpts = {
-        tcpId: selectedTcpId,
-        coordSystemId: activeCoordSystemId,
+        tcpId: this.selectedTcpId,
+        coordSystemId: this.activeCoordSystemId,
       }
 
-      if (activeDiscreteIncrement) {
-        jogger.setJoggingMode("increment", cartesianJoggingOpts)
+      if (this.activeDiscreteIncrement) {
+        this.jogger.setJoggingMode("increment", cartesianJoggingOpts)
       } else {
-        jogger.setJoggingMode("cartesian", cartesianJoggingOpts)
+        this.jogger.setJoggingMode("cartesian", cartesianJoggingOpts)
       }
     } else {
-      jogger.setJoggingMode("joint")
+      this.jogger.setJoggingMode("joint")
     }
 
-    if (jogger.activeWebsocket) {
+    if (this.jogger.activeWebsocket) {
       try {
-        jogger.stop()
-        await jogger.activeWebsocket.nextMessage()
+        this.jogger.stop()
+        await this.jogger.activeWebsocket.nextMessage()
       } catch (err) {
         runInAction(() => {
           this.activationState = "inactive"