From fe4a8b57287d1f9ceb48cdb904bc79248c8c7292 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 16 Sep 2021 15:44:39 -0500 Subject: [PATCH] Chunk modal components into features/ui --- .../features/ui/components/modal_root.js | 44 +++++++++---------- .../features/ui/util/async-components.js | 44 +++++++++++++++++++ 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/app/soapbox/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal_root.js index 9f8a90b0a..220d7f7d8 100644 --- a/app/soapbox/features/ui/components/modal_root.js +++ b/app/soapbox/features/ui/components/modal_root.js @@ -4,45 +4,45 @@ import Base from '../../../components/modal_root'; import BundleContainer from '../containers/bundle_container'; import BundleModalError from './bundle_modal_error'; import ModalLoading from './modal_loading'; -import ActionsModal from './actions_modal'; -import MediaModal from './media_modal'; -import VideoModal from './video_modal'; -import BoostModal from './boost_modal'; -import ConfirmationModal from './confirmation_modal'; -import MissingDescriptionModal from './missing_description_modal'; -import FocalPointModal from './focal_point_modal'; -import HotkeysModal from './hotkeys_modal'; -import ComposeModal from './compose_modal'; -import UnauthorizedModal from './unauthorized_modal'; -import EditFederationModal from './edit_federation_modal'; import { + MediaModal, + VideoModal, + BoostModal, + ConfirmationModal, MuteModal, ReportModal, EmbedModal, CryptoDonateModal, ListEditor, ListAdder, + MissingDescriptionModal, + ActionsModal, + FocalPointModal, + HotkeysModal, + ComposeModal, + UnauthorizedModal, + EditFederationModal, } from '../../../features/ui/util/async-components'; const MODAL_COMPONENTS = { - 'MEDIA': () => Promise.resolve({ default: MediaModal }), - 'VIDEO': () => Promise.resolve({ default: VideoModal }), - 'BOOST': () => Promise.resolve({ default: BoostModal }), - 'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }), - 'MISSING_DESCRIPTION': () => Promise.resolve({ default: MissingDescriptionModal }), + 'MEDIA': MediaModal, + 'VIDEO': VideoModal, + 'BOOST': BoostModal, + 'CONFIRM': ConfirmationModal, + 'MISSING_DESCRIPTION': MissingDescriptionModal, 'MUTE': MuteModal, 'REPORT': ReportModal, - 'ACTIONS': () => Promise.resolve({ default: ActionsModal }), + 'ACTIONS': ActionsModal, 'EMBED': EmbedModal, 'LIST_EDITOR': ListEditor, - 'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }), + 'FOCAL_POINT': FocalPointModal, 'LIST_ADDER':ListAdder, - 'HOTKEYS': () => Promise.resolve({ default: HotkeysModal }), - 'COMPOSE': () => Promise.resolve({ default: ComposeModal }), - 'UNAUTHORIZED': () => Promise.resolve({ default: UnauthorizedModal }), + 'HOTKEYS': HotkeysModal, + 'COMPOSE': ComposeModal, + 'UNAUTHORIZED': UnauthorizedModal, 'CRYPTO_DONATE': CryptoDonateModal, - 'EDIT_FEDERATION': () => Promise.resolve({ default: EditFederationModal }), + 'EDIT_FEDERATION': EditFederationModal, }; export default class ModalRoot extends React.PureComponent { diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 489554014..5c66f6919 100644 --- a/app/soapbox/features/ui/util/async-components.js +++ b/app/soapbox/features/ui/util/async-components.js @@ -150,6 +150,50 @@ export function Audio() { return import(/* webpackChunkName: "features/audio" */'../../audio'); } +export function MediaModal() { + return import(/* webpackChunkName: "features/ui" */'../components/media_modal'); +} + +export function VideoModal() { + return import(/* webpackChunkName: "features/ui" */'../components/video_modal'); +} + +export function BoostModal() { + return import(/* webpackChunkName: "features/ui" */'../components/boost_modal'); +} + +export function ConfirmationModal() { + return import(/* webpackChunkName: "features/ui" */'../components/confirmation_modal'); +} + +export function MissingDescriptionModal() { + return import(/* webpackChunkName: "features/ui" */'../components/missing_description_modal'); +} + +export function ActionsModal() { + return import(/* webpackChunkName: "features/ui" */'../components/actions_modal'); +} + +export function FocalPointModal() { + return import(/* webpackChunkName: "features/ui" */'../components/focal_point_modal'); +} + +export function HotkeysModal() { + return import(/* webpackChunkName: "features/ui" */'../components/hotkeys_modal'); +} + +export function ComposeModal() { + return import(/* webpackChunkName: "features/ui" */'../components/compose_modal'); +} + +export function UnauthorizedModal() { + return import(/* webpackChunkName: "features/ui" */'../components/unauthorized_modal'); +} + +export function EditFederationModal() { + return import(/* webpackChunkName: "features/ui" */'../components/edit_federation_modal'); +} + export function EmbedModal() { return import(/* webpackChunkName: "modals/embed_modal" */'../components/embed_modal'); }