Skip to content

fix: update logs position to be absolute #9724

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
jordanrfrazier merged 7 commits into from
Sep 8, 2025
Merged

fix: update logs position to be absolute #9724

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90a75bc
removed left auto from log canvas controls
lucaseduoli Sep 5, 2025
2111321
made initial position be fetched from event for notes
lucaseduoli Sep 5, 2025
6f817d5
added relative class and put shadow box outside of the div that conta…
lucaseduoli Sep 5, 2025
2d21db6
Merge branch 'release-1.6.0' into fix/logs_position
carlosrcoelho Sep 8, 2025
dbabfff
Merge remote-tracking branch 'origin/release-1.6.0' into fix/logs_pos…
lucaseduoli Sep 8, 2025
e170d63
Merge branch 'release-1.6.0' into fix/logs_position
carlosrcoelho Sep 8, 2025
e8849e2
Fixed lock flow test
lucaseduoli Sep 8, 2025
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
2 changes: 1 addition & 1 deletion src/frontend/src/components/core/logCanvasControlsComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const LogCanvasControls = () => {
return (
<Panel
data-testid="canvas_controls"
className="react-flow__controls !m-2 rounded-md !left-auto "
className="react-flow__controls !m-2 rounded-md"
position="bottom-left"
>
<FlowLogsModal>
Expand Down
6 changes: 2 additions & 4 deletions src/frontend/src/pages/FlowPage/components/PageComponent/MemoizedComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export const MemoizedBackground = memo(() => (

interface MemoizedCanvasControlsProps {
setIsAddingNote: (value: boolean) => void;
position: { x: number; y: number };
shadowBoxWidth: number;
shadowBoxHeight: number;
}
Expand All @@ -27,7 +26,6 @@ export const MemoizedLogCanvasControls = memo(() => <LogCanvasControls />);
export const MemoizedCanvasControls = memo(
({
setIsAddingNote,
position,
shadowBoxWidth,
shadowBoxHeight,
}: MemoizedCanvasControlsProps) => (
Expand All @@ -43,9 +41,9 @@ export const MemoizedCanvasControls = memo(
setIsAddingNote(true);
const shadowBox = document.getElementById("shadow-box");
if (shadowBox) {
shadowBox.style.left = `${e.clientX - shadowBoxWidth / 2}px`;
shadowBox.style.top = `${e.clientY - shadowBoxHeight / 2}px`;
shadowBox.style.display = "block";
shadowBox.style.left = `${position.x - shadowBoxWidth / 2}px`;
shadowBox.style.top = `${position.y - shadowBoxHeight / 2}px`;
}
}}
>
Expand Down
131 changes: 66 additions & 65 deletions src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,70 +667,71 @@ export default function Page({
return (
<div className="h-full w-full bg-canvas" ref={reactFlowWrapper}>
{showCanvas ? (
<div id="react-flow-id" className="h-full w-full bg-canvas">
{!view && (
<>
<MemoizedLogCanvasControls />
<MemoizedCanvasControls
setIsAddingNote={setIsAddingNote}
position={position.current}
shadowBoxWidth={shadowBoxWidth}
shadowBoxHeight={shadowBoxHeight}
/>
<FlowToolbar />
</>
)}
<MemoizedSidebarTrigger />
<SelectionMenu
lastSelection={lastSelection}
isVisible={selectionMenuVisible}
nodes={lastSelection?.nodes}
onClick={handleGroupNode}
/>
<ReactFlow<AllNodeType, EdgeType>
nodes={nodes}
edges={edges}
onNodesChange={onNodesChangeWithHelperLines}
onEdgesChange={onEdgesChange}
onConnect={isLocked ? undefined : onConnectMod}
disableKeyboardA11y={true}
onInit={setReactFlowInstance}
nodeTypes={nodeTypes}
onReconnect={isLocked ? undefined : onEdgeUpdate}
onReconnectStart={isLocked ? undefined : onEdgeUpdateStart}
onReconnectEnd={isLocked ? undefined : onEdgeUpdateEnd}
onNodeDrag={onNodeDrag}
onNodeDragStart={onNodeDragStart}
onSelectionDragStart={onSelectionDragStart}
elevateEdgesOnSelect={false}
onSelectionEnd={onSelectionEnd}
onSelectionStart={onSelectionStart}
connectionRadius={30}
edgeTypes={edgeTypes}
connectionLineComponent={ConnectionLineComponent}
onDragOver={onDragOver}
onNodeDragStop={onNodeDragStop}
onDrop={onDrop}
onSelectionChange={onSelectionChange}
deleteKeyCode={[]}
fitView={isEmptyFlow.current ? false : true}
fitViewOptions={fitViewOptions}
className="theme-attribution"
minZoom={MIN_ZOOM}
maxZoom={MAX_ZOOM}
zoomOnScroll={!view}
zoomOnPinch={!view}
panOnDrag={!view}
panActivationKeyCode={""}
proOptions={{ hideAttribution: true }}
onPaneClick={onPaneClick}
onEdgeClick={handleEdgeClick}
>
<FlowBuildingComponent />
<UpdateAllComponents />
<MemoizedBackground />
{helperLineEnabled && <HelperLines helperLines={helperLines} />}
</ReactFlow>
<>
<div id="react-flow-id" className="h-full w-full bg-canvas relative">
{!view && (
<>
<MemoizedLogCanvasControls />
<MemoizedCanvasControls
setIsAddingNote={setIsAddingNote}
shadowBoxWidth={shadowBoxWidth}
shadowBoxHeight={shadowBoxHeight}
/>
<FlowToolbar />
</>
)}
<MemoizedSidebarTrigger />
<SelectionMenu
lastSelection={lastSelection}
isVisible={selectionMenuVisible}
nodes={lastSelection?.nodes}
onClick={handleGroupNode}
/>
<ReactFlow<AllNodeType, EdgeType>
nodes={nodes}
edges={edges}
onNodesChange={onNodesChangeWithHelperLines}
onEdgesChange={onEdgesChange}
onConnect={isLocked ? undefined : onConnectMod}
disableKeyboardA11y={true}
onInit={setReactFlowInstance}
nodeTypes={nodeTypes}
onReconnect={isLocked ? undefined : onEdgeUpdate}
onReconnectStart={isLocked ? undefined : onEdgeUpdateStart}
onReconnectEnd={isLocked ? undefined : onEdgeUpdateEnd}
onNodeDrag={onNodeDrag}
onNodeDragStart={onNodeDragStart}
onSelectionDragStart={onSelectionDragStart}
elevateEdgesOnSelect={false}
onSelectionEnd={onSelectionEnd}
onSelectionStart={onSelectionStart}
connectionRadius={30}
edgeTypes={edgeTypes}
connectionLineComponent={ConnectionLineComponent}
onDragOver={onDragOver}
onNodeDragStop={onNodeDragStop}
onDrop={onDrop}
onSelectionChange={onSelectionChange}
deleteKeyCode={[]}
fitView={isEmptyFlow.current ? false : true}
fitViewOptions={fitViewOptions}
className="theme-attribution"
minZoom={MIN_ZOOM}
maxZoom={MAX_ZOOM}
zoomOnScroll={!view}
zoomOnPinch={!view}
panOnDrag={!view}
panActivationKeyCode={""}
proOptions={{ hideAttribution: true }}
onPaneClick={onPaneClick}
onEdgeClick={handleEdgeClick}
>
<FlowBuildingComponent />
<UpdateAllComponents />
<MemoizedBackground />
{helperLineEnabled && <HelperLines helperLines={helperLines} />}
</ReactFlow>
</div>
<div
id="shadow-box"
style={{
Expand All @@ -744,7 +745,7 @@ export default function Page({
display: "none",
}}
></div>
</div>
</>
) : (
<div className="flex h-full w-full items-center justify-center">
<CustomLoader remSize={30} />
Expand Down
Loading