From 33b0e6a5c88f2a20f52218965e9f68c2bc12f5eb Mon Sep 17 00:00:00 2001 From: Michael An <1822852997@qq.com> Date: Sun, 28 Apr 2019 15:38:21 +0800 Subject: [PATCH] tree view --- frontend/src/components/index-viewer.js | 156 ++++++++++++++++++------ frontend/src/css/index-viewer.css | 16 +++ 2 files changed, 135 insertions(+), 37 deletions(-) create mode 100644 frontend/src/css/index-viewer.css diff --git a/frontend/src/components/index-viewer.js b/frontend/src/components/index-viewer.js index c6f93fdf2d..47a37dd355 100644 --- a/frontend/src/components/index-viewer.js +++ b/frontend/src/components/index-viewer.js @@ -1,48 +1,53 @@ import React from 'react'; import PropTypes from 'prop-types'; -import MarkdownViewer from '@seafile/seafile-editor/dist/viewer/markdown-viewer'; import { repoID, slug, serviceURL, isPublicWiki } from '../utils/constants'; import { Utils } from '../utils/utils'; +import { Value } from 'slate'; +import { deserialize } from '@seafile/seafile-editor/dist/utils/slate2markdown'; +import'../css/index-viewer.css'; const viewerPropTypes = { indexContent: PropTypes.string.isRequired, onLinkClick: PropTypes.func.isRequired, }; -const contentClass = 'wiki-nav-content'; - class IndexContentViewer extends React.Component { constructor(props) { super(props); this.links = []; + this.rootNode = {}; + } + + componentWillMount() { + this.getRootNode(); } componentDidMount() { - // Bind event when first loaded - this.links = document.querySelectorAll(`.${contentClass} a`); - this.links.forEach(link => { - link.addEventListener('click', this.onLinkClick); - }); + this.bindClickEvent(); } componentWillReceiveProps() { - // Unbound event when updating - this.links.forEach(link => { - link.removeEventListener('click', this.onLinkClick); - }); + this.removeClickEvent(); } componentDidUpdate() { - // Update completed, rebind event + this.bindClickEvent(); + } + + componentWillUnmount() { + this.removeClickEvent(); + } + + bindClickEvent = () => { + const contentClass = 'wiki-nav-content'; this.links = document.querySelectorAll(`.${contentClass} a`); this.links.forEach(link => { link.addEventListener('click', this.onLinkClick); }); } - componentWillUnmount() { - // Rebinding events when the component is destroyed + removeClickEvent = () => { this.links.forEach(link => { link.removeEventListener('click', this.onLinkClick); }); @@ -51,18 +56,18 @@ class IndexContentViewer extends React.Component { onLinkClick = (event) => { event.preventDefault(); event.stopPropagation(); - let link = ''; - if (event.target.tagName !== 'A') { - let target = event.target.parentNode; - while (target.tagName !== 'A') { - target = target.parentNode; - } - link = target.href; + const link = this.getLink(event.target); + if (link) this.props.onLinkClick(link); + } + getLink = (node) => { + const tagName = node.tagName; + if (!tagName || tagName === 'HTML') return; + if (tagName === 'A') { + return node.href; } else { - link = event.target.href; + return this.getLink(node.parentNode); } - this.props.onLinkClick(link); } changeInlineNode = (item) => { @@ -88,17 +93,18 @@ class IndexContentViewer extends React.Component { else if (item.type == 'link') { url = item.data.href; + /* eslint-disable */ let expression = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-_]*)?\??(?:[\-\+=&;%@\.\w_]*)#?(?:[\.\!\/\\\w]*))?)/ + /* eslint-enable */ let re = new RegExp(expression); // Solving relative paths if (!re.test(url)) { - item.data.href = serviceURL + "/published/" + slug + '/' + url; + item.data.href = serviceURL + '/published/' + slug + '/' + url; } // change file url else if (Utils.isInternalMarkdownLink(url, repoID)) { let path = Utils.getPathFromInternalMarkdownLink(url, repoID); - console.log(path); // replace url item.data.href = serviceURL + '/published/' + slug + path; } @@ -121,23 +127,99 @@ class IndexContentViewer extends React.Component { return value; } - onContentRendered = () => { - // todo + getRootNode = () => { + let value = deserialize(this.props.indexContent); + value = value.toJSON(); + value = this.modifyValueBeforeRender(value); + value = Value.fromJSON(value); + const nodes = value.document.nodes; + nodes.map((node) => { + if (node.type ==='unordered_list' || node.type === 'ordered_list') { + this.rootNode = node; + } + }); } render() { - return ( -
- -
- ); + return ; } } IndexContentViewer.propTypes = viewerPropTypes; +const FolderItemPropTypes = { + rootNode: PropTypes.object.isRequired, + bindClickEvent: PropTypes.func.isRequired, + hasChild: PropTypes.bool, +}; + +class FolderItem extends React.Component { + + constructor(props) { + super(props); + this.state = { + showChild: true + }; + } + + toggleShowChild = () => { + this.setState({showChild: !this.state.showChild}, () => { + if (this.state.showChild) { + this.props.bindClickEvent(); + } + }); + } + + componentDidMount() { + if (this.props.hasChild) { + this.setState({ showChild: false }); + } + } + + render() { + const { rootNode } = this.props; + return ( +
+ { + rootNode.nodes.map((node) => { + if (node.type === 'paragraph') { + let href = ''; + node.nodes.map((linkNode) => { + // deal with node isn't a link + href = linkNode.data ? encodeURI(linkNode.data.get('href')) : 'javascript:void(0);'; + }); + return ( +
+ {node.text} +
+ ); + } else { + const hasChild = (rootNode.type === 'unordered_list' && rootNode.nodes.size > 1); + return ( + + {this.props.hasChild && + + {this.state.showChild ? : } + + } + {this.state.showChild && + + } + + ); + } + }) + } +
+ ); + } +} + +FolderItem.propTypes = FolderItemPropTypes; + export default IndexContentViewer; diff --git a/frontend/src/css/index-viewer.css b/frontend/src/css/index-viewer.css new file mode 100644 index 0000000000..a6184f43f0 --- /dev/null +++ b/frontend/src/css/index-viewer.css @@ -0,0 +1,16 @@ +.folder-item { + position: relative; + margin-top: 5px; +} +.folder-item .wiki-nav-content a { + color: #333; +} +.folder-item .wiki-nav-content a:hover { + text-decoration: none; +} +.switch-btn { + position: absolute; + left: 0.5rem; + top: 0; + color: #c0c0c0; +} \ No newline at end of file