FIX: #454 #455
+175
−22
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| import React from "react"; | ||
|
|
||
| import { Rnd } from "../../src"; | ||
|
|
||
| type State = { | ||
| x: number; | ||
| y: number; | ||
| width: number; | ||
| height: number; | ||
| restrict: "x" | "y" | "both" | "none"; | ||
| }; | ||
|
|
||
| const style = { | ||
| display: "flex", | ||
| alignItems: "center", | ||
| justifyContent: "center", | ||
| border: "solid 1px #ddd", | ||
| background: "#f0f0f0", | ||
| }; | ||
| export default class RestrictDrag extends React.Component<{}, State> { | ||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| width: 200, | ||
| height: 200, | ||
| x: 0, | ||
| y: 80, | ||
| restrict: "x", | ||
| }; | ||
| } | ||
| handleDragStop = (e, d) => { | ||
| const restrictedAxis = this.state.restrict; | ||
| let pos = {}; | ||
| switch (restrictedAxis) { | ||
| case "x": | ||
| pos = { | ||
| x: d.x, | ||
| }; | ||
| break; | ||
| case "y": | ||
| pos = { | ||
| y: d.y, | ||
| }; | ||
| break; | ||
| case "both": | ||
| pos = { | ||
| x: d.x, | ||
| y: d.y, | ||
| }; | ||
| break; | ||
| case "none": | ||
| pos = {}; | ||
| break; | ||
| default: | ||
| pos = {}; | ||
| break; | ||
| } | ||
| this.setState({ ...pos }); | ||
| }; | ||
|
|
||
| render() { | ||
| console.log("STATE", this.state); | ||
| return ( | ||
| <div> | ||
| <label> | ||
| Restrict Axis:{" "} | ||
| <select | ||
| onChange={e => { | ||
| this.setState({ restrict: e.target.value as "x" | "y" | "both" | "none" }); | ||
| }} | ||
| > | ||
| <option value="x">X</option> | ||
| <option value="y">Y</option> | ||
| <option value="both">Both</option> | ||
| <option value="none">None</option> | ||
| </select> | ||
| </label> | ||
| <Rnd | ||
| style={style} | ||
| size={{ | ||
| width: this.state.width, | ||
| height: this.state.height, | ||
| }} | ||
| position={{ | ||
| x: this.state.x, | ||
| y: this.state.y, | ||
| }} | ||
| onDragStop={this.handleDragStop} | ||
| dragAxis={this.state.restrict} | ||
| onResize={(e, direction, ref, delta, position) => { | ||
| this.setState({ | ||
| width: ref.offsetWidth, | ||
| height: ref.offsetHeight, | ||
| ...position, | ||
| }); | ||
| }} | ||
| > | ||
| 001 | ||
| </Rnd> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chathuraa Sorry, could you please separate these block to another function or method like
createNewPosition🙏There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @bokuweb ,
I had to update some tests, I couldnt figure out the reason for '8px' discrepancy. I managed to get pretty much everything working. apart from the uncontrolled bounds.
Thanks,
Chat.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahhh..Is it due to default margin? If you set
html, body { padding: 0, margin: 0 };to./fixture.url, will the results be as you expected?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @bokuweb,
oh okay, that makes sense. I've updated the getOffsetFromParent and the tests so the padding and margins become irrelevant.
The update on the getOffsetFromParent, seems to cause an issue with uncontrolled bounds. I cant seems to find where the issue is. Any suggestions?
Thanks,
Chat.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not understand what is issue. Why not try applying changes with you only when using
position props?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried that. however the issue was there on almost every where the getOffsetFromParent been used.
ie:
componentDidMount,
dragStart,
onDrag,
onDragStop,
etc
So decided to update the function to return left/top based on axis restrictions, rather than setting the logic on each function.
Re: the bounds, it only affecting the uncontrolled bounds. all the other scenarios including controlled bounds are working.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmmm, I'll try to fix it 🙏 So, this issue is complex....