From 81248e89f6faeaa95ee26dd356b729a10e2d7c63 Mon Sep 17 00:00:00 2001 From: Diego Buriti Date: Sun, 14 Mar 2021 20:04:44 -0300 Subject: [PATCH 1/4] chore: add resize as option prop --- .../ant-design-draggable-modal/src/ResizeHandle.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/ant-design-draggable-modal/src/ResizeHandle.tsx b/packages/ant-design-draggable-modal/src/ResizeHandle.tsx index fb66f26..54ec5c4 100644 --- a/packages/ant-design-draggable-modal/src/ResizeHandle.tsx +++ b/packages/ant-design-draggable-modal/src/ResizeHandle.tsx @@ -1,9 +1,11 @@ import * as React from 'react' -export const ResizeHandle = ( - props: React.DetailedHTMLProps, HTMLDivElement>, -): React.ReactElement => ( -
+interface ResizeHandleProps extends React.DetailedHTMLProps, HTMLDivElement>{ + resize?: boolean +} + +export const ResizeHandle = ({resize = true, ...props}: ResizeHandleProps) => ( +
-) +) \ No newline at end of file From 27ea7101372d1eb2f255f9243312e4d2ca047438 Mon Sep 17 00:00:00 2001 From: Diego Buriti Date: Sun, 14 Mar 2021 20:05:32 -0300 Subject: [PATCH 2/4] test: add test to render ResizeHandle correctly --- .../src/ResizeHandle.test.tsx | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/ant-design-draggable-modal/src/ResizeHandle.test.tsx diff --git a/packages/ant-design-draggable-modal/src/ResizeHandle.test.tsx b/packages/ant-design-draggable-modal/src/ResizeHandle.test.tsx new file mode 100644 index 0000000..f21fb76 --- /dev/null +++ b/packages/ant-design-draggable-modal/src/ResizeHandle.test.tsx @@ -0,0 +1,31 @@ +import * as React from 'react' +import { render } from '@testing-library/react' +import { ResizeHandle } from './ResizeHandle' + +describe('should render correctly', () => { + it('shoude render with resize', () => { + const { container } = render() + expect(container.firstChild).toMatchInlineSnapshot(` +
+
+
+ `) + }) + + it('shoude render without resize', () => { + const { container } = render() + expect(container.firstChild).toMatchInlineSnapshot(` +
+
+
+ `) + }) +}) From 6322710f796f662d972410d2dfb820a2cc2bf597 Mon Sep 17 00:00:00 2001 From: Diego Buriti Date: Sun, 14 Mar 2021 20:06:34 -0300 Subject: [PATCH 3/4] style: add a new class to hidder ResizeHandle when resize false --- packages/ant-design-draggable-modal/index.css | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/ant-design-draggable-modal/index.css b/packages/ant-design-draggable-modal/index.css index d1a6f17..d087d3b 100644 --- a/packages/ant-design-draggable-modal/index.css +++ b/packages/ant-design-draggable-modal/index.css @@ -2,7 +2,7 @@ * NOTE: This is not compiled. */ -.ant-design-draggable-modal { + .ant-design-draggable-modal { pointer-events: none; overflow: hidden !important; } @@ -44,6 +44,19 @@ padding: 16px; } +.ant-design-draggable-modal-resize-handle { + right: -10px; + width: 44px; + bottom: -10px; + cursor: se-resize; + height: 44px; + position: absolute; +} + +.ant-design-draggable-modal--without-resize { + display: none; +} + .ant-design-draggable-modal-resize-handle-inner { width: 12px; right: 14px; @@ -55,11 +68,3 @@ border-left: 0; } -.ant-design-draggable-modal-resize-handle { - right: -10px; - width: 44px; - bottom: -10px; - cursor: se-resize; - height: 44px; - position: absolute; -} \ No newline at end of file From f07c8f7fe2d5f62340b54d9b80eee3c02ff4c534 Mon Sep 17 00:00:00 2001 From: Diego Buriti Date: Sun, 14 Mar 2021 20:07:50 -0300 Subject: [PATCH 4/4] docs: check Resize with option key --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c188c2..21f8dd8 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,10 @@ Modal from Ant Design, draggable. - [x] During resize window. - [x] Multiple modals with managed `zIndex`. - [x] Open from center. +- [x] Resize with option key. - [ ] Better API for using as a controlled component. - [ ] Open from quadrants. - [ ] Better escape key management. -- [ ] Resize with option key. ## 📦 Install