Progress

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

@@ -2,7 +2,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import { Manager, Reference, Popper } from 'react-popper'
 import classnames from 'classnames/bind'
-import Overlay from 'react-overlays/lib/Overlay'
 import spring from 'react-motion/lib/spring'
 import Motion from '../../features/ui/util/optional_motion'
 import { openPopover, closePopover } from '../../actions/popover'
@@ -14,7 +13,7 @@ const cx = classnames.bind(_s)
 let id = 0
 
 const mapStateToProps = state => ({
-  isModalOpen: state.get('modal').modalType === 'ACTIONS',
+  isModalOpen: state.getIn(['modal', 'modalType']) === 'ACTIONS',
   popoverPlacement: state.getIn(['popover', 'placement']),
   openPopoverType: state.getIn(['popover', 'popoverType']),
 })
@@ -71,9 +70,9 @@ class PopoverBase extends ImmutablePureComponent {
 
   handleKeyDown = e => {
     switch (e.key) {
-      case 'Escape':
-        this.handleClose()
-        break
+    case 'Escape':
+      this.handleClose()
+      break
     }
   }
 
@@ -123,7 +122,7 @@ class PopoverBase extends ImmutablePureComponent {
       displayNone: !visible,
     })
 
-    console.log("targetRef:", targetRef)
+    console.log('targetRef:', targetRef)
 
 
     return (

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

@@ -32,8 +32,8 @@ const POPOVER_COMPONENTS = {
 }
 
 const mapStateToProps = state => ({
-  type: state.get('popover').popoverType,
-  props: state.get('popover').popoverProps,
+  type: state.getIn(['popover', 'popoverType']),
+  props: state.getIn(['popover', 'popoverProps'], {}),
 })
 
 const mapDispatchToProps = (dispatch) => ({
@@ -45,6 +45,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 class PopoverRoot extends PureComponent {
+
   static propTypes = {
     type: PropTypes.string,
     props: PropTypes.object,
@@ -95,22 +96,22 @@ class PopoverRoot extends PureComponent {
     let element
 
     switch (e.key) {
-      case 'ArrowDown':
-        element = items[index + 1]
-        if (element) element.focus()
-        break
-      case 'ArrowUp':
-        element = items[index - 1]
-        if (element) element.focus()
-        break
-      case 'Home':
-        element = items[0]
-        if (element) element.focus()
-        break
-      case 'End':
-        element = items[items.length - 1]
-        if (element) element.focus()
-        break
+    case 'ArrowDown':
+      element = items[index + 1]
+      if (element) element.focus()
+      break
+    case 'ArrowUp':
+      element = items[index - 1]
+      if (element) element.focus()
+      break
+    case 'Home':
+      element = items[0]
+      if (element) element.focus()
+      break
+    case 'End':
+      element = items[items.length - 1]
+      if (element) element.focus()
+      break
     }
   }
 
@@ -172,4 +173,5 @@ class PopoverRoot extends PureComponent {
       </PopoverBase>
     )
   }
+
 }