Progress

app/javascript/gabsocial/components/popover/date_picker_popover.js

@@ -1,6 +1,5 @@
 import DatePicker from 'react-datepicker'
 import { changeScheduledAt } from '../../actions/compose'
-import { openModal } from '../../actions/modal'
 import { me } from '../../initial_state'
 import { isMobile } from '../../utils/is_mobile'
 import PopoverLayout from './popover_layout'
@@ -16,22 +15,15 @@ const mapDispatchToProps = dispatch => ({
   setScheduledAt (date) {
     dispatch(changeScheduledAt(date))
   },
-
-  onOpenProUpgradeModal() {
-    dispatch(openModal('PRO_UPGRADE'))
-  },
 })
 
-
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 class DatePickerPopover extends PureComponent {
   static propTypes = {
     date: PropTypes.instanceOf(Date),
     setScheduledAt: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
     isPro: PropTypes.bool,
-    onOpenProUpgradeModal: PropTypes.func.isRequired,
     position: PropTypes.string,
     small: PropTypes.bool,
   }
@@ -46,7 +38,6 @@ class DatePickerPopover extends PureComponent {
     const open = !!date
     const datePickerDisabled = !isPro
     const withPortal = isMobile(window.innerWidth)
-    const popperPlacement = position || undefined
 
     return (
       <PopoverLayout>
@@ -63,7 +54,6 @@ class DatePickerPopover extends PureComponent {
           disabled={datePickerDisabled}
           showTimeSelect
           withPortal={withPortal}
-          popperPlacement={popperPlacement}
           popperModifiers={{
             offset: {
               enabled: true,

app/javascript/gabsocial/components/popover/popover_root.js

@@ -38,8 +38,7 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = (dispatch) => ({
   onClose(optionalType) {
-    //
-    dispatch(closePopover())
+    dispatch(closePopover(optionalType))
   },
 })
 
@@ -62,17 +61,6 @@ class PopoverRoot extends PureComponent {
 
   static propTypes = {
     onClose: PropTypes.func.isRequired,
-    style: PropTypes.object,
-    placement: PropTypes.string,
-  }
-
-  static defaultProps = {
-    style: {},
-    placement: 'bottom',
-  }
-
-  state = {
-    mounted: false,
   }
 
   handleDocumentClick = e => {
@@ -85,8 +73,6 @@ class PopoverRoot extends PureComponent {
     document.addEventListener('click', this.handleDocumentClick, false)
     document.addEventListener('keydown', this.handleKeyDown, false)
     document.addEventListener('touchend', this.handleDocumentClick, listenerOptions)
-
-    this.setState({ mounted: true })
   }
 
   componentWillUnmount() {
@@ -160,10 +146,8 @@ class PopoverRoot extends PureComponent {
   render() {
     const {
       type,
-      style,
       props,
     } = this.props
-    const { mounted } = this.state
     const visible = !!type
 
     return (