Skip to content

Commit

Permalink
refactor(internals): use non enumerable props
Browse files Browse the repository at this point in the history
  • Loading branch information
moklick committed May 26, 2022
1 parent 03f0be6 commit 27b5de2
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 22 deletions.
6 changes: 4 additions & 2 deletions src/components/ConnectionLine/index.tsx
Expand Up @@ -6,6 +6,7 @@ import { getBezierPath } from '../Edges/BezierEdge';
import { getSmoothStepPath } from '../Edges/SmoothStepEdge';
import { ConnectionLineType, ConnectionLineComponent, HandleType, Node, ReactFlowState, Position } from '../../types';
import { getSimpleBezierPath } from '../Edges/SimpleBezierEdge';
import { handleBoundsSymbol } from '../../utils';

interface ConnectionLineProps {
connectionNodeId: string;
Expand Down Expand Up @@ -37,12 +38,13 @@ export default ({

const { nodeInternals, transform } = useStore(selector, shallow);
const fromNode = useRef<Node | undefined>(nodeInternals.get(nodeId));
const fromHandleBounds = fromNode.current?.[handleBoundsSymbol];

if (!fromNode.current || !isConnectable || !fromNode.current.handleBounds?.[connectionHandleType]) {
if (!fromNode.current || !isConnectable || !fromHandleBounds?.[connectionHandleType]) {
return null;
}

const handleBound = fromNode.current.handleBounds?.[connectionHandleType];
const handleBound = fromHandleBounds[connectionHandleType];
const fromHandle = handleId ? handleBound?.find((d) => d.id === handleId) : handleBound?.[0];
const fromHandleX = fromHandle ? fromHandle.x + fromHandle.width / 2 : (fromNode.current?.width ?? 0) / 2;
const fromHandleY = fromHandle ? fromHandle.y + fromHandle.height / 2 : fromNode.current?.height ?? 0;
Expand Down
9 changes: 5 additions & 4 deletions src/container/EdgeRenderer/utils.ts
Expand Up @@ -13,7 +13,7 @@ import {
Transform,
XYPosition,
} from '../../types';
import { rectToBox } from '../../utils';
import { handleBoundsSymbol, rectToBox } from '../../utils';

export type CreateEdgeTypes = (edgeTypes: EdgeTypes) => EdgeTypesWrapped;

Expand Down Expand Up @@ -168,10 +168,11 @@ export function isEdgeVisible({

export function getNodeData(nodeInternals: NodeInternals, nodeId: string): [Rect, NodeHandleBounds | null, boolean] {
const node = nodeInternals.get(nodeId);
const handleBounds = node?.handleBounds;
const handleBounds = node?.[handleBoundsSymbol] || null;

const isInvalid =
!node ||
!node.handleBounds ||
!handleBounds ||
!node.width ||
!node.height ||
typeof node.positionAbsolute?.x === 'undefined' ||
Expand All @@ -184,7 +185,7 @@ export function getNodeData(nodeInternals: NodeInternals, nodeId: string): [Rect
width: node?.width || 0,
height: node?.height || 0,
},
handleBounds || null,
handleBounds,
!isInvalid,
];
}
5 changes: 3 additions & 2 deletions src/container/NodeRenderer/index.tsx
Expand Up @@ -11,6 +11,7 @@ import {
ReactFlowState,
WrapNodeProps,
} from '../../types';
import { isParentSymbol, zSymbol } from '../../utils';

interface NodeRendererProps {
nodeTypes: NodeTypesWrapped;
Expand Down Expand Up @@ -117,8 +118,8 @@ const NodeRenderer = (props: NodeRendererProps) => {
isConnectable={isConnectable}
resizeObserver={resizeObserver}
dragHandle={node.dragHandle}
zIndex={node.z ?? 0}
isParent={!!node.isParent}
zIndex={node[zSymbol] ?? 0}
isParent={!!node[isParentSymbol]}
noDragClassName={props.noDragClassName}
noPanClassName={props.noPanClassName}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useVisibleEdges.ts
Expand Up @@ -3,7 +3,7 @@ import { useCallback } from 'react';
import { useStore } from '../store';
import { isEdgeVisible } from '../container/EdgeRenderer/utils';
import { ReactFlowState, NodeInternals, Edge } from '../types';
import { isNumeric } from '../utils';
import { isNumeric, zSymbol } from '../utils';

const defaultEdgeTree = [{ level: 0, isMaxLevel: true, edges: [] }];

Expand All @@ -17,7 +17,7 @@ function groupEdgesByZLevel(edges: Edge[], nodeInternals: NodeInternals, elevate
if (elevateEdgesOnSelect) {
z = hasZIndex
? edge.zIndex!
: Math.max(nodeInternals.get(edge.source)?.z || 0, nodeInternals.get(edge.target)?.z || 0);
: Math.max(nodeInternals.get(edge.source)?.[zSymbol] || 0, nodeInternals.get(edge.target)?.[zSymbol] || 0);
}

if (tree[z]) {
Expand Down
4 changes: 2 additions & 2 deletions src/store/index.ts
@@ -1,7 +1,7 @@
import create from 'zustand';
import createContext from 'zustand/context';

import { clampPosition, getDimensions } from '../utils';
import { clampPosition, getDimensions, handleBoundsSymbol } from '../utils';
import { applyNodeChanges } from '../utils/changes';
import {
ReactFlowState,
Expand Down Expand Up @@ -60,7 +60,7 @@ const createStore = () =>
const handleBounds = getHandleBounds(update.nodeElement, transform[2]);
nodeInternals.set(node.id, {
...node,
handleBounds,
[handleBoundsSymbol]: handleBounds,
...dimensions,
});

Expand Down
24 changes: 17 additions & 7 deletions src/store/utils.ts
@@ -1,7 +1,7 @@
import { zoomIdentity } from 'd3-zoom';
import { GetState, SetState } from 'zustand';

import { isNumeric } from '../utils';
import { handleBoundsSymbol, isNumeric, isParentSymbol, zSymbol } from '../utils';
import { getD3Transition, getRectOfNodes, getTransformForBounds } from '../utils/graph';
import {
Edge,
Expand Down Expand Up @@ -30,7 +30,7 @@ function calculateXYZPosition(
return calculateXYZPosition(parentNode, nodeInternals, parentNodes, {
x: (result.x ?? 0) + (parentNode.position?.x ?? 0),
y: (result.y ?? 0) + (parentNode.position?.y ?? 0),
z: (parentNode.z ?? 0) > (result.z ?? 0) ? parentNode.z ?? 0 : result.z ?? 0,
z: (parentNode[zSymbol] ?? 0) > (result.z ?? 0) ? parentNode[zSymbol] ?? 0 : result.z ?? 0,
});
}

Expand All @@ -45,18 +45,28 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
const internals: Node = {
width: currInternals?.width,
height: currInternals?.height,
handleBounds: currInternals?.handleBounds,
...node,
positionAbsolute: {
x: node.position.x,
y: node.position.y,
},
z,
};

if (node.parentNode) {
internals.parentNode = node.parentNode;
parentNodes[node.parentNode] = true;
}

Object.defineProperty(internals, handleBoundsSymbol, {
enumerable: false,
value: currInternals?.[handleBoundsSymbol],
});

Object.defineProperty(internals, zSymbol, {
enumerable: false,
value: z,
});

nextNodeInternals.set(node.id, internals);
});

Expand All @@ -68,18 +78,18 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
if (node.parentNode || parentNodes[node.id]) {
const { x, y, z } = calculateXYZPosition(node, nextNodeInternals, parentNodes, {
...node.position,
z: node.z ?? 0,
z: node[zSymbol] ?? 0,
});

node.positionAbsolute = {
x,
y,
};

node.z = z;
node[zSymbol] = z;

if (parentNodes[node.id]) {
node.isParent = true;
node[isParentSymbol] = true;
}
}
});
Expand Down
7 changes: 4 additions & 3 deletions src/types/nodes.ts
Expand Up @@ -2,6 +2,7 @@ import { CSSProperties, MouseEvent as ReactMouseEvent } from 'react';

import { XYPosition, Position, CoordinateExtent } from './utils';
import { HandleElement } from './handles';
import { handleBoundsSymbol, isParentSymbol, zSymbol } from '../utils';

// interface for the user node items
export interface Node<T = any> {
Expand All @@ -28,9 +29,9 @@ export interface Node<T = any> {

// only used internally
positionAbsolute?: XYPosition;
z?: number;
handleBounds?: NodeHandleBounds;
isParent?: boolean;
[zSymbol]?: number;
[handleBoundsSymbol]?: NodeHandleBounds;
[isParentSymbol]?: boolean;
}

// props that get passed to a custom node
Expand Down
4 changes: 4 additions & 0 deletions src/utils/index.ts
Expand Up @@ -40,3 +40,7 @@ export const getBoundsofRects = (rect1: Rect, rect2: Rect): Rect =>
boxToRect(getBoundsOfBoxes(rectToBox(rect1), rectToBox(rect2)));

export const isNumeric = (n: any): n is number => !isNaN(n) && isFinite(n);

export const handleBoundsSymbol = Symbol('handleBound');
export const zSymbol = Symbol('z');
export const isParentSymbol = Symbol('isParent');

0 comments on commit 27b5de2

Please sign in to comment.