Merge pull request #146 from DanielPintilei/patch-1

Add "Short-circuit evaluation" and change "Conditionals"
2017-10-26 14:12:43 +08:00 · 2017-10-26 14:12:43 +08:00 · ee69076dd9
parent df97026de3 1dd121bd42
commit ee69076dd9
1 changed files with 11 additions and 3 deletions
--- a/react.md
+++ b/react.md
@ -379,9 +379,17 @@ Always supply a `key` property.

 ```jsx
 <div>
-  {showPopup
-    ? <Popup />
-    : null}
+  {showMyComponent
+    ? <MyComponent />
+    : <OtherComponent />}
+</div>
+```
+
+### Short-circuit evaluation
+
+```jsx
+<div>
+  {showPopup && <Popup />}
 </div>
 ```