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

Jump to bottom

Optimize node selector panel and use group hover #2625

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Optimize node selector panel and use group hover #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/renderer/components/CustomEdge/CustomEdge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
transition-timing-function: ease-in-out;
stroke: var(--bg-700);

&.hovered {
.edge-chain-group:hover & {
stroke-width: 4px;
}
}
Expand All @@ -36,9 +36,9 @@
stroke-dashoffset: 0;
stroke-linecap: round;
animation: 'none';
opacity: 100%;
opacity: 1;

&.hovered {
.edge-chain-group:hover & {
stroke-width: 4px;
}

Expand All @@ -64,7 +64,7 @@
opacity: 1;
}

&.hovered {
.edge-chain-group:hover & {
stroke-width: 4px;
}

Expand Down
33 changes: 9 additions & 24 deletions src/renderer/components/CustomEdge/CustomEdge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { NeverType } from '@chainner/navi';
import { Center, Icon, IconButton } from '@chakra-ui/react';
import { memo, useCallback, useEffect, useMemo, useState } from 'react';
import { memo, useCallback, useEffect, useMemo } from 'react';
import { TbUnlink } from 'react-icons/tb';
import { EdgeProps, getBezierPath, getStraightPath, useKeyPress, useReactFlow } from 'reactflow';
import { useContext, useContextSelector } from 'use-context-selector';
import { useDebouncedCallback } from 'use-debounce';
import { Circle, Vec2 } from '../../../common/2d';
import { EdgeData, NodeData } from '../../../common/common-types';
import { assertNever, parseSourceHandle } from '../../../common/util';
Expand All @@ -26,18 +25,10 @@ import './CustomEdge.scss';
const EDGE_CLASS = {
RUNNING: 'running',
YET_TO_RUN: 'yet-to-run',
HOVERED: 'hovered',
COLLIDING: 'colliding',
NONE: '',
};

const getHoveredClass = (isHovered: boolean) => {
if (isHovered) {
return EDGE_CLASS.HOVERED;
}
return EDGE_CLASS.NONE;
};

const getCollidingClass = (isColliding: boolean) => {
if (isColliding) {
return EDGE_CLASS.COLLIDING;
Expand Down Expand Up @@ -181,8 +172,6 @@ export const CustomEdge = memo(
const { removeEdgeById, addEdgeBreakpoint } = useContext(GlobalContext);
const { functionDefinitions } = useContext(BackendContext);

const [isHovered, setIsHovered] = useState(false);

const { outputId } = useMemo(() => parseSourceHandle(sourceHandleId!), [sourceHandleId]);
const definitionType =
functionDefinitions.get(edgeParentNode.data.schemaId)?.outputDefaults.get(outputId) ??
Expand All @@ -196,11 +185,6 @@ export const CustomEdge = memo(

const buttonSize = 32;

// Prevent hovered state from getting stuck
const hoverTimeout = useDebouncedCallback(() => {
setIsHovered(false);
}, 7500);

const showRunning = animated && !paused;

const isColliding = useContextSelector(
Expand All @@ -210,12 +194,12 @@ export const CustomEdge = memo(

const classModifier = useMemo(
() =>
`${getHoveredClass(isHovered)} ${getRunningStateClass(
`${getRunningStateClass(
sourceStatus,
targetStatus,
animateChain
)} ${getCollidingClass(isColliding)}`,
[isHovered, sourceStatus, targetStatus, isColliding, animateChain]
[sourceStatus, targetStatus, isColliding, animateChain]
);

// NOTE: I know that technically speaking this is bad
Expand Down Expand Up @@ -255,6 +239,7 @@ export const CustomEdge = memo(

return (
<g
data-group
className="edge-chain-group"
style={{
cursor: 'pointer',
Expand All @@ -264,9 +249,6 @@ export const CustomEdge = memo(
onClick={onClick}
onContextMenu={menu.onContextMenu}
onDoubleClick={() => removeEdgeById(id)}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
onMouseOver={() => hoverTimeout()}
>
{showRunning && (
<path
Expand Down Expand Up @@ -298,7 +280,6 @@ export const CustomEdge = memo(
requiredExtensions="http://www.w3.org/1999/xhtml"
style={{
borderRadius: 100,
opacity: isHovered && !altPressed ? 1 : 0,
display: altPressed ? 'none' : 'block',
transitionDuration: '0.15s',
transitionProperty: 'opacity, background-color',
Expand All @@ -309,13 +290,17 @@ export const CustomEdge = memo(
y={edgeCenterY - buttonSize / 2}
>
<Center
_groupHover={{
opacity: 1,
}}
backgroundColor={currentColor}
borderColor="var(--node-border-color)"
borderRadius={100}
borderWidth={2}
h="full"
opacity={0}
transitionDuration="0.15s"
transitionProperty="background-color"
transitionProperty="background-color opacity"
transitionTimingFunction="ease-in-out"
w="full"
>
Expand Down