fix(recording-dialog) Fix broken dialog content (#12490)

react/features/base/ui/components/web/Switch.tsx

@@ -7,6 +7,8 @@ import { ISwitchProps } from '../types';
 
 interface IProps extends ISwitchProps {
 
+    className?: string;
+
     /**
      * Id of the toggle.
      */
@@ -78,7 +80,7 @@ const useStyles = makeStyles()((theme: Theme) => {
     };
 });
 
-const Switch = ({ id, checked, disabled, onChange }: IProps) => {
+const Switch = ({ className, id, checked, disabled, onChange }: IProps) => {
     const { classes: styles, cx } = useStyles();
     const isMobile = isMobileBrowser();
 
@@ -89,7 +91,7 @@ const Switch = ({ id, checked, disabled, onChange }: IProps) => {
     return (
         <label
             className = { cx('toggle-container', styles.container, checked && styles.containerOn,
-                isMobile && 'is-mobile', disabled && 'disabled') }>
+                isMobile && 'is-mobile', disabled && 'disabled', className) }>
             <input
                 type = 'checkbox'
                 { ...(id ? { id } : {}) }

react/features/recording/components/Recording/AbstractStartRecordingDialogContent.tsx

@@ -113,7 +113,7 @@ export interface IProps extends WithTranslation {
     /**
      * Callback to change the local recording only self setting.
      */
-    onLocalRecordingSelfChange: Function;
+    onLocalRecordingSelfChange: () => void;
 
     /**
      * Callback to be invoked on sharing setting change.

react/features/recording/components/Recording/styles.web.js

@@ -1,6 +1,5 @@
 // XXX CSS is used on Web, JavaScript styles are use only for mobile. Export an
 // (empty) object so that styles[*] statements on Web don't trigger errors.
-import BaseTheme from '../../../base/ui/components/BaseTheme';
 
 export default {};
 
@@ -13,5 +12,3 @@ export const ICON_CLOUD = 'images/icon-cloud.png';
 export const ICON_INFO = 'images/icon-info.png';
 
 export const ICON_USERS = 'images/icon-users.png';
-
-export const TRACK_COLOR = BaseTheme.palette.ui15;

react/features/recording/components/Recording/web/StartRecordingDialogContent.tsx

@@ -6,12 +6,12 @@ import {
     Container,
     Image,
     LoadingIndicator,
-    Switch,
     Text
     // @ts-ignore
 } from '../../../../base/react';
 import { connect } from '../../../../base/redux/functions';
 import Button from '../../../../base/ui/components/web/Button';
+import Switch from '../../../../base/ui/components/web/Switch';
 import { BUTTON_TYPES } from '../../../../base/ui/constants';
 import { RECORDING_TYPES } from '../../../constants';
 // @ts-ignore
@@ -25,8 +25,7 @@ import {
     ICON_CLOUD,
     ICON_INFO,
     ICON_USERS,
-    LOCAL_RECORDING,
+    LOCAL_RECORDING
-    TRACK_COLOR
     // @ts-ignore
 } from '../styles.web';
 
@@ -76,11 +75,10 @@ class StartRecordingDialogContent extends AbstractStartRecordingDialogContent<IP
             = integrationsEnabled || _localRecordingAvailable
                 ? (
                     <Switch
+                        checked = { selectedRecordingService === RECORDING_TYPES.JITSI_REC_SERVICE }
                         className = 'recording-switch'
                         disabled = { isValidating }
-                        onValueChange = { this._onRecordingServiceSwitchChange }
+                        onChange = { this._onRecordingServiceSwitchChange } />
-                        trackColor = {{ false: TRACK_COLOR }}
-                        value = { selectedRecordingService === RECORDING_TYPES.JITSI_REC_SERVICE } />
                 ) : null;
 
         const label = isVpaas ? t('recording.serviceDescriptionCloud') : t('recording.serviceDescription');
@@ -141,11 +139,10 @@ class StartRecordingDialogContent extends AbstractStartRecordingDialogContent<IP
                     { t('recording.fileSharingdescription') }
                 </Text>
                 <Switch
+                    checked = { sharingSetting }
                     className = 'recording-switch'
                     disabled = { isValidating }
-                    onValueChange = { onSharingSettingChanged }
+                    onChange = { onSharingSettingChanged } />
-                    trackColor = {{ false: TRACK_COLOR }}
-                    value = { sharingSetting } />
             </Container>
         );
     }
@@ -282,12 +279,11 @@ class StartRecordingDialogContent extends AbstractStartRecordingDialogContent<IP
         if (fileRecordingsServiceEnabled || _localRecordingAvailable) {
             switchContent = (
                 <Switch
+                    checked = { selectedRecordingService
+                        === RECORDING_TYPES.DROPBOX }
                     className = 'recording-switch'
                     disabled = { isValidating }
-                    onValueChange = { this._onDropboxSwitchChange }
+                    onChange = { this._onDropboxSwitchChange } />
-                    trackColor = {{ false: TRACK_COLOR }}
-                    value = { selectedRecordingService
-                        === RECORDING_TYPES.DROPBOX } />
             );
         }
 
@@ -351,12 +347,11 @@ class StartRecordingDialogContent extends AbstractStartRecordingDialogContent<IP
                             { t('recording.saveLocalRecording') }
                         </Text>
                         <Switch
+                            checked = { selectedRecordingService
+                                === RECORDING_TYPES.LOCAL }
                             className = 'recording-switch'
                             disabled = { isValidating }
-                            onValueChange = { this._onLocalRecordingSwitchChange }
+                            onChange = { this._onLocalRecordingSwitchChange } />
-                            trackColor = {{ false: TRACK_COLOR }}
-                            value = { selectedRecordingService
-                                === RECORDING_TYPES.LOCAL } />
                     </Container>
                 </Container>
                 {selectedRecordingService === RECORDING_TYPES.LOCAL && (
@@ -373,11 +368,10 @@ class StartRecordingDialogContent extends AbstractStartRecordingDialogContent<IP
                                         {t('recording.onlyRecordSelf')}
                                     </Text>
                                     <Switch
+                                        checked = { localRecordingOnlySelf }
                                         className = 'recording-switch'
                                         disabled = { isValidating }
-                                        onValueChange = { onLocalRecordingSelfChange }
+                                        onChange = { onLocalRecordingSelfChange } />
-                                        trackColor = {{ false: TRACK_COLOR }}
-                                        value = { localRecordingOnlySelf } />
                                 </Container>
                             </Container>
                         )}