Skip to content

Revert "feat(VisualizationSurface): replace react-measure with react-resize-detector" #7809

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

Merged
nicolethoen merged 1 commit into from
Aug 10, 2022
Merged

Revert "feat(VisualizationSurface): replace react-measure with react-resize-detector" #7809

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/react-topology/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@types/d3": "^5.7.2",
"@types/d3-force": "^1.2.1",
"@types/dagre": "0.7.42",
"@types/react-measure": "^2.0.6",
"@types/webcola": "3.2.0",
"d3": "^5.16.0",
"dagre": "0.8.2",
Expand All @@ -42,7 +43,7 @@
"mobx-react": "^6.2.0",
"point-in-svg-path": "^1.0.1",
"popper.js": "^1.16.1",
"react-resize-detector": "^7.1.2",
"react-measure": "^2.3.0",
"tslib": "^2.0.0",
"webcola": "3.4.0"
},
Expand Down
42 changes: 24 additions & 18 deletions packages/react-topology/src/components/VisualizationSurface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import * as React from 'react';
import { useResizeDetector } from 'react-resize-detector';
import * as _ from 'lodash';
import { action } from 'mobx';
// https://github.com/mobxjs/mobx-react#observer-batching
import 'mobx-react/batchingForReactDom';
import { observer } from 'mobx-react';
import ReactMeasure from 'react-measure';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-styles/css/components/Topology/topology-components';
import { State } from '../types';
Expand Down Expand Up @@ -31,20 +32,20 @@ const VisualizationSurface: React.FunctionComponent<VisualizationSurfaceProps> =
state && controller.setState(state);
}, [controller, state]);

const onResize = React.useMemo(
const onMeasure = React.useMemo(
() =>
action((width?: number, height?: number) => {
controller.getGraph().setDimensions(new Dimensions(width, height));
}),
_.debounce<any>(
action((contentRect: { client: { width: number; height: number } }) => {
controller.getGraph().setDimensions(new Dimensions(contentRect.client.width, contentRect.client.height));
}),
100,
{ leading: true, trailing: true }
),
[controller]
);

const { ref } = useResizeDetector({
onResize,
refreshMode: 'debounce',
refreshRate: 100,
refreshOptions: { leading: true, trailing: true }
});
// dispose of onMeasure
React.useEffect(() => () => onMeasure.cancel(), [onMeasure]);

if (!controller.hasGraph()) {
return null;
Expand All @@ -53,13 +54,18 @@ const VisualizationSurface: React.FunctionComponent<VisualizationSurfaceProps> =
const graph = controller.getGraph();

return (
<div data-test-id="topology" className={css(styles.topologyVisualizationSurface)} ref={ref}>
<svg className={css(styles.topologyVisualizationSurfaceSvg)} onContextMenu={stopEvent}>
<SVGDefsProvider>
<ElementWrapper element={graph} />
</SVGDefsProvider>
</svg>
</div>
<ReactMeasure client onResize={onMeasure}>
{({ measureRef }: { measureRef: React.LegacyRef<any> }) => (
// render an outer div because react-measure doesn't seem to fire events properly on svg resize
<div data-test-id="topology" className={css(styles.topologyVisualizationSurface)} ref={measureRef}>
<svg className={css(styles.topologyVisualizationSurfaceSvg)} onContextMenu={stopEvent}>
<SVGDefsProvider>
<ElementWrapper element={graph} />
</SVGDefsProvider>
</svg>
</div>
)}
</ReactMeasure>
);
};

Expand Down
34 changes: 26 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,6 +2055,12 @@
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.2.0":
version "7.9.2"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.4.5", "@babel/runtime@^7.8.7":
version "7.11.2"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"
Expand Down Expand Up @@ -4090,6 +4096,12 @@
dependencies:
"@types/react" "*"

"@types/react-measure@^2.0.6":
version "2.0.6"
resolved "https://registry.npmjs.org/@types/react-measure/-/react-measure-2.0.6.tgz"
dependencies:
"@types/react" "*"

"@types/react-router-dom@^4.3.1":
version "4.3.5"
resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.5.tgz"
Expand Down Expand Up @@ -9093,6 +9105,10 @@ get-intrinsic@^1.0.2:
has "^1.0.3"
has-symbols "^1.0.3"

get-node-dimensions@^1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz"

get-own-enumerable-property-symbols@^3.0.0:
version "3.0.2"
resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
Expand Down Expand Up @@ -14325,6 +14341,15 @@ react-lifecycles-compat@^3.0.4:
version "3.0.4"
resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"

react-measure@^2.3.0:
version "2.5.0"
resolved "https://registry.npmjs.org/react-measure/-/react-measure-2.5.0.tgz"
dependencies:
"@babel/runtime" "^7.2.0"
get-node-dimensions "^1.2.1"
prop-types "^15.6.2"
resize-observer-polyfill "^1.5.0"

react-monaco-editor@0.48.0:
version "0.48.0"
resolved "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.48.0.tgz#f2b547c619f0ba3b49d3c8a0e0168ff9d0aa70dc"
Expand All @@ -14339,13 +14364,6 @@ react-monaco-editor@^0.41.2:
monaco-editor "*"
prop-types "^15.7.2"

react-resize-detector@^7.1.2:
version "7.1.2"
resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-7.1.2.tgz#8ef975dd8c3d56f9a5160ac382ef7136dcd2d86c"
integrity sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==
dependencies:
lodash "^4.17.21"

react-router-dom@^4.3.1:
version "4.3.1"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz"
Expand Down Expand Up @@ -14918,7 +14936,7 @@ requires-port@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"

resize-observer-polyfill@^1.5.1:
resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"

Expand Down