File tree Expand file tree Collapse file tree 5 files changed +26
-9
lines changed Expand file tree Collapse file tree 5 files changed +26
-9
lines changed Original file line number Diff line number Diff line change 12
12
"Environment" : [
13
13
{
14
14
"Name" : " API_BASE_URL" ,
15
- "Value" : " Reactypev17-env .eba-mbvivk7k .us-east-1.elasticbeanstalk.com"
15
+ "Value" : " Reactype-v17env .eba-sw2fhsbj .us-east-1.elasticbeanstalk.com"
16
16
}
17
17
]
18
18
}
Original file line number Diff line number Diff line change @@ -22,7 +22,13 @@ const BottomPanel = (props): JSX.Element => {
22
22
const dy = y - e . clientY ;
23
23
24
24
// Adjust the dimension of element
25
- node . current . style . height = `${ h + dy } px` ;
25
+ const newVal = h + dy ;
26
+ const styles = window . getComputedStyle ( node . current ) ;
27
+ const min = parseInt ( styles . minHeight , 10 ) ;
28
+ console . log ( 'is newVal > min newVal' , newVal )
29
+ console . log ( 'is newVal > min min' , min )
30
+ node . current . style . height = newVal > min ? `${ h + dy } px` : `${ min } px` ;
31
+ console . log ( 'mousemove' , node . current . style . height )
26
32
} ;
27
33
28
34
const mouseUpHandler = function ( ) {
@@ -33,6 +39,7 @@ const BottomPanel = (props): JSX.Element => {
33
39
34
40
useEffect ( ( ) => {
35
41
node . current . style . height = '50vh' ;
42
+ node . current . style . minHeight = '50vh' ;
36
43
} , [ ] ) ;
37
44
38
45
return (
@@ -41,7 +48,7 @@ const BottomPanel = (props): JSX.Element => {
41
48
< div id = "resize-drag" onMouseDown = { mouseDownHandler } tabIndex = { 0 } >
42
49
......
43
50
</ div >
44
- < BottomTabs isThemeLight = { props . isThemeLight } />
51
+ < BottomTabs setBottomShow = { props . setBottomShow } isThemeLight = { props . isThemeLight } />
45
52
</ div > </ >
46
53
) ;
47
54
} ;
Original file line number Diff line number Diff line change @@ -50,6 +50,7 @@ const BottomTabs = (props): JSX.Element => {
50
50
< div
51
51
className = { `${ classes . root } ${ classes . rootLight } ` }
52
52
style = { { backgroundColor : '#191919' , zIndex : 1 , borderTop : '2px solid grey' } }
53
+ onMouseOver = { ( ) => { console . log ( 'mouse over' ) ; props . setBottomShow ( true ) } }
53
54
>
54
55
< Box
55
56
display = "flex"
Original file line number Diff line number Diff line change @@ -72,9 +72,11 @@ const MainContainer = (props): JSX.Element => {
72
72
73
73
useEffect ( ( ) => {
74
74
const handleClick = ( event ) => {
75
+ console . log ( event . target )
76
+
75
77
if ( event . type === "click" &&
76
78
( bottomPanelRef . current &&
77
- ! bottomPanelRef . current . contains ( event . target ) ) || ( event . type === "message" && event . data === 'iframeClicked' ) ) {
79
+ ! bottomPanelRef . current . contains ( event . target ) && event . target . getAttribute ( "role" ) != "menu" && ! event . target . classList . contains ( 'MuiInput-input' ) ) || ( event . type === "message" && event . data === 'iframeClicked' ) ) {
78
80
//menuButtonRef is to ensure that handleClose does not get invoked when the user clicks on the menu dropdown button
79
81
handleClose ( ) ;
80
82
}
@@ -105,8 +107,8 @@ const MainContainer = (props): JSX.Element => {
105
107
< CanvasContainer isThemeLight = { props . isThemeLight } />
106
108
< DemoRender />
107
109
</ div >
108
- < div onMouseOver = { ( ) => setBottomShow ( true ) } className = { showPanel } ref = { ref } >
109
- < BottomPanel isThemeLight = { props . isThemeLight } />
110
+ < div className = { showPanel } ref = { ref } >
111
+ < BottomPanel setBottomShow = { setBottomShow } isThemeLight = { props . isThemeLight } />
110
112
</ div >
111
113
</ div >
112
114
) ;
Original file line number Diff line number Diff line change @@ -513,10 +513,10 @@ BOTTOM PANEL
513
513
.bottom-hide : focus-within {
514
514
max-height : 100% ;
515
515
}
516
-
516
+ /*
517
517
.bottom-hide:hover {
518
518
max-height: 100%;
519
- }
519
+ } */
520
520
521
521
.tab-content {
522
522
height : calc (100% - 76px );
@@ -528,10 +528,17 @@ BOTTOM PANEL
528
528
background-color : # 191919 ;
529
529
}
530
530
531
- .MuiDataGrid-menuList {
531
+ .MuiDataGrid-menuList , . MuiDataGrid-columnsPanel , . MuiDataGrid-filterForm {
532
532
533
533
background-color : # 333333
534
534
}
535
+ .MuiDataGrid-panelHeader , .MuiDataGrid-panelFooter {
536
+
537
+ background-color : # 252525
538
+
539
+ }
540
+
541
+
535
542
536
543
# resize-drag {
537
544
You can’t perform that action at this time.
0 commit comments