Skip to content
This repository has been archived by the owner on Jan 24, 2025. It is now read-only.

chore: add support for HashRouter using hashRouter config #73

Merged
merged 1 commit into from
Jun 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/docz-core/src/Entries.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const writeAppFiles = async (config: Config, dev: boolean): Promise<void> => {
theme,
isProd: !dev,
wrapper: config.wrapper,
hashRouter: config.hashRouter,
websocketUrl: `ws://${config.websocketHost}:${config.websocketPort}`,
})

Expand Down
3 changes: 2 additions & 1 deletion packages/docz-core/src/commands/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export interface ThemeConfig {
}

export interface Config extends Argv {
plugins?: Plugin[]
hashRouter: boolean
plugins: Plugin[]
mdPlugins: any[]
hastPlugins: any[]
themeConfig: ThemeConfig
Expand Down
1 change: 1 addition & 0 deletions packages/docz-core/src/utils/load-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const loadConfig = (args: Config): Config => {
const config = load('docz', {
...args,
paths,
hashRouter: false,
plugins: [],
mdPlugins: [],
hastPlugins: [],
Expand Down
13 changes: 11 additions & 2 deletions packages/docz-core/templates/root.tpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,24 @@ class Root extends React.Component {

render() {
const { imports } = this.props
return <Theme {...this.state} imports={imports} <% if (wrapper) {%>wrapper={Wrapper}<%}%>/>

return (
<Theme
{...this.state}
imports={imports}
hashRouter={<%- hashRouter %>}
<% if (wrapper) {%>wrapper={Wrapper}<%}%>
/>
)
}
}
<%} else {%>
const Root = ({ imports }) => (
<Theme
imports={imports}
config={config}
entries={entries}
imports={imports}
hashRouter={<%- hashRouter %>}
<% if (wrapper) {%>wrapper={Wrapper}<%}%>
/>
)
Expand Down
9 changes: 6 additions & 3 deletions packages/docz/src/theme.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import { Fragment, SFC } from 'react'
import { ComponentType as CT } from 'react'
import { BrowserRouter } from 'react-router-dom'
import { HashRouter, BrowserRouter } from 'react-router-dom'
import merge from 'deepmerge'

import { ComponentsMap } from './components/DocPreview'
Expand Down Expand Up @@ -59,6 +59,7 @@ const DefaultWrapper: SFC = ({ children }) => <Fragment>{children}</Fragment>

export interface ThemeProps extends DataContext {
wrapper?: CT
hashRouter?: boolean
children(WrappedComponent: CT): JSX.Element
}

Expand All @@ -71,17 +72,19 @@ export function theme(defaultConfig?: ThemeConfig): ThemeReturn {
entries,
imports,
config = {},
hashRouter = false,
}) => {
const newConfig = merge(defaultConfig, config)
const value = { entries, imports, config: newConfig }
const Router = hashRouter ? HashRouter : BrowserRouter

return (
<dataContext.Provider value={value}>
<BrowserRouter basename={BASE_URL}>
<Router basename={BASE_URL}>
<Wrapper>
<WrappedComponent />
</Wrapper>
</BrowserRouter>
</Router>
</dataContext.Provider>
)
}
Expand Down