✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.
Merge branch 'settings-modal' into toggle-expand
AykutSarac0d78a4e6c233
diff --cc src/components/Sidebar/index.tsxindex 4843f67b,5a2e15e5..f75cfe90--- a/src/components/Sidebar/index.tsx+++ b/src/components/Sidebar/index.tsx@@@ -19,15 -19,12 +19,14 @@@ import} from "react-icons/ai";import { Tooltip } from "src/components/Tooltip";-import { ConfigActionType } from "src/reducer/reducer";-import { useConfig } from "src/hocs/config";import { useRouter } from "next/router";-import { ImportModal } from "src/containers/ImportModal";-import { ClearModal } from "src/containers/ClearModal";-import { IoAlertCircleSharp } from "react-icons/io5";+import { ImportModal } from "src/containers/Modals/ImportModal";+import { ClearModal } from "src/containers/Modals/ClearModal";+import { ShareModal } from "src/containers/Modals/ShareModal";- import { IoAlertCircleSharp } from "react-icons/io5";+import useConfig from "src/hooks/store/useConfig";+import { getNextLayout } from "src/containers/Editor/LiveEditor/helpers";+import { HiHeart } from "react-icons/hi";+import shallow from "zustand/shallow";const StyledSidebar = styled.div`display: flex;diff --cc src/containers/Editor/Tools.tsxindex 31076d7a,e547fc35..a4953658--- a/src/containers/Editor/Tools.tsx+++ b/src/containers/Editor/Tools.tsx@@@ -7,12 -8,12 +7,14 @@@ importimport { FiDownload } from "react-icons/fi";import { HiOutlineSun, HiOutlineMoon } from "react-icons/hi";import { MdCenterFocusWeak } from "react-icons/md";-import { SearchInput } from "src/containers/SearchInput";-import { useConfig } from "src/hocs/config";-import { ConfigActionType } from "src/reducer/reducer";+import { SearchInput } from "src/components/SearchInput";import styled from "styled-components";+import useConfig from "src/hooks/store/useConfig";+import shallow from "zustand/shallow";+import { DownloadModal } from "../Modals/DownloadModal";+import useStored from "src/hooks/store/useStored";+ import { TbSettings } from "react-icons/tb";+ import { Settings } from "./Settings";export const StyledTools = styled.div`display: flex;@@@ -42,38 -43,43 +44,45 @@@ const StyledToolElement = styled.button`;export const Tools: React.FC = () => {+ const [settingsVisible, setSettingsVisible] = React.useState(false);- const { settings, dispatch } = useConfig();+ const [isDownloadVisible, setDownloadVisible] = React.useState(false);+ const lightmode = useStored((state) => state.lightmode);+ const setLightTheme = useStored((state) => state.setLightTheme);- const zoomIn = () => dispatch({ type: ConfigActionType.ZOOM_IN });-- const zoomOut = () => dispatch({ type: ConfigActionType.ZOOM_OUT });-- const centerView = () => dispatch({ type: ConfigActionType.CENTER_VIEW });-- const toggleEditor = () => dispatch({ type: ConfigActionType.TOGGLE_DOCK });+ const [performanceMode, hideEditor] = useConfig(+ (state) => [state.performanceMode, state.hideEditor],+ shallow+ );- const toggleTheme = () => dispatch({ type: ConfigActionType.TOGGLE_THEME });+ const setConfig = useConfig((state) => state.setConfig);- const exportAsImage = () => {- saveAsPng(document.querySelector("svg[id*='ref']"), {- filename: "jsonvisio.com",- printDate: true,- });- };+ const zoomIn = useConfig((state) => state.zoomIn);+ const zoomOut = useConfig((state) => state.zoomOut);+ const centerView = useConfig((state) => state.centerView);+ const toggleEditor = () => setConfig("hideEditor", !hideEditor);+ const toggleTheme = () => setLightTheme(!lightmode);return (<StyledTools><StyledToolElement aria-label="fullscreen" onClick={toggleEditor}><AiOutlineFullscreen /></StyledToolElement>+ <StyledToolElement+ aria-label="settings"+ onClick={() => setSettingsVisible(true)}+ >+ <TbSettings />+ </StyledToolElement><StyledToolElement aria-label="switch theme" onClick={toggleTheme}>- {settings.lightmode ? <HiOutlineMoon /> : <HiOutlineSun />}+ {lightmode ? <HiOutlineMoon /> : <HiOutlineSun />}</StyledToolElement>- {!settings.performance && <SearchInput />}- {!settings.performance && (- <StyledToolElement aria-label="save" onClick={exportAsImage}>+ {!performanceMode && <SearchInput />}++ {!performance && (+ <StyledToolElement+ aria-label="save"+ onClick={() => setDownloadVisible(true)}+ ><FiDownload /></StyledToolElement>)}@@@ -86,10 -92,7 +95,11 @@@<StyledToolElement aria-label="zoom in" onClick={zoomIn}><AiOutlinePlus /></StyledToolElement>+ <DownloadModal+ visible={isDownloadVisible}+ setVisible={setDownloadVisible}+ />+ <Settings visible={settingsVisible} setVisible={setSettingsVisible} /></StyledTools>);};