Merge PR

genexuslabs · Mar 16, 2020 · 90fb291 · 90fb291
1 parent 2a1abc6
commit 90fb291
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v4.0.3
+
+* Support for 1000000+ items
+
 # v4.0.2
 
 * Add RTL Support

diff --git a/docs/index.html b/docs/index.html
@@ -29,6 +29,6 @@
 
 <body>
   <app-root>Loading...</app-root>
-<script src="runtime-es2015.0811dcefd377500b5b1a.js" type="module"></script><script src="runtime-es5.0811dcefd377500b5b1a.js" nomodule defer></script><script src="polyfills-es5.67d73ec2ad07ed243425.js" nomodule defer></script><script src="polyfills-es2015.c9c354f3dc6732d748db.js" type="module"></script><script src="main-es2015.76af65dc3f0e810dd129.js" type="module"></script><script src="main-es5.76af65dc3f0e810dd129.js" nomodule defer></script></body>
+<script src="runtime-es2015.0811dcefd377500b5b1a.js" type="module"></script><script src="runtime-es5.0811dcefd377500b5b1a.js" nomodule defer></script><script src="polyfills-es5.67d73ec2ad07ed243425.js" nomodule defer></script><script src="polyfills-es2015.c9c354f3dc6732d748db.js" type="module"></script><script src="main-es2015.e261a70bd659f0b38273.js" type="module"></script><script src="main-es5.e261a70bd659f0b38273.js" nomodule defer></script></body>
 
 </html>
diff --git a/docs/main-es2015.76af65dc3f0e810dd129.js → docs/main-es2015.e261a70bd659f0b38273.js b/docs/main-es2015.76af65dc3f0e810dd129.js → docs/main-es2015.e261a70bd659f0b38273.js
diff --git a/docs/main-es5.76af65dc3f0e810dd129.js → docs/main-es5.e261a70bd659f0b38273.js b/docs/main-es5.76af65dc3f0e810dd129.js → docs/main-es5.e261a70bd659f0b38273.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/ng-packagr/package.schema.json",
   "name": "ngx-virtual-scroller",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Angular module for virtual -infinite- list. Supports horizontal/vertical, variable heights, & multi-column",
   "main": "dist/virtual-scroller.js",
   "types": "dist/virtual-scroller.d.ts",
@@ -13,7 +13,6 @@
     "build:all": "npm run build && npm run build:docs",
     "lint": "tslint src/**/*.ts",
     "debug-demo": "npm run build:all && cd demo && npm run start",
-    "test": "echo \"Not implemented\" && exit 1",
     "ngc": "ngc",
     "update-npm-versions": "npm-check --skip-unused --update-all --save-exact --ignore typescript --ignore @tweenjs/tween.js --ignore @types/tween.js",
     "prepublishOnly": "PLEASE RUN \"npm run prod-publish\" NOT \"npm publish\"",

diff --git a/src/virtual-scroller.ts b/src/virtual-scroller.ts
@@ -549,7 +549,7 @@ export class VirtualScrollerComponent implements OnInit, OnChanges, OnDestroy {
 			this.currentTween = undefined;
 		}
 
-		if (!animationMilliseconds) { // handles the `animationMilliseconds === 0` case
+		if (!animationMilliseconds) {
 			this.renderer.setProperty(scrollElement, this._scrollType, scrollPosition);
 			this.refresh_internal(false, animationCompletedCallback);
 			return;
@@ -668,17 +668,17 @@ export class VirtualScrollerComponent implements OnInit, OnChanges, OnDestroy {
 	protected _marginDir;
 	protected updateDirection(): void {
 		if (this.horizontal) {
-			this._invisiblePaddingProperty = 'scaleX';
 			this._childScrollDim = 'childWidth';
+			this._invisiblePaddingProperty = 'scaleX';
 			this._marginDir = 'margin-left';
 			this._offsetType = 'offsetLeft';
 			this._pageOffsetType = 'pageXOffset';
 			this._scrollType = 'scrollLeft';
 			this._translateDir = 'translateX';
 		}
 		else {
-			this._invisiblePaddingProperty = 'scaleY';
 			this._childScrollDim = 'childHeight';
+			this._invisiblePaddingProperty = 'scaleY';
 			this._marginDir = 'margin-top';
 			this._offsetType = 'offsetTop';
 			this._pageOffsetType = 'pageYOffset';
@@ -797,7 +797,8 @@ export class VirtualScrollerComponent implements OnInit, OnChanges, OnDestroy {
 				this.previousViewPort = viewport;
 
 				if (scrollLengthChanged) {
-					this.renderer.setStyle(this.invisiblePaddingElementRef.nativeElement, "transform", this._invisiblePaddingProperty+`(${viewport.scrollLength})`);
+ 					this.renderer.setStyle(this.invisiblePaddingElementRef.nativeElement, 'transform', `${this._invisiblePaddingProperty}(${viewport.scrollLength})`);
+ 					this.renderer.setStyle(this.invisiblePaddingElementRef.nativeElement, 'webkitTransform', `${this._invisiblePaddingProperty}(${viewport.scrollLength})`);
 				}
 
 				if (paddingChanged) {