Skip to content
This repository was archived by the owner on May 4, 2022. It is now read-only.

Added option to collection-repeat to use original scroll content size #216

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added option to collection-repeat to use original scroll content size #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions js/angular/directive/collectionRepeat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
* @param {boolean=} force-refresh-images Force images to refresh as you scroll. This fixes a problem
* where, when an element is interchanged as scrolling, its image will still have the old src
* while the new src loads. Setting this to true comes with a small performance loss.
* @param {boolean=} use-content-size When enabled, also use the original scroll view content size
* instead of using only the list size. This fixes a problem where the scroll view needs to be
* manipulated with additional, like when implementing a pull-to-search pattern. Setting this to
* true comes with a small performance loss.
*/

IonicModule
Expand Down Expand Up @@ -220,6 +224,7 @@ function CollectionRepeatDirective($ionicCollectionManager, $parse, $window, $$r
heightData: heightData,
widthData: widthData,
forceRefreshImages: !!(isDefined(attr.forceRefreshImages) && attr.forceRefreshImages !== 'false'),
useContentSize: !!(isDefined(attr.useContentSize) && attr.useContentSize !== 'false'),
keyExpression: keyExpr,
renderBuffer: renderBuffer,
scope: scope,
Expand Down Expand Up @@ -402,6 +407,7 @@ function RepeatManagerFactory($rootScope, $window, $$rAF) {
var afterItemsNode = options.afterItemsNode;
var containerNode = options.containerNode;
var forceRefreshImages = options.forceRefreshImages;
var useContentSize = options.useContentSize;
var heightData = options.heightData;
var widthData = options.widthData;
var keyExpression = options.keyExpression;
Expand Down Expand Up @@ -463,8 +469,8 @@ function RepeatManagerFactory($rootScope, $window, $$rAF) {
var nextItemId = 0;

var scrollViewSetDimensions = isVertical ?
function() { scrollView.setDimensions(null, null, null, view.getContentSize(), true); } :
function() { scrollView.setDimensions(null, null, view.getContentSize(), null, true); };
function() { scrollView.setDimensions(null, null, null, getContentSize(), true); } :
function() { scrollView.setDimensions(null, null, getContentSize(), null, true); };

// view is a mix of list/grid methods + static/dynamic methods.
// See bottom for implementations. Available methods:
Expand All @@ -478,7 +484,11 @@ function RepeatManagerFactory($rootScope, $window, $$rAF) {

var contentSizeStr = isVertical ? 'getContentHeight' : 'getContentWidth';
var originalGetContentSize = scrollView.options[contentSizeStr];
scrollView.options[contentSizeStr] = angular.bind(view, view.getContentSize);
var getContentSize = useContentSize ?
function() { return Math.max(originalGetContentSize(), view.getContentSize()); } :
angular.bind(view, view.getContentSize);

scrollView.options[contentSizeStr] = getContentSize;

scrollView.__$callback = scrollView.__callback;
scrollView.__callback = function(transformLeft, transformTop, zoom, wasResize) {
Expand Down