Refactor ExampleBrowser

- navigate between examples with react-router (each example has got a slug) - extract ExampleViewer into a separate component, determine its size using react-sizeme - make ExampleBrowser component functional (i.e. pure)
firtoz · Sep 6, 2016 · 17517b9 · 17517b9
1 parent 281ec03
commit 17517b9
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 82 deletions.
diff --git a/assets/index.html b/assets/index.html
@@ -61,6 +61,7 @@
 
         #panel #content .link {
             color: #2194CE;
+            display: block;
             text-decoration: none;
             cursor: pointer;
         }

diff --git a/package.json b/package.json
@@ -20,6 +20,8 @@
     "cannon": "^0.6.2",
     "react": "~15.3.1",
     "react-dom": "^15.3.1",
+    "react-router": "^3.0.0-alpha.3",
+    "react-sizeme": "^2.1.3",
     "react-three-renderer": "2.3.1",
     "stats.js": "^1.0.0",
     "three": "0.79.0"

diff --git a/src/examples/ExampleBrowser.js b/src/examples/ExampleBrowser.js
@@ -1,4 +1,6 @@
 import React from 'react';
+import { Link } from 'react-router';
+import ExampleViewer from './ExampleViewer';
 
 import SimpleExample from './Simple/index';
 import ManualRenderingExample from './ManualRendering/index';
@@ -17,41 +19,49 @@ const examples = [
     name: 'Simple',
     component: SimpleExample,
     url: 'Simple/index',
+    slug: 'webgl_simple',
   },
   {
     name: 'Cloth',
     component: ClothExample,
     url: 'AnimationCloth/index',
+    slug: 'webgl_cloth',
   },
   {
     name: 'Camera',
     component: CameraExample,
     url: 'WebGLCameraExample/index',
+    slug: 'webgl_camera',
   },
   {
     name: 'Geometries',
     component: GeometriesExample,
     url: 'Geometries/index',
+    slug: 'webgl_geometries',
   },
   {
     name: 'Geometry Shapes',
     component: GeometryShapesExample,
     url: 'GeometryShapes/index',
+    slug: 'webgl_geometry_shapes',
   },
   {
     name: 'Draggable Cubes',
     component: DraggableCubes,
     url: 'DraggableCubes/index',
+    slug: 'webgl_draggable_cubes',
   },
   {
     name: 'Physics',
     component: Physics,
     url: 'Physics/index',
+    slug: 'webgl_physics',
   },
   {
     name: 'Physics - MousePick',
     component: PhysicsMousePick,
     url: 'Physics/mousePick',
+    slug: 'webgl_physics_mousepick',
   },
   {
     separator: true,
@@ -66,6 +76,7 @@ const examples = [
     name: 'Manual rendering',
     component: ManualRenderingExample,
     url: 'ManualRendering/index',
+    slug: 'advanced_manual_rendering',
   },
   {
     separator: true,
@@ -75,74 +86,20 @@ const examples = [
     name: 'RotatingCubes - Through React',
     component: BenchmarkRotatingCubes,
     url: 'Benchmark/RotatingCubes',
+    slug: 'benchmarks_rotating_cubes_react',
   },
   {
     name: 'RotatingCubes - Direct Updates',
     component: RotatingCubesDirectUpdates,
     url: 'Benchmark/RotatingCubesDirectUpdates',
+    slug: 'benchmarks_rotating_cubes_direct',
   },
 ];
 
-class ExampleBrowser extends React.Component {
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      activeExample: null,
-      viewerWidth: 0,
-      viewerHeight: 0,
-    };
-  }
-
-  componentDidMount() {
-    window.addEventListener('resize', this._onWindowResize, false);
-  }
-
-  componentWillUnmount() {
-    window.removeEventListener('resize', this._onWindowResize, false);
-  }
-
-  _onWindowResize = () => {
-    const viewer = this.refs.viewer;
-
-    this.setState({
-      viewerWidth: viewer.offsetWidth,
-      viewerHeight: viewer.offsetHeight,
-    });
-  };
-
-  render() {
-    let exampleContent = null;
-
-    const {
-      viewerWidth,
-      viewerHeight,
-    } = this.state;
-
-    let sourceButton = null;
-
-    if (this.state.activeExample !== null) {
-      const {
-        component: ExampleComponent,
-        url,
-      } = examples[this.state.activeExample];
-
-      exampleContent = (<ExampleComponent
-        width={viewerWidth}
-        height={viewerHeight}
-      />);
-
-      sourceButton = (<div key="src" id="button">
-        <a
-          href={`https://github.com/toxicFork/react-three-renderer-example/blob/master/src/examples/${url}.js`}
-          target="_blank"
-        >
-          View source
-        </a>
-      </div>);
-    }
-
-    return (<div>
+const ExampleBrowser = ({ params }) => {
+  const activeExample = params.slug && examples.find(example => example.slug === params.slug);
+  return (
+    <div>
       <div id="panel" className="collapsed">
         <h1><a href="https://github.com/toxicFork/react-three-renderer/">react-three-renderer</a> / examples</h1>
         <div id="content">
@@ -159,33 +116,25 @@ class ExampleBrowser extends React.Component {
                 </div>);
               }
 
-              const onLinkClick = () => {
-                const viewer = this.refs.viewer;
-
-                this.setState({
-                  viewerWidth: viewer.offsetWidth,
-                  viewerHeight: viewer.offsetHeight,
-                  activeExample: index,
-                });
-              };
-
-              return (<div
-                className="link"
+              return (<Link
+                to={`/${example.slug}`}
                 key={index}
-                onClick={onLinkClick}
+                className="link"
+                activeClassName="selected"
               >
                 {example.name}
-              </div>);
+              </Link>);
             })}
           </div>
         </div>
       </div>
