remove all the conditional rendering logic to make code cleaner

pull/905/head
Brian Jian Zhao 6 years ago
parent 0daaa04596
commit 75f5d5743f

@ -88,8 +88,7 @@ export class SessionSettingListItem extends React.Component<Props, State> {
/> />
)} )}
{type === SessionSettingType.Slider && {type === SessionSettingType.Slider && (
content.sliderCategory === 'messageTTLSlider' ? (
<div className="slider-wrapper"> <div className="slider-wrapper">
<Slider <Slider
dots={content.dotsEnable} dots={content.dotsEnable}
@ -103,28 +102,10 @@ export class SessionSettingListItem extends React.Component<Props, State> {
/> />
<div className="slider-info"> <div className="slider-info">
<p>{`${currentSliderValue} Hours`}</p> <p>{content.info(currentSliderValue)}</p>
</div> </div>
</div> </div>
) : type === SessionSettingType.Slider && )}
content.sliderCategory === 'zoomFactorSlider' ? (
<div>
<Slider
dots={content.dotsEnable}
step={content.step}
min={content.min}
max={content.max}
defaultValue={currentSliderValue}
onChange={sliderValue => {
this.handleSlider(sliderValue);
}}
/>
<div className="slider-info">
<p>{`Zoom Level: %${currentSliderValue}`}</p>
</div>
</div>
) : null}
</div> </div>
</div> </div>
); );

@ -236,14 +236,10 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
{shouldRenderPasswordLock ? ( {shouldRenderPasswordLock ? (
this.renderPasswordLock() this.renderPasswordLock()
) : ( ) : (
//
<div ref={this.settingsViewRef} className="session-settings-list"> <div ref={this.settingsViewRef} className="session-settings-list">
{this.renderSettingInCategory()} {this.renderSettingInCategory()}
{/* what gets rendered back from calling renderSettingInCategory */}
</div> </div>
)} )}
{/* session info is always shown in here */}
{this.renderSessionInfo()} {this.renderSessionInfo()}
</div> </div>
</div> </div>
@ -451,6 +447,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
max: 96, max: 96,
sliderCategory: 'messageTTLSlider', sliderCategory: 'messageTTLSlider',
defaultValue: 24, defaultValue: 24,
info: (value: number) => `${value} Hours`,
}, },
confirmationDialogParams: undefined, confirmationDialogParams: undefined,
}, },
@ -471,6 +468,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
max: 200, max: 200,
sliderCategory: 'zoomFactorSlider', sliderCategory: 'zoomFactorSlider',
defaultValue: 100, defaultValue: 100,
info: (value: number) => `Zoom Factor: ${value}%`
}, },
confirmationDialogParams: undefined, confirmationDialogParams: undefined,
}, },

Loading…
Cancel
Save