From 0d10ad8215aa7c913525d4fe959b864b97758e44 Mon Sep 17 00:00:00 2001
From: Atul R <atulanand94@gmail.com>
Date: Thu, 6 Jun 2019 12:13:24 +0200
Subject: [PATCH] Fix minor heirarchy bugs

---
 demo.ts                          | 20 +++++++++++++-------
 package.json                     |  1 +
 src/lib/core/FlexLayout/index.ts |  4 ++--
 yarn.lock                        |  5 +++++
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/demo.ts b/demo.ts
index 8e6c1f24e..5edec8714 100644
--- a/demo.ts
+++ b/demo.ts
@@ -16,6 +16,7 @@ const testGridLayout = () => {
   win.setCentralWidget(view);
 
   const gridLayout = new QGridLayout();
+
   const label = new QLabel();
   label.setText("Testing1234");
   label.setStyleSheet("background-color:blue; color:white;");
@@ -52,21 +53,26 @@ const testFlexLayout = () => {
   const win = new QMainWindow();
   const view = new QWidget();
   win.setCentralWidget(view);
-  const label = new QLabel(win);
-  label.setText("Hello12321");
-  label.setStyleSheet("background-color:blue; color:white;");
-  const flayout = new FlexLayout();
   view.setStyleSheet(
     `
       background-color: green;
       qproperty-flex: 1;
-       qproperty-alignItems: center;
-       qproperty-justifyContent:center;
-       `
+      qproperty-alignItems: center;
+      qproperty-justifyContent:center;
+    `
   );
+
+  const flayout = new FlexLayout();
   flayout.setFlexNode(view.getFlexNode());
+
+  const label = new QLabel();
+  label.setText("Hello12321");
+  label.setStyleSheet("background-color:blue; color:white;");
+
   flayout.addWidget(label, label.getFlexNode());
+
   view.setLayout(flayout);
+
   win.show();
   return win;
 };
diff --git a/package.json b/package.json
index 02f71eda2..67d9d86ab 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "@types/lodash": "^4.14.130",
     "@types/node": "^12.0.2",
     "node-gyp": "^4.0.0",
+    "prettier": "^1.17.1",
     "typescript": "^3.4.5"
   },
   "scripts": {
diff --git a/src/lib/core/FlexLayout/index.ts b/src/lib/core/FlexLayout/index.ts
index 4a268918f..6b1a7fe5a 100644
--- a/src/lib/core/FlexLayout/index.ts
+++ b/src/lib/core/FlexLayout/index.ts
@@ -1,11 +1,11 @@
 import addon from "../addon";
-import { QWidget } from "../../QtGui/QWidget";
+import { NodeWidget } from "../../QtGui/QWidget";
 import { FlexNode } from "./FlexNode";
 import { NodeLayout } from "../../QtWidgets/QLayout";
 
 export class FlexLayout extends NodeLayout {
   native = new addon.FlexLayout();
-  addWidget(childWidget: QWidget, childFlexNode: FlexNode) {
+  addWidget(childWidget: NodeWidget, childFlexNode: FlexNode) {
     this.children.add(childWidget);
     this.native.addWidget(childWidget.native, childFlexNode.native);
   }
diff --git a/yarn.lock b/yarn.lock
index 1338ef0fe..308ed5d2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -502,6 +502,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+prettier@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
+  integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
+
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"