From 223ee785eb35d793c976c7b6d43b1b63c05a4b90 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 9 Jun 2018 15:01:26 +0200 Subject: [PATCH] some bug fixes for z ordering and widget dimensions in editing mode --- src/containers/widget.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/containers/widget.js b/src/containers/widget.js index 37c7b8e..bdb7761 100644 --- a/src/containers/widget.js +++ b/src/containers/widget.js @@ -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 = } + 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} > - + {element} ); } else { return ( -
+
{element}
);