@wandelbots/wandelbots-js-react-components 2.39.0 → 2.40.0-pr.feature-seperate-timer.383.c9c6f2b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "2.39.0",
+  "version": "2.40.0-pr.feature-seperate-timer.383.c9c6f2b",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/3d-viewport/collider/ColliderCollection.tsx

@@ -0,0 +1,34 @@
+import type { ThreeElements } from "@react-three/fiber"
+import type { Collider } from "@wandelbots/nova-api/v1"
+import ColliderElement from "./ColliderElement"
+
+export type MeshChildrenProvider = (
+  key: string,
+  collider: Collider,
+) => React.ReactNode
+
+type ColliderCollectionProps = {
+  name?: string
+  colliders: Record<string, Collider>
+  meshChildrenProvider: MeshChildrenProvider
+} & ThreeElements["group"]
+
+export default function ColliderCollection({
+  name,
+  colliders,
+  meshChildrenProvider,
+  ...props
+}: ColliderCollectionProps) {
+  return (
+    <group name={name} {...props}>
+      {Object.entries(colliders).map(([colliderKey, collider]) => (
+        <ColliderElement
+          key={colliderKey}
+          name={colliderKey}
+          collider={collider}
+          children={meshChildrenProvider(colliderKey, collider)}
+        />
+      ))}
+    </group>
+  )
+}

package/src/components/3d-viewport/collider/ColliderElement.tsx

@@ -0,0 +1,36 @@
+import type { Collider } from "@wandelbots/nova-api/v1"
+import type React from "react"
+import * as THREE from "three"
+import { colliderShapeToBufferGeometry } from "./colliderShapeToBufferGeometry"
+
+type ColliderElementProps = {
+  name?: string
+  collider: Collider
+  children?: React.ReactNode
+}
+
+export default function ColliderElement({
+  name,
+  collider,
+  children,
+}: ColliderElementProps) {
+  const position = collider.pose?.position ?? [0, 0, 0]
+  const rotation = collider.pose?.orientation ?? [0, 0, 0]
+  if (collider.margin) {
+    console.warn(`${name} margin is not supported`)
+  }
+  return (
+    <mesh
+      name={name}
+      position={new THREE.Vector3(
+        position[0],
+        position[1],
+        position[2],
+      ).divideScalar(1000)}
+      rotation={new THREE.Euler(rotation[0], rotation[1], rotation[2], "XYZ")}
+      geometry={colliderShapeToBufferGeometry(collider.shape)}
+    >
+      {children}
+    </mesh>
+  )
+}

package/src/components/3d-viewport/collider/CollisionSceneRenderer.tsx

@@ -0,0 +1,26 @@
+import type { CollisionScene } from "@wandelbots/nova-api/v1"
+import ColliderCollection, {
+  type MeshChildrenProvider,
+} from "./ColliderCollection"
+
+type CollisionSceneRendererProps = {
+  scene: CollisionScene
+  meshChildrenProvider: MeshChildrenProvider
+}
+
+export default function CollisionSceneRenderer({
+  scene,
+  meshChildrenProvider,
+}: CollisionSceneRendererProps) {
+  const colliders = scene.colliders
+  return (
+    <group>
+      {colliders && (
+        <ColliderCollection
+          meshChildrenProvider={meshChildrenProvider}
+          colliders={colliders}
+        />
+      )}
+    </group>
+  )
+}

package/src/components/3d-viewport/collider/colliderShapeToBufferGeometry.ts

@@ -0,0 +1,48 @@
+import type { ColliderShape } from "@wandelbots/nova-api/v1"
+import * as THREE from "three"
+import { ConvexGeometry } from "three-stdlib"
+
+export function colliderShapeToBufferGeometry(
+  shape: ColliderShape,
+): THREE.BufferGeometry {
+  const shapeType = shape.shape_type
+  switch (shapeType) {
+    case "convex_hull":
+      return new ConvexGeometry(
+        shape.vertices.map(
+          (vertex) =>
+            new THREE.Vector3(
+              vertex[0] / 1000,
+              vertex[1] / 1000,
+              vertex[2] / 1000,
+            ),
+        ),
+      )
+    case "box":
+      return new THREE.BoxGeometry(
+        shape.size_x / 1000,
+        shape.size_y / 1000,
+        shape.size_z / 1000,
+      )
+    case "sphere":
+      return new THREE.SphereGeometry(shape.radius / 1000)
+    case "capsule":
+      return new THREE.CapsuleGeometry(
+        shape.radius / 1000,
+        shape.cylinder_height / 1000,
+      )
+    case "cylinder":
+      return new THREE.CylinderGeometry(
+        shape.radius / 1000,
+        shape.radius / 1000,
+        shape.height / 1000,
+      )
+    case "rectangle": {
+      return new THREE.BoxGeometry(shape.size_x / 1000, shape.size_y / 1000, 0)
+    }
+    default: {
+      console.warn(`${shape.shape_type} is not supported`)
+      return new THREE.BufferGeometry()
+    }
+  }
+}

