Merge branch 'master' into schema_columns

1 files changed, 13 insertions, 30 deletions

diff --git a/src/debug/Test.tsx b/src/debug/Test.tsx
index 7bc70615f..c8de33f41 100644
--- a/src/debug/Test.tsx
+++ b/src/debug/Test.tsx
@@ -1,46 +1,29 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
+import JsxParser from 'react-jsx-parser'
 
-class TestInternal extends React.Component {
-    onContextMenu = (e: React.MouseEvent) => {
-        console.log("Internal");
-        e.stopPropagation();
-    }
-
-    onPointerDown = (e: React.MouseEvent) => {
-        console.log("pointer down")
-        e.preventDefault();
-    }
-
-    render() {
-        return <div onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown}
-            onPointerUp={this.onPointerDown}>Hello world</div>
-    }
-}
-
-class TestChild extends React.Component {
-    onContextMenu = () => {
-        console.log("Child");
-    }
-
+class Hello extends React.Component<{ firstName: string, lastName: string }> {
     render() {
-        return <div onContextMenu={this.onContextMenu}><TestInternal /></div>
+        return <div>Hello {this.props.firstName} {this.props.lastName}</div>
     }
 }
 
-class TestParent extends React.Component {
-    onContextMenu = () => {
-        console.log("Parent");
-    }
-
+class Test extends React.Component {
     render() {
-        return <div onContextMenu={this.onContextMenu}><TestChild /></div>
+        let jsx = "<Hello {...props}/>";
+        let bindings = {
+            props: {
+                firstName: "First",
+                lastName: "Last"
+            }
+        }
+        return <JsxParser jsx={jsx} bindings={bindings} components={{ Hello }}></JsxParser>
     }
 }
 
 ReactDOM.render((
     <div style={{ position: "absolute", width: "100%", height: "100%" }}>
-        <TestParent />
+        <Test />
     </div>),
     document.getElementById('root')
 );
\ No newline at end of file