diff --git a/packages/webui/components/viewers/model/model-viewer.test.tsx b/packages/webui/components/viewers/model/model-viewer.test.tsx index 0d494ee9..5f2c9f70 100644 --- a/packages/webui/components/viewers/model/model-viewer.test.tsx +++ b/packages/webui/components/viewers/model/model-viewer.test.tsx @@ -104,6 +104,14 @@ describe('ModelViewer', () => { fireEvent.keyDown(window, { key: 'ArrowRight' }) expect(onTimeUpdate).toHaveBeenCalledWith(expect.closeTo(1 / 6, 2)) + // Press ArrowRight second time -> advance to frame 2 (30 deg = 2/6 sec) + fireEvent.keyDown(window, { key: 'ArrowRight' }) + expect(onTimeUpdate).toHaveBeenCalledWith(expect.closeTo(2 / 6, 2)) + + // Press ArrowLeft -> back 1 frame (frame 1 = 1/6 sec) + fireEvent.keyDown(window, { key: 'ArrowLeft' }) + expect(onTimeUpdate).toHaveBeenCalledWith(expect.closeTo(1 / 6, 2)) + // Press ArrowLeft -> back 1 frame (frame 0 = 0 sec) fireEvent.keyDown(window, { key: 'ArrowLeft' }) expect(onTimeUpdate).toHaveBeenCalledWith(0) diff --git a/packages/webui/components/viewers/model/model-viewer.tsx b/packages/webui/components/viewers/model/model-viewer.tsx index ddf83fb8..cc2fbc7a 100644 --- a/packages/webui/components/viewers/model/model-viewer.tsx +++ b/packages/webui/components/viewers/model/model-viewer.tsx @@ -167,11 +167,11 @@ export const ModelViewer = React.forwardRef( togglePlay() } else if (e.key === 'ArrowLeft') { e.preventDefault() - const currentFrame = Math.floor(currentTime * FPS) + const currentFrame = Math.round(currentTime * FPS) seekToFrame(currentFrame - 1) } else if (e.key === 'ArrowRight') { e.preventDefault() - const currentFrame = Math.floor(currentTime * FPS) + const currentFrame = Math.round(currentTime * FPS) seekToFrame(currentFrame + 1) } } diff --git a/packages/webui/components/viewers/model/ruler-slider.tsx b/packages/webui/components/viewers/model/ruler-slider.tsx index bdc8c05c..6c12b68e 100644 --- a/packages/webui/components/viewers/model/ruler-slider.tsx +++ b/packages/webui/components/viewers/model/ruler-slider.tsx @@ -85,15 +85,19 @@ export const RulerSlider: React.FC = ({ if (disabled) return if (e.key === 'ArrowLeft' || e.key === 'ArrowDown') { e.preventDefault() + e.stopPropagation() onChange((((normalizedDegree - STEP) % 360) + 360) % 360) } else if (e.key === 'ArrowRight' || e.key === 'ArrowUp') { e.preventDefault() + e.stopPropagation() onChange((normalizedDegree + STEP) % 360) } else if (e.key === 'Home') { e.preventDefault() + e.stopPropagation() onChange(0) } else if (e.key === 'End') { e.preventDefault() + e.stopPropagation() onChange(345) } },