Merge branch 'hotfix/2.0.4'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+*2.0.4* (2018-03-09)
+  - ✨ better inner link handling (ea7dcc8)
+
 *2.0.3* (2018-03-09)
   - ✨ relaunch ready hook when route change (0f37a5e)
 

VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

build/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.99b383b5.css",
   "main.css.map": "static/css/main.99b383b5.css.map",
-  "main.js": "static/js/main.631160b2.js",
-  "main.js.map": "static/js/main.631160b2.js.map"
+  "main.js": "static/js/main.4016f53e.js",
+  "main.js.map": "static/js/main.4016f53e.js.map"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolbox-reader",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "private": true,
   "eslintConfig": {
     "parser": "babel-eslint",

src/components/App/App.js

@@ -42,6 +42,7 @@ class App extends Component {
   }
 
   componentDidMount() {
+    // Send a ToolboxReady event when App is mounted and on each page change
     this.updateHook();
     this.props.history.listen(() => this.updateHook());
   }

src/components/Item/Item.js

@@ -9,6 +9,7 @@ import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/di
 import xml from 'react-syntax-highlighter/dist/languages/xml';
 import { atomOneDark } from 'react-syntax-highlighter/dist/styles';
 
+import parentUrl from '../../helpers/parentUrl';
 import './Item.css';
 
 registerLanguage('html', xml);
@@ -31,8 +32,8 @@ class Item extends Component {
   }
 
   handleItemClick(e) {
-    // Disable all inner links
-    e.preventDefault();
+    // If it's a link related event, prevent default
+    if (parentUrl(e.target)) e.preventDefault();
   }
 
   render() {

src/helpers/parentUrl.js

@@ -0,0 +1,12 @@
+const parentUrl = (child) => {
+  if (child.tagName === 'A') return child;
+  if (child.parentNode) {
+    if (child.parentNode.tagName === 'A') {
+      return child.parentNode;
+    }
+    return parentUrl(child.parentNode);
+  }
+  return false;
+};
+
+export default parentUrl;

src/views/Single/SinglePage.js

@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { getComponentMarkup } from '../../actions/atomic';
+import parentUrl from '../../helpers/parentUrl';
 
 import Single from './Single';
 
@@ -31,23 +32,11 @@ class SinglePage extends Single {
   handlePageClick(e) {
     e.preventDefault();
 
-    const parentUrl = (child) => {
-      if (child.tagName === 'A') return child;
-      if (child.parentNode) {
-        if (child.parentNode.tagName === 'A') {
-          return child.parentNode;
-        }
-        return parentUrl(child.parentNode);
-      }
-      return false;
-    };
-
     // If it's a link related event, redirect to page
     const linkParent = parentUrl(e.target);
     if (linkParent) {
       const slug = linkParent.href.split('/pages/').slice(-1)[0];
-      this.getContent({ Store: this.props.store, match: { params: { slug } } });
-      this.props.history.push('/pages/homepage');
+      this.props.history.push(`/pages/${slug}`);
     }
   }
 
@@ -59,6 +48,7 @@ class SinglePage extends Single {
 }
 
 SinglePage.propTypes = {
+  history: PropTypes.object.isRequired,
   components: PropTypes.object,
 };