Skip to content

Commit 50ed46a

Browse files
authored
Fix #739 (#741)
* update: re-resizable * fix: #739
1 parent ad81c76 commit 50ed46a

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"fixture": "./fixture.html"
100100
},
101101
"dependencies": {
102-
"re-resizable": "6.3.2",
102+
"re-resizable": "6.6.1",
103103
"react-draggable": "4.4.3",
104104
"tslib": "2.0.0"
105105
}

src/index.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ export type RndDragEvent =
3131
| TouchEvent;
3232

3333
export type RndResizeStartCallback = (
34-
e: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>,
34+
e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
3535
dir: ResizeDirection,
36-
elementRef: HTMLDivElement,
37-
) => void;
36+
elementRef: HTMLElement,
37+
) => void | boolean;
3838

3939
export type ResizableDelta = {
4040
width: number;
@@ -44,7 +44,7 @@ export type ResizableDelta = {
4444
export type RndResizeCallback = (
4545
e: MouseEvent | TouchEvent,
4646
dir: ResizeDirection,
47-
elementRef: HTMLDivElement,
47+
elementRef: HTMLElement,
4848
delta: ResizableDelta,
4949
position: Position,
5050
) => void;
@@ -213,7 +213,7 @@ export class Rnd extends React.PureComponent<Props, State> {
213213
resizing = false;
214214
resizingPosition = { x: 0, y: 0 };
215215
offsetFromParent = { left: 0, top: 0 };
216-
resizableElement: { current: HTMLDivElement | null } = { current: null };
216+
resizableElement: { current: HTMLElement | null } = { current: null };
217217

218218
constructor(props: Props) {
219219
super(props);
@@ -273,7 +273,7 @@ export class Rnd extends React.PureComponent<Props, State> {
273273
return { maxWidth, maxHeight };
274274
}
275275

276-
getSelfElement(): HTMLDivElement | null {
276+
getSelfElement(): HTMLElement | null {
277277
return this.resizable && this.resizable.resizable;
278278
}
279279

@@ -373,9 +373,9 @@ export class Rnd extends React.PureComponent<Props, State> {
373373
}
374374

375375
onResizeStart(
376-
e: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>,
376+
e: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>,
377377
dir: ResizeDirection,
378-
elementRef: HTMLDivElement,
378+
elementRef: HTMLElement,
379379
) {
380380
e.stopPropagation();
381381
this.resizing = true;
@@ -473,7 +473,7 @@ export class Rnd extends React.PureComponent<Props, State> {
473473
onResize(
474474
e: MouseEvent | TouchEvent,
475475
direction: ResizeDirection,
476-
elementRef: HTMLDivElement,
476+
elementRef: HTMLElement,
477477
delta: { height: number; width: number },
478478
) {
479479
// INFO: Apply x and y position adjustments caused by resizing to draggable
@@ -513,7 +513,7 @@ export class Rnd extends React.PureComponent<Props, State> {
513513
onResizeStop(
514514
e: MouseEvent | TouchEvent,
515515
direction: ResizeDirection,
516-
elementRef: HTMLDivElement,
516+
elementRef: HTMLElement,
517517
delta: { height: number; width: number },
518518
) {
519519
this.resizing = false;

stories/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import Bare from "./bare/bare";
77
import BasicUncontrolled from "./basic/uncontrolled";
88
import BasicControlled from "./basic/controlled";
99

10+
import MinUncontrolled from "./min/uncontrolled";
11+
1012
import ScaleParentUnControlled from "./scale/parent-uncontrolled";
1113
import ScaleWindowUnControlled from "./scale/window-uncontrolled";
1214
import ScaleBodyX05UnControlled from "./scale/body-uncontrolled-x0-5";
@@ -89,3 +91,5 @@ storiesOf("sandbox", module)
8991
.add("issue622", () => <Issue622 />);
9092

9193
storiesOf("ratio", module).add("lock aspect ratio", () => <LockAspectRatioBasic />);
94+
95+
storiesOf("min", module).add("min uncontrolled", () => <MinUncontrolled />);

stories/min/uncontrolled.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from "react";
2+
import { Rnd } from "../../src";
3+
import { style } from "../styles";
4+
5+
export default () => (
6+
<Rnd
7+
style={style}
8+
default={{
9+
x: 0,
10+
y: 0,
11+
width: 320,
12+
height: 200,
13+
}}
14+
minHeight="300px"
15+
minWidth="300px"
16+
>
17+
Rnd
18+
</Rnd>
19+
);

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10040,10 +10040,10 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.7:
1004010040
minimist "^1.2.0"
1004110041
strip-json-comments "~2.0.1"
1004210042

10043-
re-resizable@6.3.2:
10044-
version "6.3.2"
10045-
resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.3.2.tgz#27cc984af6ea5dbafd2b79f64c5224a6e1722fbe"
10046-
integrity sha512-ngxe4XBSb46vfwXjAwpURacVDig/pPt1kHRhcKlRRIoGICmo4aQHr725jurezepp1pm5jSC6iQhyLYfx3zOC3w==
10043+
re-resizable@6.6.1:
10044+
version "6.6.1"
10045+
resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.6.1.tgz#654a0edc1977e5d025c777a97f5555ef4bccea7f"
10046+
integrity sha512-ttWVasZ9X7c0ir0+4YK47tkmm9EAFssW07YLkeLzG5HCOuFgFAlSVzMlzAH0h3i6hDShQCHHJecVx5rk+snoFA==
1004710047
dependencies:
1004810048
fast-memoize "^2.5.1"
1004910049

0 commit comments

Comments
 (0)