Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(collectionRepeat): other children of ion-content element fit in
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,7 +100,24 @@ function($rootScope, $timeout) { | |
| var secondaryScrollSize = this.secondaryScrollSize(); | ||
| var previousItem; | ||
|
|
||
| this.dataSource.beforeSiblings && this.dataSource.beforeSiblings.forEach(calculateSize, this); | ||
| var beforeSize = primaryPos + (previousItem ? previousItem.primarySize : 0); | ||
|
|
||
| primaryPos = secondaryPos = 0; | ||
| previousItem = null; | ||
|
|
||
|
|
||
| var dimensions = this.dataSource.dimensions.map(calculateSize, this); | ||
| var totalSize = primaryPos + (previousItem ? previousItem.primarySize : 0); | ||
|
|
||
| return { | ||
| beforeSize: beforeSize, | ||
| totalSize: totalSize, | ||
| dimensions: dimensions | ||
| }; | ||
|
|
||
| function calculateSize(dim) { | ||
|
|
||
| //Each dimension is an object {width: Number, height: Number} provided by | ||
| //the dataSource | ||
| var rect = { | ||
|
|
@@ -129,12 +146,13 @@ function($rootScope, $timeout) { | |
|
|
||
| previousItem = rect; | ||
| return rect; | ||
| } | ||
| }, | ||
| resize: function() { | ||
| var result = this.calculateDimensions(); | ||
| this.dimensions = result.dimensions; | ||
| this.viewportSize = result.totalSize; | ||
| this.beforeSize = result.beforeSize; | ||
| this.setCurrentIndex(0); | ||
| this.render(true); | ||
| if (!this.dataSource.backupItemsArray.length) { | ||
|
|
@@ -219,6 +237,7 @@ function($rootScope, $timeout) { | |
| * the data source to render the correct items into the DOM. | ||
| */ | ||
| render: function(shouldRedrawAll) { | ||
| var self = this; | ||
| var i; | ||
| var isOutOfBounds = ( this.currentIndex >= this.dataSource.getLength() ); | ||
| // We want to remove all the items and redraw everything if we're out of bounds | ||
|
|
@@ -258,10 +277,12 @@ function($rootScope, $timeout) { | |
| // Keep rendering items, adding them until we are past the end of the visible scroll area | ||
| i = renderStartIndex; | ||
| while ((rect = this.dimensions[i]) && (rect.primaryPos - rect.primarySize < scrollSizeEnd)) { | ||
| doRender(i++); | ||
| } | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| //Add two more items at the end | ||
This comment has been minimized.
Sorry, something went wrong. 
rbecheras
|
||
| doRender(i++); | ||
| doRender(i); | ||
| var renderEndIndex = i; | ||
|
|
||
| // Remove any items that were rendered and aren't visible anymore | ||
| for (i in this.renderedItems) { | ||
|
|
@@ -271,6 +292,17 @@ function($rootScope, $timeout) { | |
| } | ||
|
|
||
| this.setCurrentIndex(startIndex); | ||
|
|
||
| function doRender(dataIndex) { | ||
| var rect = self.dimensions[dataIndex]; | ||
| if (!rect) { | ||
|
|
||
| }else if (dataIndex < self.dataSource.dataStartIndex) { | ||
| // do nothing | ||
| } else { | ||
| self.renderItem(dataIndex, rect.primaryPos - self.beforeSize, rect.secondaryPos); | ||
| } | ||
| } | ||
| }, | ||
| renderItem: function(dataIndex, primaryPos, secondaryPos) { | ||
| // Attach an item, and set its transform position to the required value | ||
|
|
@@ -302,6 +334,15 @@ function($rootScope, $timeout) { | |
| } | ||
| }; | ||
|
|
||
| var exceptions = {'renderScroll':1, 'renderIfNeeded':1}; | ||
| forEach(CollectionRepeatManager.prototype, function(method, key) { | ||
| if (exceptions[key]) return; | ||
| CollectionRepeatManager.prototype[key] = function() { | ||
| console.log(key + '(', arguments, ')'); | ||
| return method.apply(this, arguments); | ||
| }; | ||
| }); | ||
|
|
||
| return CollectionRepeatManager; | ||
| }]); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Reviewing this file, intuitively, I focused on this changes, lines 260-264 of the old version, and 279-281 of the new one.
Maybe its not the issue at all, but it may be a clue.