react-grid-layout
Advanced tools
Comparing version 0.10.6 to 0.10.7
@@ -411,4 +411,2 @@ 'use strict'; | ||
var h = _props8.h; | ||
var className = _props8.className; | ||
var style = _props8.style; | ||
var isDraggable = _props8.isDraggable; | ||
@@ -427,5 +425,5 @@ var isPlaceholder = _props8.isPlaceholder; | ||
// React with merge the classNames. | ||
className: ['react-grid-item', className, isDraggable || isPlaceholder ? '' : 'static', this.state.resizing ? 'resizing' : '', this.state.dragging ? 'react-draggable-dragging' : '', useCSSTransforms ? 'cssTransforms' : ''].join(' '), | ||
className: ['react-grid-item', child.props.className || '', this.props.className, isDraggable || isPlaceholder ? '' : 'static', this.state.resizing ? 'resizing' : '', this.state.dragging ? 'react-draggable-dragging' : '', useCSSTransforms ? 'cssTransforms' : ''].join(' '), | ||
// We can set the width and height on the child, but unfortunately we can't set the position. | ||
style: _extends({ style: style }, this.createStyle(pos)) | ||
style: _extends({}, this.props.style, child.props.style, this.createStyle(pos)) | ||
}); | ||
@@ -432,0 +430,0 @@ |
@@ -98,3 +98,3 @@ 'use strict'; | ||
if (!this.props.autoSize) return; | ||
return (0, _utils.bottom)(this.state.layout) * (this.props.rowHeight + this.props.margin[1]) + 'px'; | ||
return (0, _utils.bottom)(this.state.layout) * (this.props.rowHeight + this.props.margin[1]) + this.props.margin[1] + 'px'; | ||
} | ||
@@ -101,0 +101,0 @@ |
@@ -0,1 +1,7 @@ | ||
0.10.7 | ||
------ | ||
- Bugfix: `className` and `style` props on grid children were being incorrectly dropped, a holdover | ||
from when `cloneWithProps()` used to do this merging for us. They are now merged. | ||
0.10.6 | ||
@@ -2,0 +8,0 @@ ------ |
{ | ||
"name": "react-grid-layout", | ||
"version": "0.10.6", | ||
"version": "0.10.7", | ||
"description": "A draggable and resizable grid layout with responsive breakpoints, for React.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
98093
1743