Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions lib/components/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = undefined;

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

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');
Expand Down Expand Up @@ -49,9 +51,9 @@ var _draftJsResizeablePlugin = require('draft-js-resizeable-plugin');

var _draftJsResizeablePlugin2 = _interopRequireDefault(_draftJsResizeablePlugin);

var _draftJsDndPlugin = require('draft-js-dnd-plugin');
var _draftJsDragNDropPlugin = require('draft-js-drag-n-drop-plugin');

var _draftJsDndPlugin2 = _interopRequireDefault(_draftJsDndPlugin);
var _draftJsDragNDropPlugin2 = _interopRequireDefault(_draftJsDragNDropPlugin);

require('draft-js-alignment-plugin/lib/plugin.css');

Expand Down Expand Up @@ -97,6 +99,8 @@ var _draftJsColorPickerPlugin = require('draft-js-color-picker-plugin');

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
Expand All @@ -119,7 +123,7 @@ var hashtagPlugin = (0, _draftJsHashtagPlugin2.default)();

var focusPlugin = (0, _draftJsFocusPlugin2.default)();
var resizeablePlugin = (0, _draftJsResizeablePlugin2.default)();
var dndPlugin = (0, _draftJsDndPlugin2.default)();
var dndPlugin = (0, _draftJsDragNDropPlugin2.default)();
var alignmentPlugin = (0, _draftJsAlignmentPlugin2.default)();
var AlignmentTool = alignmentPlugin.AlignmentTool;

Expand Down Expand Up @@ -233,14 +237,18 @@ var _default = function (_Component) {
value: function render() {
var _this2 = this;

var _props = this.props,
editorState = _props.editorState,
editorProps = _objectWithoutProperties(_props, ['editorState']);

return _react2.default.createElement(
'div',
null,
_react2.default.createElement(
'div',
{ className: 'editor' },
_react2.default.createElement(_draftJsPluginsEditor2.default, {
editorState: this.props.editorState,
_react2.default.createElement(_draftJsPluginsEditor2.default, _extends({}, editorProps, {
editorState: editorState,
onChange: this.onChange,
plugins: plugins,
customStyleMap: _draftJsColorPickerPlugin.colorStyleMap,
Expand All @@ -249,7 +257,7 @@ var _default = function (_Component) {
ref: function ref(element) {
_this2.editor = element;
}
}),
})),
_react2.default.createElement(AlignmentTool, null),
_react2.default.createElement(Toolbar, null),
_react2.default.createElement(Sidebar, null),
Expand Down
8 changes: 7 additions & 1 deletion src/components/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,17 @@ export default class extends Component {
}

render () {
const {
editorState,
...editorProps,
} = this.props;

return (
<div>
<div className='editor'>
<Editor
editorState={this.props.editorState}
{...editorProps}
editorState={editorState}
onChange={this.onChange}
plugins={plugins}
customStyleMap={colorStyleMap}
Expand Down