Add components: HashRouter BrowserRouter MemoryRouter.

.eslintrc

@@ -6,7 +6,7 @@
   "rules": {
     "no-console": 0,
     "no-unused-vars": 0,
-    "react/prop-types": 1,
+    "react/prop-types": 0,
     "react/display-name": 0,
     "react/wrap-multilines": 2
   },

docs/Route.md

@@ -4,26 +4,26 @@
   * normal component
   * dynamic component 
 ## Index Component
-  * Add `'rc-index'` property to Route component, when path is equals to parent component's path,this one will match and mount.
+  * Add `'index'` property to Route component, when path is equals to parent component's path,this one will match and mount.
   ```
   <Route component={ User } path='/user'>
-    <Route rc-index component={ Info } path='/info'/>
+    <Route index component={ Info } path='/info'/>
     <Route component={ Edit } path='/edit'/>
     <Route component={ Article } path='/user'/>
    </Route>
   ```
-   *`'rc-indexv` component can no use `'path'` property*
+   *`'indexv` component can no use `'path'` property*
 ## Miss Match Deal
   * When no component is matched, we should show users something, such as `404` page. we support two way for this scene.
-  - use `'rc-miss'` property
+  - use `'miss'` property
   ```
    <Route component={ User } path='/user'>
      <Route component={ Edit } path='/edit'/>
      <Route component={ Article } path='/user'/>
-     <Route component={ NotFound } rc-miss/>
+     <Route component={ NotFound } miss/>
    </Route>
   ```
