diff --git a/components/drawer/demo/basic-left.md b/components/drawer/demo/basic-left.md new file mode 100644 index 0000000000..6eccefe99b --- /dev/null +++ b/components/drawer/demo/basic-left.md @@ -0,0 +1,68 @@ +--- +order: 1 +title: + zh-CN: 左侧滑出 + en-US: Left Silder +--- + +## zh-CN + +基础抽屉,点击触发按钮抽屉从左滑出,点击遮罩区关闭 + +## en-US + +Basic drawer. + +```jsx +import { Drawer, Button } from 'antd'; + +class App extends React.Component { + state = { visible: false }; + toogerHotjar = () => { + const hotjar = document.getElementById('_hj_feedback_container'); + if (hotjar.style.display === 'none') { + hotjar.style.display = ''; + } else { + hotjar.style.display = 'none'; + } + }; + showDrawer = () => { + this.toogerHotjar(); + this.setState({ + visible: true, + }); + }; + onClose = () => { + this.setState( + { + visible: false, + }, + () => { + this.toogerHotjar(); + } + ); + }; + render() { + return ( +
+ + +

Some contents...

+

Some contents...

+

Some contents...

+
+
+ ); + } +} + +ReactDOM.render(, mountNode); +``` diff --git a/components/drawer/demo/basic.md b/components/drawer/demo/basic-right.md similarity index 70% rename from components/drawer/demo/basic.md rename to components/drawer/demo/basic-right.md index 4b78f9cabf..12864cbaa3 100644 --- a/components/drawer/demo/basic.md +++ b/components/drawer/demo/basic-right.md @@ -18,15 +18,29 @@ import { Drawer, Button } from 'antd'; class App extends React.Component { state = { visible: false }; + toogerHotjar = () => { + const hotjar = document.getElementById('_hj_feedback_container'); + if (hotjar.style.display === 'none') { + hotjar.style.display = ''; + } else { + hotjar.style.display = 'none'; + } + }; showDrawer = () => { + this.toogerHotjar(); this.setState({ visible: true, }); }; onClose = () => { - this.setState({ - visible: false, - }); + this.setState( + { + visible: false, + }, + () => { + this.toogerHotjar(); + } + ); }; render() { return ( diff --git a/components/drawer/demo/from-drawer.md b/components/drawer/demo/from-drawer.md index 6afab62cf5..535de794dc 100644 --- a/components/drawer/demo/from-drawer.md +++ b/components/drawer/demo/from-drawer.md @@ -1,5 +1,5 @@ --- -order: 0 +order: 3 title: zh-CN: 对象编辑 en-US: Edit item in drawer @@ -20,15 +20,29 @@ const { Option } = Select; class App extends React.Component { state = { visible: false }; + toogerHotjar = () => { + const hotjar = document.getElementById('_hj_feedback_container'); + if (hotjar.style.display === 'none') { + hotjar.style.display = ''; + } else { + hotjar.style.display = 'none'; + } + }; showDrawer = () => { + this.toogerHotjar(); this.setState({ - visible: !this.state.visible, + visible: true, }); }; onClose = () => { - this.setState({ - visible: false, - }); + this.setState( + { + visible: false, + }, + () => { + this.toogerHotjar(); + } + ); }; render() { const { getFieldDecorator } = this.props.form; diff --git a/components/drawer/demo/user-profile.md b/components/drawer/demo/user-profile.md index 90c462fdbe..07fe468a8b 100644 --- a/components/drawer/demo/user-profile.md +++ b/components/drawer/demo/user-profile.md @@ -1,5 +1,5 @@ --- -order: 0 +order: 4 title: zh-CN: 信息预览抽屉 en-US: Preview drawer @@ -9,7 +9,6 @@ title: 需要快速预览对象概要时使用,点击遮罩区关闭。 - ## en-US Use when you need to quickly preview the outline of the object. Such as list item preview. @@ -49,11 +48,11 @@ const DescriptionItem = ({ title, content }) => { ); }; -class App extends React.Component { +class MiniDrawer extends React.Component { state = { visible: false }; showDrawer = () => { this.setState({ - visible: !this.state.visible, + visible: true, }); }; onClose = () => { @@ -61,6 +60,59 @@ class App extends React.Component { visible: false, }); }; + render() { + return ( +
+ View Profile + +

User Profile

+

Personal

+ + + {' '} + + + + + +
+
+ ); + } +} + +class App extends React.Component { + state = { visible: false }; + toogerHotjar = () => { + const hotjar = document.getElementById('_hj_feedback_container'); + if (hotjar.style.display === 'none') { + hotjar.style.display = ''; + } else { + hotjar.style.display = 'none'; + } + }; + showDrawer = () => { + this.toogerHotjar(); + this.setState({ + visible: true, + }); + }; + onClose = () => { + this.setState( + { + visible: false, + }, + () => { + this.toogerHotjar(); + } + ); + }; render() { return (
@@ -95,6 +147,7 @@ class App extends React.Component { >

User Profile

Personal

+ {' '} diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less index d5fd3eeabd..5786ddad56 100644 --- a/components/drawer/style/drawer.less +++ b/components/drawer/style/drawer.less @@ -54,7 +54,6 @@ .@{dawer-prefix-cls} { &-mask { opacity: 0.3; - display: block; } } } @@ -73,6 +72,7 @@ border: 0; background-clip: padding-box; box-shadow: @shadow-2; + z-index: 1; } &-close { @@ -131,22 +131,16 @@ word-wrap: break-word; } - &.zoom-enter, - &.zoom-appear { - animation-duration: @animation-duration-slow; - transform: none; // reset scale avoid mousePosition bug - opacity: 0; - } - &-mask { position: fixed; top: 0; right: 0; left: 0; bottom: 0; - display: none; - background-color: @modal-mask-bg; // lesshint duplicateProperty: false + opacity: 0; + background-color: @modal-mask-bg; height: 100%; + transition: opacity .3s @ease-in-out-circ; filter: ~"alpha(opacity=50)"; }