From 3fd1a10b73f6d2fa3d4fcab8d118e29470c3142b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 11 Sep 2021 18:00:48 -0500
Subject: [PATCH] Webpack: optimize ScheduleForm

---
 .../compose/components/schedule_form.js       | 20 ++++++++++++---
 .../containers/schedule_form_container.js     | 25 +++++++++----------
 .../features/ui/util/async-components.js      |  4 +++
 app/styles/components/datepicker.scss         |  1 +
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/soapbox/features/compose/components/schedule_form.js b/app/soapbox/features/compose/components/schedule_form.js
index e679259a4..1394cb6a2 100644
--- a/app/soapbox/features/compose/components/schedule_form.js
+++ b/app/soapbox/features/compose/components/schedule_form.js
@@ -4,10 +4,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { setSchedule, removeSchedule } from '../../../actions/compose';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import IconButton from 'soapbox/components/icon_button';
-import { removeSchedule } from 'soapbox/actions/compose';
 import classNames from 'classnames';
 
 const messages = defineMessages({
@@ -15,11 +15,22 @@ const messages = defineMessages({
   remove: { id: 'schedule.remove', defaultMessage: 'Remove schedule' },
 });
 
-const mapStateToProps = (state, ownProps) => ({
+const mapStateToProps = state => ({
+  active: state.getIn(['compose', 'schedule']) ? true : false,
   scheduledAt: state.getIn(['compose', 'schedule']),
 });
 
-export default @connect(mapStateToProps)
+const mapDispatchToProps = dispatch => ({
+  onSchedule(date) {
+    dispatch(setSchedule(date));
+  },
+
+  onRemoveSchedule(date) {
+    dispatch(removeSchedule());
+  },
+});
+
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
 class ScheduleForm extends React.Component {
 
@@ -27,6 +38,7 @@ class ScheduleForm extends React.Component {
     scheduledAt: PropTypes.instanceOf(Date),
     intl: PropTypes.object.isRequired,
     onSchedule: PropTypes.func.isRequired,
+    onRemoveSchedule: PropTypes.func.isRequired,
     dispatch: PropTypes.func,
     active: PropTypes.bool,
   };
@@ -60,7 +72,7 @@ class ScheduleForm extends React.Component {
   }
 
   handleRemove = e => {
-    this.props.dispatch(removeSchedule());
+    this.props.onRemoveSchedule();
     e.preventDefault();
   }
 
diff --git a/app/soapbox/features/compose/containers/schedule_form_container.js b/app/soapbox/features/compose/containers/schedule_form_container.js
index da4887300..50042e5b3 100644
--- a/app/soapbox/features/compose/containers/schedule_form_container.js
+++ b/app/soapbox/features/compose/containers/schedule_form_container.js
@@ -1,16 +1,15 @@
-import { connect } from 'react-redux';
-import ScheduleForm from '../components/schedule_form';
-import { setSchedule } from '../../../actions/compose';
+import React from 'react';
+import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
+import { ScheduleForm } from 'soapbox/features/ui/util/async-components';
 
-const mapStateToProps = state => ({
-  schedule: state.getIn(['compose', 'schedule']),
-  active: state.getIn(['compose', 'schedule']) ? true : false,
-});
+export default class ScheduleFormContainer extends React.PureComponent {
 
-const mapDispatchToProps = dispatch => ({
-  onSchedule(date) {
-    dispatch(setSchedule(date));
-  },
-});
+  render() {
+    return (
+      <BundleContainer fetchComponent={ScheduleForm}>
+        {Component => <Component {...this.props} />}
+      </BundleContainer>
+    );
+  }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ScheduleForm);
+}
diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js
index 4a86d4a61..1f1d8ca31 100644
--- a/app/soapbox/features/ui/util/async-components.js
+++ b/app/soapbox/features/ui/util/async-components.js
@@ -277,3 +277,7 @@ export function FederationRestrictions() {
 export function Aliases() {
   return import(/* webpackChunkName: "features/aliases" */'../../aliases');
 }
+
+export function ScheduleForm() {
+  return import(/* webpackChunkName: "features/compose" */'../../compose/components/schedule_form');
+}
diff --git a/app/styles/components/datepicker.scss b/app/styles/components/datepicker.scss
index ef8483b97..78a20b01f 100644
--- a/app/styles/components/datepicker.scss
+++ b/app/styles/components/datepicker.scss
@@ -156,6 +156,7 @@
     display: flex !important;
     align-items: center !important;
     transition: 0.2s !important;
+    background: var(--foreground-color);
 
     &:hover {
       background-color: var(--background-color) !important;