package/src/components/CycleTimer/DefaultVariant.tsx

@@ -114,7 +114,6 @@ export const DefaultVariant = ({
               showLabels &&
               !hasError &&
               currentState !== "idle" &&
-              currentState !== "countup" &&
               currentState !== "success"
             }
             timeout={300}
@@ -277,7 +276,6 @@ export const DefaultVariant = ({
               showLabels &&
               !hasError &&
               currentState !== "idle" &&
-              currentState !== "countup" &&
               currentState !== "success"
             }
             timeout={300}

package/src/components/CycleTimer/SmallVariant.tsx

@@ -31,7 +31,7 @@ export const SmallVariant = ({
   } = animationState
 
   // Simple text-only mode for compact variant in certain states
-  if (compact && (currentState === "countup" || currentState === "idle")) {
+  if (compact && currentState === "idle") {
     return (
       <Box
         className={className}
@@ -72,10 +72,7 @@ export const SmallVariant = ({
       }}
     >
       {/* Animated progress ring icon */}
-      {!(
-        currentState === "countup" ||
-        (currentState === "idle" && compact)
-      ) && (
+      {!(currentState === "idle" && compact) && (
         <Box
           sx={{
             width: 20,

package/src/components/CycleTimer/index.tsx

@@ -8,19 +8,18 @@ import { useAnimations } from "./useAnimations"
 import { useTimerLogic } from "./useTimerLogic"
 
 /**
- * A circular gauge timer component that shows the remaining time of a cycle or counts up
+ * A circular gauge timer component for cycle-specific timing operations
  *
  * Features:
  * - Custom SVG circular gauge with 264px diameter and 40px thickness
- * - Multiple states: idle, measuring, measured, countdown, countup, success
+ * - Multiple states: idle, measuring, measured, countdown, success
  * - Idle state: shows "Waiting for program cycle" with transparent inner circle
  * - Measuring state: counts up with "Cycle Time" / "measuring..." labels
  * - Measured state: shows final time with "Cycle Time" / "determined" labels in pulsating green
  * - Countdown mode: shows remaining time prominently, counts down to zero
- * - Count-up mode: shows elapsed time without special labels
  * - Success state: brief green flash after cycle completion
  * - Displays appropriate labels based on state
- * - Automatically counts down/up and triggers callback when reaching zero (countdown only)
+ * - Automatically counts down and triggers callback when reaching zero
  * - Full timer control: start, pause, resume functionality
  * - Support for starting with elapsed time (resume mid-cycle)
  * - Error state support: pauses timer and shows error styling (red color)
@@ -28,7 +27,7 @@ import { useTimerLogic } from "./useTimerLogic"
  * - Pulsating text animation for completed measuring state
  * - Fully localized with i18next
  * - Material-UI theming integration
- * - Small variant with animated progress icon (gauge border only) next to text or simple text-only mode
+ * - Small variant with animated progress icon (gauge border only) next to text
  */
 export const CycleTimer = externalizeComponent(
   observer(

package/src/components/CycleTimer/types.ts

@@ -3,13 +3,11 @@ export type CycleTimerState =
   | "measuring" // Counting up without max time, showing "Cycle Time" / "measuring..."
   | "measured" // Completed measuring state showing "Cycle Time" / "determined" with pulsating green text
   | "countdown" // Counting down with max time
-  | "countup" // Simple count up without special text
   | "success" // Brief success state after cycle completion
 
 export interface CycleTimerControls {
-  startNewCycle: (maxTimeSeconds?: number, elapsedSeconds?: number) => void
+  startNewCycle: (maxTimeSeconds: number, elapsedSeconds?: number) => void
   startMeasuring: (elapsedSeconds?: number) => void
-  startCountUp: (elapsedSeconds?: number) => void
   setIdle: () => void
   completeMeasuring: () => void
   pause: () => void

package/src/components/CycleTimer/useTimerLogic.ts

@@ -88,93 +88,46 @@ export const useTimerLogic = ({
     [autoStart, progressInterpolator],
   )
 
-  const startCountUp = useCallback(
-    (elapsedSeconds: number = 0) => {
-      const initialProgress = ((elapsedSeconds / 60) % 1) * 100
-      setTimerState((prev) => ({
-        ...prev,
-        currentState: "countup",
-        maxTime: null,
-        remainingTime: elapsedSeconds,
-        isPausedState: false,
-        currentProgress: initialProgress, // Immediately set progress
-      }))
-      pausedTimeRef.current = 0
-
-      progressInterpolator.setImmediate([initialProgress]) // Use setImmediate for instant reset
-
-      if (autoStart) {
-        startTimeRef.current = Date.now() - elapsedSeconds * 1000
-        setTimerState((prev) => ({ ...prev, isRunning: true }))
-      } else {
-        startTimeRef.current = null
-      }
-    },
-    [autoStart, progressInterpolator],
-  )
-
   const startNewCycle = useCallback(
-    (maxTimeSeconds?: number, elapsedSeconds: number = 0) => {
+    (maxTimeSeconds: number, elapsedSeconds: number = 0) => {
       // Stop any running timer first to prevent conflicts
       setTimerState((prev) => ({ ...prev, isRunning: false }))
       startTimeRef.current = null
 
-      const newState = maxTimeSeconds !== undefined ? "countdown" : "countup"
       setTimerState((prev) => ({
         ...prev,
-        currentState: newState,
-        maxTime: maxTimeSeconds ?? null,
+        currentState: "countdown",
+        maxTime: maxTimeSeconds,
         isPausedState: false,
       }))
       pausedTimeRef.current = 0
 
-      if (maxTimeSeconds !== undefined) {
-        // Count-down mode
-        const remainingSeconds = Math.max(0, maxTimeSeconds - elapsedSeconds)
-        const initialProgress =
-          elapsedSeconds > 0 ? (elapsedSeconds / maxTimeSeconds) * 100 : 0
-
-        setTimerState((prev) => ({
-          ...prev,
-          remainingTime: remainingSeconds,
-          currentProgress: initialProgress, // Immediately set progress
-        }))
-
-        progressInterpolator.setImmediate([initialProgress]) // Use setImmediate for instant reset
-
-        if (remainingSeconds === 0) {
-          setTimerState((prev) => ({ ...prev, isRunning: false }))
-          startTimeRef.current = null
-          if (onCycleEnd) {
-            queueMicrotask(() => onCycleEnd())
-          }
-        } else if (autoStart) {
-          setTimeout(() => {
-            startTimeRef.current = Date.now() - elapsedSeconds * 1000
-            setTimerState((prev) => ({ ...prev, isRunning: true }))
-          }, 0)
-        } else {
-          startTimeRef.current = null
+      // Count-down mode
+      const remainingSeconds = Math.max(0, maxTimeSeconds - elapsedSeconds)
+      const initialProgress =
+        elapsedSeconds > 0 ? (elapsedSeconds / maxTimeSeconds) * 100 : 0
+
+      setTimerState((prev) => ({
+        ...prev,
+        remainingTime: remainingSeconds,
+        currentProgress: initialProgress, // Immediately set progress
+      }))
+
+      progressInterpolator.setImmediate([initialProgress]) // Use setImmediate for instant reset
+
+      if (remainingSeconds === 0) {
+        setTimerState((prev) => ({ ...prev, isRunning: false }))
+        startTimeRef.current = null
+        if (onCycleEnd) {
+          queueMicrotask(() => onCycleEnd())
         }
+      } else if (autoStart) {
+        setTimeout(() => {
+          startTimeRef.current = Date.now() - elapsedSeconds * 1000
+          setTimerState((prev) => ({ ...prev, isRunning: true }))
+        }, 0)
       } else {
-        // Count-up mode
-        const initialProgress = ((elapsedSeconds / 60) % 1) * 100
-        setTimerState((prev) => ({
-          ...prev,
-          remainingTime: elapsedSeconds,
-          currentProgress: initialProgress, // Immediately set progress
-        }))
-
-        progressInterpolator.setImmediate([initialProgress]) // Use setImmediate for instant reset
-
-        if (autoStart) {
-          setTimeout(() => {
-            startTimeRef.current = Date.now() - elapsedSeconds * 1000
-            setTimerState((prev) => ({ ...prev, isRunning: true }))
-          }, 0)
-        } else {
-          startTimeRef.current = null
-        }
+        startTimeRef.current = null
       }
     },
     [autoStart, onCycleEnd, progressInterpolator],
@@ -316,13 +269,6 @@ export const useTimerLogic = ({
             }))
             const progress = ((elapsed / 60) % 1) * 100
             progressInterpolator.setTarget([progress])
-          } else if (timerState.currentState === "countup") {
-            setTimerState((prev) => ({
-              ...prev,
-              remainingTime: Math.floor(elapsed),
-            }))
-            const progress = ((elapsed / 60) % 1) * 100
-            progressInterpolator.setTarget([progress])
           }
 
           if (timerState.isRunning) {
@@ -375,7 +321,6 @@ export const useTimerLogic = ({
     controls: {
       startNewCycle,
       startMeasuring,
-      startCountUp,
       setIdle,
       completeMeasuring,
       pause,

package/src/components/CycleTimer/utils.ts

@@ -25,8 +25,8 @@ export const calculateProgress = (
     return Math.min(100, (elapsed / maxTime) * 100)
   }
 
-  if (currentState === "measuring" || currentState === "countup") {
-    // Count-up modes: progress based on minute steps (0-100% per minute)
+  if (currentState === "measuring") {
+    // Measuring mode: progress based on minute steps (0-100% per minute)
     return ((remainingTime / 60) % 1) * 100
   }
 
@@ -45,7 +45,7 @@ export const calculateExactProgress = (
     return Math.min(100, (totalElapsed / maxTime) * 100)
   }
 
-  if (currentState === "measuring" || currentState === "countup") {
+  if (currentState === "measuring") {
     return ((totalElapsed / 60) % 1) * 100
   }
 

package/src/components/Timer/Timer.ts

@@ -0,0 +1,2 @@
+export { Timer } from "./index"
+export type { TimerControls, TimerProps } from "./types"

package/src/components/Timer/TimerDefaultVariant.tsx

@@ -0,0 +1,140 @@
+import { Box, Fade, Typography } from "@mui/material"
+import { Gauge } from "@mui/x-charts"
+import { useTheme } from "@mui/material/styles"
+import { useTranslation } from "react-i18next"
+import type { TimerState, TimerAnimationState } from "./types"
+import { formatTime } from "./utils"
+
+interface TimerDefaultVariantProps {
+  timerState: TimerState
+  animationState: TimerAnimationState
+  hasError: boolean
+  className?: string
+}
+
+export const TimerDefaultVariant = ({
+  timerState,
+  animationState,
+  hasError,
+  className,
+}: TimerDefaultVariantProps) => {
+  const { t } = useTranslation()
+  const theme = useTheme()
+  const { elapsedTime, currentProgress } = timerState
+  const { showErrorAnimation, showPauseAnimation, showMainText } = animationState
+
+  return (
+    <Box
+      className={className}
+      sx={{
+        position: "relative",
+        width: 264,
+        height: 264,
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+      }}
+    >
+      <Gauge
+        width={264}
+        height={264}
+        value={currentProgress}
+        valueMin={0}
+        valueMax={100}
+        innerRadius="85%"
+        outerRadius="100%"
+        margin={0}
+        skipAnimation={true}
+        text={() => ""}
+        sx={{
+          opacity: showPauseAnimation || showErrorAnimation ? 0.6 : 1,
+          transition: "opacity 0.5s ease-out",
+          [`& .MuiGauge-valueArc`]: {
+            fill: hasError
+              ? theme.palette.error.light
+              : theme.palette.success.main,
+            transition: "fill 0.5s ease-out",
+          },
+          [`& .MuiGauge-referenceArc`]: {
+            fill: "#171927",
+            stroke: "transparent",
+            strokeWidth: 0,
+            transition:
+              "fill 0.5s ease-out, stroke 0.5s ease-out, stroke-width 0.5s ease-out",
+          },
+          [`& .MuiGauge-valueText`]: {
+            display: "none",
+          },
+          [`& .MuiGauge-text`]: {
+            display: "none",
+          },
+        }}
+      />
+
+      {/* Center content overlay */}
+      <Box
+        sx={{
+          position: "absolute",
+          top: "50%",
+          left: "50%",
+          transform: "translate(-50%, -50%)",
+          width: 225,
+          height: 225,
+          borderRadius: "50%",
+          backgroundColor: "#292B3F",
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          justifyContent: "center",
+          textAlign: "center",
+          gap: 1,
+          transition: "background-color 0.5s ease-out",
+        }}
+      >
+        {/* Main display */}
+        <Box
+          sx={{
+            position: "relative",
+            height: "48px",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            marginBottom: 0.5,
+          }}
+        >
+          {/* Error text */}
+          <Fade in={showMainText && hasError} timeout={200}>
+            <Typography
+              variant="h6"
+              sx={{
+                position: "absolute",
+                fontSize: "16px",
+                fontWeight: 500,
+                color: theme.palette.error.light,
+              }}
+            >
+              {t("timer.error")}
+            </Typography>
+          </Fade>
+
+          {/* Timer display */}
+          <Fade in={showMainText && !hasError} timeout={300}>
+            <Typography
+              variant="h1"
+              sx={{
+                position: "absolute",
+                fontSize: "48px",
+                fontWeight: 500,
+                color: theme.palette.text.primary,
+                lineHeight: 1,
+                letterSpacing: "-0.5px",
+              }}
+            >
+              {formatTime(elapsedTime)}
+            </Typography>
+          </Fade>
+        </Box>
+      </Box>
+    </Box>
+  )
+}