From 9c48fa715d663d36577a449cc86775433d309b5b Mon Sep 17 00:00:00 2001 From: Abdelaziz Bennouna Date: Fri, 15 Mar 2019 21:52:33 +0000 Subject: [PATCH] fix(spinner): fix default spinner logic for relevant components (#17660) - In the **`loading`** component, fallback to `spinner` icon config before platform default. - In both **`refresher`** & **`infinite-scroll`** components, use platform default as final fallback. - In **`infinite-scroll`** test templates, and the _basic_ **`virtual-scroll`** test template, fix loading _spinner_ and _text_ attributes. fixes #17659 --- .../infinite-scroll-content/infinite-scroll-content.tsx | 2 +- .../src/components/infinite-scroll/test/basic/index.html | 2 +- .../components/infinite-scroll/test/preview/index.html | 2 +- .../infinite-scroll/test/standalone/index.html | 4 ++-- core/src/components/infinite-scroll/test/top/index.html | 2 +- core/src/components/loading/loading.tsx | 5 ++++- .../components/refresher-content/refresher-content.tsx | 9 +++++++-- core/src/components/virtual-scroll/test/basic/index.html | 2 +- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx b/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx index f425e56019..6361b1e303 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx @@ -30,7 +30,7 @@ export class InfiniteScrollContent implements ComponentInterface { if (this.loadingSpinner === undefined) { this.loadingSpinner = this.config.get( 'infiniteLoadingSpinner', - this.config.get('spinner', 'lines') + this.config.get('spinner', this.mode === 'ios' ? 'lines' : 'crescent') ); } } diff --git a/core/src/components/infinite-scroll/test/basic/index.html b/core/src/components/infinite-scroll/test/basic/index.html index 444a4ee6aa..b424b4874d 100644 --- a/core/src/components/infinite-scroll/test/basic/index.html +++ b/core/src/components/infinite-scroll/test/basic/index.html @@ -30,7 +30,7 @@ - + diff --git a/core/src/components/infinite-scroll/test/preview/index.html b/core/src/components/infinite-scroll/test/preview/index.html index ea6c671889..0b387001d2 100644 --- a/core/src/components/infinite-scroll/test/preview/index.html +++ b/core/src/components/infinite-scroll/test/preview/index.html @@ -30,7 +30,7 @@ - + diff --git a/core/src/components/infinite-scroll/test/standalone/index.html b/core/src/components/infinite-scroll/test/standalone/index.html index ee33c560aa..d83c28aa7f 100644 --- a/core/src/components/infinite-scroll/test/standalone/index.html +++ b/core/src/components/infinite-scroll/test/standalone/index.html @@ -18,8 +18,8 @@ + loading-spinner="bubbles" + loading-text="Loading more data..."> diff --git a/core/src/components/infinite-scroll/test/top/index.html b/core/src/components/infinite-scroll/test/top/index.html index 029a8cff2e..3febf95aa4 100644 --- a/core/src/components/infinite-scroll/test/top/index.html +++ b/core/src/components/infinite-scroll/test/top/index.html @@ -24,7 +24,7 @@ - + diff --git a/core/src/components/loading/loading.tsx b/core/src/components/loading/loading.tsx index 6d59427338..ec66c30021 100644 --- a/core/src/components/loading/loading.tsx +++ b/core/src/components/loading/loading.tsx @@ -113,7 +113,10 @@ export class Loading implements ComponentInterface, OverlayInterface { componentWillLoad() { if (this.spinner === undefined) { - this.spinner = this.config.get('loadingSpinner', this.mode === 'ios' ? 'lines' : 'crescent'); + this.spinner = this.config.get( + 'loadingSpinner', + this.config.get('spinner', this.mode === 'ios' ? 'lines' : 'crescent') + ); } } diff --git a/core/src/components/refresher-content/refresher-content.tsx b/core/src/components/refresher-content/refresher-content.tsx index 49b622cf7d..4940ad58f4 100644 --- a/core/src/components/refresher-content/refresher-content.tsx +++ b/core/src/components/refresher-content/refresher-content.tsx @@ -1,12 +1,14 @@ import { Component, ComponentInterface, Prop } from '@stencil/core'; -import { Config, SpinnerTypes } from '../../interface'; +import { Config, Mode, SpinnerTypes } from '../../interface'; @Component({ tag: 'ion-refresher-content' }) export class RefresherContent implements ComponentInterface { + mode!: Mode; + @Prop({ context: 'config' }) config!: Config; /** @@ -34,7 +36,10 @@ export class RefresherContent implements ComponentInterface { this.pullingIcon = this.config.get('refreshingIcon', 'arrow-down'); } if (this.refreshingSpinner === undefined) { - this.refreshingSpinner = this.config.get('refreshingSpinner', this.config.get('spinner', 'lines')); + this.refreshingSpinner = this.config.get( + 'refreshingSpinner', + this.config.get('spinner', this.mode === 'ios' ? 'lines' : 'crescent') + ); } } diff --git a/core/src/components/virtual-scroll/test/basic/index.html b/core/src/components/virtual-scroll/test/basic/index.html index 569a612919..0016eb9388 100644 --- a/core/src/components/virtual-scroll/test/basic/index.html +++ b/core/src/components/virtual-scroll/test/basic/index.html @@ -42,7 +42,7 @@ - +