Merge pull request JedWatson#27 from JodusNodus/master

Allow interaction with codemirror object from parent.

Author: JedWatson

dist/react-codemirror.js

@@ -64,7 +64,7 @@
 elseif(typeofdefine=="function"&&define.amd)// AMD
 returndefine([],mod);
 else// Plain browser env
-this.CodeMirror=mod();
+(this||window).CodeMirror=mod();
 })(function(){
 "use strict";
 
@@ -874,7 +874,7 @@
 // given line.
 functionupdateWidgetHeight(line){
 if(line.widgets)for(vari=0;i<line.widgets.length;++i)
-line.widgets[i].height=line.widgets[i].node.offsetHeight;
+line.widgets[i].height=line.widgets[i].node.parentNode.offsetHeight;
 }
 
 // Do a bulk-read of the DOM positions and sizes needed to draw the
@@ -1145,10 +1145,6 @@
 if(!cm.state.focused){cm.display.input.focus();onFocus(cm);}
 }
 
-functionisReadOnly(cm){
-returncm.options.readOnly||cm.doc.cantEdit;
-}
-
 // This will be set to an array of strings when copying, so that,
 // when pasting, we know what kind of selections the copied text
 // was made out of.
@@ -1203,7 +1199,7 @@
 varpasted=e.clipboardData&&e.clipboardData.getData("text/plain");
 if(pasted){
 e.preventDefault();
-if(!isReadOnly(cm)&&!cm.options.disableInput)
+if(!cm.isReadOnly()&&!cm.options.disableInput)
 runInOp(cm,function(){applyTextInput(cm,pasted,0,null,"paste");});
 returntrue;
 }
@@ -1306,7 +1302,7 @@
 });
 
 on(te,"paste",function(e){
-if(handlePaste(e,cm))returntrue;
+if(signalDOMEvent(cm,e)||handlePaste(e,cm))return
 
 cm.state.pasteIncoming=true;
 input.fastPoll();
@@ -1340,7 +1336,7 @@
 on(te,"copy",prepareCopyCut);
 
 on(display.scroller,"paste",function(e){
-if(eventInWidget(display,e))return;
+if(eventInWidget(display,e)||signalDOMEvent(cm,e))return;
 cm.state.pasteIncoming=true;
 input.focus();
 });
@@ -1474,7 +1470,7 @@
 // in which case reading its value would be expensive.
 if(this.contextMenuPending||!cm.state.focused||
 (hasSelection(input)&&!prevInput&&!this.composing)||
-isReadOnly(cm)||cm.options.disableInput||cm.state.keySeq)
+cm.isReadOnly()||cm.options.disableInput||cm.state.keySeq)
 returnfalse;
 
 vartext=input.value;
@@ -1625,7 +1621,9 @@
 vardiv=input.div=display.lineDiv;
 disableBrowserMagic(div);
 
-on(div,"paste",function(e){handlePaste(e,cm);})
+on(div,"paste",function(e){
+if(!signalDOMEvent(cm,e))handlePaste(e,cm);
+})
 
 on(div,"compositionstart",function(e){
 vardata=e.data;
@@ -1663,7 +1661,7 @@
 
 on(div,"input",function(){
 if(input.composing)return;
-if(isReadOnly(cm)||!input.pollContent())
+if(cm.isReadOnly()||!input.pollContent())
 runInOp(input.cm,function(){regChange(cm);});
 });
 
@@ -1743,8 +1741,13 @@
 try{varrng=range(start.node,start.offset,end.offset,end.node);}
 catch(e){}// Our model of the DOM might be outdated, in which case the range we try to set can be impossible
 if(rng){
-sel.removeAllRanges();
-sel.addRange(rng);
+if(!gecko&&this.cm.state.focused){
+sel.collapse(start.node,start.offset);
+if(!rng.collapsed)sel.addRange(rng);
+}else{
+sel.removeAllRanges();
+sel.addRange(rng);
+}
 if(old&&sel.anchorNode==null)sel.addRange(old);
 elseif(gecko)this.startGracePeriod();
 }
@@ -1888,7 +1891,7 @@
 this.div.focus();
 },
 applyComposition: function(composing){
-if(isReadOnly(this.cm))
+if(this.cm.isReadOnly())
 operation(this.cm,regChange)(this.cm)
 elseif(composing.data&&composing.data!=composing.startData)
 operation(this.cm,applyTextInput)(this.cm,composing.data,0,composing.sel);
@@ -1900,7 +1903,7 @@
 
 onKeyPress: function(e){
 e.preventDefault();
-if(!isReadOnly(this.cm))
+if(!this.cm.isReadOnly())
 operation(this.cm,applyTextInput)(this.cm,String.fromCharCode(e.charCode==null ? e.keyCode : e.charCode),0);
 },
 
@@ -2205,15 +2208,16 @@
 
 // Give beforeSelectionChange handlers a change to influence a
 // selection update.
-functionfilterSelectionChange(doc,sel){
+functionfilterSelectionChange(doc,sel,options){
 varobj={
 ranges: sel.ranges,
 update: function(ranges){
 this.ranges=[];
 for(vari=0;i<ranges.length;i++)
 this.ranges[i]=newRange(clipPos(doc,ranges[i].anchor),
 clipPos(doc,ranges[i].head));
-}
+},
+origin: options&&options.origin
 };
 signal(doc,"beforeSelectionChange",doc,obj);
 if(doc.cm)signal(doc.cm,"beforeSelectionChange",doc.cm,obj);
@@ -2239,7 +2243,7 @@
 
 functionsetSelectionNoUndo(doc,sel,options){
 if(hasHandler(doc,"beforeSelectionChange")||doc.cm&&hasHandler(doc.cm,"beforeSelectionChange"))
-sel=filterSelectionChange(doc,sel);
+sel=filterSelectionChange(doc,sel,options);
 
 varbias=options&&options.bias||
 (cmp(sel.primary().head,doc.sel.primary().head)<0 ? -1 : 1);
@@ -2273,8 +2277,9 @@
 varout;
 for(vari=0;i<sel.ranges.length;i++){
 varrange=sel.ranges[i];
-varnewAnchor=skipAtomic(doc,range.anchor,bias,mayClear);
-varnewHead=skipAtomic(doc,range.head,bias,mayClear);
+varold=sel.ranges.length==doc.sel.ranges.length&&doc.sel.ranges[i];
+varnewAnchor=skipAtomic(doc,range.anchor,old&&old.anchor,bias,mayClear);
+varnewHead=skipAtomic(doc,range.head,old&&old.head,bias,mayClear);
 if(out||newAnchor!=range.anchor||newHead!=range.head){
 if(!out)out=sel.ranges.slice(0,i);
 out[i]=newRange(newAnchor,newHead);
@@ -2283,54 +2288,59 @@
 returnout ? normalizeSelection(out,sel.primIndex) : sel;
 }
 
-// Ensure a given position is not inside an atomic range.
-functionskipAtomic(doc,pos,bias,mayClear){
-varflipped=false,curPos=pos;
-vardir=bias||1;
-doc.cantEdit=false;
- search: for(;;){
-varline=getLine(doc,curPos.line);
-if(line.markedSpans){
-for(vari=0;i<line.markedSpans.length;++i){
-varsp=line.markedSpans[i],m=sp.marker;
-if((sp.from==null||(m.inclusiveLeft ? sp.from<=curPos.ch : sp.from<curPos.ch))&&
-(sp.to==null||(m.inclusiveRight ? sp.to>=curPos.ch : sp.to>curPos.ch))){
-if(mayClear){
-signal(m,"beforeCursorEnter");
-if(m.explicitlyCleared){
-if(!line.markedSpans)break;
-else{--i;continue;}
-}
-}
-if(!m.atomic)continue;
-varnewPos=m.find(dir<0 ? -1 : 1);
-if(cmp(newPos,curPos)==0){
-newPos.ch+=dir;
-if(newPos.ch<0){
-if(newPos.line>doc.first)newPos=clipPos(doc,Pos(newPos.line-1));
-elsenewPos=null;
-}elseif(newPos.ch>line.text.length){
-if(newPos.line<doc.first+doc.size-1)newPos=Pos(newPos.line+1,0);
-elsenewPos=null;
-}
-if(!newPos){
-if(flipped){
-// Driven in a corner -- no valid cursor position found at all
-// -- try again *with* clearing, if we didn't already
-if(!mayClear)returnskipAtomic(doc,pos,bias,true);
-// Otherwise, turn off editing until further notice, and return the start of the doc
-doc.cantEdit=true;
-returnPos(doc.first,0);
-}
-flipped=true;newPos=pos;dir=-dir;
-}
-}
-curPos=newPos;
-continue search;
+functionskipAtomicInner(doc,pos,oldPos,dir,mayClear){
+varline=getLine(doc,pos.line);
+if(line.markedSpans)for(vari=0;i<line.markedSpans.length;++i){
+varsp=line.markedSpans[i],m=sp.marker;
+if((sp.from==null||(m.inclusiveLeft ? sp.from<=pos.ch : sp.from<pos.ch))&&
+(sp.to==null||(m.inclusiveRight ? sp.to>=pos.ch : sp.to>pos.ch))){
+if(mayClear){
+signal(m,"beforeCursorEnter");
+if(m.explicitlyCleared){
+if(!line.markedSpans)break;
+else{--i;continue;}
 }
 }
+if(!m.atomic)continue;
+
+if(oldPos){
+varnear=m.find(dir<0 ? 1 : -1),diff;
+if(dir<0 ? m.inclusiveRight : m.inclusiveLeft)near=movePos(doc,near,-dir,line);
+if(near&&near.line==pos.line&&(diff=cmp(near,oldPos))&&(dir<0 ? diff<0 : diff>0))
+returnskipAtomicInner(doc,near,pos,dir,mayClear);
+}
+
+varfar=m.find(dir<0 ? -1 : 1);
+if(dir<0 ? m.inclusiveLeft : m.inclusiveRight)far=movePos(doc,far,dir,line);
+returnfar ? skipAtomicInner(doc,far,pos,dir,mayClear) : null;
 }
-returncurPos;
+}
+returnpos;
+}
+
+// Ensure a given position is not inside an atomic range.
+functionskipAtomic(doc,pos,oldPos,bias,mayClear){
+vardir=bias||1;
+varfound=skipAtomicInner(doc,pos,oldPos,dir,mayClear)||
+(!mayClear&&skipAtomicInner(doc,pos,oldPos,dir,true))||
+skipAtomicInner(doc,pos,oldPos,-dir,mayClear)||
+(!mayClear&&skipAtomicInner(doc,pos,oldPos,-dir,true));
+if(!found){
+doc.cantEdit=true;
+returnPos(doc.first,0);
+}
+returnfound;
+}
+
+functionmovePos(doc,pos,dir,line){
+if(dir<0&&pos.ch==0){
+if(pos.line>doc.first)returnclipPos(doc,Pos(pos.line-1));
+elsereturnnull;
+}elseif(dir>0&&pos.ch==(line||getLine(doc,pos.line)).text.length){
+if(pos.line<doc.first+doc.size-1)returnPos(pos.line+1,0);
+elsereturnnull;
+}else{
+returnnewPos(pos.line,pos.ch+dir);
 }
 }
 
@@ -3659,7 +3669,7 @@
 }
 
 varsel=cm.doc.sel,modifier=mac ? e.metaKey : e.ctrlKey,contained;
-if(cm.options.dragDrop&&dragAndDrop&&!isReadOnly(cm)&&
+if(cm.options.dragDrop&&dragAndDrop&&!cm.isReadOnly()&&
 type=="single"&&(contained=sel.contains(start))>-1&&
 (cmp((contained=sel.ranges[contained]).from(),start)<0||start.xRel>0)&&
 (cmp(contained.to(),start)>0||start.xRel<0))
@@ -3883,7 +3893,7 @@
 e_preventDefault(e);
 if(ie)lastDrop=+newDate;
 varpos=posFromMouse(cm,e,true),files=e.dataTransfer.files;
-if(!pos||isReadOnly(cm))return;
+if(!pos||cm.isReadOnly())return;
 // Might be a file drop, in which case we simply extract the text
 // and insert it.
 if(files&&files.length&&window.FileReader&&window.File){
@@ -4122,7 +4132,7 @@
 cm.display.input.ensurePolled();
 varprevShift=cm.display.shift,done=false;
 try{
-if(isReadOnly(cm))cm.state.suppressEdits=true;
+if(cm.isReadOnly())cm.state.suppressEdits=true;
 if(dropShift)cm.display.shift=false;
 done=bound(cm)!=Pass;
 }finally{
@@ -4895,7 +4905,7 @@
 if(dir>0&&!moveOnce(!first))break;
 }
 }
-varresult=skipAtomic(doc,Pos(line,ch),origDir,true);
+varresult=skipAtomic(doc,Pos(line,ch),pos,origDir,true);
 if(!possible)result.hitSide=true;
 returnresult;
 }
@@ -5283,6 +5293,7 @@
 signal(this,"overwriteToggle",this,this.state.overwrite);
 },
 hasFocus: function(){returnthis.display.input.getField()==activeElt();},
+isReadOnly: function(){return!!(this.options.readOnly||this.doc.cantEdit);},
 
 scrollTo: methodOp(function(x,y){
 if(x!=null||y!=null)resolveScrollToPos(this);
@@ -6719,7 +6730,7 @@
 parentStyle+="width: "+cm.display.wrapper.clientWidth+"px;";
 removeChildrenAndAdd(cm.display.measure,elt("div",[widget.node],null,parentStyle));
 }
-returnwidget.height=widget.node.offsetHeight;
+returnwidget.height=widget.node.parentNode.offsetHeight;
 }
 
 functionaddLineWidget(doc,handle,node,options){
@@ -7129,7 +7140,7 @@
 if(nextChange==pos){// Update current marker set
 spanStyle=spanEndStyle=spanStartStyle=title=css="";
 collapsed=null;nextChange=Infinity;
-varfoundBookmarks=[];
+varfoundBookmarks=[],endStyles
 for(varj=0;j<spans.length;++j){
 varsp=spans[j],m=sp.marker;
 if(m.type=="bookmark"&&sp.from==pos&&m.widgetNode){
@@ -7142,14 +7153,17 @@
 if(m.className)spanStyle+=" "+m.className;
 if(m.css)css=(css ? css+"" : "")+m.css;
 if(m.startStyle&&sp.from==pos)spanStartStyle+=" "+m.startStyle;
-if(m.endStyle&&sp.to==nextChange)spanEndStyle+=" "+m.endStyle;
+if(m.endStyle&&sp.to==nextChange)(endStyles||(endStyles=[])).push(m.endStyle,sp.to)
 if(m.title&&!title)title=m.title;
 if(m.collapsed&&(!collapsed||compareCollapsedMarkers(collapsed.marker,m)<0))
 collapsed=sp;
 }elseif(sp.from>pos&&nextChange>sp.from){
 nextChange=sp.from;
 }
 }
+if(endStyles)for(varj=0;j<endStyles.length;j+=2)
+if(endStyles[j+1]==nextChange)spanEndStyle+=" "+endStyles[j]
+
 if(collapsed&&(collapsed.from||0)==pos){
 buildCollapsedSpan(builder,(collapsed.to==null ? len+1 : collapsed.to)-pos,
 collapsed.marker,collapsed.from==null);
@@ -7497,10 +7511,11 @@
 extendSelection(this,clipPos(this,head),other&&clipPos(this,other),options);
 }),
 extendSelections: docMethodOp(function(heads,options){
-extendSelections(this,clipPosArray(this,heads,options));
+extendSelections(this,clipPosArray(this,heads),options);
 }),
 extendSelectionsBy: docMethodOp(function(f,options){
-extendSelections(this,map(this.sel.ranges,f),options);
+varheads=map(this.sel.ranges,f);
+extendSelections(this,clipPosArray(this,heads),options);
 }),
 setSelections: docMethodOp(function(ranges,primary,options){
 if(!ranges.length)return;
@@ -8917,7 +8932,7 @@
 
 // THE END
 
-CodeMirror.version="5.9.0";
+CodeMirror.version="5.10.0";
 
 returnCodeMirror;
 });
@@ -8929,7 +8944,6 @@
 varCM=require('codemirror');
 varReact=(typeofwindow!=="undefined" ? window['React'] : typeofglobal!=="undefined" ? global['React'] : null);
 varclassName=require('classnames');
-
 varCodeMirror=React.createClass({
 displayName: 'CodeMirror',
 
@@ -8947,7 +8961,6 @@ var CodeMirror = React.createClass({
 isFocused: false
 };
 },
-
 componentDidMount: functioncomponentDidMount(){
 vartextareaNode=this.refs.textarea;
 this.codeMirror=CM.fromTextArea(textareaNode,this.props.options);
@@ -8956,8 +8969,8 @@ var CodeMirror = React.createClass({
 this.codeMirror.on('blur',this.focusChanged.bind(this,false));
 this._currentCodemirrorValue=this.props.defaultValue||this.props.value||'';
 this.codeMirror.setValue(this._currentCodemirrorValue);
+this.props.interact(this.codeMirror);
 },
-
 componentWillUnmount: functioncomponentWillUnmount(){
 // todo: is there a lighter-weight way to remove the cm instance?
 if(this.codeMirror){