-      <div id="viewer" ref="viewer">
-        {exampleContent}
-        {sourceButton}
-      </div>
-    </div>);
-  }
-}
+      <ExampleViewer example={activeExample} />
+    </div>
+  );
+};
+
+ExampleBrowser.propTypes = {
+  params: React.PropTypes.object.isRequired,
+};
 
 export default ExampleBrowser;
diff --git a/src/examples/ExampleViewer.js b/src/examples/ExampleViewer.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import sizeMe from 'react-sizeme';
+
+const ExampleViewer = ({ example, size }) => {
+  let sourceButton = null;
+  let exampleContent = null;
+
+  if (example) {
+    const {
+      component: ExampleComponent,
+      url,
+    } = example;
+    exampleContent = (<ExampleComponent width={size.width} height={size.height} />);
+    sourceButton = (<div key="src" id="button">
+      <a
+        href={`https://github.com/toxicFork/react-three-renderer-example/blob/master/src/examples/${url}.js`}
+        target="_blank"
+      >
+        View source
+      </a>
+    </div>);
+  }
+
+  return (
+    <div id="viewer">
+      {exampleContent}
+      {sourceButton}
+    </div>
+  );
+};
+
+ExampleViewer.propTypes = {
+  example: React.PropTypes.object,
+  size: React.PropTypes.object,
+};
+
+export default sizeMe({ monitorHeight: true, refreshRate: 200 })(ExampleViewer);
diff --git a/src/index.js b/src/index.js
@@ -1,8 +1,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { Router, Route, hashHistory } from 'react-router';
 import ExampleBrowser from './examples/ExampleBrowser';
 import Perf from 'react-addons-perf';
 
 window.Perf = Perf;
 
-ReactDOM.render(<ExampleBrowser/>, document.getElementById('content'));
+ReactDOM.render(
+  <Router history={hashHistory}>
+    <Route path="/(:slug)" component={ExampleBrowser} />
+  </Router>,
+  document.getElementById('content')
+);