Skip to content
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

refactor: simplify hover controls, use CSS instead of react states, fix node flickering #82

Merged
merged 3 commits into from
Jan 7, 2025
Merged

refactor: simplify hover controls, use CSS instead of react states, fix node flickering #82

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1712002
refactor: simplify hover controls, use CSS instead of react states
srijanpatel Jan 7, 2025
20880ed
fix node flickering
srijanpatel Jan 7, 2025
66a177c
refactor: streamline border styling logic in BaseNode component
srijanpatel Jan 7, 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
176 changes: 67 additions & 109 deletions frontend/src/components/nodes/BaseNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,6 @@ const BaseNode: React.FC<BaseNodeProps> = ({
positionAbsoluteX,
positionAbsoluteY,
}) => {
const [isHovered, setIsHovered] = useState(false)
const [showControls, setShowControls] = useState(false)
const [isTooltipHovered, setIsTooltipHovered] = useState(false)
const [editingTitle, setEditingTitle] = useState(false)
const [isRunning, setIsRunning] = useState(false)
const [showTitleError, setShowTitleError] = useState(false)
Expand All @@ -166,34 +163,6 @@ const BaseNode: React.FC<BaseNodeProps> = ({

const { executePartialRun, loading } = usePartialRun()

const handleMouseEnter = useCallback(() => {
setIsHovered(true)
setShowControls(true)
}, [setIsHovered, setShowControls])

const handleMouseLeave = useCallback(() => {
setIsHovered(false)
if (!isTooltipHovered) {
setTimeout(() => {
setShowControls(false)
}, 200)
}
}, [setIsHovered, setShowControls, isTooltipHovered])

const handleControlsMouseEnter = useCallback(() => {
setShowControls(true)
setIsTooltipHovered(true)
}, [setShowControls, setIsTooltipHovered])

const handleControlsMouseLeave = useCallback(() => {
setIsTooltipHovered(false)
setTimeout(() => {
if (!isHovered) {
setShowControls(false)
}
}, 300)
}, [isHovered, setShowControls, setIsTooltipHovered])

const handleDelete = () => {
deleteNode(id, selectedNodeId, dispatch)
}
Expand Down Expand Up @@ -285,18 +254,11 @@ const BaseNode: React.FC<BaseNodeProps> = ({
() => ({
...restStyle,
borderColor,
borderWidth: isSelected
? '3px'
: status === 'completed'
? '2px'
: isHovered
? '3px'
: restStyle.borderWidth || '1px',
borderStyle: 'solid',
transition: 'border-color 0.1s, border-width 0.02s',
pointerEvents: 'auto' as const,
}),
[isSelected, status, isHovered, restStyle, borderColor]
[restStyle, borderColor]
)

const acronym = data.acronym || 'N/A'
Expand Down Expand Up @@ -334,7 +296,7 @@ const BaseNode: React.FC<BaseNodeProps> = ({
)

return (
<div style={staticStyles.container} draggable={false}>
<div style={staticStyles.container} draggable={false} className="group" id={`node-${id}`}>
{showTitleError && (
<Alert
key={`alert-${id}`}
Expand Down Expand Up @@ -363,11 +325,10 @@ const BaseNode: React.FC<BaseNodeProps> = ({
key={`card-${id}`}
className={`base-node ${className || ''}`}
style={cardStyle}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
isHoverable
classNames={{
base: 'bg-background border-default-200',
base: `bg-background border-default-200 ${
isSelected ? 'border-[3px]' : status === 'completed' ? 'border-[2px]' : 'border-[1px]'
} group-hover:border-[3px]`,
}}
>
{data && (
Expand Down Expand Up @@ -404,7 +365,7 @@ const BaseNode: React.FC<BaseNodeProps> = ({
<img
src={`${PUBLIC_URL}` + data.logo}
alt="Node Logo"
className='mr-2 max-h-8 max-w-8 mb-3'
className="mr-2 max-h-8 max-w-8 mb-3"
/>
)}
<h3
Expand Down Expand Up @@ -449,86 +410,83 @@ const BaseNode: React.FC<BaseNodeProps> = ({
</div>
</div>

{/* Controls */}
{(showControls || isSelected) && (
<Card
key={`controls-card-${id}`}
onMouseEnter={handleControlsMouseEnter}
onMouseLeave={handleControlsMouseLeave}
style={staticStyles.controlsCard}
classNames={{
base: 'bg-background border-default-200',
}}
>
<div className="flex flex-row gap-1">
{/* Controls - Update to use CSS-based hover */}
<Card
key={`controls-card-${id}`}
style={staticStyles.controlsCard}
className={`opacity-0 group-hover:opacity-100 ${isSelected ? 'opacity-100' : ''}`}
classNames={{
base: 'bg-background border-default-200 transition-opacity duration-200',
}}
>
<div className="flex flex-row gap-1">
<Button
key={`run-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={handlePartialRun}
disabled={loading || isRunning}
>
{isRunning ? (
<Spinner key={`spinner-${id}`} size="sm" color="current" />
) : (
<Icon
key={`play-icon-${id}`}
className="text-default-500"
icon="solar:play-linear"
width={22}
/>
)}
</Button>
{!isInputNode && (
<Button
key={`run-btn-${id}`}
key={`delete-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={handlePartialRun}
disabled={loading || isRunning}
onPress={handleDelete}
>
{isRunning ? (
<Spinner key={`spinner-${id}`} size="sm" color="current" />
) : (
<Icon
key={`play-icon-${id}`}
className="text-default-500"
icon="solar:play-linear"
width={22}
/>
)}
<Icon
key={`delete-icon-${id}`}
className="text-default-500"
icon="solar:trash-bin-trash-linear"
width={22}
/>
</Button>
{!isInputNode && (
<Button
key={`delete-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={handleDelete}
>
<Icon
key={`delete-icon-${id}`}
className="text-default-500"
icon="solar:trash-bin-trash-linear"
width={22}
/>
</Button>
)}
)}
<Button
key={`duplicate-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={handleDuplicate}
>
<Icon
key={`duplicate-icon-${id}`}
className="text-default-500"
icon="solar:copy-linear"
width={22}
/>
</Button>
{handleOpenModal && data?.run !== undefined && (
<Button
key={`duplicate-btn-${id}`}
key={`modal-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={handleDuplicate}
onPress={() => handleOpenModal(true)}
>
<Icon
key={`duplicate-icon-${id}`}
key={`view-icon-${id}`}
className="text-default-500"
icon="solar:copy-linear"
icon="solar:eye-linear"
width={22}
/>
</Button>
{handleOpenModal && data?.run !== undefined && (
<Button
key={`modal-btn-${id}`}
isIconOnly
radius="full"
variant="light"
onPress={() => handleOpenModal(true)}
>
<Icon
key={`view-icon-${id}`}
className="text-default-500"
icon="solar:eye-linear"
width={22}
/>
</Button>
)}
</div>
</Card>
)}
)}
</div>
</Card>
</div>
)
}
Expand Down