Merge pull request #18041 from evilangelist/master

react-sortable-tree: Made TreeItem.children prop optional

types/react-measure/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for react-measure 0.4.0
+// Type definitions for react-measure 0.4
 // Project: https://github.com/souporserious/react-measure
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,7 +19,7 @@ declare module "react-measure" {
             left?: number;
         }
 
-        type MeasureChildren = React.ReactElement<any> | { (dimension: Dimensions): React.ReactElement<any> };
+        type MeasureChildren = React.ReactNode | React.ReactElement<any> | ((dimension: Dimensions) => React.ReactElement<any>);
 
         interface MeasureProps {
             /**
@@ -43,7 +43,7 @@ declare module "react-measure" {
             /**
              * Callback when the component has been mutated. Receives dimensions, mutations, and anything passed to shouldMeasure.
              */
-            onMeasure?: (dimensions: Dimensions) => void;
+            onMeasure?(dimensions: Dimensions): void;
             /**
              * Children, ordinary JSX element or function. Leaving it for reference here
              */
@@ -51,5 +51,4 @@ declare module "react-measure" {
         }
     }
     export = Measure;
-
 }

types/react-measure/react-measure-tests.tsx

@@ -34,3 +34,20 @@ class Test2 extends React.Component {
         );
     }
 }
+
+function testHocComponent<T>(Component: React.ComponentClass<T>): React.ComponentClass<T> {
+    return class extends React.Component<T> {
+        render(): JSX.Element {
+            return (
+                <Measure onMeasure={this.handleDimensionChange}>
+                    <Component {...this.props} />;
+                </Measure>
+            );
+        }
+
+        private handleDimensionChange = (dimensions: Measure.Dimensions) => {
+            dimensions.width;
+            dimensions.height;
+        }
+    };
+}

types/react-sortable-tree/index.d.ts

@@ -15,7 +15,7 @@ export interface TreeItem {
     title?: string;
     subtitle?: string;
     expanded?: boolean;
-    children: TreeItem[];
+    children?: TreeItem[];
     [x: string]: any;
 }
 

types/react-sortable-tree/react-sortable-tree-tests.tsx

@@ -21,7 +21,7 @@ class Test extends React.Component {
             {
                 title: "Title", subtitle: "Subtitle", children: [
                     {title: "Child 1", subtitle: "Subtitle", children: []},
-                    {title: "Child 2", subtitle: "Subtitle", children: []}
+                    {title: "Child 2", subtitle: "Subtitle"}
                 ]
             }
         ];

types/react-sortable-tree/tsconfig.json

@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,