✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.
feat: improve collapse/expand all & rename fold/unfold
AykutSarac7774e685b470
diff --git a/src/components/MonacoEditor/index.tsx b/src/components/MonacoEditor/index.tsxindex 07a1f575..92fb68cc 100644--- a/src/components/MonacoEditor/index.tsx+++ b/src/components/MonacoEditor/index.tsx@@ -41,19 +41,19 @@ export const MonacoEditor = ({setHasError: (value: boolean) => void;}) => {const json = useConfig(state => state.json);- const expand = useConfig(state => state.expand);+ const foldNodes = useConfig(state => state.foldNodes);const setJson = useConfig(state => state.setJson);const setGraphValue = useGraph(state => state.setGraphValue);const lightmode = useStored(state => (state.lightmode ? "light" : "vs-dark"));const [value, setValue] = React.useState<string | undefined>("");React.useEffect(() => {- const { nodes, edges } = parser(json, expand);+ const { nodes, edges } = parser(json, foldNodes);setGraphValue("nodes", nodes);setGraphValue("edges", edges);setValue(json);- }, [expand, json, setGraphValue]);+ }, [foldNodes, json, setGraphValue]);React.useEffect(() => {const formatTimer = setTimeout(() => {diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsxindex e5be91d4..fd50a6f0 100644--- a/src/components/Sidebar/index.tsx+++ b/src/components/Sidebar/index.tsx@@ -1,6 +1,5 @@import React from "react";import Link from "next/link";-import { useRouter } from "next/router";import toast from "react-hot-toast";import {AiOutlineDelete,@@ -11,16 +10,12 @@ import {AiOutlineLink,AiOutlineEdit,} from "react-icons/ai";-import {- CgArrowsMergeAltH,- CgArrowsMergeAltV,- CgArrowsShrinkH,- CgArrowsShrinkV,-} from "react-icons/cg";+import { CgArrowsMergeAltH, CgArrowsShrinkH } from "react-icons/cg";import { FiDownload } from "react-icons/fi";import { HiHeart } from "react-icons/hi";import { MdCenterFocusWeak } from "react-icons/md";import { TiFlowMerge } from "react-icons/ti";+import { VscCollapseAll, VscExpandAll } from "react-icons/vsc";import { Tooltip } from "src/components/Tooltip";import { ClearModal } from "src/containers/Modals/ClearModal";import { DownloadModal } from "src/containers/Modals/DownloadModal";@@ -149,19 +144,21 @@ export const Sidebar: React.FC = () => {const getJson = useConfig(state => state.getJson);const setConfig = useConfig(state => state.setConfig);const centerView = useConfig(state => state.centerView);++ const collapseGraph = useGraph(state => state.collapseGraph);+ const expandGraph = useGraph(state => state.expandGraph);+ const graphCollapsed = useGraph(state => state.graphCollapsed);+const [uploadVisible, setUploadVisible] = React.useState(false);const [clearVisible, setClearVisible] = React.useState(false);const [shareVisible, setShareVisible] = React.useState(false);const [isDownloadVisible, setDownloadVisible] = React.useState(false);- const { push } = useRouter();- const [expand, layout, hideEditor] = useConfig(- state => [state.expand, state.layout, state.hideEditor],+ const [foldNodes, layout, hideEditor] = useConfig(+ state => [state.foldNodes, state.layout, state.hideEditor],shallow);- const { collapseGraph, expandGraph, graphCollapsed } = useGraph();-const handleSave = () => {const a = document.createElement("a");const file = new Blob([getJson()], { type: "text/plain" });@@ -171,9 +168,9 @@ export const Sidebar: React.FC = () => {a.click();};- const toggleExpandShrink = () => {- setConfig("expand", !expand);- toast(`${expand ? "Shrunk" : "Expanded"} nodes.`);+ const toggleFoldNodes = () => {+ setConfig("foldNodes", !foldNodes);+ toast(`${foldNodes ? "Fold" : "Unfold"} nodes.`);};const toggleLayout = () => {@@ -182,11 +179,9 @@ export const Sidebar: React.FC = () => {};const toggleExpandCollapseGraph = () => {- if (graphCollapsed) {- expandGraph();- } else {- collapseGraph();- }+ if (graphCollapsed) expandGraph();+ else collapseGraph();+toast(`${graphCollapsed ? "Expanded" : "Collapsed"} graph.`);};@@ -221,10 +216,10 @@ export const Sidebar: React.FC = () => {</Tooltip><TooltipclassName="desktop"- title={expand ? "Shrink Nodes" : "Expand Nodes"}+ title={foldNodes ? "Fold Nodes" : "Unfold Nodes"}>- <StyledElement title="Toggle Expand/Shrink" onClick={toggleExpandShrink}>- {expand ? <CgArrowsMergeAltH /> : <CgArrowsShrinkH />}+ <StyledElement onClick={toggleFoldNodes}>+ {foldNodes ? <CgArrowsMergeAltH /> : <CgArrowsShrinkH />}</StyledElement></Tooltip><Tooltip@@ -232,7 +227,7 @@ export const Sidebar: React.FC = () => {title={graphCollapsed ? "Expand Graph" : "Collapse Graph"}><StyledElement onClick={toggleExpandCollapseGraph}>- {graphCollapsed ? <CgArrowsShrinkV /> : <CgArrowsMergeAltV />}+ {graphCollapsed ? <VscExpandAll /> : <VscCollapseAll />}</StyledElement></Tooltip><Tooltip className="desktop" title="Save JSON">diff --git a/src/containers/Home/index.tsx b/src/containers/Home/index.tsxindex 4d395f21..ea5ebe60 100644--- a/src/containers/Home/index.tsx+++ b/src/containers/Home/index.tsx@@ -52,7 +52,7 @@ const HeroSection = () => {</Styles.StyledSubTitle><Styles.StyledMinorTitle>Paste - Import - Fetch!</Styles.StyledMinorTitle>- <Styles.StyledButton rel="prefetch" href="/editor" target="_blank" link>+ <Styles.StyledButton rel="prefetch" href="/editor" link>GO TO EDITOR</Styles.StyledButton>diff --git a/src/hooks/store/useConfig.tsx b/src/hooks/store/useConfig.tsxindex 28537604..a977561a 100644--- a/src/hooks/store/useConfig.tsx+++ b/src/hooks/store/useConfig.tsx@@ -16,7 +16,7 @@ const initialStates = {json: defaultJson,cursorMode: "move" as "move" | "navigation",layout: "RIGHT" as CanvasDirection,- expand: true,+ foldNodes: false,hideEditor: false,performanceMode: true,disableLoading: false,diff --git a/src/hooks/store/useGraph.tsx b/src/hooks/store/useGraph.tsxindex a06ad979..5a714603 100644--- a/src/hooks/store/useGraph.tsx+++ b/src/hooks/store/useGraph.tsx@@ -69,7 +69,7 @@ const useGraph = create<Graph & GraphActions>((set, get) => ({collapsedParents,collapsedNodes,collapsedEdges,- graphCollapsed: false,+ graphCollapsed: !!collapsedNodes.length,});},collapseNodes: nodeId => {@@ -83,6 +83,7 @@ const useGraph = create<Graph & GraphActions>((set, get) => ({collapsedParents: get().collapsedParents.concat(nodeId),collapsedNodes: get().collapsedNodes.concat(nodeIds),collapsedEdges: get().collapsedEdges.concat(edgeIds),+ graphCollapsed: !!get().collapsedNodes.concat(nodeIds).length,});},collapseGraph: () => {diff --git a/src/pages/_app.tsx b/src/pages/_app.tsxindex 4117ebe3..3b55eac3 100644--- a/src/pages/_app.tsx+++ b/src/pages/_app.tsx@@ -56,6 +56,9 @@ function JsonCrack({ Component, pageProps }: AppProps) {<Component {...pageProps} /><Toasterposition="bottom-right"+ containerStyle={{+ right: 60,+ }}toastOptions={{style: {background: "#4D4D4D",