fix onEventPress

wesoftyou · Jun 30, 2018 · cd0e463 · cd0e463
1 parent 0b10523
commit cd0e463
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/example/App.js b/example/App.js
@@ -54,7 +54,7 @@ export default class App extends Component<{}> {
           events={events}
           selectedDate={this.selectedDate}
           numberOfDays={3}
-          onEventPress={() => Alert.alert('select')}
+          onEventPress={(event) => Alert.alert('eventId:' + event.id)}
           headerStyle={styles.headerStyle}
           formatDateHeader="MMM D"
         />

diff --git a/src/Event/Event.js b/src/Event/Event.js
@@ -10,7 +10,7 @@ import styles from './Event.styles';
 const Event = ({ event, onPress, style }) => {
   return (
     <TouchableOpacity
-      onPress={onPress}
+      onPress={() => onPress(event)}
       style={[styles.item, style, {
         backgroundColor: event.color,
       }]}

diff --git a/src/Events/Events.js b/src/Events/Events.js
@@ -28,10 +28,10 @@ const TimeRow = () => {
 };
 
 class Events extends Component {
-  onEventPress = (item) => {
+  onEventPress = (event) => {
     const { onEventPress } = this.props;
     if (onEventPress) {
-      onEventPress(item.data);
+      onEventPress(event);
     }
   };
 
@@ -140,7 +140,6 @@ class Events extends Component {
       events,
       numberOfDays,
       selectedDate,
-      onEventPress,
       times,
     } = this.props;
     const sortedEvents = this.sortEventByDates(events);
@@ -164,7 +163,7 @@ class Events extends Component {
                       key={item.data.id}
                       event={item.data}
                       style={item.style}
-                      onPress={onEventPress}
+                      onPress={this.onEventPress}
                     />
                   );
                 })}

diff --git a/src/Swipeable/Swipeable.js b/src/Swipeable/Swipeable.js
@@ -88,7 +88,13 @@ export default class Swipeable extends Component {
   };
 
   render() {
-    const { numberOfDays, headerStyle, formatDateHeader } = this.props;
+    const {
+      numberOfDays,
+      headerStyle,
+      formatDateHeader,
+      onEventPress,
+      events,
+    } = this.props;
     const { currentMoment } = this.state;
     const dates = this.prepareDates(currentMoment, numberOfDays);
     return (
@@ -127,8 +133,8 @@ export default class Swipeable extends Component {
                         times={this.times}
                         selectedDate={date.toDate()}
                         numberOfDays={numberOfDays}
-                        onEventPress={this.props.onEventPress}
-                        events={this.props.events}
+                        onEventPress={onEventPress}
+                        events={events}
                       />
                     </View>
                   );

diff --git a/src/WeekView/WeekView.js b/src/WeekView/WeekView.js
@@ -8,27 +8,21 @@ import Events from '../Events/Events';
 import styles from './WeekView.styles';
 
 class WeekView extends Component {
-  onEventPress = (item) => {
-    const { onEventPress } = this.props;
-    if (onEventPress) {
-      onEventPress(item.data);
-    }
-  };
-
   render() {
     const {
       events,
       selectedDate,
       numberOfDays,
       times,
+      onEventPress,
     } = this.props;
     return (
       <View style={styles.container}>
         <Events
           times={times}
           events={events}
           numberOfDays={numberOfDays}
-          onEventPress={this.onEventPress}
+          onEventPress={onEventPress}
           selectedDate={selectedDate}
         />
       </View>