Merge branch 'master' into dependabot/npm_and_yarn/example/cli5/diff-…

…3.5.0
CirclonGroup · Dec 19, 2019 · bae69d6 · bae69d6
2 parents c65dfbf + 2a3f530
commit bae69d6
Show file tree

Hide file tree

Showing 7 changed files with 357 additions and 1,201 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+<a name="8.5.2"></a>
+# 8.5.2 (2019-03-12)
+* Fixed computed value after updating model, because parent was null and we got a race-condition
+
+<a name="8.5.1"></a>
+# 8.5.1 (2019-07-11)
+* Changed options input to ITreeOptions
+
+<a name="8.5.0"></a>
+# 8.5.0 (2019-06-11)
+* Support IVY by removing transitive dependency on Renderer via mobx-angular
+
 <a name="8.4.1"></a>
 # 8.4.1 (2019-01-10)
 * Exporting TreeNodeWrapperComponent and TreeAnimateOpenDirective from main module

diff --git a/README.md b/README.md
@@ -4,6 +4,13 @@
 
 # angular tree component
 
+<p align="center">
+  <a href="https://app.codefund.io/properties/628/visit-sponsor">
+    <img src="https://app.codefund.io/properties/628/sponsor" />
+  </a>
+</p>
+
+
 ## ❤️ Support Us ❤️
 
 Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/angular-tree-component/contribute)]

diff --git a/example/cli5/yarn.lock b/example/cli5/yarn.lock
@@ -954,8 +954,8 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 clean-css@4.1.x:
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301"
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
   dependencies:
     source-map "0.5.x"
 

diff --git a/lib/components/tree-node-collection.component.ts b/lib/components/tree-node-collection.component.ts
@@ -39,7 +39,10 @@ export class TreeNodeCollectionComponent implements OnInit, OnDestroy {
 
   @computed get marginTop(): string {
     const firstNode = this.viewportNodes && this.viewportNodes.length && this.viewportNodes[0];
-    const relativePosition = firstNode ? firstNode.position - firstNode.parent.position - firstNode.parent.getSelfHeight() : 0;
+    const relativePosition =
+      (firstNode && firstNode.parent)
+      ? firstNode.position - firstNode.parent.position - firstNode.parent.getSelfHeight()
+      : 0;
 
     return `${relativePosition}px`;
   }