Skip to content

Feat: #11304 Improve the layout of the timeline plugin by putting widgets tray in footer #11844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allyoucanmap merged 4 commits into from
Jan 5, 2026
+26 −13
Merged

Feat: #11304 Improve the layout of the timeline plugin by putting widgets tray in footer #11844

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c34ae3
Move the widgets tray to footer
subashtiwari1010 Jan 5, 2026
953e8f6
Merge branch 'master' of github.com:geosolutions-it/MapStore2 into fi…
subashtiwari1010 Jan 5, 2026
7c2993d
Update the localconfig and add createPlugin in widget tray plugin
subashtiwari1010 Jan 5, 2026
c2bb353
Update the local config and fix the widget collapse button issue in m…
subashtiwari1010 Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions web/client/configs/localConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,12 @@
},
"FeedbackMask",
{ "name": "Widgets" },
{ "name": "WidgetsTray" }
{
"name": "WidgetsTray",
"cfg": {
"containerPosition": "footer"
}
}
Copy link
Contributor

@allyoucanmap allyoucanmap Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please check how this is rendered on mobile? We don't have map footer on mobile, I wondering how this behave

Copy link
Contributor Author

@subashtiwari1010 subashtiwari1010 Jan 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this, the widget tray is rendered, but it is not displayed properly. So, condition have been added to display the widget collapse button in same place when in mobile view.
image

],
"desktop": [
"Details",
Expand Down Expand Up @@ -654,7 +659,12 @@
{
"name": "Widgets"
},
"WidgetsTray",
{
"name": "WidgetsTray",
"cfg": {
"containerPosition": "footer"
}
},
{
"name": "Timeline",
"cfg": {
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/MousePosition.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export default {
MousePositionPlugin: Object.assign(MousePositionPlugin, {
MapFooter: {
name: 'mousePosition',
position: 2,
position: 3,
target: 'right-footer',
priority: 1
}
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/ScaleBox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default {
}, {
MapFooter: {
name: 'scale',
position: 1,
position: 2,
target: 'right-footer',
priority: 1
}
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/Widgets.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ compose(
useDefaultWidthProvider: false,
style: {
left: leftOffset + 'px',
bottom: 35 + backgroundSelectorOffset,
bottom: 6 + backgroundSelectorOffset,
height: baseHeight,
width: viewWidth + 'px',
position: 'absolute',
Expand Down
9 changes: 8 additions & 1 deletion web/client/plugins/WidgetsTray.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ import epics from '../epics/widgetsTray';
* @class
*/
export default {
WidgetsTrayPlugin: autoDisableWidgets(WidgetsTray),
WidgetsTrayPlugin: Object.assign(autoDisableWidgets(WidgetsTray), {
MapFooter: {
name: 'widgetsTray',
position: 1,
target: 'right-footer',
priority: 1
}
}),
epics
};
14 changes: 4 additions & 10 deletions web/client/plugins/widgets/WidgetsTray.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,9 @@ class WidgetsTray extends React.Component {
};
render() {
return this.props.enabled
? (<div className="widgets-tray"
style={{
marginBottom: this.props.isMobileAgent && !this.props.is3DMap ? 60 : 2,
marginRight: (this.props.layout?.right ?? 0) + 65,
bottom: 0,
right: 0,
position: "absolute"
}}>
? (<div className="widgets-tray">
<BorderLayout
style={{ width: 'auto' }}
columns={[
...( !this.props.isSingleWidgetLayout
? [<CollapseTrayButton key="collapse-tray" toolsOptions={this.props.toolsOptions} expanded={this.props.expanded} onClick={() => this.props.setExpanded(!this.props.expanded)} />]
Expand Down Expand Up @@ -137,9 +131,9 @@ export default compose(
hasCollapsedWidgets: widgets.filter(({ collapsed } = {}) => collapsed).length > 0,
hasTrayWidgets: widgets.length > 0
})),
withProps(({ isMobileAgent, width, singleWidgetLayoutBreakpoint = 1024 }) => {
withProps(({ isMobileAgent }) => {
return {
isSingleWidgetLayout: isMobileAgent || width <= singleWidgetLayoutBreakpoint
isSingleWidgetLayout: isMobileAgent
};
}),
// flag of plugin presence
Expand Down
6 changes: 4 additions & 2 deletions web/client/themes/default/less/widget.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,7 @@
}

.widgets-tray {
.shadow-soft;
padding: 4px;
z-index: 1000;
.widgets-bar {
> span {
button.btn {
Expand All @@ -511,6 +509,10 @@
border-right: 1px solid @ms-main-border-color;
}
}
.ms2-border-layout-body,
.ms2-border-layout-content {
flex: none !important;
}
}

.mapstore-chart-advance-options {
Expand Down