Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 621fa98

Browse files
committed
[core] rename Drawer to Preview
Drawer is kind of conflict with Doraomon in search
1 parent a2d2478 commit 621fa98

File tree

18 files changed

+110
-109
lines changed

18 files changed

+110
-109
lines changed

containers/Body/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ const AppHeader = () => {
4747
<Search onClick={logic.openDoraemon}>
4848
<SearchIcon />
4949
</Search>
50-
<Notification onClick={logic.openDrawer}>
50+
<Notification onClick={logic.openPreview}>
5151
<NotificationIcon />
5252
</Notification>
53-
<User onClick={logic.openDrawer.bind(this, 'user')}>
53+
<User onClick={logic.openPreview.bind(this, 'user')}>
5454
<UserIcon />
5555
</User>
5656
</Header>

containers/Body/logic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const debug = makeDebugger('L:Body')
55

66
let store = null
77

8-
export function openDrawer(type) {
9-
store.openDrawer(type)
8+
export function openPreview(type) {
9+
store.openPreview(type)
1010
}
1111

1212
export function changeTheme(name) {

containers/Drawer/index.js

Lines changed: 0 additions & 63 deletions
This file was deleted.

containers/IntroBody/logic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const debug = makeDebugger('L:IntroBody')
55

66
let store = null
77

8-
export function openDrawer() {
9-
store.openDrawer()
8+
export function openPreview() {
9+
store.openPreview()
1010
}
1111

1212
export function changeTheme(name) {

containers/Preview/index.js

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
*
3+
* Preview
4+
*
5+
*/
6+
7+
import React from 'react'
8+
import { inject, observer } from 'mobx-react'
9+
10+
// import Link from 'next/link'
11+
12+
import { makeDebugger } from '../../utils/functions'
13+
import * as logic from './logic'
14+
import {
15+
PreviewOverlay,
16+
PreviewWrapper,
17+
PreviewCloser,
18+
PreviewContent,
19+
PreviewHeader,
20+
PreviewBody,
21+
Closer,
22+
CloserInner,
23+
} from './styles'
24+
25+
const debug = makeDebugger('C:Preview')
26+
27+
const CloseBtn = ({ type }) => (
28+
<PreviewCloser onClick={logic.closePreview}>
29+
<Closer type={type}>
30+
<CloserInner />
31+
</Closer>
32+
</PreviewCloser>
33+
)
34+
35+
const selector = ({ store }) => ({
36+
store: store.preview,
37+
})
38+
39+
class PreviewContainer extends React.Component {
40+
componentWillMount() {
41+
debug('mount')
42+
logic.init(this.props.store)
43+
}
44+
45+
render() {
46+
const { visible, type } = this.props.store
47+
// debug('visiblei: ', visible)
48+
return (
49+
<div>
50+
<PreviewOverlay visible={visible} onClick={logic.closePreview} />
51+
<PreviewWrapper visible={visible} type={type}>
52+
<CloseBtn type={type} />
53+
<PreviewContent>
54+
<PreviewHeader>Preview header</PreviewHeader>
55+
<PreviewBody>Preview body</PreviewBody>
56+
</PreviewContent>
57+
</PreviewWrapper>
58+
</div>
59+
)
60+
}
61+
}
62+
63+
export default inject(selector)(observer(PreviewContainer))
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { makeDebugger } from '../../utils/functions'
22

3-
const debug = makeDebugger('L:Drawer')
3+
const debug = makeDebugger('L:Preview')
44

55
let store = null
66

77
export function init(selectedStore) {
88
store = selectedStore
99
}
1010

11-
export function closeDrawer() {
12-
debug('closeDrawer')
11+
export function closePreview() {
12+
debug('closePreview')
1313
store.close()
1414
}

containers/Drawer/styles/index.js renamed to containers/Preview/styles/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function doTransform(visible) {
66
return visible ? 'translate(0px, 0px)' : 'translate(105%, 0px)'
77
}
88

9-
export const DrawerOverlay = styled.div`
9+
export const PreviewOverlay = styled.div`
1010
bottom: 0;
1111
left: 0;
1212
overflow: auto;
@@ -22,7 +22,7 @@ export const DrawerOverlay = styled.div`
2222
// display: ${props => (props.visible ? 'block' : 'none')};
2323
// visibility: ${props => (props.visible ? 'visible' : 'hidden')};
2424

25-
export const DrawerWrapper = styled.div`
25+
export const PreviewWrapper = styled.div`
2626
color: ${theme('drawer.font')};
2727
box-sizing: border-box;
2828
transition: transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
@@ -40,24 +40,24 @@ export const DrawerWrapper = styled.div`
4040
display: flex;
4141
justify-content: flex-end;
4242
`
43-
export const DrawerContent = styled.div`
43+
export const PreviewContent = styled.div`
4444
width: 90%;
4545
background-color: ${theme('drawer.bg')};
4646
height: 100%;
4747
box-shadow: -5px 0px 14px 0px rgba(189, 189, 189, 0.37);
4848
padding: 20px;
4949
`
50-
export const DrawerHeader = styled.div`
50+
export const PreviewHeader = styled.div`
5151
border-bottom: 1px solid tomato;
5252
text-align: center;
5353
line-height: 30px;
5454
`
55-
export const DrawerBody = styled.div`
55+
export const PreviewBody = styled.div`
5656
text-align: center;
5757
margin-top: 20%;
5858
`
5959

60-
export const DrawerCloser = styled.div`width: 10%;`
60+
export const PreviewCloser = styled.div`width: 10%;`
6161

6262
const closeWith = '40px'
6363

containers/Drawer/tests/index.test.js renamed to containers/Preview/tests/index.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// import React from 'react'
22
// import { shallow } from 'enzyme'
33

4-
// import Drawer from '../index'
4+
// import Preview from '../index'
55

6-
describe('<Drawer />', () => {
6+
describe('<Preview />', () => {
77
it('Expect to have unit tests specified', () => {
88
expect(true).toEqual(true)
99
})

docs/ideas.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
## TODO
3333

34+
- [ ] rename Drawer -> Preview
3435
- [ ] use header section footer main ... html tags
3536
- [ ] [字体问题参考](http://element.eleme.io/2.0/#/zh-CN/component/typography)
3637
- [ ] [字体](https://github.com/ethantw/Han)

pages/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import MultiLanguage from '../containers/MultiLanguage'
99
import Sidebar from '../containers/Sidebar'
1010
import Body from '../containers/Body'
1111

12-
import Drawer from '../containers/Drawer'
12+
import Preview from '../containers/Preview'
1313
import Doraemon from '../containers/Doraemon'
1414

1515
// try to fix safari bug
@@ -46,7 +46,7 @@ export default class Index extends React.Component {
4646
<Provider store={this.store}>
4747
<Decrator>
4848
<MultiLanguage>
49-
<Drawer />
49+
<Preview />
5050
<Body route={route} />
5151
<Sidebar route={route} />
5252
<Doraemon />

0 commit comments

Comments
 (0)