@@ -62,20 +62,6 @@ const TabBarMore = React.memo<TabBarMoreProps>(
62
62
} ,
63
63
) ;
64
64
65
- const TabBarContext = ( { children } ) => {
66
- if ( ! children || ! document . querySelector ( ".main-topBar-topbarContentWrapper" ) ) return null ;
67
- return ReactDOM . createPortal (
68
- < div className = "main-topBar-topbarContent" >
69
- { children }
70
- </ div > ,
71
- document . querySelector ( ".main-topBar-topbarContentWrapper" ) as Element ,
72
- ) ;
73
- } ;
74
-
75
- TabBarContext . propTypes = {
76
- children : PropTypes . element ,
77
- } ;
78
-
79
65
export const TopBarContent = ( props : {
80
66
links : TabItemConfig [ ] ;
81
67
activeLink : string ;
@@ -86,24 +72,35 @@ export const TopBarContent = (props: {
86
72
87
73
const [ windowSize , setWindowSize ] = useState ( resizeHost . clientWidth ) ;
88
74
const resizeHandler = ( ) => setWindowSize ( resizeHost . clientWidth ) ;
89
-
75
+ const contextHandler = ( ) => {
76
+ // Move the marketplace-tabBar item to the main-topBar-topbarContent div
77
+ const tabBar = document . querySelector ( ".marketplace-tabBar" ) ;
78
+ const topBarContent = document . querySelector ( ".main-topBar-container" ) ;
79
+ console . log ( tabBar , topBarContent ) ;
80
+ if ( tabBar && topBarContent ) {
81
+ topBarContent . appendChild ( tabBar ) ;
82
+ }
83
+
84
+ } ;
90
85
useEffect ( ( ) => {
91
86
const observer = new ResizeObserver ( resizeHandler ) ;
92
87
observer . observe ( resizeHost ) ;
93
88
return ( ) => {
94
89
observer . disconnect ( ) ;
95
90
} ;
96
91
} , [ resizeHandler ] ) ;
97
-
92
+ useEffect ( ( ) => {
93
+ contextHandler ( ) ;
94
+ } ) ;
98
95
return (
99
- < TabBarContext >
100
- < TabBar
101
- windowSize = { windowSize }
102
- links = { props . links }
103
- activeLink = { props . activeLink }
104
- switchCallback = { props . switchCallback }
105
- />
106
- </ TabBarContext >
96
+
97
+ < TabBar
98
+ windowSize = { windowSize }
99
+ links = { props . links }
100
+ activeLink = { props . activeLink }
101
+ switchCallback = { props . switchCallback }
102
+ />
103
+
107
104
) ;
108
105
} ;
109
106
0 commit comments