v 3.0.14: support for custom data attributes in Reflex components

leefsmp · Jun 17, 2019 · fd4bf24 · fd4bf24
1 parent 58b7914
commit fd4bf24
Show file tree

Hide file tree

Showing 17 changed files with 336 additions and 296 deletions.
diff --git a/dist/commonjs/ReflexContainer.js b/dist/commonjs/ReflexContainer.js
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -681,7 +683,7 @@ function (_React$Component) {
     value: function render() {
       var _this5 = this;
 
-      var className = [this.state.resizing ? 'reflex-resizing' : ''].concat((0, _toConsumableArray2.default)(this.props.className.split(' ')), [this.props.orientation, 'reflex-container']).join(' ');
+      var className = [this.state.resizing ? 'reflex-resizing' : ''].concat((0, _toConsumableArray2.default)(this.props.className.split(' ')), [this.props.orientation, 'reflex-container']).join(' ').trim();
       this.children = _react.default.Children.map(this.getValidChildren(), function (child, index) {
         if (index > _this5.state.flexData.length - 1) {
           return _react.default.createElement("div", null);
@@ -699,10 +701,9 @@ function (_React$Component) {
         });
         return _react.default.cloneElement(child, newProps);
       });
-      return _react.default.createElement("div", {
-        className: className,
-        style: this.props.style
-      }, this.children);
+      return _react.default.createElement("div", (0, _extends2.default)({}, this.props, {
+        className: className
+      }), this.children);
     }
   }]);
   return ReflexContainer;

diff --git a/dist/commonjs/ReflexElement.js b/dist/commonjs/ReflexElement.js
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -319,14 +321,14 @@ function (_React$Component2) {
   }, {
     key: "render",
     value: function render() {
-      var className = (0, _toConsumableArray2.default)(this.props.className.split(' ')).concat([this.props.orientation, 'reflex-element']).join(' ');
+      var className = (0, _toConsumableArray2.default)(this.props.className.split(' ')).concat([this.props.orientation, 'reflex-element']).join(' ').trim();
       var style = (0, _objectSpread2.default)({}, this.props.style, {
         flex: this.props.flex
       });
-      return _react.default.createElement("div", {
+      return _react.default.createElement("div", (0, _extends2.default)({}, this.props, {
         className: className,
         style: style
-      }, this.props.propagateDimensions ? _react.default.createElement(SizeAwareReflexElement, this.props) : this.renderChildren());
+      }), this.props.propagateDimensions ? _react.default.createElement(SizeAwareReflexElement, this.props) : this.renderChildren());
     }
   }]);
   return ReflexElement;

diff --git a/dist/commonjs/ReflexHandle.js b/dist/commonjs/ReflexHandle.js
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -184,14 +186,13 @@ function (_React$Component) {
     //
     /////////////////////////////////////////////////////////
     value: function render() {
-      var className = (0, _toConsumableArray2.default)(this.props.className.split(' ')).concat([this.state.active ? 'active' : '', 'reflex-handle']).join(' ');
-      return _react.default.createElement("div", {
+      var className = (0, _toConsumableArray2.default)(this.props.className.split(' ')).concat([this.state.active ? 'active' : '', 'reflex-handle']).join(' ').trim();
+      return _react.default.createElement("div", (0, _extends2.default)({}, this.props, {
         onTouchStart: this.onMouseDown,
         onMouseDown: this.onMouseDown,
-        style: this.props.style,
         className: className,
         id: this.props.id
-      }, this.props.children);
+      }), this.props.children);
     }
   }]);
   return ReflexHandle;

diff --git a/dist/commonjs/ReflexSplitter.js b/dist/commonjs/ReflexSplitter.js
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -186,14 +188,13 @@ function (_React$Component) {
     //
     /////////////////////////////////////////////////////////
     value: function render() {
-      var className = [_Browser.default.isMobile() ? 'reflex-thin' : ''].concat((0, _toConsumableArray2.default)(this.props.className.split(' ')), [this.state.active ? 'active' : '', 'reflex-splitter']).join(' ');
-      return _react.default.createElement("div", {
+      var className = [_Browser.default.isMobile() ? 'reflex-thin' : ''].concat((0, _toConsumableArray2.default)(this.props.className.split(' ')), [this.state.active ? 'active' : '', 'reflex-splitter']).join(' ').trim();
+      return _react.default.createElement("div", (0, _extends2.default)({}, this.props, {
         onTouchStart: this.onMouseDown,
         onMouseDown: this.onMouseDown,
-        style: this.props.style,
         className: className,
         id: this.props.id
-      }, this.props.children);
+      }), this.props.children);
     }
   }]);
   return ReflexSplitter;