Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 47e3c70

Browse files
Manduromanucorporat
authored andcommittedJun 12, 2017
fix(refresher): border should only show when pulled (#12015)
fixes #10994
1 parent a91a68e commit 47e3c70

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed
 

‎src/components/content/content.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ export class EventEmitterProxy<T> extends EventEmitter<T> {
167167
'</div>' +
168168
'<ng-content select="ion-refresher"></ng-content>',
169169
host: {
170-
'[class.statusbar-padding]': 'statusbarPadding'
170+
'[class.statusbar-padding]': 'statusbarPadding',
171+
'[class.has-refresher]': '_hasRefresher'
171172
},
172173
changeDetection: ChangeDetectionStrategy.OnPush,
173174
encapsulation: ViewEncapsulation.None
@@ -212,6 +213,8 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
212213
/** @internal */
213214
_fullscreen: boolean;
214215
/** @internal */
216+
_hasRefresher: boolean = false;
217+
/** @internal */
215218
_footerEle: HTMLElement;
216219
/** @internal */
217220
_dirty: boolean;
@@ -782,6 +785,11 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
782785
this._cBottom += this._tabbarHeight;
783786
}
784787

788+
// Refresher uses a border which should be hidden unless pulled
789+
if (this._hasRefresher) {
790+
this._cTop -= 1;
791+
}
792+
785793
// Fixed content shouldn't include content padding
786794
this._fTop = this._cTop;
787795
this._fBottom = this._cBottom;

‎src/components/refresher/refresher.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class Refresher {
202202

203203
constructor(private _plt: Platform, @Host() private _content: Content, private _zone: NgZone, gestureCtrl: GestureController) {
204204
this._events = new UIEventManager(_plt);
205-
_content.setElementClass('has-refresher', true);
205+
_content._hasRefresher = true;
206206
this._gesture = gestureCtrl.createGesture({
207207
name: GESTURE_REFRESHER,
208208
priority: GESTURE_PRIORITY_REFRESHER

‎src/components/refresher/test/refresher.spec.ts

+3
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ describe('Refresher', () => {
224224

225225
});
226226

227+
it('should set hasRefresher on content', () => {
228+
expect(content._hasRefresher).toBeTruthy();
229+
});
227230

228231
let contentElementRef: any;
229232
let refresher: Refresher;

0 commit comments

Comments
 (0)
Please sign in to comment.