Skip to content
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

Fix: persist hidden nodes on rotate #238

Merged
merged 1 commit into from
Oct 12, 2022
Merged

Fix: persist hidden nodes on rotate #238

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: 3 additions & 1 deletion src/components/Graph/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const GraphComponent = ({
}: LayoutProps) => {
const [minScale, setMinScale] = React.useState(0.4);
const setGraphValue = useGraph(state => state.setGraphValue);
const setLoading = useGraph(state => state.setLoading);
const setConfig = useConfig(state => state.setConfig);
const centerView = useConfig(state => state.centerView);
const loading = useGraph(state => state.loading);
Expand Down Expand Up @@ -85,12 +86,13 @@ const GraphComponent = ({
const MIN_SCALE = Math.round((450_000 / areaSize) * 100) / 100;
const scale = MIN_SCALE > 2 ? 1 : MIN_SCALE <= 0 ? 0.1 : MIN_SCALE;

setLoading(true);
setMinScale(scale);
setSize({ width: layout.width + 400, height: layout.height + 400 });

requestAnimationFrame(() => {
setTimeout(() => {
setGraphValue("loading", false);
setLoading(false);
setTimeout(() => changeRatio > 100 && centerView(), 0);
}, 0);
});
Expand Down
3 changes: 2 additions & 1 deletion src/containers/Editor/LiveEditor/GraphCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const GraphCanvas = ({ isWidget = false }: { isWidget?: boolean }) => {

const collapsedNodes = useGraph(state => state.collapsedNodes);
const collapsedEdges = useGraph(state => state.collapsedEdges);
const loading = useGraph(state => state.loading);

React.useEffect(() => {
const nodeList = collapsedNodes.map(id => `[id$="node-${id}"]`);
Expand All @@ -26,7 +27,7 @@ export const GraphCanvas = ({ isWidget = false }: { isWidget?: boolean }) => {
selectedNodes.forEach(node => node.classList.add("hide"));
selectedEdges.forEach(edge => edge.classList.add("hide"));
}
}, [collapsedNodes, collapsedEdges]);
}, [collapsedNodes, collapsedEdges, loading]);

return (
<>
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/store/useGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export type Graph = typeof initialStates;

interface GraphActions {
setGraphValue: (key: keyof Graph, value: any) => void;
setLoading: (loading: boolean) => void;
expandNodes: (nodeId: string) => void;
collapseNodes: (nodeId: string) => void;
collapseGraph: () => void;
Expand All @@ -32,6 +33,7 @@ const useGraph = create<Graph & GraphActions>((set, get) => ({
collapsedEdges: [],
[key]: value,
}),
setLoading: loading => set({ loading }),
expandNodes: nodeId => {
const [childrenNodes, matchingNodes] = getOutgoers(
nodeId,
Expand Down