Skip to content

✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.

chore: split graph

AykutSarac3d50e48a855c
diff --git a/src/components/Graph/CustomEdge/index.tsx b/src/components/Graph/CustomEdge/index.tsx
new file mode 100644
index 00000000..ab77e945
--- /dev/null
+++ b/src/components/Graph/CustomEdge/index.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import dynamic from "next/dynamic";
+import { EdgeProps } from "reaflow/dist/symbols/Edge";
+
+const Edge = dynamic(() => import("reaflow").then(r => r.Edge), {
+ ssr: false,
+});
+
+const CustomEdgeWrapper = (props: EdgeProps) => {
+ return <Edge containerClassName={`edge-${props.id}`} {...props} />;
+};
+
+export const CustomEdge = React.memo(CustomEdgeWrapper);
diff --git a/src/components/Graph/CustomNode/index.tsx b/src/components/Graph/CustomNode/index.tsx
index eebbe57b..c94e88ce 100644
--- a/src/components/Graph/CustomNode/index.tsx
+++ b/src/components/Graph/CustomNode/index.tsx
@@ -1,9 +1,16 @@
import React from "react";
-import { Node, NodeProps } from "reaflow";
+import dynamic from "next/dynamic";
+import { NodeProps } from "reaflow";
+import useGraph from "src/store/useGraph";
+import useModal from "src/store/useModal";
import { NodeData } from "src/types/models";
import { ObjectNode } from "./ObjectNode";
import { TextNode } from "./TextNode";
+const Node = dynamic(() => import("reaflow").then(r => r.Node), {
+ ssr: false,
+});
+
export interface CustomNodeProps {
node: NodeData;
x: number;
@@ -16,13 +23,29 @@ const rootProps = {
ry: 50,
};
-export const CustomNode = (nodeProps: NodeProps<NodeData["data"]>) => {
- const { text, data } = nodeProps.properties;
+const CustomNodeWrapper = (nodeProps: NodeProps<NodeData["data"]>) => {
+ const data = nodeProps.properties.data;
+ const setSelectedNode = useGraph(state => state.setSelectedNode);
+ const setVisible = useModal(state => state.setVisible);
+
+ const handleNodeClick = React.useCallback(
+ (_: React.MouseEvent<SVGGElement, MouseEvent>, data: NodeData) => {
+ if (setSelectedNode) setSelectedNode(data);
+ setVisible("node")(true);
+ },
+ [setSelectedNode, setVisible]
+ );
return (
- <Node {...nodeProps} {...(data?.isEmpty && rootProps)} animated={false} label={null as any}>
+ <Node
+ {...nodeProps}
+ {...(data?.isEmpty && rootProps)}
+ onClick={handleNodeClick as any}
+ animated={false}
+ label={null as any}
+ >
{({ node, x, y }) => {
- if (Array.isArray(text)) {
+ if (Array.isArray(nodeProps.properties.text)) {
if (data?.isEmpty) return null;
return <ObjectNode node={node as NodeData} x={x} y={y} />;
}
@@ -32,3 +55,5 @@ export const CustomNode = (nodeProps: NodeProps<NodeData["data"]>) => {
</Node>
);
};
+
+export const CustomNode = React.memo(CustomNodeWrapper);
diff --git a/src/components/Graph/index.tsx b/src/components/Graph/index.tsx
index 6fa05d6f..d9636975 100644
--- a/src/components/Graph/index.tsx
+++ b/src/components/Graph/index.tsx
@@ -3,23 +3,16 @@ import dynamic from "next/dynamic";
import styled from "styled-components";
import { Space } from "react-zoomable-ui";
import { ElkRoot } from "reaflow/dist/layout/useLayout";
-import { EdgeProps } from "reaflow/dist/symbols/Edge";
-import { NodeProps } from "reaflow/dist/symbols/Node";
import { useLongPress } from "use-long-press";
import { CustomNode } from "src/components/Graph/CustomNode";
import useToggleHide from "src/hooks/useToggleHide";
import { Loading } from "src/layout/Loading";
import useGraph from "src/store/useGraph";
-import useModal from "src/store/useModal";
import useUser from "src/store/useUser";
-import { NodeData } from "src/types/models";
+import { CustomEdge } from "./CustomEdge";
import { ErrorView } from "./ErrorView";
import { PremiumView } from "./PremiumView";
-const Edge = dynamic(() => import("reaflow").then(r => r.Edge), {
- ssr: false,
-});
-
const Canvas = dynamic(() => import("reaflow").then(r => r.Canvas), {
ssr: false,
});
@@ -84,8 +77,6 @@ const GraphCanvas = ({ isWidget }: { isWidget: boolean }) => {
const { validateHiddenNodes } = useToggleHide();
const setLoading = useGraph(state => state.setLoading);
const centerView = useGraph(state => state.centerView);
- const setSelectedNode = useGraph(state => state.setSelectedNode);
- const setVisible = useModal(state => state.setVisible);
const direction = useGraph(state => state.direction);
const nodes = useGraph(state => state.nodes);
const edges = useGraph(state => state.edges);
@@ -93,14 +84,6 @@ const GraphCanvas = ({ isWidget }: { isWidget: boolean }) => {
const [paneWidth, setPaneWidth] = React.useState(2000);
const [paneHeight, setPaneHeight] = React.useState(2000);
- const handleNodeClick = React.useCallback(
- (_: React.MouseEvent<SVGElement>, data: NodeData) => {
- if (setSelectedNode) setSelectedNode(data);
- setVisible("node")(true);
- },
- [setSelectedNode, setVisible]
- );
-
const onLayoutChange = React.useCallback(
(layout: ElkRoot) => {
if (layout.width && layout.height) {
@@ -119,31 +102,15 @@ const GraphCanvas = ({ isWidget }: { isWidget: boolean }) => {
});
}
},
- [centerView, isWidget, paneHeight, paneWidth, setLoading, validateHiddenNodes]
- );
-
- const onCanvasClick = React.useCallback(() => {
- (document.activeElement as HTMLElement)?.blur();
- }, []);
-
- const memoizedNode = React.useCallback(
- (props: JSX.IntrinsicAttributes & NodeProps<any>) => (
- // @ts-ignore
- <CustomNode {...props} onClick={handleNodeClick} />
- ),
- [handleNodeClick]
- );
-
- const memoizedEdge = React.useCallback(
- (props: JSX.IntrinsicAttributes & Partial<EdgeProps>) => (
- <Edge {...props} containerClassName={`edge-${props.id}`} />
- ),
- []
+ [isWidget, paneHeight, paneWidth, centerView, setLoading, validateHiddenNodes]
);
return (
<Canvas
className="jsoncrack-canvas"
+ onLayoutChange={onLayoutChange}
+ node={p => <CustomNode {...p} />}
+ edge={p => <CustomEdge {...p} />}
nodes={nodes}
edges={edges}
maxHeight={paneHeight}
@@ -152,10 +119,6 @@ const GraphCanvas = ({ isWidget }: { isWidget: boolean }) => {
width={paneWidth}
direction={direction}
layoutOptions={layoutOptions}
- onLayoutChange={onLayoutChange}
- onCanvasClick={onCanvasClick}
- node={memoizedNode}
- edge={memoizedEdge}
key={direction}
pannable={false}
zoomable={false}
diff --git a/src/constants/globalStyle.ts b/src/constants/globalStyle.ts
index 7f12f956..22920df0 100644
--- a/src/constants/globalStyle.ts
+++ b/src/constants/globalStyle.ts
@@ -22,6 +22,10 @@ const GlobalStyle = createGlobalStyle`
display: none;
}
+ /* g {
+ opacity: 1 !important;
+ } */
+
.mantine-Modal-inner {
padding: 0;
}
diff --git a/src/containers/Modals/SettingsModal/index.tsx b/src/containers/Modals/SettingsModal/index.tsx
index 04402274..53793e0f 100644
--- a/src/containers/Modals/SettingsModal/index.tsx
+++ b/src/containers/Modals/SettingsModal/index.tsx
@@ -1,13 +1,18 @@
import React from "react";
import { Modal, Group, Switch, Stack, ModalProps } from "@mantine/core";
+// import { VscLock } from "react-icons/vsc";
+// import useToggleHide from "src/hooks/useToggleHide";
+// import useGraph from "src/store/useGraph";
+// import useModal from "src/store/useModal";
+// import useUser from "src/store/useUser";
import useStored from "src/store/useStored";
export const SettingsModal: React.FC<ModalProps> = ({ opened, onClose }) => {
// const { validateHiddenNodes } = useToggleHide();
- // const isPremium = useUser(state => state.premium);
// const setVisible = useModal(state => state.setVisible);
// const toggleCollapseAll = useGraph(state => state.toggleCollapseAll);
// const collapseAll = useGraph(state => state.collapseAll);
+ // const isPremium = useUser(state => state.premium);
const setLightTheme = useStored(state => state.setLightTheme);
const toggleHideCollapse = useStored(state => state.toggleHideCollapse);
const toggleChildrenCount = useStored(state => state.toggleChildrenCount);
@@ -48,7 +53,7 @@ export const SettingsModal: React.FC<ModalProps> = ({ opened, onClose }) => {
<Flex align="center" gap="xs">
Collapse All by Default
<Badge size="xs" color="violet" variant="outline" radius="sm">
- For Big Datasets
+ 35% Faster
</Badge>
</Flex>
}