-  *`'rc-miss'` component can no use `'path'` property*
+  *`'miss'` component can no use `'path'` property*
 
   - use `'*'` path property, and add it as the last child
   ```

example/common/Footer.js

@@ -5,7 +5,7 @@ export default class Footer extends React.Component {
     return (
       <footer className="navbar navbar-default navbar-fixed-bottom">
         <div className="container-fluid text-center">
-          <h4 className="text-center">React-Control</h4>
+          <h4 className="text-center">react-flex-router</h4>
           <p>Contact Us : Qiupeng Xie() 、 Zhipeng Zhang() 、 Bin Zhang(vifird@163.com)</p>
         </div>
       </footer>

example/common/Header.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link,Control } from 'react-control'
+import { Link,Control } from 'react-flex-router'
 import './com.css'
 
 export default class Header extends React.Component {
@@ -10,7 +10,7 @@ export default class Header extends React.Component {
       <header className="navbar navbar-static-top navbar-inverse bs-docs-nav" id="top" role="banner">
         <div className="container-fluid">
           <div className="navbar-header">
-            <Link to="#/" className="navbar-brand">React-Control</Link>
+            <Link to="#/" className="navbar-brand">react-flex-router</Link>
           </div>
           <nav className="collapse navbar-collapse bs-navbar-collapse" role="navigation">
             <ul className="nav navbar-nav">

example/main/app.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { Router, Route, history } from 'react-control'
+import { HashRouter, Route } from 'react-flex-router'
 
 import Home from './pages/Home'
 
@@ -13,33 +13,25 @@ import AboutUs from './pages/AboutUs'
 
 import Host from './pages/host/Host'
 
-const historyConfig = {
-  type: 'hash',
-  basename: ''
-}
-
 class App extends React.Component {
-  constructor(...args) {
-    super(...args)
-  }
 
   render() {
     return (
-      <Router history={ history(historyConfig) }>
-
-        <Route component={Home} path="/"/>
-
-        <Route component={Products} path="/products">
-          <Route rc-index component={Enterprise} path="/ep"/>
-          <Route rc-miss component={Mobile}/>
-          <Route component={Detail} path="/item/:id" time={new Date().toLocaleString()}/>
-        </Route>
+      <HashRouter>
+        <div>
+          <Route component={Home} path="/"/>
 
-        <Route component={Host} path="/host" enterFilter={[ 'loginCheck', 'permitCheck' ]}/>
+          <Route component={Products} path="/products">
+            <Route index component={Enterprise} path="/ep"/>
+            <Route miss component={Mobile}/>
+            <Route component={Detail} path="/item/:id" time={new Date().toLocaleString()}/>
+          </Route>
 
-        <Route path="aboutus" component={AboutUs}/>
+          <Route component={Host} path="/host" enterFilter={[ 'loginCheck', 'permitCheck' ]}/>
 
-      </Router>
+          <Route lock path="aboutus" component={AboutUs}/>
+        </div>
+      </HashRouter>
     )
   }
 }

example/main/pages/host/Concerns.js

@@ -6,10 +6,10 @@ export default class Concerns extends React.Component {
     super(...args)
     this.state = {
       concerns: [
-        { id:110, subject: 'React-Control , more than router of react.', time: 1457789912, user: 'Vifird', face: '/common/attach/user/1.jpg' },
-        { id:110, subject: 'React-Control , more than router of react.', time: 1457789912, user: 'Lisa', face: '/common/attach/user/2.jpg' },
-        { id:110, subject: 'React-Control , more than router of react.', time: 1457789912, user: 'John', face: '/common/attach/user/3.jpg' },
-        { id:110, subject: 'React-Control , more than router of react.', time: 1457789912, user: 'Jasine', face: '/common/attach/user/4.jpg' }
+        { id:110, subject: 'react-flex-router , more than router of react.', time: 1457789912, user: 'Vifird', face: '/common/attach/user/1.jpg' },
+        { id:110, subject: 'react-flex-router , more than router of react.', time: 1457789912, user: 'Lisa', face: '/common/attach/user/2.jpg' },
+        { id:110, subject: 'react-flex-router , more than router of react.', time: 1457789912, user: 'John', face: '/common/attach/user/3.jpg' },
+        { id:110, subject: 'react-flex-router , more than router of react.', time: 1457789912, user: 'Jasine', face: '/common/attach/user/4.jpg' }
       ]
     }
   }

example/main/pages/host/Host.js

@@ -2,7 +2,7 @@ import React from 'react'
 import Header from '../../../common/Header'
 import Footer from '../../../common/Footer'
 import LeftNav from './LeftNav'
-import { Route } from 'react-control'
+import { Route } from 'react-flex-router'
 import HostInfo from './HostInfo'
 import Edit from './Edit'
 import Concerns from './Concerns'
@@ -16,9 +16,9 @@ export default class Host extends React.Component {
           <LeftNav/>
           <div className="col-md-10">
 
-            <Route rc-index component={HostInfo} path="/info"/>
+            <Route index component={HostInfo} path="/info"/>
             <Route component={Edit} path="edit" leaveFilter={[ 'editLeave' ]}/>
-            <Route rc-miss path="concerns" component={Concerns}/>
+            <Route miss path="concerns" component={Concerns}/>
 
           </div>
         </div>

example/main/pages/host/LeftNav.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link, Control } from 'react-control'
+import { Link, Control } from 'react-flex-router'
 
 export default class LeftNav extends React.Component {
   render() {

example/main/pages/products/LeftNav.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link, Control } from 'react-control'
+import { Link, Control } from 'react-flex-router'
 
 export default class LeftNav extends React.Component {
 

example/temp/App.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { Router, Route, history, Link } from 'react-control'
+import { HashRouter, Route, Link } from 'react-flex-router'
 
 const historyConfig = {
   type: 'hash',
@@ -32,13 +32,9 @@ class App extends React.Component {
     super(...args)
   }
 
-  componentDidMount() {
-
-  }
-
   render() {
     return (
-      <Router history={ history(historyConfig) }>
+      <HashRouter>
         <span>
           <ul>
             <li><Link to="/">Home</Link></li>
@@ -60,7 +56,7 @@ class App extends React.Component {
 
         </span>
 
-      </Router>
+      </HashRouter>
     )
   }
 }

example/webpack.config.js

@@ -41,7 +41,7 @@ module.exports = {
 
   resolve: {
     alias: {
-      'react-control': path.join(__dirname, '..', 'modules/index')
+      'react-flex-router': path.join(__dirname, '..', 'modules/index')
     }
   },
 

jsconfig.json

@@ -0,0 +1,20 @@
+/** vscode config */
+{
+
+	"compilerOptions": {
+
+		"target": "ES6",
+
+		"module": "commonjs",
+
+		"experimentalDecorators" : true,
+
+    "lib": [
+      "es7",
+      "es2017.sharedmemory",
+      "es2017.object"
+    ]
+
+	}
+
+}

modules/BrowserRouter.js

@@ -0,0 +1,10 @@
+import Router from './Router'
+import createBrowserHistory from 'history/createBrowserHistory'
+
+export default class BrowserRouter extends Router {
+}
+
+BrowserRouter.prototype.createHistory = function () {
+  const { basename, hashType, getUserConfirmation }  = this.props
+  return createBrowserHistory({ basename, hashType, getUserConfirmation })
+}

modules/HashRouter.js

@@ -0,0 +1,10 @@
+import Router from './Router'
+import createHashHistory from 'history/createHashHistory'
+
+export default class HashRouter extends Router {
+}
+
+HashRouter.prototype.createHistory = function () {
+  const { basename, hashType, getUserConfirmation }  = this.props
+  return createHashHistory({ basename, hashType, getUserConfirmation })
+}

modules/Link.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import history from './history'
+import { go } from './OuterControl'
 
 /**
  * replace the tag 'A', used to link to a new url
@@ -33,11 +33,11 @@ export default class Link extends React.Component {
     if(to.indexOf('/') !== 0) {
       to = `/${to}`
     }
-    if(history.getHistory().location.pathname === to) {
+
+    if(this.context.history.location.pathname === to) {
       return
     }
-    history.getHistory().push(to)
-    history.getHistory().goForward()
+    go(to)
   }
 
   render() {

modules/MemoryRouter.js

@@ -0,0 +1,10 @@
+import Router from './Router'
+import createMemoryHistory from 'history/createMemoryHistory'
+
+export default class MemoryRouter extends Router {
+}
+
+MemoryRouter.prototype.createHistory = function () {
+  const { initialEntries, initialIndex, getUserConfirmation }  = this.props
+  return createMemoryHistory({ initialEntries, initialIndex, getUserConfirmation })
+}