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

removing all default display area skips until I can investigate further

Browse Source
This commit is contained in:
SteffeyDev
2018-12-16 00:21:40 -05:00
parent b26ba5e6b8
commit 117081bbf8
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Popover.js
View File

@@ -169,11 +169,14 @@ class Popover extends React.Component {
// If the view initially overflowed the display area, wait one more render cycle to test-render it within the display area to get
// final calculations for popoverOrigin before show
if (geom.viewLargerThanDisplayArea.width || geom.viewLargerThanDisplayArea.height)
if (geom.viewLargerThanDisplayArea.width || geom.viewLargerThanDisplayArea.height) {
this.debug("measureContent - Delaying showing popover because viewLargerThanDisplayArea");
this.setState(Object.assign(geom, {requestedContentSize}));
else
} else {
this.debug("measureContent - Showing Popover - Animating In");
this.setState(Object.assign(geom, {requestedContentSize, isAwaitingShow: false}), this.animateIn);
}
}
} else if (requestedContentSize.width !== this.state.requestedContentSize.width || requestedContentSize.height !== this.state.requestedContentSize.height) {
this.debug("measureContent - new requestedContentSize: " + JSON.stringify(requestedContentSize) + " (used to be " + JSON.stringify(this.state.requestedContentSize) + ")");
this.handleGeomChange(requestedContentSize);
@@ -247,7 +250,7 @@ class Popover extends React.Component {
let viewLargerThanDisplayArea = {
height: preferedY < minY - 1,
width: requestedContentSize.width > Math.ceil(displayArea.width)
width: requestedContentSize.width > displayArea.width + 1
}
let viewWidth = viewLargerThanDisplayArea.width ? forcedContentSize.width : requestedContentSize.width;
@@ -286,8 +289,8 @@ class Popover extends React.Component {
}
let viewLargerThanDisplayArea = {
height: preferedY + requestedContentSize.height > Math.ceil(displayArea.y + displayArea.height),
width: requestedContentSize.width > Math.ceil(displayArea.width)
height: preferedY + requestedContentSize.height > displayArea.y + displayArea.height + 1,
width: requestedContentSize.width > displayArea.width + 1
}
let viewWidth = viewLargerThanDisplayArea.width ? forcedContentSize.width : requestedContentSize.width;
@@ -329,8 +332,8 @@ class Popover extends React.Component {
}
let viewLargerThanDisplayArea = {
height: requestedContentSize.height > Math.ceil(displayArea.height),
width: requestedContentSize.width > Math.ceil(fromRect.x - displayArea.x - arrowSize.width)
height: requestedContentSize.height > displayArea.height + 1,
width: requestedContentSize.width > fromRect.x - displayArea.x - arrowSize.width + 1
}
let viewWidth = viewLargerThanDisplayArea.width ? forcedContentSize.width : requestedContentSize.width;
@@ -372,8 +375,8 @@ class Popover extends React.Component {
}
let viewLargerThanDisplayArea = {
height: requestedContentSize.height > Math.ceil(displayArea.height),
width: requestedContentSize.width > Math.ceil(horizontalSpace)
height: requestedContentSize.height > displayArea.height + 1,
width: requestedContentSize.width > horizontalSpace + 1
}
let viewHeight = viewLargerThanDisplayArea.height ? forcedContentSize.height : requestedContentSize.height;
@@ -550,7 +553,6 @@ class Popover extends React.Component {
if (willBeVisible) {
// We want to start the show animation only when contentSize is known
// so that we can have some logic depending on the geometry
if (isLandscape() && isIOS && !Platform.isPad) this.skipNextDefaultDisplayArea = true;
if (!Popover.isShowingInModal) {
this.calculateRect(nextProps, fromRect => this.setState({fromRect, isAwaitingShow: true, visible: true}));
if (showInModal) Popover.isShowingInModal = true;