Update to match method signature changes in draft-js v0.10.1

<draft-js-plugins/draft-js-plugins#736>
icelab · Jun 18, 2017 · 221a0ab · 221a0ab
1 parent 99e69f9
commit 221a0ab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -97,17 +97,14 @@ function autoListPlugin() {
      * Means that lists act as you’d expect while typing.
      *
      * @param  {KeyboardEvent} e Synthetic keyboard event from draftjs
-     * @param  {Function} options.getEditorState Getter function passed by
-     * the draft-js-plugin-editor
+     * @param  {Object} editorState Current editor state
      * @param  {Function} options.setEditorState Setter function passed by
      * the draft-js-plugin-editor
-     * @return {Boolean} Did we handle the return or not?
+     * @return {String} Did we handle the return or not?
      */
-    handleReturn: function handleReturn(e, _ref) {
-      var getEditorState = _ref.getEditorState;
+    handleReturn: function handleReturn(e, editorState, _ref) {
       var setEditorState = _ref.setEditorState;
 
-      var editorState = getEditorState();
       var content = editorState.getCurrentContent();
 
       // Retrieve current block
@@ -131,13 +128,13 @@ function autoListPlugin() {
 
     /**
      * Handle our custom `commands`
-     * @param  {[type]} command                [description]
-     * @param  {[type]} options.getEditorState [description]
-     * @param  {[type]} options.setEditorState [description]
-     * @return {[type]}                        [description]
+     * @param  {String} command The current command to respond to
+     * @param  {Object} editorState Current editor state
+     * @param  {Function} options.setEditorState Setter function passed by
+     * the draft-js-plugin-editor
+     * @return {String} Did we handle the return or not?
      */
-    handleKeyCommand: function handleKeyCommand(command, _ref2) {
-      var getEditorState = _ref2.getEditorState;
+    handleKeyCommand: function handleKeyCommand(command, editorState, _ref2) {
       var setEditorState = _ref2.setEditorState;
 
       if (command === commands.UL || command === commands.OL) {
@@ -153,7 +150,6 @@ function autoListPlugin() {
           };
         }
 
-        var editorState = getEditorState();
         var content = editorState.getCurrentContent();
 
         // Retrieve the focused block

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/icelab/draft-js-autolist-plugin",
   "peerDependencies": {
-    "draft-js": ">=0.5.0"
+    "draft-js": ">=0.10.1"
   },
   "devDependencies": {
     "babel-cli": "6.7.5",

diff --git a/src/index.js b/src/index.js
@@ -84,14 +84,12 @@ function autoListPlugin () {
      * Means that lists act as you’d expect while typing.
      *
      * @param  {KeyboardEvent} e Synthetic keyboard event from draftjs
-     * @param  {Function} options.getEditorState Getter function passed by
-     * the draft-js-plugin-editor
+     * @param  {Object} editorState Current editor state
      * @param  {Function} options.setEditorState Setter function passed by
      * the draft-js-plugin-editor
-     * @return {Boolean} Did we handle the return or not?
+     * @return {String} Did we handle the return or not?
      */
-    handleReturn (e, { getEditorState, setEditorState }) {
-      let editorState = getEditorState()
+    handleReturn (e, editorState, { setEditorState }) {
       let content = editorState.getCurrentContent()
 
       // Retrieve current block
@@ -114,12 +112,13 @@ function autoListPlugin () {
 
     /**
      * Handle our custom `commands`
-     * @param  {[type]} command                [description]
-     * @param  {[type]} options.getEditorState [description]
-     * @param  {[type]} options.setEditorState [description]
-     * @return {[type]}                        [description]
+     * @param  {String} command The current command to respond to
+     * @param  {Object} editorState Current editor state
+     * @param  {Function} options.setEditorState Setter function passed by
+     * the draft-js-plugin-editor
+     * @return {String} Did we handle the return or not?
      */
-    handleKeyCommand (command, { getEditorState, setEditorState }) {
+    handleKeyCommand (command, editorState, { setEditorState }) {
       if (command === commands.UL || command === commands.OL) {
         // Set up the base types/checks
         let listType = blockTypes.UL
@@ -129,7 +128,6 @@ function autoListPlugin () {
           listTest = (text) => OL_INTERCEPT_REGEX.test(text)
         }
 
-        let editorState = getEditorState()
         let content = editorState.getCurrentContent()
 
         // Retrieve the focused block