File tree Expand file tree Collapse file tree 2 files changed +17
-5
lines changed
apps/remix-ide/src/app/panels
libs/remix-ui/tabs/src/lib Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -343,17 +343,29 @@ export default class TabProxy extends Plugin {
343
343
if ( ! this . loadedTabs . find ( tab => tab . name === name ) ) return // prevent removing tab that doesn't exist
344
344
this . loadedTabs = this . loadedTabs . filter ( ( tab , index ) => {
345
345
if ( ! previous && tab . name === name ) {
346
- if ( index - 1 >= 0 && this . loadedTabs [ index - 1 ] )
347
- previous = this . loadedTabs [ index - 1 ]
348
- else if ( index + 1 && this . loadedTabs [ index + 1 ] )
349
- previous = this . loadedTabs [ index + 1 ]
346
+ previous = this . getPreviousVisibleTab ( index )
347
+ if ( ! previous ) previous = this . getNextVisibleTab ( index )
350
348
}
351
349
return tab . name !== name
352
350
} )
353
351
this . renderComponent ( )
354
352
if ( previous ) this . switchTab ( previous . name )
355
353
}
356
354
355
+ getPreviousVisibleTab ( index ) {
356
+ for ( let i = index - 1 ; i >= 0 ; i -- ) {
357
+ if ( this . loadedTabs [ i ] . show ) return this . loadedTabs [ i ]
358
+ }
359
+ return null
360
+ }
361
+
362
+ getNextVisibleTab ( index ) {
363
+ for ( let i = index + 1 ; i < this . loadedTabs . length ; i ++ ) {
364
+ if ( this . loadedTabs [ i ] . show ) return this . loadedTabs [ i ]
365
+ }
366
+ return null
367
+ }
368
+
357
369
addHandler ( type , fn ) {
358
370
this . handlers [ type ] = fn
359
371
}
Original file line number Diff line number Diff line change @@ -622,7 +622,7 @@ export const TabsUI = (props: TabsUIProps) => {
622
622
< div style = { { minWidth : '4rem' , height : '1rem' } } id = "dummyElForLastXVisibility" > </ div >
623
623
</ TabList >
624
624
{ props . tabs . map ( ( tab ) => (
625
- < TabPanel key = { tab . name } > </ TabPanel >
625
+ < TabPanel className = { tab . show ? '' : 'd-none' } key = { tab . name } > </ TabPanel >
626
626
) ) }
627
627
</ Tabs >
628
628
You can’t perform that action at this time.
0 commit comments