Merge branch 'master' into patch-1

website/contents/properties/align-items.md

@@ -18,6 +18,8 @@ applying to the main axis, `align items` applies to the cross axis.
 
 **CENTER** Align children of a container in the center of the container's cross axis.
 
+**BASELINE** Align children of a container along a common baseline. Individual children can be set to be the reference baseline for their parents.
+
 <controls prop="alignItems"></controls>
 
 ## Align Self

website/contents/properties/justify-content.md

@@ -22,7 +22,7 @@ remaining space between the children.
 
 **SPACE AROUND** Evenly space of children across the container's main axis, distributing
 remaining space around the children. Compared to `space between` using
-`Sspace around` will result in space being distributed to the beginning of
+`space around` will result in space being distributed to the beginning of
 the first child and end of the last child.
 
 <controls prop="justifyContent"></controls>

website/contents/properties/layout-direction.md

@@ -14,10 +14,10 @@ refers to `right`. When localizing your apps for markets with RTL languages
 you should customize this by either by passing a direction
 to the `CalculateLayout` call or by setting the direction on the root node.
 
-**LTR (DEFAULT)** Text and children and laid our from left to right. Margin and
+**LTR (DEFAULT)** Text and children and laid out from left to right. Margin and
 padding applied the start of an element are applied on the left side.
 
-**RTL** Text and children and laid our from right to left. Margin and
+**RTL** Text and children and laid out from right to left. Margin and
 padding applied the start of an element are applied on the right side.
 
 <controls prop="layoutDirection"></controls>

website/gatsby-config.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/gatsby-node.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/package.json

@@ -4,21 +4,22 @@
   "version": "1.0.0",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "dependencies": {
-    "antd": "^3.2.0",
-    "atob": "^2.0.3",
-    "gatsby": "^1.9.158",
-    "gatsby-link": "^1.6.34",
-    "gatsby-plugin-antd": "^1.0.10",
-    "gatsby-plugin-google-analytics": "^1.0.19",
-    "gatsby-plugin-less": "^1.1.4",
-    "gatsby-plugin-react-helmet": "^2.0.3",
-    "gatsby-plugin-react-next": "^1.0.8",
-    "gatsby-remark-prismjs": "^1.2.14",
-    "gatsby-source-filesystem": "^1.5.18",
-    "gatsby-transformer-remark": "^1.7.31",
+    "antd": "^3.6.5",
+    "atob": "^2.1.1",
+    "btoa": "^1.2.1",
+    "gatsby": "^1.9.273",
+    "gatsby-link": "^1.6.45",
+    "gatsby-plugin-antd": "^1.0.12",
+    "gatsby-plugin-google-analytics": "^1.0.31",
+    "gatsby-plugin-less": "^1.1.8",
+    "gatsby-plugin-react-helmet": "^2.0.11",
+    "gatsby-plugin-react-next": "^1.0.11",
+    "gatsby-remark-prismjs": "^2.0.4",
+    "gatsby-source-filesystem": "^1.5.39",
+    "gatsby-transformer-remark": "^1.7.44",
     "immutable": "^4.0.0-rc.9",
     "react-helmet": "^5.2.0",
-    "react-syntax-highlighter": "^7.0.0",
+    "react-syntax-highlighter": "^8.0.0",
     "yoga-layout": "^1.9.3"
   },
   "keywords": [
@@ -31,6 +32,6 @@
     "develop": "gatsby develop"
   },
   "devDependencies": {
-    "prettier": "1.13.4"
+    "prettier": "1.13.7"
   }
 }

website/src/components/DocsSidebar.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/DocsSidebar.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/FacebookOSSLogo.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Footer.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Footer.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Padded.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Padded.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Page.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Page.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/CodeComponentKit.js

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // @flow
 import yoga from 'yoga-layout/dist/entry-browser';
 import LayoutRecord from './LayoutRecord';
@@ -137,9 +144,9 @@ function getLayoutCode(
             )}\n${indent}\t},`,
         ),
     );
-    lines.push(indent + `}]${isRoot ? ';' : ''}`);
+    lines.push(indent + `}]${isRoot ? ';' : ','}`);
   } else {
-    lines[lines.length - 1] += ']';
+    lines[lines.length - 1] += '],';
     CKFlexboxComponentChild.forEach(key => {
       let line = renderKey(node, key, indent);
       if (line) {
@@ -165,7 +172,7 @@ function renderKey(node: Yoga$Node, key: string, indent: string): ?string {
       );
     }
 
-    ['top', 'left', 'right', 'bottom'].forEach(pKey => {
+    ['top', 'start', 'end', 'bottom'].forEach(pKey => {
       if (node[key][pKey]) {
         lines.push(indent + `\t.${pKey} = ${getValue(node[key][pKey])},`);
       }

website/src/components/Playground/CodeGenerators.css

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 .CodeGeneratorsTitle {
   display: flex;
   justify-content: space-between;

website/src/components/Playground/CodeGenerators.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/CodeJavaScript.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/CodeLitho.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/CodeReactNative.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/EditValue.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/Editor.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/Editor.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/InfoText.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/InfoText.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/LayoutRecord.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/PositionGuide.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/PositionGuide.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/PositionRecord.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/Sidebar.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/Sidebar.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/URLShortener.css

@@ -1,2 +1,9 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 .URLShortener {
 }

website/src/components/Playground/URLShortener.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaEnumSelect.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaEnumSelect.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaNode.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaNode.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaPositionEditor.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/YogaPositionEditor.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/index.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Playground/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -19,6 +19,7 @@ import PositionRecord from './PositionRecord';
 import LayoutRecord from './LayoutRecord';
 import Sidebar from './Sidebar';
 import {Row, Col, Button} from 'antd';
+import btoa from 'btoa';
 import type {LayoutRecordT} from './LayoutRecord';
 import type {Yoga$Direction} from 'yoga-layout';
 import './index.css';

website/src/components/Toolbar.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/components/Toolbar.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/pages/404.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/pages/docs/index.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/pages/docs/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/pages/index.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/pages/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,6 +18,7 @@ import './index.css';
 import ReactNativeLogo from './logos/reactnative.png';
 import LithoLogo from './logos/litho.png';
 import ComponentKitLogo from './logos/componentkit.png';
+import ReactPDFLogo from './logos/reactpdf.png';
 import Link from 'gatsby-link';
 import Footer from '../components/Footer';
 
@@ -143,6 +144,13 @@ const AboutSectionOne = () => (
         <img src={ReactNativeLogo} />
         <h3>React Native</h3>
       </a>
+      <a
+        href="https://react-pdf.org/"
+        target="_blank"
+        className="logo">
+        <img src={ReactPDFLogo} />
+        <h3>React-PDF</h3>
+      </a>
     </div>
   </Padded>
 );
@@ -183,12 +191,14 @@ const AboutSectionTwo = () => (
 );
 
 export default () => (
-  <Page className="landing-page" title="A cross-platform layout engine">
-    <HeroSection />
-    <PlaygroundSection />
-    <AboutSectionOne />
-    <hr />
-    <AboutSectionTwo />
-    <Footer />
-  </Page>
+  <div>
+    <Page className="landing-page" title="A cross-platform layout engine">
+      <HeroSection />
+      <PlaygroundSection />
+      <AboutSectionOne />
+      <hr />
+      <AboutSectionTwo />
+      <Footer />
+    </Page>
+  </div>
 );

website/src/pages/playground/index.css

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 .playground-page {
   display: flex;
   flex: 1;

website/src/pages/playground/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/templates/index.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/templates/withPlayground.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

website/src/templates/withoutPlayground.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.