Merge pull request facebook#779 from chenglou/live-err

docs better error display for live editor and JSX compiler
naholyr · Jan 2, 2014 · a78f6f7 · a78f6f7
2 parents 3396654 + f0b5219
commit a78f6f7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/docs/_css/react.scss b/docs/_css/react.scss
@@ -466,6 +466,12 @@ section.black content {
       @include code-typography;
     }
   }
+
+  .playgroundError {
+    // The compiler view kills padding in order to render the CodeMirror code
+    // more nicely. For the error view, put a padding back
+    padding: 15px 20px;
+  }
 }
 
 /* Button */
@@ -560,7 +566,7 @@ figure {
   margin-top: 60px;
 }
 
-/* Code Mirror */
+/* CodeMirror */
 
 div.CodeMirror pre, div.CodeMirror-linenumber, code {
   @include code-typography;
@@ -622,6 +628,11 @@ p code {
   width: $columnWidth;
 }
 
+.playgroundError {
+  color: darken($primary, 5%);
+  font-size: 15px;
+}
+
 .MarkdownEditor textarea {
   width: 100%;
   height: 100px
@@ -636,7 +647,7 @@ p code {
   padding-left: 9px;
 }
 
-/* Codemirror doesn't support <jsx> syntax. Instead of highlighting it
+/* CodeMirror doesn't support <jsx> syntax. Instead of highlighting it
    as error, just ignore it */
 .highlight .javascript .err {
   background-color: transparent;

diff --git a/docs/_js/live_editor.js b/docs/_js/live_editor.js
@@ -53,7 +53,20 @@ var CodeMirrorEditor = React.createClass({
   }
 });
 
+var selfCleaningTimeout = {
+  componentDidUpdate: function() {
+    clearTimeout(this.timeoutID);
+  },
+
+  setTimeout: function() {
+    clearTimeout(this.timeoutID);
+    this.timeoutID = setTimeout.apply(null, arguments);
+  }
+};
+
 var ReactPlayground = React.createClass({
+  mixins: [selfCleaningTimeout],
+
   MODES: {XJS: 'XJS', JS: 'JS'}, //keyMirror({XJS: true, JS: true}),
 
   propTypes: {
@@ -137,11 +150,12 @@ var ReactPlayground = React.createClass({
         eval(compiledCode);
       }
     } catch (e) {
-      React.renderComponent(
-        <div content={e.toString()} className="playgroundError" />,
-        mountNode
-      );
+      this.setTimeout(function() {
+        React.renderComponent(
+          <div className="playgroundError">{e.toString()}</div>,
+          mountNode
+        );
+      }, 500);
     }
   }
 });
-