javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(refresher): add correct fallbacks for native refreshers (#20333)

Browse Source
This commit is contained in:
Liam DeBeasi
2020-01-29 15:36:09 -05:00
committed by GitHub
parent e580b88477
commit fd55427991
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/components/refresher-content/refresher-content.tsx
View File

@ -1,4 +1,4 @@
import { Component, ComponentInterface, Host, Prop, h } from '@stencil/core'; import { Component, ComponentInterface, Element, Host, Prop, h } from '@stencil/core';
import { config } from '../../global/config'; import { config } from '../../global/config';
import { getIonMode } from '../../global/ionic-global'; import { getIonMode } from '../../global/ionic-global';
@ -12,6 +12,8 @@ import { SPINNERS } from '../spinner/spinner-configs';
}) })
export class RefresherContent implements ComponentInterface { export class RefresherContent implements ComponentInterface {
@Element() el!: HTMLIonRefresherContentElement;
/** /**
* A static icon or a spinner to display when you begin to pull down. * A static icon or a spinner to display when you begin to pull down.
* A spinner name can be provided to gradually show tick marks * A spinner name can be provided to gradually show tick marks
@ -49,9 +51,10 @@ export class RefresherContent implements ComponentInterface {
componentWillLoad() { componentWillLoad() {
if (this.pullingIcon === undefined) { if (this.pullingIcon === undefined) {
const mode = getIonMode(this); const mode = getIonMode(this);
const overflowRefresher = (this.el.style as any).webkitOverflowScrolling !== undefined ? 'lines' : 'arrow-down';
this.pullingIcon = config.get( this.pullingIcon = config.get(
'refreshingIcon', 'refreshingIcon',
mode === 'ios' && isPlatform('mobile') ? config.get('spinner', 'lines') : 'circular' mode === 'ios' && isPlatform('mobile') ? config.get('spinner', overflowRefresher) : 'circular'
); );
} }
if (this.refreshingSpinner === undefined) { if (this.refreshingSpinner === undefined) {

2
core/src/components/refresher/refresher.utils.ts
View File

@ -174,7 +174,7 @@ export const shouldUseNativeRefresher = (referenceEl: HTMLIonRefresherElement, m
pullingSpinner !== null && pullingSpinner !== null &&
refreshingSpinner !== null && refreshingSpinner !== null &&
( (
(mode === 'ios' && isPlatform('mobile')) || (mode === 'ios' && isPlatform('mobile') && (referenceEl.style as any).webkitOverflowScrolling !== undefined) ||
mode === 'md' mode === 'md'
) )

2
core/src/themes/ionic.globals.scss
View File

@ -46,7 +46,7 @@ $z-index-click-block: 99999;
$z-index-fixed-content: 999; $z-index-fixed-content: 999;
$z-index-scroll-content: 1; $z-index-scroll-content: 1;
$z-index-refresher: -1; $z-index-refresher: 0;
$z-index-page-container: 0; $z-index-page-container: 0;
$z-index-toolbar: 10; $z-index-toolbar: 10;