gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: unneeded scrollbar multi file editor (#42411)

Browse Source 
* fix: multi editor unneeded scrollbar
This commit is contained in:
Sem Bauke
2021-06-23 19:15:36 +02:00
committed by GitHub
parent 4ed0befc4e
commit 3b4afe0e59
1 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/templates/Challenges/classic/DesktopLayout.js
View File

@ -84,10 +84,15 @@ class DesktopLayout extends Component {
return ( return (
<Fragment> <Fragment>
<ReflexContainer className='desktop-layout' orientation='horizontal'>
{projectBasedChallenge && ( {projectBasedChallenge && (
<ActionRow switchDisplayTab={this.switchDisplayTab} {...this.state} /> <ActionRow
switchDisplayTab={this.switchDisplayTab}
{...this.state}
/>
)} )}
<ReflexContainer className='desktop-layout' orientation='vertical'> <ReflexElement flex={8} {...reflexProps} {...resizeProps}>
<ReflexContainer orientation='vertical'>
{!projectBasedChallenge && ( {!projectBasedChallenge && (
<ReflexElement <ReflexElement
flex={instructionPane.flex} flex={instructionPane.flex}
@ -106,18 +111,21 @@ class DesktopLayout extends Component {
name='editorPane' name='editorPane'
{...resizeProps} {...resizeProps}
> >
{challengeFile && showUpcomingChanges && !hasEditableBoundries && ( {challengeFile &&
<EditorTabs /> showUpcomingChanges &&
)} !hasEditableBoundries && <EditorTabs />}
{challengeFile && ( {challengeFile && (
<ReflexContainer key={challengeFile.key} orientation='horizontal'> <ReflexContainer
key={challengeFile.key}
orientation='horizontal'
>
<ReflexElement <ReflexElement
flex={codePane.flex} flex={codePane.flex}
name='codePane' name='codePane'
{...reflexProps} {...reflexProps}
{...resizeProps} {...resizeProps}
> >
{<Fragment>{editor}</Fragment>} <Fragment>{editor}</Fragment>
</ReflexElement> </ReflexElement>
{isConsoleDisplayable && ( {isConsoleDisplayable && (
<ReflexSplitter propagate={true} {...resizeProps} /> <ReflexSplitter propagate={true} {...resizeProps} />
@ -148,6 +156,8 @@ class DesktopLayout extends Component {
</ReflexElement> </ReflexElement>
)} )}
</ReflexContainer> </ReflexContainer>
</ReflexElement>
</ReflexContainer>
</Fragment> </Fragment>
); );
} }