Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

some bug fixes for z ordering and widget dimensions in editing mode

Browse source
This commit is contained in:
Steffen Vogel 2018-06-09 15:01:26 +02:00
parent 2e849c6cf6
commit 223ee785eb
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/containers/widget.js
View file

@ -190,6 +190,7 @@ class Widget extends React.Component {
const widget = this.props.data;
let borderedWidget = false;
let element = null;
let zIndex = Number(widget.z);
let simulationModel = null;
@ -232,6 +233,9 @@ class Widget extends React.Component {
element = <WidgetTopology widget={widget} files={this.state.files} />
}
if (widget.type === 'Box')
zIndex = 0;
const widgetClasses = classNames({
'widget': !this.props.editing,
'editing-widget': this.props.editing,
@ -258,18 +262,25 @@ class Widget extends React.Component {
onDragStop={(event, data) => this.dragStop(event, data)}
dragGrid={grid}
resizeGrid={grid}
zIndex={widget.z}
z={zIndex}
enableResizing={resizing}
disableDragging={widget.locked}
>
<ContextMenuProvider id={'widgetMenu' + this.props.index}>
<ContextMenuProvider className={'full'} id={'widgetMenu' + this.props.index}>
{element}
</ContextMenuProvider>
</Rnd>
);
} else {
return (
<div className={ widgetClasses } style={{ width: Number(widget.width), height: Number(widget.height), left: Number(widget.x), top: Number(widget.y), 'zIndex': Number(widget.z), position: 'absolute' }}>
<div
className={ widgetClasses }
style={{
width: Number(widget.width), height: Number(widget.height),
left: Number(widget.x), top: Number(widget.y),
zIndex: zIndex,
position: 'absolute'
}}>
{element}
</div>
);