kylefang/react-native-popover-view
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-popover-view.git synced 2026-01-12 22:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for handling changing displayArea and fromRect

Browse Source
This commit is contained in:
SteffeyDev
2017-09-12 01:12:44 -04:00
parent 480914e332
commit 71d2ec822e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Popover.js
View File

@@ -145,6 +145,7 @@ var Popover = React.createClass({
fromRect = fromRect || this.props.fromRect;
displayArea = displayArea || this.props.displayArea;
//check to see if the mode is select
//and pass in a dummy arrowSize object
var arrowSize;
@@ -162,6 +163,10 @@ var Popover = React.createClass({
}
if (fromRect) {
//check to see if fromRect is outside of displayArea, and adjust if it is
if (fromRect.x > displayArea.x + displayArea.width) fromRect.x = displayArea.x + displayArea.width;
if (fromRect.y > displayArea.y + displayArea.height) fromRect.y = displayArea.y + displayArea.height;
var options = {
displayArea,
fromRect,
@@ -182,11 +187,6 @@ var Popover = React.createClass({
return this.computeAutoGeometry(options);
}
} else {
console.log("floating");
console.log(displayArea);
console.log(contentSize);
console.log(new Point((displayArea.width - contentSize.width)/2, (displayArea.height - contentSize.height)/2));
console.log(new Point(displayArea.width/2, displayArea.height/2));
return {
popoverOrigin: new Point((displayArea.width - contentSize.width)/2, (displayArea.height - contentSize.height)/2),
anchorPoint: new Point(displayArea.width/2, displayArea.height/2),
@@ -295,13 +295,13 @@ var Popover = React.createClass({
// }
if (fromRect.x - displayArea.x - arrowSize.width >= contentSize.width) { // We could fit it on the left side
return this.computeGeometry({contentSize, placement: 'left'});
return this.computeGeometry({contentSize, placement: 'left'}, fromRect, displayArea);
} else if (displayArea.x + displayArea.width - (fromRect.x + fromRect.width) - arrowSize.width >= contentSize.width) { // We could fit it on the right side
return this.computeGeometry({contentSize, placement: 'right'});
return this.computeGeometry({contentSize, placement: 'right'}, fromRect, displayArea);
} else { // We could fit it on the top or bottom, need to figure out which is better
let topSpace = fromRect.y - displayArea.y;
let bottomSpace = displayArea.y + displayArea.height - (fromRect.y + fromRect.height);
return topSpace > bottomSpace ? this.computeGeometry({contentSize, placement: 'top'}) : this.computeGeometry({contentSize, placement: 'bottom'});
return topSpace > bottomSpace ? this.computeGeometry({contentSize, placement: 'top'}, fromRect, displayArea) : this.computeGeometry({contentSize, placement: 'bottom'}, fromRect, displayArea);
}