fix(Bubble Icon Event Handlers): Allow bubble icons to be interactive

#21
rcdexta · Jan 12, 2019 · dedef94 · dedef94
1 parent 5cb4691
commit dedef94
Show file tree

Hide file tree

Showing 5 changed files with 1,107 additions and 541 deletions.
diff --git a/components/TimelineEvent.js b/components/TimelineEvent.js
@@ -1,5 +1,6 @@
-import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import React, { Component } from 'react'
+
 import s from './styles'
 
 class TimelineEvent extends Component {
@@ -16,8 +17,13 @@ class TimelineEvent extends Component {
   }
 
   mergeNotificationStyle(iconColor, bubbleStyle, orientation) {
-    const iconColorStyle = iconColor ? { ...s.eventType, ...{ color: iconColor, borderColor: iconColor } } : s.eventType
-    const leftOrRight = orientation === 'right' ? { ...s['eventType--right'] } : { ...s['eventType--left'] }
+    const iconColorStyle = iconColor
+      ? { ...s.eventType, ...{ color: iconColor, borderColor: iconColor } }
+      : s.eventType
+    const leftOrRight =
+      orientation === 'right'
+        ? { ...s['eventType--right'] }
+        : { ...s['eventType--left'] }
     return { ...iconColorStyle, ...leftOrRight, ...bubbleStyle }
   }
 
@@ -43,7 +49,8 @@ class TimelineEvent extends Component {
 
   toggleStyle() {
     const { container, cardHeaderStyle, collapsible } = this.props
-    const messageStyle = container === 'card' ? { ...s.cardTitle, ...cardHeaderStyle } : {}
+    const messageStyle =
+      container === 'card' ? { ...s.cardTitle, ...cardHeaderStyle } : {}
     return collapsible ? { ...s.toggleEnabled, ...messageStyle } : messageStyle
   }
 
@@ -59,7 +66,10 @@ class TimelineEvent extends Component {
         <div style={s.messageAfter} />
       </div>
     ) : (
-      <span style={{ fontWeight: 500, fontSize: 16, cursor: 'pointer' }} onClick={this.toggleContent}>
+      <span
+        style={{ fontWeight: 500, fontSize: 16, cursor: 'pointer' }}
+        onClick={this.toggleContent}
+      >
         …
       </span>
     )
@@ -80,22 +90,47 @@ class TimelineEvent extends Component {
       orientation,
       collapsible,
       onClick,
+      onIconClick,
       className
     } = this.props
-    const leftOrRightEventStyling = orientation === 'right' ? { ...s['event--right'] } : { ...s['event--left'] }
-    const leftOrRightButtonStyling = orientation === 'left' ? { ...s['actionButtons--right'] } : { ...s['actionButtons--left'] }
+    const leftOrRightEventStyling =
+      orientation === 'right'
+        ? { ...s['event--right'] }
+        : { ...s['event--left'] }
+    const leftOrRightButtonStyling =
+      orientation === 'left'
+        ? { ...s['actionButtons--right'] }
+        : { ...s['actionButtons--left'] }
     return (
       <div style={{ ...s.event, ...leftOrRightEventStyling }}>
-        <div style={this.mergeNotificationStyle(iconColor, bubbleStyle, orientation)}>
-          <span style={{ ...s.materialIcons, ...iconStyle }}>{icon}</span>
+        <div
+          style={this.mergeNotificationStyle(
+            iconColor,
+            bubbleStyle,
+            orientation
+          )}
+        >
+          <span
+            style={{ ...s.materialIcons, ...iconStyle }}
+            onClick={onIconClick}
+          >
+            {icon}
+          </span>
         </div>
         <div style={this.containerStyle()} {...{ onClick, className }}>
           <div style={s.eventContainerBefore} />
-          <div style={this.toggleStyle()} onClick={collapsible && this.toggleContent}>
+          <div
+            style={this.toggleStyle()}
+            onClick={collapsible && this.toggleContent}
+          >
             {createdAt && <div style={this.timeStyle()}>{createdAt}</div>}
             <div style={titleStyle}>{title}</div>
-            {subtitle && <div style={{ ...s.subtitle, ...subtitleStyle }}>{subtitle}</div>}
-            <div style={{ ...s.actionButtons, ...leftOrRightButtonStyling }}>{buttons}</div>
+            {subtitle && (
+              <div style={{ ...s.subtitle, ...subtitleStyle }}>{subtitle}</div>
+            )}
+            <div style={{ ...s.actionButtons, ...leftOrRightButtonStyling }}>
+              {buttons}
+            </div>
           </div>
           {this.props.children && this.renderChildren()}
         </div>
@@ -125,7 +160,8 @@ TimelineEvent.propTypes = {
   collapsible: PropTypes.bool,
   showContent: PropTypes.bool,
   className: PropTypes.string,
-  onClick: PropTypes.func
+  onClick: PropTypes.func,
+  onIconClick: PropTypes.func
 }
 
 TimelineEvent.defaultProps = {
@@ -140,7 +176,8 @@ TimelineEvent.defaultProps = {
   orientation: 'left',
   showContent: false,
   className: '',
-  onClick: () => {}
+  onClick: () => {},
+  onIconClick: () => {}
 }
 
 export default TimelineEvent
diff --git a/components/styles.js b/components/styles.js
@@ -67,6 +67,7 @@ let style = {
     height: 32,
     position: 'relative',
     justifyContent: 'center',
+    cursor: 'pointer',
     alignSelf: 'center',
     alignItems: 'center'
   },

diff --git a/stories/App.story.js b/stories/App.story.js
@@ -1,6 +1,7 @@
-import React, { Component } from 'react'
 import { storiesOf } from '@storybook/react'
-import { Timeline, TimelineEvent, TimelineBlip } from '../components/index'
+import React, { Component } from 'react'
+
+import { Timeline, TimelineBlip, TimelineEvent } from '../components'
 import Image from './sample.jpg'
 
 const globalStyles = {
@@ -189,7 +190,7 @@ storiesOf('Timeline', module)
     { info: 'Timeline event container can be modelled as a card' }
   )
   .add(
-    'Event handlers',
+    'Content Event handlers',
     () => (
       <Timeline>
         <TimelineEvent
@@ -205,6 +206,51 @@ storiesOf('Timeline', module)
     ),
     { info: 'Timeline events can listen to user actions' }
   )
+  .add(
+    'Icon Event handlers',
+    () => {
+      class IconEventDemo extends React.Component {
+        constructor(props) {
+          super(props)
+          this.state = {
+            active: true,
+            iconColor: 'red'
+          }
+          this.toggleEvent = this.toggleEvent.bind(this)
+        }
+
+        get icon() {
+          return this.state.active ? 'stop' : 'play_arrow'
+        }
+
+        toggleEvent() {
+          alert('Will toggle event status between play and stop')
+          this.setState({
+            active: !this.state.active,
+            iconColor: this.state.iconColor === 'red' ? 'green' : 'red'
+          })
+        }
+
+        render() {
+          return (
+            <Timeline>
+              <TimelineEvent
+                title="Playing Beethoven's Moonlight Sonata"
+                createdAt='2016-09-12 10:06 PM'
+                icon={<i className='material-icons md-18'>{this.icon}</i>}
+                iconColor={this.state.iconColor}
+                onIconClick={this.toggleEvent}
+              >
+                Press icon on the bubble to stop music
+              </TimelineEvent>
+            </Timeline>
+          )
+        }
+      }
+      return <IconEventDemo />
+    },
+    { info: 'Timeline events can listen to user actions' }
+  )
   .add(
     'Event Styling',
     () => (