Skip to content

support passing screen width for the hint container #510

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 2 commits into from
Aug 27, 2019
Merged

support passing screen width for the hint container #510

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
685263b
support passing screen width for the hint container
ethanshar Aug 25, 2019
b9a8798
rename screenWidth to containerWidth
ethanshar Aug 27, 2019
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
21 changes: 15 additions & 6 deletions src/components/hint/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ class Hint extends BaseComponent {
* Callback for the background press
*/
onBackgroundPress: PropTypes.func,
/**
* The hint container width
*/
containerWidth: PropTypes.number,
/**
* The hint's test identifier
*/
Expand Down Expand Up @@ -141,6 +145,11 @@ class Hint extends BaseComponent {
}
};

get containerWidth() {
const {containerWidth} = this.getThemeProps();
return containerWidth || Constants.screenWidth;
}

get targetLayout() {
const {onBackgroundPress, targetFrame} = this.props;
const {targetLayout, targetLayoutInWindow} = this.state;
Expand Down Expand Up @@ -181,9 +190,9 @@ class Hint extends BaseComponent {
getTargetPositionOnScreen() {
const targetMidPosition = this.targetLayout.x + this.targetLayout.width / 2;

if (targetMidPosition > Constants.screenWidth * (2 / 3)) {
if (targetMidPosition > this.containerWidth * (2 / 3)) {
return TARGET_POSITIONS.RIGHT;
} else if (targetMidPosition < Constants.screenWidth * (1 / 3)) {
} else if (targetMidPosition < this.containerWidth * (1 / 3)) {
return TARGET_POSITIONS.LEFT;
}
return TARGET_POSITIONS.CENTER;
Expand Down Expand Up @@ -222,7 +231,7 @@ class Hint extends BaseComponent {
if (targetPositionOnScreen === TARGET_POSITIONS.LEFT) {
paddings.paddingLeft = this.targetLayout.x;
} else if (targetPositionOnScreen === TARGET_POSITIONS.RIGHT) {
paddings.paddingRight = Constants.screenWidth - this.targetLayout.x - this.targetLayout.width;
paddings.paddingRight = this.containerWidth - this.targetLayout.x - this.targetLayout.width;
}
}
return paddings;
Expand All @@ -243,8 +252,8 @@ class Hint extends BaseComponent {

const leftPosition = this.useSideTip ? this.targetLayout.x : this.targetLayout.x + targetMidWidth - tipMidWidth;
const rightPosition = this.useSideTip
? Constants.screenWidth - this.targetLayout.x - this.targetLayout.width
: Constants.screenWidth - this.targetLayout.x - targetMidWidth - tipMidWidth;
? this.containerWidth - this.targetLayout.x - this.targetLayout.width
: this.containerWidth - this.targetLayout.x - targetMidWidth - tipMidWidth;
const targetPositionOnScreen = this.getTargetPositionOnScreen();

switch (targetPositionOnScreen) {
Expand Down Expand Up @@ -315,7 +324,7 @@ class Hint extends BaseComponent {
<AnimatableView
animation={shownUp ? AnimatableManager.animations.hintAppearUp : AnimatableManager.animations.hintAppearDown}
duration={200}
style={[{width: Constants.screenWidth}, styles.animatedContainer, this.getHintPosition(), this.getHintPadding()]}
style={[{width: this.containerWidth}, styles.animatedContainer, this.getHintPosition(), this.getHintPadding()]}
pointerEvents="box-none"
testID={testID}
>
Expand Down