Merge pull request #188 from scniro/elsigh

Adds options to constructor, fixes #100

Author: elsigh

.ts/index.js

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

index.js

@@ -510,12 +510,12 @@ export class Controlled extends React.Component<IControlledCodeMirror, any> {
       }
     }
 
-    this.editor = cm(this.ref) as codemirror.Editor;
+    this.editor = cm(this.ref, this.props.options) as codemirror.Editor;
 
     this.shared = new Shared(this.editor, this.props);
 
     this.mirror = (cm as any)(() => {
-    });
+    }, this.props.options);
 
     this.editor.on('electricInput', () => {
       this.mirror.setHistory(this.editor.getDoc().getHistory());
@@ -713,7 +713,7 @@ export class UnControlled extends React.Component<IUnControlledCodeMirror, any>
       }
     }
 
-    this.editor = cm(this.ref) as codemirror.Editor;
+    this.editor = cm(this.ref, this.props.options) as codemirror.Editor;
 
     this.shared = new Shared(this.editor, this.props);
 

package.json

@@ -59,6 +59,29 @@ describe('[Controlled, UnControlled]: init', () => {
     expect(cUnmounted).toBeTruthy();
   });
 
+  // refs https://github.com/scniro/react-codemirror2/issues/100
+  // prior to 7115754851dde1e1ae90be9f1c1a5e46faecc016 would throw
+  it('should allow inputStyle to be set (uses the constructor)', () => {
+    let inputStyle = 'contenteditable' as const;
+    const options = {inputStyle};
+    Enzyme.shallow(
+      <UnControlled
+        options={options}
+        editorDidMount={(editor, value, next) => {
+          expect(editor.getInputField().tagName).toBe('DIV');
+        }}
+      />);
+    Enzyme.shallow(
+      <Controlled
+        value=""
+        options={options}
+        onBeforeChange={sinon.spy}
+        editorDidMount={(editor, value, next) => {
+          expect(editor.getInputField().tagName).toBe('DIV');
+        }}
+      />);
+  });
+
   it('should append a class name', () => {
 
     const uWrapper = Enzyme.mount(