From 259f5fdef663da661805c707e939da19981d2e9b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 27 Feb 2022 15:47:43 +0800
Subject: [PATCH] doc: update drawer
---
.../__tests__/__snapshots__/demo.test.js.snap | 4 +--
components/drawer/demo/basic.vue | 2 +-
components/drawer/demo/form-in-drawer.vue | 10 ++++---
components/drawer/demo/render-in-current.vue | 4 +--
components/drawer/index.en-US.md | 2 +-
components/drawer/index.tsx | 16 ++++++----
components/drawer/index.zh-CN.md | 4 +--
components/drawer/style/drawer.less | 30 ++++++++-----------
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/components/drawer/__tests__/__snapshots__/demo.test.js.snap b/components/drawer/__tests__/__snapshots__/demo.test.js.snap
index 5c0146173..988c9b4ea 100644
--- a/components/drawer/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/drawer/__tests__/__snapshots__/demo.test.js.snap
@@ -15,9 +15,7 @@ exports[`renders ./components/drawer/demo/extra.vue correctly 1`] = `
`;
exports[`renders ./components/drawer/demo/form-in-drawer.vue correctly 1`] = `
-
+
`;
diff --git a/components/drawer/demo/basic.vue b/components/drawer/demo/basic.vue
index 998684be9..61cd11cb9 100644
--- a/components/drawer/demo/basic.vue
+++ b/components/drawer/demo/basic.vue
@@ -8,7 +8,7 @@ title:
## zh-CN
-基础抽屉，点击触发按钮抽屉从右滑出，点击遮罩区关闭
+基础抽屉，点击触发按钮抽屉从右滑出，点击遮罩区关闭。
## en-US
diff --git a/components/drawer/demo/form-in-drawer.vue b/components/drawer/demo/form-in-drawer.vue
index 82a9de594..603aaf6a6 100644
--- a/components/drawer/demo/form-in-drawer.vue
+++ b/components/drawer/demo/form-in-drawer.vue
@@ -18,7 +18,7 @@ Use form in drawer with submit button.
-
+
New account
-
- Cancel
- Submit
+
+
+ Cancel
+ Submit
+
diff --git a/components/drawer/demo/render-in-current.vue b/components/drawer/demo/render-in-current.vue
index b4429d867..676c8f544 100644
--- a/components/drawer/demo/render-in-current.vue
+++ b/components/drawer/demo/render-in-current.vue
@@ -8,11 +8,11 @@ title:
## zh-CN
-渲染在当前 dom 里。自定义容器，查看 getContainer。
+渲染在当前 dom 里。自定义容器，查看 `getContainer`。
## en-US
-Render in current dom. custom container, check getContainer.
+Render in current dom. custom container, check `getContainer`.
diff --git a/components/drawer/index.en-US.md b/components/drawer/index.en-US.md
index be80ea6cd..4d9cb97df 100644
--- a/components/drawer/index.en-US.md
+++ b/components/drawer/index.en-US.md
@@ -22,7 +22,7 @@ A Drawer is a panel that is typically overlaid on top of a page and slides in fr
| autofocus | Whether Drawer should get focused after open | boolean | true | 3.0.0 |
| bodyStyle | Style of the drawer content part | CSSProperties | - | |
| class | The class name of the container of the Drawer dialog | string | - | |
-| closable | Whether a close (x) button is visible on top right of the Drawer dialog or not | boolean | true | |
+| closable | Whether a close (x) button is visible on top left of the Drawer dialog or not | boolean | true | |
| closeIcon | Custom close icon | VNode \| slot | | 3.0.0 |
| contentWrapperStyle | Style of the drawer wrapper of content part | CSSProperties | - | 3.0.0 |
| destroyOnClose | Whether to unmount child components on closing drawer or not | boolean | false | |
diff --git a/components/drawer/index.tsx b/components/drawer/index.tsx
index 386f91a60..232646954 100644
--- a/components/drawer/index.tsx
+++ b/components/drawer/index.tsx
@@ -20,6 +20,8 @@ import { tuple, withInstall } from '../_util/type';
import omit from '../_util/omit';
import devWarning from '../vc-util/devWarning';
+type ILevelMove = number | [number, number];
+
const PlacementTypes = tuple('top', 'right', 'bottom', 'left');
export type placementType = typeof PlacementTypes[number];
@@ -43,8 +45,8 @@ const drawerProps = () => ({
mask: PropTypes.looseBool,
maskStyle: PropTypes.object,
/** @deprecated Use `style` instead */
- wrapStyle: PropTypes.style,
- style: PropTypes.style,
+ wrapStyle: { type: Object as PropType, default: undefined as CSSProperties },
+ style: { type: Object as PropType, default: undefined as CSSProperties },
class: PropTypes.any,
/** @deprecated Use `class` instead */
wrapClassName: PropTypes.string,
@@ -68,7 +70,11 @@ const drawerProps = () => ({
footer: PropTypes.any,
footerStyle: PropTypes.object,
level: PropTypes.any,
- levelMove: PropTypes.any,
+ levelMove: {
+ type: [Number, Array, Function] as PropType<
+ ILevelMove | ((e: { target: HTMLElement; open: boolean }) => ILevelMove)
+ >,
+ },
handle: PropTypes.any,
/** @deprecated Use `@afterVisibleChange` instead */
afterVisibleChange: PropTypes.func,
@@ -199,7 +205,7 @@ const Drawer = defineComponent({
const offsetStyle = computed(() => {
// https://github.com/ant-design/ant-design/issues/24287
- const { visible, mask, placement, size, width, height } = props;
+ const { visible, mask, placement, size = 'default', width, height } = props;
if (!visible && !mask) {
return {};
}
@@ -254,7 +260,7 @@ const Drawer = defineComponent({
const renderCloseIcon = (prefixCls: string) => {
const { closable } = props;
- const $closeIcon = props.closeIcon ? slots.closeIcon?.() : props.closeIcon;
+ const $closeIcon = slots.closeIcon ? slots.closeIcon?.() : props.closeIcon;
return (
closable && (