From fdb15e12967abf51aff345f9c1f5f3496ccffcea Mon Sep 17 00:00:00 2001 From: Arjan Singh <1598641+arjansingh@users.noreply.github.com> Date: Sat, 27 Sep 2025 09:17:23 -0700 Subject: [PATCH] [fix] remove unnecessary awaits (#5806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary Cleans up src/renderer/extensions/vueNodes/composables/useNodePointerInteractions.test.ts 1. Removes unnecessary ticks. 2. Cleans up `beforeEach` ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5806-fix-remove-unnecessary-awaits-27a6d73d36508103ae1ccb8199195905) by [Unito](https://www.unito.io) --- .../useNodePointerInteractions.test.ts | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/renderer/extensions/vueNodes/composables/useNodePointerInteractions.test.ts b/src/renderer/extensions/vueNodes/composables/useNodePointerInteractions.test.ts index 7e4f30c42..ad598bdbe 100644 --- a/src/renderer/extensions/vueNodes/composables/useNodePointerInteractions.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useNodePointerInteractions.test.ts @@ -67,12 +67,7 @@ const createMouseEvent = ( } describe('useNodePointerInteractions', () => { - let mockNodeData: VueNodeData - let mockOnPointerUp: ReturnType - beforeEach(() => { - mockNodeData = createMockVueNodeData() - mockOnPointerUp = vi.fn() vi.clearAllMocks() }) @@ -81,6 +76,9 @@ describe('useNodePointerInteractions', () => { }) it('should only start drag on left-click', async () => { + const mockNodeData = createMockVueNodeData() + const mockOnPointerUp = vi.fn() + const { pointerHandlers } = useNodePointerInteractions( ref(mockNodeData), mockOnPointerUp @@ -89,18 +87,15 @@ describe('useNodePointerInteractions', () => { // Right-click should not start drag const rightClickEvent = createPointerEvent('pointerdown', { button: 2 }) pointerHandlers.onPointerdown(rightClickEvent) - await nextTick() expect(mockOnPointerUp).not.toHaveBeenCalled() // Left-click should start drag and emit callback const leftClickEvent = createPointerEvent('pointerdown', { button: 0 }) pointerHandlers.onPointerdown(leftClickEvent) - await nextTick() const pointerUpEvent = createPointerEvent('pointerup') pointerHandlers.onPointerup(pointerUpEvent) - await nextTick() expect(mockOnPointerUp).toHaveBeenCalledWith( pointerUpEvent, @@ -110,6 +105,9 @@ describe('useNodePointerInteractions', () => { }) it('should distinguish drag from click based on distance threshold', async () => { + const mockNodeData = createMockVueNodeData() + const mockOnPointerUp = vi.fn() + const { pointerHandlers } = useNodePointerInteractions( ref(mockNodeData), mockOnPointerUp @@ -119,14 +117,12 @@ describe('useNodePointerInteractions', () => { pointerHandlers.onPointerdown( createPointerEvent('pointerdown', { clientX: 100, clientY: 100 }) ) - await nextTick() const dragUpEvent = createPointerEvent('pointerup', { clientX: 200, clientY: 200 }) pointerHandlers.onPointerup(dragUpEvent) - await nextTick() expect(mockOnPointerUp).toHaveBeenCalledWith( dragUpEvent, @@ -139,11 +135,9 @@ describe('useNodePointerInteractions', () => { // Test click (same position) const samePos = { clientX: 100, clientY: 100 } pointerHandlers.onPointerdown(createPointerEvent('pointerdown', samePos)) - await nextTick() const clickUpEvent = createPointerEvent('pointerup', samePos) pointerHandlers.onPointerup(clickUpEvent) - await nextTick() expect(mockOnPointerUp).toHaveBeenCalledWith( clickUpEvent, @@ -153,6 +147,9 @@ describe('useNodePointerInteractions', () => { }) it('should handle drag termination via cancel and context menu', async () => { + const mockNodeData = createMockVueNodeData() + const mockOnPointerUp = vi.fn() + const { pointerHandlers } = useNodePointerInteractions( ref(mockNodeData), mockOnPointerUp @@ -160,50 +157,49 @@ describe('useNodePointerInteractions', () => { // Test pointer cancel pointerHandlers.onPointerdown(createPointerEvent('pointerdown')) - await nextTick() pointerHandlers.onPointercancel(createPointerEvent('pointercancel')) - await nextTick() // Should not emit callback on cancel expect(mockOnPointerUp).not.toHaveBeenCalled() // Test context menu during drag prevents default pointerHandlers.onPointerdown(createPointerEvent('pointerdown')) - await nextTick() const contextMenuEvent = createMouseEvent('contextmenu') const preventDefaultSpy = vi.spyOn(contextMenuEvent, 'preventDefault') pointerHandlers.onContextmenu(contextMenuEvent) - await nextTick() expect(preventDefaultSpy).toHaveBeenCalled() }) it('should not emit callback when nodeData becomes null', async () => { + const mockNodeData = createMockVueNodeData() + const mockOnPointerUp = vi.fn() const nodeDataRef = ref(mockNodeData) + const { pointerHandlers } = useNodePointerInteractions( nodeDataRef, mockOnPointerUp ) pointerHandlers.onPointerdown(createPointerEvent('pointerdown')) - await nextTick() // Clear nodeData before pointerup nodeDataRef.value = null - await nextTick() pointerHandlers.onPointerup(createPointerEvent('pointerup')) - await nextTick() expect(mockOnPointerUp).not.toHaveBeenCalled() }) it('should integrate with layout store dragging state', async () => { + const mockNodeData = createMockVueNodeData() + const mockOnPointerUp = vi.fn() const { layoutStore } = await import( '@/renderer/core/layout/store/layoutStore' ) + const { pointerHandlers } = useNodePointerInteractions( ref(mockNodeData), mockOnPointerUp