Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
Showing only changes of commit d0451f1795 - Show all commits

View File

@@ -1,13 +1,12 @@
import './VisProgUI.css'
import {
Background,
Controls,
Panel,
ReactFlow,
ReactFlowProvider,
MarkerType,
Panel,
} from '@xyflow/react';
import '@xyflow/react/dist/style.css';
import {
@@ -15,17 +14,16 @@ import {
EndNode,
PhaseNode,
NormNode
} from "./components/NodeDefinitions.tsx";
} from './components/NodeDefinitions.tsx';
import { Sidebar } from './components/DragDropSidebar.tsx';
import useFlowStore from "./VisProgStores.tsx";
import {useShallow} from "zustand/react/shallow";
import type {FlowState} from "./VisProgTypes.tsx";
import useFlowStore from './VisProgStores.tsx';
import {useShallow} from 'zustand/react/shallow';
import type {FlowState} from './VisProgTypes.tsx';
// --| config starting params for flow |--
const nodeTypes = {
start: StartNode,
end: EndNode,
@@ -67,9 +65,9 @@ const VisProgUI = ()=> {
nodes={nodes}
edges={edges}
defaultEdgeOptions={defaultEdgeOptions}
nodeTypes={nodeTypes}
onNodesChange={onNodesChange}
onEdgesChange={onEdgesChange}
nodeTypes={nodeTypes}
onReconnect={onReconnect}
onReconnectStart={onReconnectStart}
onReconnectEnd={onReconnectEnd}
@@ -85,16 +83,15 @@ const VisProgUI = ()=> {
<Background />
</ReactFlow>
</div>
</div>
);
};
/* --| Places the VisProgUI component inside a ReactFlowProvider
*
* Wrapping the editor component inside a ReactFlowProvider
* allows us to access and interact with the components inside the editor,
* allows us to access and interact with the components inside the editor, outside the editor definition,
* thus facilitating the addition of node specific functions inside their node definitions
*/
function VisualProgrammingUI(){