Skip to content

fix:#618 #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2019
Merged

fix:#618 #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export type HandleComponent = {
bottomRight?: React.ReactElement<any>;
bottomLeft?: React.ReactElement<any>;
topLeft?: React.ReactElement<any>;
}
};

export interface Props {
dragGrid?: Grid;
Expand Down Expand Up @@ -363,8 +363,11 @@ export class Rnd extends React.PureComponent<Props, State> {
this.resizing = true;

const scale = this.props.scale as number;
const offset = this.getOffsetFromParent();
const pos = this.getDraggablePosition();
this.resizingPosition = { x: pos.x + offset.left, y: pos.y + offset.top };
this.setState({
original: this.getDraggablePosition(),
original: pos,
});
if (this.props.bounds) {
const parent = this.getParent();
Expand Down Expand Up @@ -587,7 +590,7 @@ export class Rnd extends React.PureComponent<Props, State> {
};
}
// INFO: Make uncontorolled component when resizing to control position by setPostion.
const pos = this.resizing ? undefined : draggablePosition
const pos = this.resizing ? undefined : draggablePosition;
return (
<Draggable
ref={this.refDraggable}
Expand Down