Skip to content

Bug 1796626: fix create connector arrow head in topology #4063

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
openshift-merge-robot merged 1 commit into from
Feb 3, 2020
Merged

Bug 1796626: fix create connector arrow head in topology #4063

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
4 changes: 2 additions & 2 deletions frontend/packages/console-shared/src/components/popper/Popper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ const Popper: React.FC<PopperProps> = ({
returnFocus,
}) => {
const controlled = typeof open === 'boolean';
const openProp = controlled ? open : true;
const openProp = controlled ? open || false : true;
const nodeRef = React.useRef<Element>();
const popperRef = React.useRef<PopperJS>(null);
const popperRefs = useCombineRefs<PopperJS>(popperRef, popperRefIn);
const [isOpen, setOpenState] = React.useState(openProp);
const focusRef = React.useRef<Element>();
const focusRef = React.useRef<Element | null>();
const onRequestCloseRef = React.useRef(onRequestClose);
onRequestCloseRef.current = onRequestClose;

Expand Down
5 changes: 2 additions & 3 deletions frontend/packages/topology/src/components/GraphComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Graph } from '../types';
import { WithPanZoomProps } from '../behavior/usePanZoom';
import { WithDndDropProps } from '../behavior/useDndDrop';
import { WithSelectionProps } from '../behavior/useSelection';
import useCombineRefs from '../utils/useCombineRefs';
import { WithContextMenuProps } from '../behavior/withContextMenu';
import LayersProvider from './layers/LayersProvider';
import { DEFAULT_LAYER } from './layers/LayersContext';
Expand Down Expand Up @@ -50,7 +49,6 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
onContextMenu,
}) => {
const layout = element.getLayout();
const refs = useCombineRefs<SVGPathElement>(panZoomRef, dndDropRef);
React.useEffect(() => {
element.layout();
// Only re-run if the layout changes
Expand All @@ -61,6 +59,7 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
return (
<>
<rect
ref={dndDropRef}
x={0}
y={0}
width={bounds.width}
Expand All @@ -71,7 +70,7 @@ const GraphComponent: React.FC<GraphComponentProps> = ({
/>
<g
data-surface="true"
ref={refs}
ref={panZoomRef}
transform={`translate(${bounds.x}, ${bounds.y}) scale(${element.getScale()})`}
>
<Inner element={element} />
Expand Down