From b12863f297301b7b35e110e87dc2f3d80fa77c3b Mon Sep 17 00:00:00 2001 From: Braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Wed, 15 Dec 2021 13:35:51 +0100 Subject: [PATCH] refactor(flow): lowercase event names (OnPaneLoad -> onPaneLoad) Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com> --- src/composables/useElementsState.ts | 8 ++++---- src/store/store.ts | 2 +- src/types/flow.ts | 4 ++-- src/types/hooks.ts | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/composables/useElementsState.ts b/src/composables/useElementsState.ts index 734c0a50..68e4fe4c 100644 --- a/src/composables/useElementsState.ts +++ b/src/composables/useElementsState.ts @@ -64,7 +64,7 @@ export const applyNodeChanges = (changes: NodeChange[], nodes: GraphNode[]) => a export const useEdgesState = ({ edges, applyDefault }: UseEdgesStateOptions = { applyDefault: true }): UseEdgesState => { const { store } = useVueFlow() if (edges && edges.length) store.setEdges(edges) - if (applyDefault && !store.applyDefault) store.hooksOn.OnEdgesChange((e) => applyEdgeChanges(e, store.edges)) + if (applyDefault && !store.applyDefault) store.hooksOn.onEdgesChange((e) => applyEdgeChanges(e, store.edges)) return { edges: store.edges, applyEdgeChanges: (changes) => applyEdgeChanges(changes, store.edges), @@ -90,14 +90,14 @@ export const useEdgesState = ({ edges, applyDefault }: UseEdgesStateOptions = { return store.edges }, updateEdge: (oldEdge, newConnection) => updateEdge(oldEdge, newConnection, store.edges), - OnEdgesChange: store.hooksOn.OnEdgesChange, + onEdgesChange: store.hooksOn.onEdgesChange, } } export const useNodesState = ({ nodes, applyDefault }: UseNodesStateOptions = { applyDefault: true }): UseNodesState => { const { store } = useVueFlow() if (nodes && nodes.length) store.setNodes(nodes) - if (applyDefault && !store.applyDefault) store.hooksOn.OnNodesChange((c) => applyNodeChanges(c, store.nodes)) + if (applyDefault && !store.applyDefault) store.hooksOn.onNodesChange((c) => applyNodeChanges(c, store.nodes)) return { nodes: store.nodes, applyNodeChanges: (changes) => applyNodeChanges(changes, store.nodes), @@ -111,7 +111,7 @@ export const useNodesState = ({ nodes, applyDefault }: UseNodesStateOptions = { store.nodes.push(...parsed) return store.nodes }, - OnNodesChange: store.hooksOn.OnNodesChange, + onNodesChange: store.hooksOn.onNodesChange, } } diff --git a/src/store/store.ts b/src/store/store.ts index fb0c7845..b67b670b 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -10,7 +10,7 @@ const useFlowStore = (preloadedState: State): Store => { const actions = useActions(state, getters) const hooksOn: FlowHooksOn = {} Object.entries(state.hooks).forEach(([n, h]) => { - const name = `On${n.charAt(0).toUpperCase() + n.slice(1)}` + const name = `on${n.charAt(0).toUpperCase() + n.slice(1)}` hooksOn[name] = h.on as any }) actions.setState(state) diff --git a/src/types/flow.ts b/src/types/flow.ts index 83709a42..c9012857 100644 --- a/src/types/flow.ts +++ b/src/types/flow.ts @@ -142,7 +142,7 @@ export type UseNodesState = { applyNodeChanges: (changes: NodeChange[]) => GraphNode[] setNodes: Actions['setNodes'] addNodes: (nodes: Node[], extent?: CoordinateExtent) => GraphNode[] - OnNodesChange: FlowHooksOn['OnNodesChange'] + onNodesChange: FlowHooksOn['onNodesChange'] } export type UseEdgesState = { edges: GraphEdge[] @@ -150,7 +150,7 @@ export type UseEdgesState = { setEdges: Actions['setEdges'] addEdges: (params: (Edge | Connection)[]) => GraphEdge[] updateEdge: (oldEdge: GraphEdge, newConnection: Connection) => GraphEdge | false - OnEdgesChange: FlowHooksOn['OnEdgesChange'] + onEdgesChange: FlowHooksOn['onEdgesChange'] } export type UseElementsState = UseNodesState & UseEdgesState diff --git a/src/types/hooks.ts b/src/types/hooks.ts index f9e1edc2..9cbaaa75 100644 --- a/src/types/hooks.ts +++ b/src/types/hooks.ts @@ -1,4 +1,4 @@ -import { EventHook } from '@vueuse/core' +import { EventHook, EventHookOn } from '@vueuse/core' import { MouseTouchEvent } from '@braks/revue-draggable' import { FlowInstance, Dimensions, XYPosition } from './flow' import { GraphEdge } from './edge' @@ -81,10 +81,11 @@ export interface FlowEvents { export type FlowEvent = FlowEvents[keyof FlowEvents] export type FlowHook = EventHook +export type FlowHookOn = EventHookOn export type FlowHooks = { [key in keyof FlowEvents]: FlowHook[key]> } export type FlowHooksOn = { - [key in keyof FlowEvents as `On${Capitalize}`]: FlowHook[key]>['on'] + [key in keyof FlowEvents as `on${Capitalize}`]: FlowHookOn[key]> } export type EmitFunc = (name: keyof T, ...args: any[]) => void