This commit is contained in:
mgabdev
2020-02-24 16:56:07 -05:00
parent d255982ec5
commit 7679012e2f
84 changed files with 1048 additions and 1132 deletions

View File

@@ -1,27 +0,0 @@
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
import { openModal, closeModal } from '../actions/modal';
import { isUserTouching } from '../utils/is_mobile';
import DropdownMenu from '../components/dropdown_menu';
const mapStateToProps = state => ({
isModalOpen: state.get('modal').modalType === 'ACTIONS',
dropdownPlacement: state.getIn(['dropdown_menu', 'placement']),
openDropdownId: state.getIn(['dropdown_menu', 'openId']),
openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
});
const mapDispatchToProps = (dispatch, { status, items }) => ({
onOpen(id, onItemClick, dropdownPlacement, keyboard) {
dispatch(isUserTouching() ? openModal('ACTIONS', {
status,
actions: items,
onClick: onItemClick,
}) : openDropdownMenu(id, dropdownPlacement, keyboard));
},
onClose(id) {
dispatch(closeModal());
dispatch(closeDropdownMenu(id));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(DropdownMenu);

View File

@@ -7,7 +7,7 @@ import Video from '../features/video';
import Card from '../features/status/components/card';
import Poll from '../components/poll';
import MediaGallery from '../components/media_gallery';
import ModalRoot from '../components/modal_root';
import ModalRoot from '../components/modal/modal_root';
import { MediaModal } from '../components/modal';
const { localeData, messages } = getLocale();

View File

@@ -1,6 +1,6 @@
import { closeModal } from '../actions/modal';
import { cancelReplyCompose } from '../actions/compose';
import ModalRoot from '../components/modal_root';
import ModalRoot from '../components/modal/modal_root';
const mapStateToProps = state => ({
type: state.get('modal').modalType,

View File

@@ -1,28 +1,28 @@
import { injectIntl } from 'react-intl';
import { NotificationStack } from 'react-notification';
import { dismissAlert } from '../actions/alerts';
import { getAlerts } from '../selectors';
import { injectIntl } from 'react-intl'
import { NotificationStack } from 'react-notification'
import { dismissAlert } from '../actions/alerts'
import { getAlerts } from '../selectors'
const mapStateToProps = (state, { intl }) => {
const notifications = getAlerts(state);
const notifications = getAlerts(state)
notifications.forEach(notification => ['title', 'message'].forEach(key => {
const value = notification[key];
const value = notification[key]
if (typeof value === 'object') {
notification[key] = intl.formatMessage(value);
notification[key] = intl.formatMessage(value)
}
}));
}))
return { notifications };
};
return { notifications }
}
const mapDispatchToProps = (dispatch) => {
return {
onDismiss: alert => {
dispatch(dismissAlert(alert));
dispatch(dismissAlert(alert))
},
};
};
}
}
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationStack));
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationStack))