Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/components/graph/selectionToolbox/MoreOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
</template>

<script setup lang="ts">
import { useRafFn } from '@vueuse/core'
import Button from 'primevue/button'
import Popover from 'primevue/popover'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'

import { useCanvasTransformSync } from '@/composables/canvas/useCanvasTransformSync'
import {
forceCloseMoreOptionsSignal,
moreOptionsOpen,
Expand Down Expand Up @@ -152,9 +152,7 @@ const repositionPopover = () => {
}
}

const { startSync, stopSync } = useCanvasTransformSync(repositionPopover, {
autoStart: false
})
const { resume: startSync, pause: stopSync } = useRafFn(repositionPopover)

function openPopover(triggerEvent?: Event): boolean {
const el = getButtonEl()
Expand Down
136 changes: 0 additions & 136 deletions src/composables/canvas/useCanvasTransformSync.ts

This file was deleted.

6 changes: 2 additions & 4 deletions src/composables/canvas/useSelectionToolboxPosition.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRafFn } from '@vueuse/core'
import { computed, onUnmounted, ref, watch } from 'vue'
import type { Ref } from 'vue'

import { useCanvasTransformSync } from '@/composables/canvas/useCanvasTransformSync'
import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
Expand Down Expand Up @@ -128,9 +128,7 @@ export function useSelectionToolboxPosition(
}

// Sync with canvas transform
const { startSync, stopSync } = useCanvasTransformSync(updateTransform, {
autoStart: false
})
const { resume: startSync, pause: stopSync } = useRafFn(updateTransform)

// Watch for selection changes
watch(
Expand Down
19 changes: 12 additions & 7 deletions src/renderer/core/layout/transform/TransformPane.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</template>

<script setup lang="ts">
import { useRafFn } from '@vueuse/core'
import { computed, provide } from 'vue'

import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
import { TransformStateKey } from '@/renderer/core/layout/injectionKeys'
import { useCanvasTransformSync } from '@/renderer/core/layout/transform/useCanvasTransformSync'
import { useTransformSettling } from '@/renderer/core/layout/transform/useTransformSettling'
import { useTransformState } from '@/renderer/core/layout/transform/useTransformState'
import { useLOD } from '@/renderer/extensions/vueNodes/lod/useLOD'
Expand Down Expand Up @@ -68,14 +68,19 @@ const handlePointerDown = (event: PointerEvent) => {

const emit = defineEmits<{
rafStatusChange: [active: boolean]
transformUpdate: [time: number]
transformUpdate: []
}>()

useCanvasTransformSync(props.canvas, syncWithCanvas, {
onStart: () => emit('rafStatusChange', true),
onUpdate: (duration) => emit('transformUpdate', duration),
onStop: () => emit('rafStatusChange', false)
})
useRafFn(
() => {
if (!props.canvas) {
return
}
syncWithCanvas(props.canvas)
emit('transformUpdate')
},
{ immediate: true }
)
</script>

<style scoped>
Expand Down
115 changes: 0 additions & 115 deletions src/renderer/core/layout/transform/useCanvasTransformSync.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRafFn } from '@vueuse/core'
import { computed, ref } from 'vue'
import type { Ref } from 'vue'

import { useCanvasTransformSync } from '@/composables/canvas/useCanvasTransformSync'
import type { LGraph } from '@/lib/litegraph/src/litegraph'
import {
calculateMinimapScale,
Expand Down Expand Up @@ -124,9 +124,8 @@ export function useMinimapViewport(

c.setDirty(true, true)
}

const { startSync: startViewportSync, stopSync: stopViewportSync } =
useCanvasTransformSync(updateViewport, { autoStart: false })
const { resume: startViewportSync, pause: stopViewportSync } =
useRafFn(updateViewport)

return {
bounds: computed(() => bounds.value),
Expand Down
Loading