v 1.0.7

Author: kaivi

CHANGELOG.md

@@ -1,3 +1,11 @@
+1.0.7 / 2016-04-28
+==================
+
+* Merged PR [#16](https://github.com/kaivi/ReactInlineEdit/pull/16)
+  - Implement option to disable editing
+* Merged PR [#17](https://github.com/kaivi/ReactInlineEdit/pull/16)
+  - Update peer dependencies to allow React 15.x.x
+
 1.0.6 / 2016-01-25
 ==================
 

demo/index.js

@@ -148,10 +148,6 @@
 
 	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
 
-	Object.defineProperty(exports, "__esModule", {
-	    value: true
-	});
-
 	var _createClass = function () {
 	    function defineProperties(target, props) {
 	        for (var i = 0; i < props.length; i++) {
@@ -162,6 +158,10 @@
 	    };
 	}();
 
+	Object.defineProperty(exports, "__esModule", {
+	    value: true
+	});
+
 	var _react = __webpack_require__(2);
 
 	var _react2 = _interopRequireDefault(_react);
@@ -282,21 +282,21 @@
 	    }, {
 	        key: 'render',
 	        value: function render() {
-	            if (!this.state.editing) {
+	            if (this.props.isDisabled) {
+	                var Element = this.props.element || this.props.staticElement;
+	                return _react2.default.createElement(Element, {
+	                    className: this.props.className,
+	                    style: this.props.style }, this.state.text || this.props.placeholder);
+	            } else if (!this.state.editing) {
 	                var Element = this.props.element || this.props.staticElement;
 	                return _react2.default.createElement(Element, {
 	                    className: this.props.className,
 	                    onClick: this.startEditing,
 	                    tabIndex: this.props.tabIndex,
 	                    style: this.props.style }, this.state.text || this.props.placeholder);
 	            } else {
-<<<<<<< HEAD
-	                var _Element = this.props.element || this.props.editingElement;
-	                return _react2.default.createElement(_Element, {
-=======
 	                var Element = this.props.element || this.props.editingElement;
 	                return _react2.default.createElement(Element, {
->>>>>>> b141e64... Add stopPropagation option
 	                    onClick: this.clickWhenEditing,
 	                    onKeyDown: this.keyDown,
 	                    onBlur: this.finishEditing,
@@ -327,14 +327,16 @@
 	    style: _react2.default.PropTypes.object,
 	    editingElement: _react2.default.PropTypes.string,
 	    staticElement: _react2.default.PropTypes.string,
-	    tabIndex: _react2.default.PropTypes.number
+	    tabIndex: _react2.default.PropTypes.number,
+	    isDisabled: _react2.default.PropTypes.bool
 	};
 	InlineEdit.defaultProps = {
 	    minLength: 1,
 	    maxLength: 256,
 	    editingElement: 'input',
 	    staticElement: 'span',
-	    tabIndex: 0
+	    tabIndex: 0,
+	    isDisabled: false
 	};
 	exports.default = InlineEdit;
 

index.js

@@ -1,11 +1,11 @@
 'use strict';
 
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -122,9 +122,9 @@ var InlineEdit = function (_React$Component) {
                     this.state.text || this.props.placeholder
                 );
             } else if (!this.state.editing) {
-                var _Element = this.props.element || this.props.staticElement;
+                var Element = this.props.element || this.props.staticElement;
                 return _react2.default.createElement(
-                    _Element,
+                    Element,
                     {
                         className: this.props.className,
                         onClick: this.startEditing,
@@ -133,8 +133,8 @@ var InlineEdit = function (_React$Component) {
                     this.state.text || this.props.placeholder
                 );
             } else {
-                var _Element2 = this.props.element || this.props.editingElement;
-                return _react2.default.createElement(_Element2, {
+                var Element = this.props.element || this.props.editingElement;
+                return _react2.default.createElement(Element, {
                     onClick: this.clickWhenEditing,
                     onKeyDown: this.keyDown,
                     onBlur: this.finishEditing,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-edit-inline",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A simple inline text editor for React with ECMAScript 6 + JSX Harmony syntax",
   "main": "index.js",
   "scripts": {