Skip to content

Add isSelected value so when click next and prev month it can selected also not auto set to next month date #5

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

Open
abadikaka wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add isSelected value so when click next and prev month it can selected also not auto set to next month date #5

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f4efd1
Fix some selected day
abadikaka Jul 19, 2017
870aca6
Add isselected
abadikaka Jul 19, 2017
15931b9
Add isselected
abadikaka Jul 19, 2017
eb5f027
FEATURE ISSELECTED and ISTODAY
abadikaka Jul 19, 2017
0d2ef02
Merge pull request #1 from abadikaka/feature/correct_selected
abadikaka Jul 19, 2017
d8917a6
remove idea
abadikaka Jul 19, 2017
3fe859c
Update index.js
abadikaka Feb 16, 2018
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
23 changes: 15 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ import {

export default class Calendar extends PureComponent {

isSelected = true

static get defaultProps() {
return {
date: new Date(),
todayDayInnerStyle: styles.todayDayInner,
dayWeekendTextStyle: styles.dayWeekendText,
onDateSelect: null,
onPrevButtonPress: null,
onNextButtonPress: null,
Expand All @@ -31,6 +35,8 @@ export default class Calendar extends PureComponent {
static get propTypes() {
return {
date: React.PropTypes.object,
todayDayInnerStyle: React.PropTypes.object,
dayWeekendTextStyle: React.PropTypes.object,
onDateSelect: React.PropTypes.func,
onPrevButtonPress: React.PropTypes.func,
onNextButtonPress: React.PropTypes.func,
Expand All @@ -42,12 +48,14 @@ export default class Calendar extends PureComponent {

handleNextButtonPress() {
if (this.props.onNextButtonPress !== null) {
this.isSelected = false
this.props.onNextButtonPress();
}
}

handlePrevButtonPress() {
if (this.props.onPrevButtonPress !== null) {
this.isSelected = false
this.props.onPrevButtonPress();
}
}
Expand All @@ -57,7 +65,7 @@ export default class Calendar extends PureComponent {
const month = this.props.date.getMonth();
const year = this.props.date.getFullYear();
const selectedDate = new Date(year, month, dateNumber);

this.isSelected = true
this.props.onDateSelect(selectedDate);
}
}
Expand Down Expand Up @@ -126,16 +134,15 @@ export default class Calendar extends PureComponent {
const isWeekend = weekDay === 0 || weekDay === 6;

const today = new Date();
const isToday = this.props.date.getDate() === dateNumber &&
this.props.date.getMonth() === today.getMonth() &&
this.props.date.getFullYear() === today.getFullYear();

const isToday = this.props.date.getDate() === dateNumber

return (
<View key={dateNumber} style={styles.dayOuter}>
<TouchableOpacity onPress={() => this.handleDayPress(dateNumber)}>
<View style={[styles.dayInner, isToday ? styles.todayDayInner : {}]}>
<Text style={[styles.dayText, isWeekend ? styles.dayWeekendText : {}]}>
{dateNumber}
<View style={[styles.dayInner, (isToday && this.isSelected) ? this.props.todayDayInnerStyle : {}]}>
<Text style={[styles.dayText, isWeekend ? this.props.dayWeekendTextStyle : {}]}>
{`${dateNumber}`}
</Text>
</View>
</TouchableOpacity>
Expand Down Expand Up @@ -269,4 +276,4 @@ const styles = StyleSheet.create({
schadedText: {
color: "#AAAAAA",
}
});
});