From 1f4efd1dbccf2b49609f2688b69d7f5d5f0ba38f Mon Sep 17 00:00:00 2001 From: abadikaka Date: Wed, 19 Jul 2017 15:35:18 +0700 Subject: [PATCH 1/6] Fix some selected day --- .idea/misc.xml | 21 +++ .idea/modules.xml | 8 + .idea/react-native-calendar.iml | 9 + .idea/vcs.xml | 6 + .idea/workspace.xml | 294 ++++++++++++++++++++++++++++++++ index.js | 8 +- 6 files changed, 343 insertions(+), 3 deletions(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/react-native-calendar.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..2768266 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7de9e8d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/react-native-calendar.iml b/.idea/react-native-calendar.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/react-native-calendar.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..ba2df59 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + false + true + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1500453151691 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/index.js b/index.js index 68c440d..5057672 100644 --- a/index.js +++ b/index.js @@ -126,16 +126,18 @@ export default class Calendar extends PureComponent { const isWeekend = weekDay === 0 || weekDay === 6; const today = new Date(); - const isToday = this.props.date.getDate() === dateNumber && + /*const isToday = this.props.date.getDate() === dateNumber && this.props.date.getMonth() === today.getMonth() && - this.props.date.getFullYear() === today.getFullYear(); + this.props.date.getFullYear() === today.getFullYear();*/ + + const isToday = this.props.date.getDate() === dateNumber return ( this.handleDayPress(dateNumber)}> - {dateNumber} + {`${dateNumber}`} From 870aca61aae52817b6ca0660c285027a880d801c Mon Sep 17 00:00:00 2001 From: abadikaka Date: Wed, 19 Jul 2017 16:37:11 +0700 Subject: [PATCH 2/6] Add isselected --- .idea/workspace.xml | 72 ++++++++++++++++++++++++++++----------------- index.js | 7 +++-- 2 files changed, 50 insertions(+), 29 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ba2df59..adfa7be 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ + - + - - + + @@ -28,6 +29,12 @@ + + + onDateSelect + monthNames + + @@ -77,8 +84,6 @@ - - @@ -107,6 +112,8 @@ + + @@ -228,45 +235,46 @@ - - + - - - - - - + + + + + + - - - - - + + + + + - + - - + + - + - - + + @@ -282,8 +290,18 @@ - - + + + + + + + + + + + + diff --git a/index.js b/index.js index 5057672..984a06e 100644 --- a/index.js +++ b/index.js @@ -16,6 +16,7 @@ export default class Calendar extends PureComponent { onPrevButtonPress: null, onNextButtonPress: null, weekFirstDay: 0, + isSelected: true, dayNames: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", ], @@ -42,12 +43,14 @@ export default class Calendar extends PureComponent { handleNextButtonPress() { if (this.props.onNextButtonPress !== null) { + this.props.isSelected = false this.props.onNextButtonPress(); } } handlePrevButtonPress() { if (this.props.onPrevButtonPress !== null) { + this.props.isSelected = false this.props.onPrevButtonPress(); } } @@ -57,7 +60,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.props.isSelected = true this.props.onDateSelect(selectedDate); } } @@ -135,7 +138,7 @@ export default class Calendar extends PureComponent { return ( this.handleDayPress(dateNumber)}> - + {`${dateNumber}`} From 15931b9b87c6160e2a9f445f40ce4b451191c74c Mon Sep 17 00:00:00 2001 From: abadikaka Date: Wed, 19 Jul 2017 16:41:44 +0700 Subject: [PATCH 3/6] Add isselected --- .idea/workspace.xml | 13 ++++++------- index.js | 11 ++++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index adfa7be..94cbdfd 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - - @@ -300,8 +299,8 @@ - - + + diff --git a/index.js b/index.js index 984a06e..00ef1c3 100644 --- a/index.js +++ b/index.js @@ -9,6 +9,8 @@ import { export default class Calendar extends PureComponent { + isSelected = true + static get defaultProps() { return { date: new Date(), @@ -16,7 +18,6 @@ export default class Calendar extends PureComponent { onPrevButtonPress: null, onNextButtonPress: null, weekFirstDay: 0, - isSelected: true, dayNames: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", ], @@ -43,14 +44,14 @@ export default class Calendar extends PureComponent { handleNextButtonPress() { if (this.props.onNextButtonPress !== null) { - this.props.isSelected = false + this.isSelected = false this.props.onNextButtonPress(); } } handlePrevButtonPress() { if (this.props.onPrevButtonPress !== null) { - this.props.isSelected = false + this.isSelected = false this.props.onPrevButtonPress(); } } @@ -60,7 +61,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.props.isSelected = true + this.isSelected = true this.props.onDateSelect(selectedDate); } } @@ -138,7 +139,7 @@ export default class Calendar extends PureComponent { return ( this.handleDayPress(dateNumber)}> - + {`${dateNumber}`} From eb5f027d1ed8ea2b07fe4e0be8078a1096308e43 Mon Sep 17 00:00:00 2001 From: abadikaka Date: Wed, 19 Jul 2017 16:47:40 +0700 Subject: [PATCH 4/6] FEATURE ISSELECTED and ISTODAY --- .idea/misc.xml | 21 -- .idea/modules.xml | 8 - .idea/react-native-calendar.iml | 9 - .idea/vcs.xml | 6 - .idea/workspace.xml | 327 +++++++++++++++++++++++++++++--- index.js | 3 - 6 files changed, 305 insertions(+), 69 deletions(-) delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/react-native-calendar.iml delete mode 100644 .idea/vcs.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 2768266..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7de9e8d..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/react-native-calendar.iml b/.idea/react-native-calendar.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/react-native-calendar.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 94cbdfd..c581ca7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,11 @@ + + + + + - - @@ -260,7 +543,7 @@ - + @@ -299,8 +582,8 @@ - - + + diff --git a/index.js b/index.js index 00ef1c3..f1b25c1 100644 --- a/index.js +++ b/index.js @@ -130,9 +130,6 @@ 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 From d8917a6f05f98e0ada960de48059be93c9f2a3e7 Mon Sep 17 00:00:00 2001 From: abadikaka Date: Wed, 19 Jul 2017 16:52:03 +0700 Subject: [PATCH 5/6] remove idea --- .idea/workspace.xml | 594 -------------------------------------------- 1 file changed, 594 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index c581ca7..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - onDateSelect - monthNames - - - - - - - - - - - - - - true - - false - true - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1500453151691 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 3fe859c75f307d1c6be1225bd747becf534f0351 Mon Sep 17 00:00:00 2001 From: Michael Abadi Santoso Date: Fri, 16 Feb 2018 11:39:21 +0700 Subject: [PATCH 6/6] Update index.js --- index.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index f1b25c1..865280b 100644 --- a/index.js +++ b/index.js @@ -14,6 +14,8 @@ export default class Calendar extends PureComponent { static get defaultProps() { return { date: new Date(), + todayDayInnerStyle: styles.todayDayInner, + dayWeekendTextStyle: styles.dayWeekendText, onDateSelect: null, onPrevButtonPress: null, onNextButtonPress: null, @@ -33,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, @@ -136,8 +140,8 @@ export default class Calendar extends PureComponent { return ( this.handleDayPress(dateNumber)}> - - + + {`${dateNumber}`} @@ -272,4 +276,4 @@ const styles = StyleSheet.create({ schadedText: { color: "#AAAAAA", } -}); \ No newline at end of file +});