File tree Expand file tree Collapse file tree 5 files changed +26
-13
lines changed
Expand file tree Collapse file tree 5 files changed +26
-13
lines changed Original file line number Diff line number Diff line change @@ -146,7 +146,7 @@ export default {
146146 MousePositionPlugin : Object . assign ( MousePositionPlugin , {
147147 MapFooter : {
148148 name : 'mousePosition' ,
149- position : 2 ,
149+ position : 3 ,
150150 target : 'right-footer' ,
151151 priority : 1
152152 }
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ export default {
6060 } , {
6161 MapFooter : {
6262 name : 'scale' ,
63- position : 1 ,
63+ position : 2 ,
6464 target : 'right-footer' ,
6565 priority : 1
6666 }
Original file line number Diff line number Diff line change 1010import WidgetsTray from './widgets/WidgetsTray' ;
1111import autoDisableWidgets from './widgets/autoDisableWidgets' ;
1212import epics from '../epics/widgetsTray' ;
13+ import { createPlugin } from '../utils/PluginsUtils' ;
1314
1415/**
1516 * Plugin that allow to collapse widgets. Shows a small tray where to see the collapsed plugins list.
@@ -18,7 +19,15 @@ import epics from '../epics/widgetsTray';
1819 * @prop {boolean|string|array } [toolsOptions.seeHidden] hides the widgets under particular conditions. **Must** be the same of rule of the Widget plugin. @see plugins.Widgets.
1920 * @class
2021 */
21- export default {
22- WidgetsTrayPlugin : autoDisableWidgets ( WidgetsTray ) ,
22+ export default createPlugin ( "WidgetsTrayPlugin" , {
23+ component : autoDisableWidgets ( WidgetsTray ) ,
24+ containers : {
25+ MapFooter : {
26+ name : 'widgetsTray' ,
27+ position : 1 ,
28+ target : 'right-footer' ,
29+ priority : 1
30+ }
31+ } ,
2332 epics
24- } ;
33+ } ) ;
Original file line number Diff line number Diff line change @@ -96,14 +96,16 @@ class WidgetsTray extends React.Component {
9696 render ( ) {
9797 return this . props . enabled
9898 ? ( < div className = "widgets-tray"
99- style = { {
100- marginBottom : this . props . isMobileAgent && ! this . props . is3DMap ? 60 : 2 ,
99+ style = { this . props . isMobileAgent ? {
100+ marginBottom : ! this . props . is3DMap ? 60 : 2 ,
101101 marginRight : ( this . props . layout ?. right ?? 0 ) + 65 ,
102102 bottom : 0 ,
103103 right : 0 ,
104- position : "absolute"
105- } } >
104+ position : "absolute" ,
105+ zIndex : 1000
106+ } : { } } >
106107 < BorderLayout
108+ style = { { width : 'auto' } }
107109 columns = { [
108110 ...( ! this . props . isSingleWidgetLayout
109111 ? [ < CollapseTrayButton key = "collapse-tray" toolsOptions = { this . props . toolsOptions } expanded = { this . props . expanded } onClick = { ( ) => this . props . setExpanded ( ! this . props . expanded ) } /> ]
@@ -137,9 +139,9 @@ export default compose(
137139 hasCollapsedWidgets : widgets . filter ( ( { collapsed } = { } ) => collapsed ) . length > 0 ,
138140 hasTrayWidgets : widgets . length > 0
139141 } ) ) ,
140- withProps ( ( { isMobileAgent, width , singleWidgetLayoutBreakpoint = 1024 } ) => {
142+ withProps ( ( { isMobileAgent } ) => {
141143 return {
142- isSingleWidgetLayout : isMobileAgent || width <= singleWidgetLayoutBreakpoint
144+ isSingleWidgetLayout : isMobileAgent
143145 } ;
144146 } ) ,
145147 // flag of plugin presence
Original file line number Diff line number Diff line change 478478}
479479
480480.widgets-tray {
481- .shadow-soft ;
482481 padding : 4px ;
483- z-index : 1000 ;
484482 .widgets-bar {
485483 > span {
486484 button .btn {
493491 border-right : 1px solid @ms-main-border-color ;
494492 }
495493 }
494+ .ms2-border-layout-body ,
495+ .ms2-border-layout-content {
496+ flex : none !important ;
497+ }
496498}
497499
498500.mapstore-chart-advance-options {
You can’t perform that action at this time.
0 commit comments