Skip to content
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

Fix: marker is not clickable on android #4774

Merged
merged 3 commits into from
Aug 23, 2021
Merged

Fix: marker is not clickable on android #4774

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f1aad8
fix: marker on android
parasharrajat Aug 20, 2021
c9496e6
fix: name of the component
parasharrajat Aug 20, 2021
574918e
comments
parasharrajat Aug 23, 2021
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
11 changes: 11 additions & 0 deletions src/pages/home/report/MarkerBadge/MarkerBadgeContainer/MarkerBadgeContainerPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import PropTypes from 'prop-types';

const propTypes = {
/** Container Styles */
Beamanator marked this conversation as resolved.
Show resolved Hide resolved
containerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,

/** Children of the MakerBadgeContainer */
Beamanator marked this conversation as resolved.
Show resolved Hide resolved
children: PropTypes.element.isRequired,
};

export default propTypes;
17 changes: 17 additions & 0 deletions src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import {View, Animated} from 'react-native';
import styles from '../../../../../styles/styles';
import propTypes from './MarkerBadgeContainerPropTypes';

const MarkerBadgeContainer = props => (
<Animated.View style={[styles.reportMarkerBadgeWrapperAndroid, ...props.containerStyles]}>
<View style={styles.reportMarkerBadgeSubWrapperAndroid}>
{props.children}
</View>
</Animated.View>
);

MarkerBadgeContainer.propTypes = propTypes;
MarkerBadgeContainer.displayName = 'MarkerBadgeContainer';

export default MarkerBadgeContainer;
15 changes: 15 additions & 0 deletions src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import {Animated} from 'react-native';
import styles from '../../../../../styles/styles';
import propTypes from './MarkerBadgeContainerPropTypes';

const MarkerBadgeContainer = props => (
<Animated.View style={[styles.reportMarkerBadgeWrapper, ...props.containerStyles]}>
{props.children}
</Animated.View>
);

MarkerBadgeContainer.propTypes = propTypes;
MarkerBadgeContainer.displayName = 'MarkerBadgeContainer';

export default MarkerBadgeContainer;
32 changes: 16 additions & 16 deletions src/pages/home/report/MarkerBadge.js → src/pages/home/report/MarkerBadge/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React, {PureComponent} from 'react';
import {Animated, Text, View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../../../styles/styles';
import Button from '../../../components/Button';
import Icon from '../../../components/Icon';
import {Close, DownArrow} from '../../../components/Icon/Expensicons';
import themeColors from '../../../styles/themes/default';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import styles from '../../../../styles/styles';
import Button from '../../../../components/Button';
import Icon from '../../../../components/Icon';
import {Close, DownArrow} from '../../../../components/Icon/Expensicons';
import themeColors from '../../../../styles/themes/default';
import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
import MarkerBadgeContainer from './MarkerBadgeContainer';

const MARKER_NOT_ACTIVE_TRANSLATE_Y = -30;
const MARKER_ACTIVE_TRANSLATE_Y = 10;
const propTypes = {
/** Count of new messages to show in the badge */
count: PropTypes.number,
Expand All @@ -25,12 +24,17 @@ const propTypes = {

...withLocalizePropTypes,
};

const defaultProps = {
count: 0,
active: false,
onClose: () => {},
onClick: () => {},
};

const MARKER_NOT_ACTIVE_TRANSLATE_Y = -30;
const MARKER_ACTIVE_TRANSLATE_Y = 10;

class MarkerBadge extends PureComponent {
constructor(props) {
super(props);
Expand Down Expand Up @@ -65,12 +69,8 @@ class MarkerBadge extends PureComponent {

render() {
return (
<View style={styles.reportMarkerBadgeWrapper}>
<Animated.View style={[
styles.reportMarkerBadge,
styles.reportMarkerBadgeTransformation(this.translateY),
]}
>
<MarkerBadgeContainer containerStyles={[styles.reportMarkerBadgeTransformation(this.translateY)]}>
<View style={styles.reportMarkerBadge}>
<View style={[
styles.flexRow,
styles.justifyContentBetween,
Expand Down Expand Up @@ -112,8 +112,8 @@ class MarkerBadge extends PureComponent {
)}
/>
</View>
</Animated.View>
</View>
</View>
</MarkerBadgeContainer>
);
}
}
Expand Down
15 changes: 15 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,21 @@ const styles = {
...visibility('hidden'),
},

reportMarkerBadgeWrapperAndroid: {
left: 0,
width: '100%',
alignItems: 'center',
position: 'absolute',
top: 0,
zIndex: 100,
...visibility('hidden'),
},

reportMarkerBadgeSubWrapperAndroid: {
left: '50%',
width: 'auto',
},

reportMarkerBadge: {
left: '-50%',
...visibility('visible'),
Expand Down