diff --git a/app/assets/javascripts/components/components/dropdown_menu.jsx b/app/assets/javascripts/components/components/dropdown_menu.jsx new file mode 100644 index 000000000..619605f63 --- /dev/null +++ b/app/assets/javascripts/components/components/dropdown_menu.jsx @@ -0,0 +1,25 @@ +import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown'; + +const DropdownMenu = ({ icon, items, size }) => { + return ( + + + + + + + + + + ); +}; + +DropdownMenu.propTypes = { + icon: React.PropTypes.string.isRequired, + items: React.PropTypes.array.isRequired, + size: React.PropTypes.number.isRequired +}; + +export default DropdownMenu; diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx index 3e826d68a..945b722a6 100644 --- a/app/assets/javascripts/components/components/status_action_bar.jsx +++ b/app/assets/javascripts/components/components/status_action_bar.jsx @@ -1,7 +1,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import PureRenderMixin from 'react-addons-pure-render-mixin'; import IconButton from './icon_button'; -import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown'; +import DropdownMenu from './dropdown_menu'; const StatusActionBar = React.createClass({ propTypes: { @@ -26,23 +26,16 @@ const StatusActionBar = React.createClass({ this.props.onReblog(this.props.status); }, - handleDeleteClick(e) { - e.preventDefault(); + handleDeleteClick () { this.props.onDelete(this.props.status); }, render () { const { status, me } = this.props; - let menu = ''; + let menu = []; if (status.getIn(['account', 'id']) === me) { - menu = ( - - ); - } else { - menu =