#75

Author: scniro

CHANGELOG.md

@@ -1,3 +1,7 @@
+5.0.0
+==================
+* #75 - remove `autoFocus` in favor of codemirror.options.autofocus
+
 4.3.0
 ==================
 * #74 => add support for more DOM events => onContextMenu | onCopy | onCut | onDblClick | onDragLeave | onDragStart | onMouseDown | onPaste | onTouchStart

README.md

@@ -71,8 +71,7 @@ require('codemirror/mode/javascript/javascript');
 
 | prop         | type *`default`*  | components                        | description                                                                                                           |
 |--------------|------------------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------|
-| `autoCursor` | boolean *`true`*  | `Controlled` `UnControlled`  | should component cursor position correct when `value` changed                                                         |
-| `autoFocus`  | boolean *`false`* | `Controlled` `UnControlled`  | should component focus on mount                                                                                       |
+| `autoCursor` | boolean *`true`*  | `Controlled` `UnControlled`  | should component cursor position correct when `value` changed                                                         |                                                                                   |
 | `autoScroll` | boolean *`true`*  | `Controlled` `UnControlled`  | should component scroll cursor position into view when `value` changed                                                |
 | `className`  | string                 | `Controlled` `UnControlled`  | pass through class *`class="react-codemirror2 className"`*                                                            |
 | `defineMode` | object                 | `Controlled` `UnControlled`  | pass a [custom mode](http://marijnhaverbeke.nl/blog/codemirror-mode-system.html) via `{name: 'custom', fn: myModeFn}` |

docs/app.min.js

@@ -1,6 +1,6 @@
 {
   "name": "react-codemirror2",
-  "version": "4.3.0",
+  "version": "5.0.0",
   "description": "a tiny react codemirror component wrapper",
   "main": "index.js",
   "typings": "index.d.ts",

index.d.ts

@@ -50,7 +50,6 @@ export interface DomEvent {
 
 export interface ICodeMirror {
   autoCursor?: boolean; // default: true
-  autoFocus?: boolean; // default: false
   autoScroll?: boolean; // default: false
   className?: string;
   cursor?: codemirror.Position;
@@ -165,7 +164,7 @@ class Shared implements ICommon {
 
     // init cursor
     if (props && props.cursor) {
-      this.delegateCursor(props.cursor, (props.autoScroll || false), (props.autoFocus || false));
+      this.delegateCursor(props.cursor, (props.autoScroll || false), (this.editor.getOption('autofocus') || false));
     }
 
     // init scroll
@@ -200,7 +199,7 @@ class Shared implements ICommon {
 
   public applyUserDefined(props: IControlledCodeMirror | IUnControlledCodeMirror, preserved?: any) {
     if (preserved && preserved.cursor) {
-      this.delegateCursor(preserved.cursor, (props.autoScroll || false), (props.autoFocus || false));
+      this.delegateCursor(preserved.cursor, (props.autoScroll || false), (this.editor.getOption('autofocus') || false));
     }
   }
 
@@ -562,6 +561,10 @@ export class Controlled extends React.Component<IControlledCodeMirror, any> {
 
     this.shared.wire(this.props);
 
+    if (this.editor.getOption('autofocus')) {
+      this.editor.focus();
+    }
+
     if (this.props.editorDidMount) {
       this.props.editorDidMount(this.editor, this.editor.getValue(), this.initCb);
     }

index.js

@@ -853,38 +853,6 @@ describe('Props', () => {
   // </value>
 
   // <misc>
-  it('[Controlled]: autoFocus', () => {
-    let wrapper = Enzyme.mount(
-      <Controlled
-        value='foo'
-        autoFocus={true}
-        cursor={{
-          line: 0,
-          ch: 3
-        }}/>
-    );
-
-    let editor = wrapper.instance().editor;
-
-    expect(editor.state.focused).toBeTruthy();
-  });
-
-  it('[UnControlled]: autoFocus', () => {
-    let wrapper = Enzyme.mount(
-      <UnControlled
-        value='foo'
-        autoFocus={true}
-        cursor={{
-          line: 0,
-          ch: 3
-        }}/>
-    );
-
-    let editor = wrapper.instance().editor;
-
-    expect(editor.state.focused).toBeTruthy();
-  });
-
   it('[UnControlled]: detached | should detach', () => {
     const spy = sinon.spy();
     const wrapper = Enzyme.mount(