diff --git a/packages/svelte/package.json b/packages/svelte/package.json index 98f38b77..318b2125 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", - "@sveltejs/kit": "^1.5.6", + "@sveltejs/kit": "^1.9.1", "@sveltejs/package": "^1.0.2", "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", @@ -37,11 +37,11 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-svelte3": "^4.0.0", "prettier": "^2.8.0", - "prettier-plugin-svelte": "^2.8.1", + "prettier-plugin-svelte": "^2.9.0", "svelte": "^3.55.1", - "svelte-check": "^3.0.1", + "svelte-check": "^3.0.4", "tslib": "^2.4.1", "typescript": "^4.9.3", - "vite": "^4.1.1" + "vite": "^4.1.4" } } diff --git a/packages/svelte/src/customnodes/Custom.svelte b/packages/svelte/src/customnodes/Custom.svelte index cb4dc2ee..1a64be22 100644 --- a/packages/svelte/src/customnodes/Custom.svelte +++ b/packages/svelte/src/customnodes/Custom.svelte @@ -1,5 +1,5 @@ diff --git a/packages/svelte/src/lib/components/EdgeLabelRenderer/index.svelte b/packages/svelte/src/lib/components/EdgeLabelRenderer/EdgeLabelRenderer.svelte similarity index 100% rename from packages/svelte/src/lib/components/EdgeLabelRenderer/index.svelte rename to packages/svelte/src/lib/components/EdgeLabelRenderer/EdgeLabelRenderer.svelte diff --git a/packages/svelte/src/lib/components/EdgeLabelRenderer/index.ts b/packages/svelte/src/lib/components/EdgeLabelRenderer/index.ts new file mode 100644 index 00000000..18592b1b --- /dev/null +++ b/packages/svelte/src/lib/components/EdgeLabelRenderer/index.ts @@ -0,0 +1 @@ +export { default as EdgeLabelRenderer } from './EdgeLabelRenderer.svelte'; \ No newline at end of file diff --git a/packages/svelte/src/lib/components/edges/EdgeWrapper.svelte b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte similarity index 96% rename from packages/svelte/src/lib/components/edges/EdgeWrapper.svelte rename to packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte index 1bcb6b4b..be931cbd 100644 --- a/packages/svelte/src/lib/components/edges/EdgeWrapper.svelte +++ b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte @@ -3,7 +3,7 @@ import { Position } from '@reactflow/system'; import { useStore } from '$lib/store'; - import BezierEdge from '$lib/components/edges/StraightEdge.svelte'; + import BezierEdge from '$lib/components/edges/BezierEdge.svelte'; import type { EdgeProps, EdgeLayouted } from '$lib/types'; type $$Props = EdgeLayouted; diff --git a/packages/svelte/src/lib/components/EdgeWrapper/index.ts b/packages/svelte/src/lib/components/EdgeWrapper/index.ts new file mode 100644 index 00000000..b055ce5a --- /dev/null +++ b/packages/svelte/src/lib/components/EdgeWrapper/index.ts @@ -0,0 +1 @@ +export { default as EdgeWrapper } from './EdgeWrapper.svelte'; diff --git a/packages/svelte/src/lib/components/Handle/index.svelte b/packages/svelte/src/lib/components/Handle/Handle.svelte similarity index 97% rename from packages/svelte/src/lib/components/Handle/index.svelte rename to packages/svelte/src/lib/components/Handle/Handle.svelte index 4ce9f57a..82a39e04 100644 --- a/packages/svelte/src/lib/components/Handle/index.svelte +++ b/packages/svelte/src/lib/components/Handle/Handle.svelte @@ -14,8 +14,6 @@ export let position: $$Props['position'] = Position.Top; export let isConnectable: $$Props['isConnectable'] = true; export let isValidConnection: $$Props['isValidConnection'] = (_: Connection) => true; - let className: string | null = null; - export { className as class }; const isTarget = type === 'target'; const nodeId = getContext('rf_nodeid'); @@ -80,7 +78,6 @@ `react-flow__handle-${position}`, 'nodrag', 'nopan', - className, position ])} class:source={!isTarget} diff --git a/packages/svelte/src/lib/components/Handle/index.ts b/packages/svelte/src/lib/components/Handle/index.ts new file mode 100644 index 00000000..162ffba0 --- /dev/null +++ b/packages/svelte/src/lib/components/Handle/index.ts @@ -0,0 +1 @@ +export { default as Handle } from './Handle.svelte'; diff --git a/packages/svelte/src/lib/components/KeyHandler/KeyHandler.svelte b/packages/svelte/src/lib/components/KeyHandler/KeyHandler.svelte index adb11dae..8f800add 100644 --- a/packages/svelte/src/lib/components/KeyHandler/KeyHandler.svelte +++ b/packages/svelte/src/lib/components/KeyHandler/KeyHandler.svelte @@ -2,7 +2,7 @@ import { shortcut } from '@svelte-put/shortcut'; import { useStore } from '$lib/store'; - import type { KeyHandlerProps } from './KeyHandler'; + import type { KeyHandlerProps } from './types'; import type { KeyDefinition, KeyDefinitionObject } from '$lib/types'; const { selectionKeyPressed, deleteKeyPressed } = useStore(); diff --git a/packages/svelte/src/lib/components/KeyHandler/index.ts b/packages/svelte/src/lib/components/KeyHandler/index.ts index 41481384..4973665d 100644 --- a/packages/svelte/src/lib/components/KeyHandler/index.ts +++ b/packages/svelte/src/lib/components/KeyHandler/index.ts @@ -1,2 +1,2 @@ export { default as KeyHandler } from './KeyHandler.svelte'; -export type { KeyHandlerProps } from './KeyHandler'; +export type { KeyHandlerProps } from './types'; diff --git a/packages/svelte/src/lib/components/KeyHandler/KeyHandler.d.ts b/packages/svelte/src/lib/components/KeyHandler/types.ts similarity index 66% rename from packages/svelte/src/lib/components/KeyHandler/KeyHandler.d.ts rename to packages/svelte/src/lib/components/KeyHandler/types.ts index d7ef91b7..14e76167 100644 --- a/packages/svelte/src/lib/components/KeyHandler/KeyHandler.d.ts +++ b/packages/svelte/src/lib/components/KeyHandler/types.ts @@ -1,4 +1,4 @@ -import { KeyDefinition } from '$lib/types'; +import type { KeyDefinition } from '$lib/types'; export type KeyHandlerProps = { selectionKey?: KeyDefinition; diff --git a/packages/svelte/src/lib/components/NodeSelection/index.svelte b/packages/svelte/src/lib/components/NodeSelection/NodeSelection.svelte similarity index 93% rename from packages/svelte/src/lib/components/NodeSelection/index.svelte rename to packages/svelte/src/lib/components/NodeSelection/NodeSelection.svelte index 5b649d36..743aacc9 100644 --- a/packages/svelte/src/lib/components/NodeSelection/index.svelte +++ b/packages/svelte/src/lib/components/NodeSelection/NodeSelection.svelte @@ -2,7 +2,7 @@ import { getRectOfNodes } from '@reactflow/utils'; import { useStore } from '$lib/store'; - import Selection from '$lib/components/Selection/index.svelte'; + import { Selection } from '$lib/components/Selection'; import drag from '$lib/actions/drag'; const { selectionRectMode, nodes, nodeOrigin, transform, updateNodePositions } = useStore(); diff --git a/packages/svelte/src/lib/components/NodeSelection/index.ts b/packages/svelte/src/lib/components/NodeSelection/index.ts new file mode 100644 index 00000000..65539494 --- /dev/null +++ b/packages/svelte/src/lib/components/NodeSelection/index.ts @@ -0,0 +1 @@ +export { default as NodeSelection } from './NodeSelection.svelte'; diff --git a/packages/svelte/src/lib/components/nodes/NodeWrapper.svelte b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte similarity index 67% rename from packages/svelte/src/lib/components/nodes/NodeWrapper.svelte rename to packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte index 643298aa..ef1a81ce 100644 --- a/packages/svelte/src/lib/components/nodes/NodeWrapper.svelte +++ b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte @@ -1,36 +1,46 @@ diff --git a/packages/svelte/src/lib/components/UserSelection/index.ts b/packages/svelte/src/lib/components/UserSelection/index.ts new file mode 100644 index 00000000..743064e1 --- /dev/null +++ b/packages/svelte/src/lib/components/UserSelection/index.ts @@ -0,0 +1 @@ +export { default as UserSelection } from './UserSelection.svelte'; diff --git a/packages/svelte/src/lib/components/edges/BezierEdge.svelte b/packages/svelte/src/lib/components/edges/BezierEdge.svelte index fa8b6914..622c3240 100644 --- a/packages/svelte/src/lib/components/edges/BezierEdge.svelte +++ b/packages/svelte/src/lib/components/edges/BezierEdge.svelte @@ -2,7 +2,7 @@ import { getBezierPath } from '@reactflow/edge-utils'; import type { EdgeProps } from '$lib/types'; - import BaseEdge from './BaseEdge.svelte'; + import { BaseEdge } from '$lib/components/BaseEdge'; type $$Props = EdgeProps; diff --git a/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte b/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte index fd360f9d..b43dd789 100644 --- a/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte +++ b/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte @@ -2,7 +2,7 @@ import { getSmoothStepPath } from '@reactflow/edge-utils'; import type { EdgeProps } from '$lib/types'; - import BaseEdge from './BaseEdge.svelte'; + import { BaseEdge } from '$lib/components/BaseEdge'; type $$Props = EdgeProps; diff --git a/packages/svelte/src/lib/components/edges/StraightEdge.svelte b/packages/svelte/src/lib/components/edges/StraightEdge.svelte index 5e27ec3d..a0123b67 100644 --- a/packages/svelte/src/lib/components/edges/StraightEdge.svelte +++ b/packages/svelte/src/lib/components/edges/StraightEdge.svelte @@ -2,7 +2,7 @@ import { getStraightPath } from '@reactflow/edge-utils'; import type { EdgeProps } from '$lib/types'; - import BaseEdge from './BaseEdge.svelte'; + import { BaseEdge } from '$lib/components/BaseEdge'; type $$Props = EdgeProps; diff --git a/packages/svelte/src/lib/components/nodes/DefaultNode.svelte b/packages/svelte/src/lib/components/nodes/DefaultNode.svelte index 1c10eb34..99873347 100644 --- a/packages/svelte/src/lib/components/nodes/DefaultNode.svelte +++ b/packages/svelte/src/lib/components/nodes/DefaultNode.svelte @@ -1,7 +1,7 @@ + + - + - import type { PanelPosition } from '@reactflow/system'; - - import Panel from '$lib/container/Panel/index.svelte'; + import Panel from '$lib/container/Panel/Panel.svelte'; import { useStore } from '$lib/store'; import ControlButton from './ControlButton.svelte'; import PlusIcon from './Icons/Plus.svelte'; @@ -10,10 +8,14 @@ import LockIcon from './Icons/Lock.svelte'; import UnlockIcon from './Icons/Unlock.svelte'; - export let position: PanelPosition = 'bottom-left'; - export let showZoom = true; - export let showFitView = true; - export let showInteractive = true; + import type { ControlsProps } from './types'; + + type $$Props = ControlsProps; + + export let position: $$Props['position'] = 'bottom-left'; + export let showZoom: $$Props['showZoom'] = true; + export let showFitView: $$Props['showFitView'] = true; + export let showInteractive: $$Props['showInteractive'] = true; const { zoomIn, zoomOut, fitView } = useStore(); diff --git a/packages/svelte/src/lib/plugins/Controls/index.ts b/packages/svelte/src/lib/plugins/Controls/index.ts index 58323ba3..681f5255 100644 --- a/packages/svelte/src/lib/plugins/Controls/index.ts +++ b/packages/svelte/src/lib/plugins/Controls/index.ts @@ -1,2 +1,3 @@ export { default as Controls } from './Controls.svelte'; export { default as ControlButton } from './ControlButton.svelte'; +export { type ControlsProps } from './types'; diff --git a/packages/svelte/src/lib/plugins/Controls/types.ts b/packages/svelte/src/lib/plugins/Controls/types.ts new file mode 100644 index 00000000..2c52f432 --- /dev/null +++ b/packages/svelte/src/lib/plugins/Controls/types.ts @@ -0,0 +1,8 @@ +import type { PanelPosition } from '@reactflow/system'; + +export type ControlsProps = { + position: PanelPosition; + showZoom: boolean; + showFitView: boolean; + showInteractive: boolean; +}; diff --git a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte index cf24f1d2..a4259174 100644 --- a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte +++ b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte @@ -1,34 +1,43 @@ + +