Skip to content

Fix (better drag-n-drop): Scope Handler & Scope right-click Menu for adding new nodes #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Fix (better drag-n-drop): Scope Handler & Scope right-click Menu for adding new nodes #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b206943
add drag handler & scope context menu
li-xin-yi Apr 20, 2023
3972e52
clean up
li-xin-yi Apr 20, 2023
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
24 changes: 21 additions & 3 deletions ui/src/components/Canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,22 @@ function CanvasImpl() {
const [showContextMenu, setShowContextMenu] = useState(false);
const [points, setPoints] = useState({ x: 0, y: 0 });
const [client, setClient] = useState({ x: 0, y: 0 });
const [parentNode, setParentNode] = useState("ROOT");

const onPaneContextMenu = (event) => {
event.preventDefault();
setShowContextMenu(true);
setParentNode("ROOT");
setPoints({ x: event.pageX, y: event.pageY });
setClient({ x: event.clientX, y: event.clientY });
};

const onNodeContextMenu = (event, node) => {
if (node?.type !== "scope") return;

event.preventDefault();
setShowContextMenu(true);
setParentNode(node.id);
setPoints({ x: event.pageX, y: event.pageY });
setClient({ x: event.clientX, y: event.clientY });
};
Expand Down Expand Up @@ -603,6 +615,7 @@ function CanvasImpl() {
maxZoom={10}
minZoom={0.1}
onPaneContextMenu={onPaneContextMenu}
onNodeContextMenu={onNodeContextMenu}
nodeTypes={nodeTypes}
// custom edge for easy connect
edgeTypes={edgeTypes}
Expand Down Expand Up @@ -657,17 +670,22 @@ function CanvasImpl() {
x={points.x}
y={points.y}
addCode={() =>
addNode("code", project({ x: client.x, y: client.y }))
addNode("code", project({ x: client.x, y: client.y }), parentNode)
}
addScope={() =>
addNode("scope", project({ x: client.x, y: client.y }))
addNode(
"scope",
project({ x: client.x, y: client.y }),
parentNode
)
}
addRich={() =>
addNode("rich", project({ x: client.x, y: client.y }))
addNode("rich", project({ x: client.x, y: client.y }), parentNode)
}
onShareClick={() => {
setShareOpen(true);
}}
parentNode={null}
/>
)}
{shareOpen && <ShareProjDialog open={shareOpen} id={repoId || ""} />}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/nodes/Scope.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ export const ScopeNode = memo<NodeProps>(function ScopeNode({
border: isCutting ? "dashed 2px red" : "solid 1px #d6dee6",
borderRadius: "4px",
}}
className="custom-drag-handle"
>
{/* <NodeResizer color="#ff0071" minWidth={100} minHeight={30} /> */}
<NodeResizeControl
Expand Down Expand Up @@ -194,6 +193,7 @@ export const ScopeNode = memo<NodeProps>(function ScopeNode({
<Box
// bgcolor={"rgb(225,225,225)"}
sx={{ display: "flex" }}
className="custom-drag-handle"
>
{devMode && (
<Box
Expand Down
29 changes: 23 additions & 6 deletions ui/src/lib/store/canvasSlice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ function getScopeAt(
function getNodePositionInsideScope(
node: Node,
scope: Node,
nodesMap
nodesMap,
nodeHeight: number = 0
): XYPosition {
// compute the actual position
let [x, y] = getAbsPos(node, nodesMap);
Expand All @@ -178,11 +179,11 @@ function getNodePositionInsideScope(
y -= dy;
// auto-align the node to, keep it bound in the scope
// FIXME: it assumes the scope must be larger than the node

x = Math.max(x, 0);
x = Math.min(x, scope.width! - node.width!);
y = Math.max(y, 0);
y = Math.min(y, scope.height! - node.height!);
// FIXME: node.height can be undefined
y = Math.min(y, scope.height! - nodeHeight);
return { x, y };
}

Expand Down Expand Up @@ -250,7 +251,11 @@ export interface CanvasSlice {
setPaneFocus: () => void;
setPaneBlur: () => void;

addNode: (type: "code" | "scope" | "rich", position: XYPosition) => void;
addNode: (
type: "code" | "scope" | "rich",
position: XYPosition,
parent: string
) => void;

pastingNodes?: Node[];
headPastingNodes?: Set<string>;
Expand Down Expand Up @@ -390,7 +395,7 @@ export const createCanvasSlice: StateCreator<MyState, [], [], CanvasSlice> = (
get().addPod({
id: node.id,
children: [],
parent,
parent: "ROOT",
type: nodetype2dbtype(node.type || ""),
lang: "python",
x: node.position.x,
Expand All @@ -401,6 +406,10 @@ export const createCanvasSlice: StateCreator<MyState, [], [], CanvasSlice> = (
dirty: true,
pending: true,
});
if (parent !== "ROOT") {
// we don't assign its parent when created, because we have to adjust its position to make it inside its parent.
get().moveIntoScope(node.id, parent);
}
get().updateView();
},

Expand Down Expand Up @@ -610,7 +619,15 @@ export const createCanvasSlice: StateCreator<MyState, [], [], CanvasSlice> = (
}
// let [x, y] = getAbsPos(node, nodesMap);
// let position = getNodePositionInsideParent(node, scope, { x, y });
let position = getNodePositionInsideScope(node, scope, nodesMap);

// FIXME: since richNode and codeNode doesn't have height when it's created, we have to pass its height manually in case crash.
const nodeHeight = get().getPod(nodeId)?.height || 0;
let position = getNodePositionInsideScope(
node,
scope,
nodesMap,
nodeHeight
);
let newNode: Node = {
...node,
position,
Expand Down