Merge pull request #309 from MurhafSousli/v7.3.1

V7.3.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.3.1
+
+- fix: Safe-check viewport clientHeight in auto-height mode, closes [#307](https://github.com/MurhafSousli/ngx-scrollbar/issues/307) in [8136f9d](https://github.com/MurhafSousli/ngx-scrollbar/pull/308/commits/8136f9db91cf34f00078c737968d488305ba97b7).
+
 ## 7.3.0
 
 - feat: Upgrade to Angular 10.

e2e/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",

package.json

@@ -14,30 +14,30 @@
     "url": "https://github.com/MurhafSousli/ngx-scrollbar"
   },
   "dependencies": {
-    "@angular-devkit/build-angular": "^0.1000.5",
-    "@angular/animations": "~10.0.8",
-    "@angular/cdk": "~10.1.3",
-    "@angular/common": "~10.0.8",
-    "@angular/compiler": "~10.0.8",
-    "@angular/core": "~10.0.8",
-    "@angular/forms": "~10.0.8",
-    "@angular/material": "^10.1.3",
-    "@angular/platform-browser": "~10.0.8",
-    "@angular/platform-browser-dynamic": "~10.0.8",
-    "@angular/router": "~10.0.8",
+    "@angular-devkit/build-angular": "^0.1002.0",
+    "@angular/animations": "~10.2.3",
+    "@angular/cdk": "~10.2.7",
+    "@angular/common": "~10.2.3",
+    "@angular/compiler": "~10.2.3",
+    "@angular/core": "~10.2.3",
+    "@angular/forms": "~10.2.3",
+    "@angular/material": "^10.2.7",
+    "@angular/platform-browser": "~10.2.3",
+    "@angular/platform-browser-dynamic": "~10.2.3",
+    "@angular/router": "~10.2.3",
     "@juggle/resize-observer": "^3.2.0",
     "bezier-easing": "^2.1.0",
-    "chance": "^1.1.6",
+    "chance": "^1.1.7",
     "ngx-infinite-scroll": "^8.0.2",
     "rxjs": "~6.5.4",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-ng-packagr": "~0.1000.5",
-    "@angular/cli": "~10.0.5",
-    "@angular/compiler-cli": "~10.0.8",
-    "@angular/language-service": "~10.0.8",
+    "@angular-devkit/build-ng-packagr": "~0.1002.0",
+    "@angular/cli": "~10.2.0",
+    "@angular/compiler-cli": "~10.2.3",
+    "@angular/language-service": "~10.2.3",
     "@types/bezier-easing": "^2.1.2",
     "@types/chance": "^1.1.0",
     "@types/jasmine": "~3.3.8",
@@ -51,7 +51,7 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^10.0.0",
+    "ng-packagr": "^10.1.2",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
     "tslint": "~6.1.0",

projects/ngx-scrollbar-demo/e2e/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",

projects/ngx-scrollbar-demo/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

projects/ngx-scrollbar-demo/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

projects/ngx-scrollbar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-scrollbar",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "license": "MIT",
   "homepage": "https://ngx-scrollbar.netlify.com/",
   "author": {

projects/ngx-scrollbar/tsconfig.lib.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",

projects/ngx-scrollbar/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []

tsconfig.json

@@ -1,23 +1,32 @@
-/*
-  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
-  It is not intended to be used to perform a compilation.
-
-  To learn more about this file see: https://angular.io/config/solution-tsconfig.
-*/
 {
-  "files": [],
-  "references": [
-    {
-      "path": "./projects/ngx-scrollbar/tsconfig.lib.json"
-    },
-    {
-      "path": "./projects/ngx-scrollbar/tsconfig.spec.json"
-    },
-    {
-      "path": "./projects/ngx-scrollbar-demo/tsconfig.app.json"
-    },
-    {
-      "path": "./projects/ngx-scrollbar-demo/tsconfig.spec.json"
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "module": "es2020",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "paths": {
+      "ngx-scrollbar": [
+        "dist/ngx-scrollbar"
+      ],
+      "ngx-scrollbar/*": [
+        "dist/ngx-scrollbar/*"
+      ]
     }
-  ]
-}
+  }
+}

tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [