Merge remote-tracking branch 'origin/master' into fix-react-svg-attrs

react/index.d.ts

@@ -1,6 +1,6 @@
 // Type definitions for React v15.0
 // Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>, John Reilly <https://github.com/johnnyreilly/>, Benoit Benezech <https://github.com/bbenezech>, Patricio Zavolinsky <https://github.com/pzavolinsky>
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>, John Reilly <https://github.com/johnnyreilly/>, Benoit Benezech <https://github.com/bbenezech>, Patricio Zavolinsky <https://github.com/pzavolinsky>, Digiguru <https://github.com/digiguru>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -1296,7 +1296,7 @@ declare namespace React {
          * along the main-axis of their container.
          * See CSS justify-content property https://www.w3.org/TR/css-flexbox-1/#justify-content-property
          */
-        justifyContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around";
+        justifyContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly";
 
         layoutGrid?: CSSWideKeyword | any;
 
@@ -2146,6 +2146,7 @@ declare namespace React {
         shape?: string;
         size?: number;
         sizes?: string;
+        slot?: string;
         span?: number;
         spellCheck?: boolean;
         src?: string;
@@ -2585,6 +2586,7 @@ declare namespace React {
 
         // SVG
         svg: SVGFactory;
+        animate: SVGFactory;
         circle: SVGFactory;
         defs: SVGFactory;
         ellipse: SVGFactory;
@@ -2812,6 +2814,7 @@ declare global {
             // SVG
             svg: React.SVGProps<SVGSVGElement>;
 
+            animate: React.SVGProps<SVGElement>; // TODO: It is SVGAnimateElement but is not in TypeScript's lib.dom.d.ts for now.
             circle: React.SVGProps<SVGCircleElement>;
             clipPath: React.SVGProps<SVGClipPathElement>;
             defs: React.SVGProps<SVGDefsElement>;

react/test/cssProperties.tsx

@@ -21,7 +21,7 @@ const fontStyleStyleTest = <div style={fontStyleStyle} />;
 const fontWeightStyle: React.CSSProperties = { fontWeight: 400 };
 const fontWeightStyleTest = <div style={fontWeightStyle} />;
 
-const justifyContentStyle: React.CSSProperties = { justifyContent: 'space-around' };
+const justifyContentStyle: React.CSSProperties = { justifyContent: 'space-evenly' };
 const justifyContentStyleTest = <div style={justifyContentStyle} />;
 
 

react/test/index.ts

@@ -317,6 +317,7 @@ var htmlAttr: React.HTMLProps<HTMLElement> = {
     children: children,
     className: "test-attr",
     style: divStyle,
+    slot: "HTMLComponent",
     onClick: (event: React.MouseEvent<{}>) => {
         event.preventDefault();
         event.stopPropagation();

react/test/tsx.tsx

@@ -30,5 +30,6 @@ StatelessComponent2.defaultProps = {
         <text x="200" y="300" strokeWidth="5" stroke="black" alignmentBaseline="middle">
             Hello, world!
         </text>
+        <div slot="Some Div"> Hello again! </div>
     </g>
 </svg>;