@@ -95,6 +95,8 @@ const App: React.FC = (): React.JSX.Element => {
9595 const [ shownPythonToolboxCategories , setShownPythonToolboxCategories ] = React . useState < Set < string > > ( new Set ( ) ) ;
9696 const [ triggerPythonRegeneration , setTriggerPythonRegeneration ] = React . useState ( 0 ) ;
9797 const [ leftCollapsed , setLeftCollapsed ] = React . useState ( false ) ;
98+ const [ rightCollapsed , setRightCollapsed ] = React . useState ( false ) ;
99+
98100
99101 const blocksEditor = React . useRef < editor . Editor | null > ( null ) ;
100102 const generatorContext = React . useRef < GeneratorContext | null > ( null ) ;
@@ -210,11 +212,6 @@ const App: React.FC = (): React.JSX.Element => {
210212 setCurrentModule ( module ) ;
211213 } ;
212214
213- /** Handles left sidebar collapse state change. */
214- const handleSiderCollapse = ( collapsed : boolean ) : void => {
215- setLeftCollapsed ( collapsed ) ;
216- } ;
217-
218215 /** Handles toolbox settings modal close. */
219216 const handleToolboxSettingsCancel = ( ) : void => {
220217 setToolboxSettingsModalIsOpen ( false ) ;
@@ -337,21 +334,21 @@ const App: React.FC = (): React.JSX.Element => {
337334 }
338335 } , [ project ] ) ;
339336
340- const { Sider} = Antd . Layout ;
337+ const { Sider, Content } = Antd . Layout ;
341338
342339 return (
343340 < Antd . ConfigProvider
344341 theme = { {
345342 algorithm : Antd . theme . darkAlgorithm ,
346343 components : {
347- Tree : {
348- directoryNodeSelectedBg : '#1677ff' ,
349- directoryNodeSelectedColor : '#fff' ,
350- nodeSelectedBg : '#1677ff' ,
351- nodeSelectedColor : '#fff' ,
352- nodeHoverBg : '#333' ,
353- nodeHoverColor : '#fff' ,
344+ Layout : {
345+ headerBg : '#000000' , // This is only for dark mode
346+ siderBg : '#000000' , // This is only for dark mode
347+ triggerBg : '#000000' , // This is only for dark mode
354348 } ,
349+ Menu :{
350+ darkItemBg : '#000000' , // This is only for dark mode
351+ }
355352 } ,
356353 } }
357354 >
@@ -371,7 +368,7 @@ const App: React.FC = (): React.JSX.Element => {
371368 < Sider
372369 collapsible
373370 collapsed = { leftCollapsed }
374- onCollapse = { handleSiderCollapse }
371+ onCollapse = { ( collapsed : boolean ) => setLeftCollapsed ( collapsed ) }
375372 >
376373 < Menu . Component
377374 storage = { storage }
@@ -394,22 +391,25 @@ const App: React.FC = (): React.JSX.Element => {
394391 setProject = { setProject }
395392 storage = { storage }
396393 />
397- < Antd . Splitter >
398- < Antd . Splitter . Panel >
394+ < Antd . Layout >
395+ < Content >
399396 < BlocklyComponent ref = { blocklyComponent } />
400- </ Antd . Splitter . Panel >
401- < Antd . Splitter . Panel
402- min = { CODE_PANEL_MIN_SIZE }
403- defaultSize = { CODE_PANEL_DEFAULT_SIZE }
404- collapsible = { true }
397+ </ Content >
398+ < Sider
399+ collapsible
400+ reverseArrow = { true }
401+ collapsed = { rightCollapsed }
402+ collapsedWidth = { 80 }
403+ width = { '25%' }
404+ onCollapse = { ( collapsed : boolean ) => setRightCollapsed ( collapsed ) }
405405 >
406406 < CodeDisplay
407407 generatedCode = { generatedCode }
408408 messageApi = { messageApi }
409409 setAlertErrorMessage = { setAlertErrorMessage }
410410 />
411- </ Antd . Splitter . Panel >
412- </ Antd . Splitter >
411+ </ Sider >
412+ </ Antd . Layout >
413413 </ Antd . Layout >
414414 </ Antd . Layout >
415415 </ Antd . Layout >
0 commit comments