diff --git a/package-lock.json b/package-lock.json index 0ad0246..77d8f02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14117,14 +14117,6 @@ "shallowequal": "^1.0.1" } }, - "react-treeview": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/react-treeview/-/react-treeview-0.4.7.tgz", - "integrity": "sha1-9kfgT3BJbrEfsJEsNRh+gOtg1Fg=", - "requires": { - "prop-types": "^15.5.8" - } - }, "read": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", diff --git a/package.json b/package.json index b941770..bd2b5ca 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "react-dom": "^16.8.6", "react-helmet": "^5.2.1", "react-perfect-scrollbar": "^1.5.3", - "react-treeview": "^0.4.7", "styled-components": "^4.3.2" }, "devDependencies": { diff --git a/src/components/ResourcesSidebar/index.tsx b/src/components/ResourcesSidebar/index.tsx index 6c68493..8d51251 100644 --- a/src/components/ResourcesSidebar/index.tsx +++ b/src/components/ResourcesSidebar/index.tsx @@ -1,9 +1,9 @@ import React, { useState } from "react" -import Tree from "react-treeview" import { useStaticQuery, graphql } from "gatsby" import useBuildTree from "./useBuildTree" import useSidebar from "./../../hooks/useSidebar" import banner from "../../images/tph-banner.png" +import TriangleDown from "../../icons/triangle-down.svg" import * as SC from "./styles" export interface IFile { @@ -82,13 +82,11 @@ function Folder({ item }: { item: IFolder }) { } return ( - - {item.title}} - > - {item.children.map(node => plantTree(node))} - + + + {item.title} + + {item.children.map(node => plantTree(node))} ) } @@ -98,22 +96,15 @@ function FirstLevelFolder({ item, index }: { item: IFolder; index: number }) { const collapsed = current !== index return ( - - setCurrent(index)} - > - {item.title} - - - } + + setCurrent(index)} > - {item.children.map(node => plantTree(node))} - + {item.title} + + + {item.children.map(node => plantTree(node))} ) } diff --git a/src/components/ResourcesSidebar/styles.tsx b/src/components/ResourcesSidebar/styles.tsx index 0bd74f8..80b0fe2 100644 --- a/src/components/ResourcesSidebar/styles.tsx +++ b/src/components/ResourcesSidebar/styles.tsx @@ -4,7 +4,7 @@ import ChevronUp from "../../icons/chevron-up.svg" export const ResourcesSidebarWrapper = styled.div` box-sizing: border-box; - flex: 0 0 300px; + flex: 0 0 320px; background: #f9f9f9; ` @@ -13,25 +13,41 @@ export const Banner = styled.img` width: 100%; ` -export const TreeWrapper = styled.div` - width: 100%; - - & + & { - border-top: 1px solid #dbdbdb; - } +export const Children = styled.div` + padding-left: 16px; + padding-bottom: 8px; + display: flex; + flex-direction: column; + align-items: flex-start; + overflow: hidden; ` export const Label = styled.div` - padding: 4px 0; + user-select: none; + position: relative; + padding: 8px 0; + cursor: pointer; + display: flex; + align-items: center; + + svg { + position: absolute; + right: 100%; + margin-right: 4px; + width: 10px; + } ` export const FirstLabel = styled.div` + user-select: none; display: flex; align-items: center; width: 100%; + box-sizing: border-box; padding: 12px 15px 12px 0; font-weight: 700; color: #a9a9a9; + cursor: pointer; &.active { color: #000; @@ -56,62 +72,44 @@ export const FirstLabel = styled.div` } ` +export const TreeWrapper = styled.div<{ collapsed: boolean }>` + width: 100%; + font-size: 20px; + + &.firstLevel { + overflow: hidden; + } + + & + & { + border-top: 1px solid #dbdbdb; + } + + ${Children} { + display: ${props => (props.collapsed ? "none" : "block")}; + /* height: ${props => (props.collapsed ? 0 : "auto")}; */ + } + + & > ${Label} svg { + transform: rotate(${props => (props.collapsed ? -90 : 0)}deg); + } +` + export const CollapseToggler = styled(ChevronUp)`` export const Inner = styled.div` padding-top: 30px; padding-left: 20px; - - .tree-view { - overflow-y: hidden; - } - - .tree-view_item { - display: flex; - cursor: pointer; - } - - .tree-view_children { - margin-left: 16px; - display: flex; - flex-direction: column; - align-items: flex-start; - } - - .tree-view_children-collapsed { - height: 0px; - } - - .tree-view_arrow { - cursor: pointer; - margin-right: 6px; - display: inline-block; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } - - .tree-view_arrow:after { - content: "▾"; - } - - .tree-view_arrow.firstLevel { - display: none; - } - - .tree-view_arrow-collapsed { - -webkit-transform: rotate(-90deg); - -moz-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); - transform: rotate(-90deg); - } ` export const PageLink = styled(Link)` display: block; padding: 4px 0; - color: #1c61df; + color: #000; + text-decoration: none; + + & + & { + margin-top: 4px; + } &.active { font-weight: 700; diff --git a/src/icons/triangle-down.svg b/src/icons/triangle-down.svg new file mode 100644 index 0000000..33f1f64 --- /dev/null +++ b/src/icons/triangle-down.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file