FAD-5353 Clean up Popover story & Datepicker

2 files changed, 14 insertions, 23 deletions

diff --git a/src/components/Datepicker/Datepicker.js b/src/components/Datepicker/Datepicker.js
index f22b978..53520ff 100644
--- a/src/components/Datepicker/Datepicker.js
+++ b/src/components/Datepicker/Datepicker.js
@@ -34,10 +34,15 @@ class Navbar extends Component {
 
 class Datepicker extends Component {
   render() {
-    const modifiers = {
-      firstSelected: (day) => DateUtils.isSameDay(day, this.props.selectedDays.from),
-      lastSelected: (day) => DateUtils.isSameDay(day, this.props.selectedDays.to),
-    };
+    const { selectedDays } = this.props;
+
+    const modifiers = selectedDays
+    ? {
+        firstSelected: (day) => DateUtils.isSameDay(day, selectedDays.from),
+        lastSelected: (day) => DateUtils.isSameDay(day, selectedDays.to),
+      }
+    : {};
+    
     const modifiersStyles = {
       firstSelected: {
         color: 'white',
diff --git a/stories/Popover.js b/stories/Popover.js
index 3fee988..188ceab 100644
--- a/stories/Popover.js
+++ b/stories/Popover.js
@@ -3,32 +3,18 @@ import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import { StoryContainer } from './helpers';
 
-import { Popover, Button, TextField } from '../src';
+import { Popover, Datepicker, Button, TextField } from '../src';
 
 export default storiesOf('Popover', module)
   .addDecorator((getStory) => (
     <StoryContainer>{ getStory() }</StoryContainer>
   ))
-  .addWithInfo('Default', () => {
-    const trigger = () => <Button>Trigger</Button>;
-
-    return (
+  .addWithInfo('With Datepicker', () => (
       <div>
         <Popover
-          trigger={<Button onClick={action('Trigger Click')}>Trigger</Button>}
-          sectioned
-          style={{ width: '400px' }}>
-          <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit unde eius eligendi, quod sed maxime quis nam error suscipit.</p>
-          <Button primary>Yup</Button>
-        </Popover>
-        <br/><br/><br/><br/><br/><br/>
-        <Popover
-          trigger={<TextField onClick={action('Trigger Click')} />}
-          sectioned
+          trigger={<TextField onClick={action('Trigger Click')} value={new Date}/>}
           style={{ width: '400px' }}>
-          <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit unde eius eligendi, quod sed maxime quis nam error suscipit.</p>
-          <Button primary>Yup</Button>
+          <Datepicker />
         </Popover>
       </div>
-    );
-  });
+    ));