From a9e7411d6daa8562a8e70d2acb9dc6b291d9c6f6 Mon Sep 17 00:00:00 2001 From: GeoffreyLiu Date: Tue, 8 Nov 2022 13:56:05 +0800 Subject: [PATCH 1/6] test: add the test case --- .../reactflow/multiple-instance.cy.tsx | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx diff --git a/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx b/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx new file mode 100644 index 00000000..eacf8d4f --- /dev/null +++ b/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx @@ -0,0 +1,61 @@ +import ReactFlow, { BaseEdge, EdgeLabelRenderer, EdgeProps, getSmoothStepPath, ReactFlowProvider } from 'reactflow'; +import * as simpleflow from '../../fixtures/simpleflow'; + +function CustomEdge(props: EdgeProps) { + const [path, labelX, labelY] = getSmoothStepPath(props); + return ( + <> + + +
{props.id}
+ + + ); +} + +const simpleflow1 = { ...simpleflow }; +simpleflow1.edges = [...simpleflow1.edges]; +simpleflow1.edges[0] = { ...simpleflow1.edges[0], id: 'edge1' }; + +const simpleflow2 = { ...simpleflow }; +simpleflow2.edges = [...simpleflow2.edges]; +simpleflow2.edges[0] = { ...simpleflow2.edges[0], id: 'edge2' }; + +describe(': Multiple Instances', () => { + describe('render EdgeLabelRenderer', () => { + beforeEach(() => { + cy.mount( + <> + + + + + + + + ); + }); + + it('Each ReactFlow instance has its EdgeLabelRenderer DOM element without conflict', () => { + cy.get('#edgelabel-portal-reactflow-a').should('have.length', 1); + cy.get('#edgelabel-portal-reactflow-b').should('have.length', 1); + }); + + it('Each ReactFlow instance has one edge label in EdgeLabelRenderer', () => { + cy.get('#edgelabel-portal-reactflow-a .label').should('have.length', 1); + cy.get('#edgelabel-portal-reactflow-a .label').should('contain.text', 'edge1'); + cy.get('#edgelabel-portal-reactflow-b .label').should('have.length', 1); + cy.get('#edgelabel-portal-reactflow-b .label').should('contain.text', 'edge2'); + }); + }); +}); From 55cf7560c0713cf4b499e142ed9fa2b96f440af4 Mon Sep 17 00:00:00 2001 From: GeoffreyLiu Date: Tue, 8 Nov 2022 13:53:48 +0800 Subject: [PATCH 2/6] fix: access the edge-label-renderer by reactflow's id --- packages/core/src/components/EdgeLabelRenderer/index.tsx | 6 +++++- packages/core/src/container/GraphView/index.tsx | 3 ++- packages/core/src/utils/graph.ts | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/core/src/components/EdgeLabelRenderer/index.tsx b/packages/core/src/components/EdgeLabelRenderer/index.tsx index 0647364a..772a8372 100644 --- a/packages/core/src/components/EdgeLabelRenderer/index.tsx +++ b/packages/core/src/components/EdgeLabelRenderer/index.tsx @@ -1,9 +1,13 @@ import { useRef } from 'react'; import type { ReactNode } from 'react'; import { createPortal } from 'react-dom'; +import { useStoreApi } from '../../hooks/useStore'; +import { getEdgeLabelRendererId } from '../../utils/graph'; function EdgeLabelRenderer({ children }: { children: ReactNode }) { - const wrapperRef = useRef(document.getElementById('edgelabel-portal')); + const store = useStoreApi() + const state = store.getState() + const wrapperRef = useRef(document.getElementById(getEdgeLabelRendererId(state.rfId))); if (!wrapperRef.current) { return null; diff --git a/packages/core/src/container/GraphView/index.tsx b/packages/core/src/container/GraphView/index.tsx index 4190bed0..47be5bfc 100644 --- a/packages/core/src/container/GraphView/index.tsx +++ b/packages/core/src/container/GraphView/index.tsx @@ -6,6 +6,7 @@ import EdgeRenderer from '../EdgeRenderer'; import ViewportWrapper from '../Viewport'; import useOnInitHandler from '../../hooks/useOnInitHandler'; import type { EdgeTypesWrapped, NodeTypesWrapped, ReactFlowProps } from '../../types'; +import { getEdgeLabelRendererId } from '../../utils/graph'; export type GraphViewProps = Omit & Required< @@ -158,7 +159,7 @@ const GraphView = ({ disableKeyboardA11y={disableKeyboardA11y} rfId={rfId} /> -
+
, duration = 0) => { return selection.transition().duration(duration); }; + +export function getEdgeLabelRendererId(id: string) { + return `edgelabel-portal-${id}` +} From 3170f875e543d81c90ebe4eb2a3ff9dda65340d7 Mon Sep 17 00:00:00 2001 From: GeoffreyLiu Date: Fri, 11 Nov 2022 09:31:53 +0800 Subject: [PATCH 3/6] refactor: access edge-label-renderer by storing the root element --- .../components/EdgeLabelRenderer/index.tsx | 21 ++++++++++++------- .../src/components/StoreUpdater/index.tsx | 14 +++++++++++-- packages/core/src/constants/component.ts | 1 + .../core/src/container/GraphView/index.tsx | 4 ++-- .../core/src/container/ReactFlow/index.tsx | 20 ++++++++++++++++-- packages/core/src/store/initialState.ts | 1 + packages/core/src/types/general.ts | 5 ++++- packages/core/src/utils/graph.ts | 3 --- 8 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 packages/core/src/constants/component.ts diff --git a/packages/core/src/components/EdgeLabelRenderer/index.tsx b/packages/core/src/components/EdgeLabelRenderer/index.tsx index 772a8372..815916f0 100644 --- a/packages/core/src/components/EdgeLabelRenderer/index.tsx +++ b/packages/core/src/components/EdgeLabelRenderer/index.tsx @@ -1,19 +1,26 @@ -import { useRef } from 'react'; import type { ReactNode } from 'react'; import { createPortal } from 'react-dom'; import { useStoreApi } from '../../hooks/useStore'; -import { getEdgeLabelRendererId } from '../../utils/graph'; +import { EDGE_LABEL_RENDERER_MAIN_CLASS } from '../../constants/component'; function EdgeLabelRenderer({ children }: { children: ReactNode }) { - const store = useStoreApi() - const state = store.getState() - const wrapperRef = useRef(document.getElementById(getEdgeLabelRendererId(state.rfId))); + const store = useStoreApi(); + const { + rootElementRef: { current: rootElement }, + } = store.getState(); - if (!wrapperRef.current) { + if (!rootElement) { return null; } - return createPortal(children, wrapperRef.current); + const collection = rootElement.getElementsByClassName(EDGE_LABEL_RENDERER_MAIN_CLASS); + + const edgeLabelRendererElement = collection.item(0); + if (!edgeLabelRendererElement) { + return null; + } + + return createPortal(children, edgeLabelRendererElement); } export default EdgeLabelRenderer; diff --git a/packages/core/src/components/StoreUpdater/index.tsx b/packages/core/src/components/StoreUpdater/index.tsx index 2f98a453..bb3f89ca 100644 --- a/packages/core/src/components/StoreUpdater/index.tsx +++ b/packages/core/src/components/StoreUpdater/index.tsx @@ -3,7 +3,15 @@ import { StoreApi } from 'zustand'; import shallow from 'zustand/shallow'; import { useStore, useStoreApi } from '../../hooks/useStore'; -import type { Node, Edge, ReactFlowState, CoordinateExtent, ReactFlowProps, ReactFlowStore } from '../../types'; +import type { + Node, + Edge, + ReactFlowState, + CoordinateExtent, + ReactFlowProps, + ReactFlowStore, + RootElementRef, +} from '../../types'; type StoreUpdaterProps = Pick< ReactFlowProps, @@ -44,7 +52,7 @@ type StoreUpdaterProps = Pick< | 'onSelectionDragStop' | 'noPanClassName' | 'nodeOrigin' -> & { rfId: string }; +> & { rfId: string; rootElementRef: RootElementRef }; const selector = (s: ReactFlowState) => ({ setNodes: s.setNodes, @@ -117,6 +125,7 @@ const StoreUpdater = ({ noPanClassName, nodeOrigin, rfId, + rootElementRef, }: StoreUpdaterProps) => { const { setNodes, @@ -169,6 +178,7 @@ const StoreUpdater = ({ useDirectStoreUpdater('noPanClassName', noPanClassName, store.setState); useDirectStoreUpdater('nodeOrigin', nodeOrigin, store.setState); useDirectStoreUpdater('rfId', rfId, store.setState); + useDirectStoreUpdater('rootElementRef', rootElementRef, store.setState); useStoreUpdater(nodes, setNodes); useStoreUpdater(edges, setEdges); diff --git a/packages/core/src/constants/component.ts b/packages/core/src/constants/component.ts new file mode 100644 index 00000000..abb2f46b --- /dev/null +++ b/packages/core/src/constants/component.ts @@ -0,0 +1 @@ +export const EDGE_LABEL_RENDERER_MAIN_CLASS = 'react-flow__edgelabel-renderer' diff --git a/packages/core/src/container/GraphView/index.tsx b/packages/core/src/container/GraphView/index.tsx index 47be5bfc..98f9bede 100644 --- a/packages/core/src/container/GraphView/index.tsx +++ b/packages/core/src/container/GraphView/index.tsx @@ -6,7 +6,7 @@ import EdgeRenderer from '../EdgeRenderer'; import ViewportWrapper from '../Viewport'; import useOnInitHandler from '../../hooks/useOnInitHandler'; import type { EdgeTypesWrapped, NodeTypesWrapped, ReactFlowProps } from '../../types'; -import { getEdgeLabelRendererId } from '../../utils/graph'; +import { EDGE_LABEL_RENDERER_MAIN_CLASS } from '../../constants/component'; export type GraphViewProps = Omit & Required< @@ -159,7 +159,7 @@ const GraphView = ({ disableKeyboardA11y={disableKeyboardA11y} rfId={rfId} /> -
+
( const edgeTypesWrapped = useNodeOrEdgeTypes(edgeTypes, createEdgeTypes) as EdgeTypesWrapped; const rfId = id || '1'; + const rootElementRef = useRef(null); + + function setRootRef(element: HTMLDivElement | null) { + rootElementRef.current = element; + + if (typeof ref === 'function') { + ref(element); + return; + } + + if (ref) { + ref.current = element; + } + } + return (
( noPanClassName={noPanClassName} nodeOrigin={nodeOrigin} rfId={rfId} + rootElementRef={rootElementRef} /> {children} diff --git a/packages/core/src/store/initialState.ts b/packages/core/src/store/initialState.ts index ab918e65..a0353868 100644 --- a/packages/core/src/store/initialState.ts +++ b/packages/core/src/store/initialState.ts @@ -54,6 +54,7 @@ const initialState: ReactFlowStore = { connectOnClick: true, ariaLiveMessage: '', + rootElementRef: { current: null } }; export default initialState; diff --git a/packages/core/src/types/general.ts b/packages/core/src/types/general.ts index b18f4d32..48222f49 100644 --- a/packages/core/src/types/general.ts +++ b/packages/core/src/types/general.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { MouseEvent as ReactMouseEvent, ComponentType, MemoExoticComponent } from 'react'; +import type { MouseEvent as ReactMouseEvent, ComponentType, MemoExoticComponent, MutableRefObject } from 'react'; import type { Selection as D3Selection, ZoomBehavior } from 'd3'; import type { XYPosition, Rect, Transform, CoordinateExtent } from './utils'; @@ -129,6 +129,8 @@ export type ViewportHelperFunctions = { viewportInitialized: boolean; }; +export type RootElementRef = MutableRefObject + export type ReactFlowStore = { rfId: string; width: number; @@ -208,6 +210,7 @@ export type ReactFlowStore = { onSelectionChange?: OnSelectionChangeFunc; ariaLiveMessage: string; + rootElementRef: RootElementRef }; export type ReactFlowActions = { diff --git a/packages/core/src/utils/graph.ts b/packages/core/src/utils/graph.ts index 95feec38..5e7e776b 100644 --- a/packages/core/src/utils/graph.ts +++ b/packages/core/src/utils/graph.ts @@ -224,6 +224,3 @@ export const getD3Transition = (selection: D3Selection Date: Fri, 11 Nov 2022 10:38:48 +0800 Subject: [PATCH 4/6] test: update the test cases --- .../components/reactflow/basic-props.cy.tsx | 29 +++++++++++++++++++ .../reactflow/multiple-instance.cy.tsx | 24 ++++++++------- .../vite-app/cypress/support/RefReactFlow.tsx | 12 ++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 examples/vite-app/cypress/support/RefReactFlow.tsx diff --git a/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx b/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx index d777531e..8738436e 100644 --- a/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx +++ b/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx @@ -2,6 +2,7 @@ import ReactFlow, { EdgeProps } from 'reactflow'; import ControlledFlow from '../../support/ControlledFlow'; import * as simpleflow from '../../fixtures/simpleflow'; +import { RefReactFlow } from '../../support/RefReactFlow'; describe(': Basic Props', () => { describe('uses defaultNodes and defaultEdges', () => { @@ -194,4 +195,32 @@ describe(': Basic Props', () => { cy.mount(); cy.get('.react-flow').should('have.class', 'custom'); }); + + it('uses function ref', () => { + let pResolve: ((element: HTMLDivElement | PromiseLike | null) => void) | null = null; + const promise: Promise = new Promise((resolve) => { + pResolve = resolve; + }); + + function ref(root: HTMLDivElement | null) { + pResolve && pResolve(root); + } + + cy.mount(); + cy.wrap(promise).should('be.instanceOf', HTMLDivElement); + }); + + it('use mutable ref', () => { + let pResolve: ((element: HTMLDivElement | PromiseLike | null) => void) | null = null; + const promise: Promise = new Promise((resolve) => { + pResolve = resolve; + }); + + function onGetRef(root: HTMLDivElement | null) { + pResolve && pResolve(root); + } + + cy.mount(); + cy.wrap(promise).should('be.instanceOf', HTMLDivElement); + }); }); diff --git a/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx b/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx index eacf8d4f..b1b354a0 100644 --- a/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx +++ b/examples/vite-app/cypress/components/reactflow/multiple-instance.cy.tsx @@ -31,7 +31,6 @@ describe(': Multiple Instances', () => { defaultNodes={simpleflow1.nodes} edgeTypes={{ default: CustomEdge }} defaultEdges={simpleflow1.edges} - id="reactflow-a" /> @@ -39,23 +38,26 @@ describe(': Multiple Instances', () => { defaultNodes={simpleflow2.nodes} edgeTypes={{ default: CustomEdge }} defaultEdges={simpleflow2.edges} - id="reactflow-b" /> ); }); - it('Each ReactFlow instance has its EdgeLabelRenderer DOM element without conflict', () => { - cy.get('#edgelabel-portal-reactflow-a').should('have.length', 1); - cy.get('#edgelabel-portal-reactflow-b').should('have.length', 1); - }); - it('Each ReactFlow instance has one edge label in EdgeLabelRenderer', () => { - cy.get('#edgelabel-portal-reactflow-a .label').should('have.length', 1); - cy.get('#edgelabel-portal-reactflow-a .label').should('contain.text', 'edge1'); - cy.get('#edgelabel-portal-reactflow-b .label').should('have.length', 1); - cy.get('#edgelabel-portal-reactflow-b .label').should('contain.text', 'edge2'); + cy.get('.react-flow__edgelabel-renderer').should('have.length', 2); + + cy.get('.react-flow__edgelabel-renderer') + .eq(0) + .within(() => { + cy.get('.label').should('have.length', 1).should('contain.text', 'edge1'); + }); + + cy.get('.react-flow__edgelabel-renderer') + .eq(1) + .within(() => { + cy.get('.label').should('have.length', 1).should('contain.text', 'edge2'); + }); }); }); }); diff --git a/examples/vite-app/cypress/support/RefReactFlow.tsx b/examples/vite-app/cypress/support/RefReactFlow.tsx new file mode 100644 index 00000000..baec9696 --- /dev/null +++ b/examples/vite-app/cypress/support/RefReactFlow.tsx @@ -0,0 +1,12 @@ +import { useEffect, useRef } from 'react'; +import ReactFlow from 'reactflow'; + +export function RefReactFlow({ onGetRef }: { onGetRef: (element: HTMLDivElement | null) => void }) { + const ref = useRef(null); + + useEffect(() => { + onGetRef(ref.current); + }, []); + + return ; +} From 23aa8bb2707406c79a28b0cba5d49752e8335e81 Mon Sep 17 00:00:00 2001 From: GeoffreyLiu Date: Mon, 14 Nov 2022 08:30:09 +0800 Subject: [PATCH 5/6] refactor: use existing d3Selection to get the element ref --- .../components/reactflow/basic-props.cy.tsx | 29 ------------------- .../vite-app/cypress/support/RefReactFlow.tsx | 12 -------- .../components/EdgeLabelRenderer/index.tsx | 22 ++++++-------- .../src/components/StoreUpdater/index.tsx | 14 ++------- packages/core/src/constants/component.ts | 1 - .../core/src/container/GraphView/index.tsx | 3 +- .../core/src/container/ReactFlow/index.tsx | 20 ++----------- packages/core/src/store/initialState.ts | 1 - packages/core/src/types/general.ts | 5 +--- 9 files changed, 15 insertions(+), 92 deletions(-) delete mode 100644 examples/vite-app/cypress/support/RefReactFlow.tsx delete mode 100644 packages/core/src/constants/component.ts diff --git a/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx b/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx index 8738436e..d777531e 100644 --- a/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx +++ b/examples/vite-app/cypress/components/reactflow/basic-props.cy.tsx @@ -2,7 +2,6 @@ import ReactFlow, { EdgeProps } from 'reactflow'; import ControlledFlow from '../../support/ControlledFlow'; import * as simpleflow from '../../fixtures/simpleflow'; -import { RefReactFlow } from '../../support/RefReactFlow'; describe(': Basic Props', () => { describe('uses defaultNodes and defaultEdges', () => { @@ -195,32 +194,4 @@ describe(': Basic Props', () => { cy.mount(); cy.get('.react-flow').should('have.class', 'custom'); }); - - it('uses function ref', () => { - let pResolve: ((element: HTMLDivElement | PromiseLike | null) => void) | null = null; - const promise: Promise = new Promise((resolve) => { - pResolve = resolve; - }); - - function ref(root: HTMLDivElement | null) { - pResolve && pResolve(root); - } - - cy.mount(); - cy.wrap(promise).should('be.instanceOf', HTMLDivElement); - }); - - it('use mutable ref', () => { - let pResolve: ((element: HTMLDivElement | PromiseLike | null) => void) | null = null; - const promise: Promise = new Promise((resolve) => { - pResolve = resolve; - }); - - function onGetRef(root: HTMLDivElement | null) { - pResolve && pResolve(root); - } - - cy.mount(); - cy.wrap(promise).should('be.instanceOf', HTMLDivElement); - }); }); diff --git a/examples/vite-app/cypress/support/RefReactFlow.tsx b/examples/vite-app/cypress/support/RefReactFlow.tsx deleted file mode 100644 index baec9696..00000000 --- a/examples/vite-app/cypress/support/RefReactFlow.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useEffect, useRef } from 'react'; -import ReactFlow from 'reactflow'; - -export function RefReactFlow({ onGetRef }: { onGetRef: (element: HTMLDivElement | null) => void }) { - const ref = useRef(null); - - useEffect(() => { - onGetRef(ref.current); - }, []); - - return ; -} diff --git a/packages/core/src/components/EdgeLabelRenderer/index.tsx b/packages/core/src/components/EdgeLabelRenderer/index.tsx index 815916f0..c98665ef 100644 --- a/packages/core/src/components/EdgeLabelRenderer/index.tsx +++ b/packages/core/src/components/EdgeLabelRenderer/index.tsx @@ -1,22 +1,18 @@ import type { ReactNode } from 'react'; import { createPortal } from 'react-dom'; -import { useStoreApi } from '../../hooks/useStore'; -import { EDGE_LABEL_RENDERER_MAIN_CLASS } from '../../constants/component'; +import { useStore } from '../../hooks/useStore'; +import { ReactFlowState } from '../../types'; + +const selector = (s: ReactFlowState) => ({ + d3Selection: s.d3Selection, +}); function EdgeLabelRenderer({ children }: { children: ReactNode }) { - const store = useStoreApi(); - const { - rootElementRef: { current: rootElement }, - } = store.getState(); + const { d3Selection } = useStore(selector); - if (!rootElement) { - return null; - } + const edgeLabelRendererElement = d3Selection?.select('.react-flow__edgelabel-renderer').node(); - const collection = rootElement.getElementsByClassName(EDGE_LABEL_RENDERER_MAIN_CLASS); - - const edgeLabelRendererElement = collection.item(0); - if (!edgeLabelRendererElement) { + if (!edgeLabelRendererElement || !(edgeLabelRendererElement instanceof HTMLDivElement)) { return null; } diff --git a/packages/core/src/components/StoreUpdater/index.tsx b/packages/core/src/components/StoreUpdater/index.tsx index bb3f89ca..2f98a453 100644 --- a/packages/core/src/components/StoreUpdater/index.tsx +++ b/packages/core/src/components/StoreUpdater/index.tsx @@ -3,15 +3,7 @@ import { StoreApi } from 'zustand'; import shallow from 'zustand/shallow'; import { useStore, useStoreApi } from '../../hooks/useStore'; -import type { - Node, - Edge, - ReactFlowState, - CoordinateExtent, - ReactFlowProps, - ReactFlowStore, - RootElementRef, -} from '../../types'; +import type { Node, Edge, ReactFlowState, CoordinateExtent, ReactFlowProps, ReactFlowStore } from '../../types'; type StoreUpdaterProps = Pick< ReactFlowProps, @@ -52,7 +44,7 @@ type StoreUpdaterProps = Pick< | 'onSelectionDragStop' | 'noPanClassName' | 'nodeOrigin' -> & { rfId: string; rootElementRef: RootElementRef }; +> & { rfId: string }; const selector = (s: ReactFlowState) => ({ setNodes: s.setNodes, @@ -125,7 +117,6 @@ const StoreUpdater = ({ noPanClassName, nodeOrigin, rfId, - rootElementRef, }: StoreUpdaterProps) => { const { setNodes, @@ -178,7 +169,6 @@ const StoreUpdater = ({ useDirectStoreUpdater('noPanClassName', noPanClassName, store.setState); useDirectStoreUpdater('nodeOrigin', nodeOrigin, store.setState); useDirectStoreUpdater('rfId', rfId, store.setState); - useDirectStoreUpdater('rootElementRef', rootElementRef, store.setState); useStoreUpdater(nodes, setNodes); useStoreUpdater(edges, setEdges); diff --git a/packages/core/src/constants/component.ts b/packages/core/src/constants/component.ts deleted file mode 100644 index abb2f46b..00000000 --- a/packages/core/src/constants/component.ts +++ /dev/null @@ -1 +0,0 @@ -export const EDGE_LABEL_RENDERER_MAIN_CLASS = 'react-flow__edgelabel-renderer' diff --git a/packages/core/src/container/GraphView/index.tsx b/packages/core/src/container/GraphView/index.tsx index 98f9bede..3af02659 100644 --- a/packages/core/src/container/GraphView/index.tsx +++ b/packages/core/src/container/GraphView/index.tsx @@ -6,7 +6,6 @@ import EdgeRenderer from '../EdgeRenderer'; import ViewportWrapper from '../Viewport'; import useOnInitHandler from '../../hooks/useOnInitHandler'; import type { EdgeTypesWrapped, NodeTypesWrapped, ReactFlowProps } from '../../types'; -import { EDGE_LABEL_RENDERER_MAIN_CLASS } from '../../constants/component'; export type GraphViewProps = Omit & Required< @@ -159,7 +158,7 @@ const GraphView = ({ disableKeyboardA11y={disableKeyboardA11y} rfId={rfId} /> -
+
( const edgeTypesWrapped = useNodeOrEdgeTypes(edgeTypes, createEdgeTypes) as EdgeTypesWrapped; const rfId = id || '1'; - const rootElementRef = useRef(null); - - function setRootRef(element: HTMLDivElement | null) { - rootElementRef.current = element; - - if (typeof ref === 'function') { - ref(element); - return; - } - - if (ref) { - ref.current = element; - } - } - return (
( noPanClassName={noPanClassName} nodeOrigin={nodeOrigin} rfId={rfId} - rootElementRef={rootElementRef} /> {children} diff --git a/packages/core/src/store/initialState.ts b/packages/core/src/store/initialState.ts index a0353868..ab918e65 100644 --- a/packages/core/src/store/initialState.ts +++ b/packages/core/src/store/initialState.ts @@ -54,7 +54,6 @@ const initialState: ReactFlowStore = { connectOnClick: true, ariaLiveMessage: '', - rootElementRef: { current: null } }; export default initialState; diff --git a/packages/core/src/types/general.ts b/packages/core/src/types/general.ts index 48222f49..b18f4d32 100644 --- a/packages/core/src/types/general.ts +++ b/packages/core/src/types/general.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { MouseEvent as ReactMouseEvent, ComponentType, MemoExoticComponent, MutableRefObject } from 'react'; +import type { MouseEvent as ReactMouseEvent, ComponentType, MemoExoticComponent } from 'react'; import type { Selection as D3Selection, ZoomBehavior } from 'd3'; import type { XYPosition, Rect, Transform, CoordinateExtent } from './utils'; @@ -129,8 +129,6 @@ export type ViewportHelperFunctions = { viewportInitialized: boolean; }; -export type RootElementRef = MutableRefObject - export type ReactFlowStore = { rfId: string; width: number; @@ -210,7 +208,6 @@ export type ReactFlowStore = { onSelectionChange?: OnSelectionChangeFunc; ariaLiveMessage: string; - rootElementRef: RootElementRef }; export type ReactFlowActions = { From 038835772f54e6e11cc66d89c4ad7d7ae610c537 Mon Sep 17 00:00:00 2001 From: GeoffreyLiu Date: Mon, 14 Nov 2022 19:55:56 +0800 Subject: [PATCH 6/6] refactor: use domNode prop to get edge-label-renderer --- .../core/src/components/EdgeLabelRenderer/index.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/core/src/components/EdgeLabelRenderer/index.tsx b/packages/core/src/components/EdgeLabelRenderer/index.tsx index c98665ef..059dae1b 100644 --- a/packages/core/src/components/EdgeLabelRenderer/index.tsx +++ b/packages/core/src/components/EdgeLabelRenderer/index.tsx @@ -4,19 +4,17 @@ import { useStore } from '../../hooks/useStore'; import { ReactFlowState } from '../../types'; const selector = (s: ReactFlowState) => ({ - d3Selection: s.d3Selection, + edgeLabelRenderer: s.domNode?.querySelector('.react-flow__edgelabel-renderer'), }); function EdgeLabelRenderer({ children }: { children: ReactNode }) { - const { d3Selection } = useStore(selector); + const { edgeLabelRenderer } = useStore(selector); - const edgeLabelRendererElement = d3Selection?.select('.react-flow__edgelabel-renderer').node(); - - if (!edgeLabelRendererElement || !(edgeLabelRendererElement instanceof HTMLDivElement)) { + if (!edgeLabelRenderer) { return null; } - return createPortal(children, edgeLabelRendererElement); + return createPortal(children, edgeLabelRenderer); } export default EdgeLabelRenderer;