chore(props): rename isEdgeAutoZIndex to elevateEdgesOnSelect

This commit is contained in:
moklick
2022-05-02 23:40:04 +02:00
parent 2363046af9
commit dcc05ad8cd
5 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -37,7 +37,7 @@ interface EdgeRendererProps {
onEdgeUpdateEnd?: (event: MouseEvent, edge: Edge, handleType: HandleType) => void; onEdgeUpdateEnd?: (event: MouseEvent, edge: Edge, handleType: HandleType) => void;
edgeUpdaterRadius?: number; edgeUpdaterRadius?: number;
noPanClassName?: string; noPanClassName?: string;
isEdgeAutoZIndex: boolean; elevateEdgesOnSelect: boolean;
} }
const selector = (s: ReactFlowState) => ({ const selector = (s: ReactFlowState) => ({
@@ -66,7 +66,7 @@ const EdgeRenderer = (props: EdgeRendererProps) => {
connectionMode, connectionMode,
nodeInternals, nodeInternals,
} = useStore(selector, shallow); } = useStore(selector, shallow);
const edgeTree = useVisibleEdges(props.onlyRenderVisibleElements, nodeInternals, props.isEdgeAutoZIndex); const edgeTree = useVisibleEdges(props.onlyRenderVisibleElements, nodeInternals, props.elevateEdgesOnSelect);
if (!width) { if (!width) {
return null; return null;
+2 -2
View File
@@ -82,7 +82,7 @@ const GraphView = ({
noDragClassName, noDragClassName,
noWheelClassName, noWheelClassName,
noPanClassName, noPanClassName,
isEdgeAutoZIndex, elevateEdgesOnSelect,
}: GraphViewProps) => { }: GraphViewProps) => {
useOnInitHandler(onInit); useOnInitHandler(onInit);
@@ -136,7 +136,7 @@ const GraphView = ({
edgeUpdaterRadius={edgeUpdaterRadius} edgeUpdaterRadius={edgeUpdaterRadius}
defaultMarkerColor={defaultMarkerColor} defaultMarkerColor={defaultMarkerColor}
noPanClassName={noPanClassName} noPanClassName={noPanClassName}
isEdgeAutoZIndex={!!isEdgeAutoZIndex} elevateEdgesOnSelect={!!elevateEdgesOnSelect}
/> />
<NodeRenderer <NodeRenderer
nodeTypes={nodeTypes} nodeTypes={nodeTypes}
+2 -2
View File
@@ -137,7 +137,7 @@ const ReactFlow = forwardRef<ReactFlowRefType, ReactFlowProps>(
attributionPosition, attributionPosition,
proOptions, proOptions,
defaultEdgeOptions, defaultEdgeOptions,
isEdgeAutoZIndex = false, elevateEdgesOnSelect = false,
...rest ...rest
}, },
ref ref
@@ -205,7 +205,7 @@ const ReactFlow = forwardRef<ReactFlowRefType, ReactFlowProps>(
noDragClassName={noDragClassName} noDragClassName={noDragClassName}
noWheelClassName={noWheelClassName} noWheelClassName={noWheelClassName}
noPanClassName={noPanClassName} noPanClassName={noPanClassName}
isEdgeAutoZIndex={isEdgeAutoZIndex} elevateEdgesOnSelect={elevateEdgesOnSelect}
/> />
<StoreUpdater <StoreUpdater
nodes={nodes} nodes={nodes}
+4 -4
View File
@@ -7,14 +7,14 @@ import { isNumeric } from '../utils';
const defaultEdgeTree = [{ level: 0, isMaxLevel: true, edges: [] }]; const defaultEdgeTree = [{ level: 0, isMaxLevel: true, edges: [] }];
function groupEdgesByZLevel(edges: Edge[], nodeInternals: NodeInternals, isEdgeAutoZIndex: boolean = false) { function groupEdgesByZLevel(edges: Edge[], nodeInternals: NodeInternals, elevateEdgesOnSelect: boolean = false) {
let maxLevel = -1; let maxLevel = -1;
const levelLookup = edges.reduce<Record<string, Edge[]>>((tree, edge) => { const levelLookup = edges.reduce<Record<string, Edge[]>>((tree, edge) => {
const hasZIndex = isNumeric(edge.zIndex); const hasZIndex = isNumeric(edge.zIndex);
let z = hasZIndex ? edge.zIndex! : 0; let z = hasZIndex ? edge.zIndex! : 0;
if (isEdgeAutoZIndex) { if (elevateEdgesOnSelect) {
z = hasZIndex z = hasZIndex
? edge.zIndex! ? edge.zIndex!
: Math.max(nodeInternals.get(edge.source)?.z || 0, nodeInternals.get(edge.target)?.z || 0); : Math.max(nodeInternals.get(edge.source)?.z || 0, nodeInternals.get(edge.target)?.z || 0);
@@ -48,7 +48,7 @@ function groupEdgesByZLevel(edges: Edge[], nodeInternals: NodeInternals, isEdgeA
return edgeTree; return edgeTree;
} }
function useVisibleEdges(onlyRenderVisible: boolean, nodeInternals: NodeInternals, isEdgeAutoZIndex: boolean) { function useVisibleEdges(onlyRenderVisible: boolean, nodeInternals: NodeInternals, elevateEdgesOnSelect: boolean) {
const edges = useStore( const edges = useStore(
useCallback( useCallback(
(s: ReactFlowState) => { (s: ReactFlowState) => {
@@ -83,7 +83,7 @@ function useVisibleEdges(onlyRenderVisible: boolean, nodeInternals: NodeInternal
) )
); );
return groupEdgesByZLevel(edges, nodeInternals, isEdgeAutoZIndex); return groupEdgesByZLevel(edges, nodeInternals, elevateEdgesOnSelect);
} }
export default useVisibleEdges; export default useVisibleEdges;
+1 -1
View File
@@ -118,7 +118,7 @@ export interface ReactFlowProps extends HTMLAttributes<HTMLDivElement> {
connectOnClick?: boolean; connectOnClick?: boolean;
attributionPosition?: AttributionPosition; attributionPosition?: AttributionPosition;
proOptions?: ProOptions; proOptions?: ProOptions;
isEdgeAutoZIndex?: boolean; elevateEdgesOnSelect?: boolean;
} }
export type ReactFlowRefType = HTMLDivElement; export type ReactFlowRefType = HTMLDivElement;