diff --git a/packages/core/src/components/content/content.tsx b/packages/core/src/components/content/content.tsx index d48228aac0..7f29cb326a 100644 --- a/packages/core/src/components/content/content.tsx +++ b/packages/core/src/components/content/content.tsx @@ -28,6 +28,11 @@ export class Content { */ @Prop() fullscreen = false; + /** + * If true and the content does not cause an overflow scroll, the scroll interaction will cause a bounce. + * If the content exceeds the bounds of ionContent, nothing will change. + * Note, the does not disable the system bounce on iOS. That is an OS level setting. + */ @Prop() forceOverscroll: boolean; @Listen('body:ionNavChanged') diff --git a/packages/core/src/components/infinite-scroll-content/readme.md b/packages/core/src/components/infinite-scroll-content/readme.md index 9ef479576c..c14de472d4 100644 --- a/packages/core/src/components/infinite-scroll-content/readme.md +++ b/packages/core/src/components/infinite-scroll-content/readme.md @@ -1,10 +1,21 @@ # ion-infinite-scroll-content +InfiniteScrollContent is a component that adds the content to InfiniteScroll. +You can loading icon or loading text with the component's properties. +```html + + + + + + +``` - ## Properties #### loadingSpinner @@ -13,14 +24,12 @@ string An animated SVG spinner that shows while loading. - #### loadingText string Optional text to display while loading. - ## Attributes #### loading-spinner @@ -29,15 +38,12 @@ string An animated SVG spinner that shows while loading. - #### loading-text string Optional text to display while loading. +--- - ----------------------------------------------- - -*Built with [StencilJS](https://stenciljs.com/)* +_Built with [StencilJS](https://stenciljs.com/)_ diff --git a/packages/core/src/components/infinite-scroll/readme.md b/packages/core/src/components/infinite-scroll/readme.md index a35f2defd7..74d8ad9548 100644 --- a/packages/core/src/components/infinite-scroll/readme.md +++ b/packages/core/src/components/infinite-scroll/readme.md @@ -12,7 +12,7 @@ on the infinite scroll instance. - {% raw %}{{i}}{% endraw %} + {% raw %}{{i}}{% endraw %} diff --git a/packages/core/src/components/scroll/scroll.tsx b/packages/core/src/components/scroll/scroll.tsx index 62e7e0e335..d11f6cf2eb 100644 --- a/packages/core/src/components/scroll/scroll.tsx +++ b/packages/core/src/components/scroll/scroll.tsx @@ -32,6 +32,13 @@ export class Scroll { @Prop({ context: 'isServer' }) isServer: boolean; @Prop() mode: string; + + + /** + * If true and the content does not cause an overflow scroll, the scroll interaction will cause a bounce. + * If the content exceeds the bounds of ionScroll, nothing will change. + * Note, the does not disable the system bounce on iOS. That is an OS level setting. + */ @Prop({mutable: true}) forceOverscroll: boolean; @Prop() onionScrollStart: ScrollCallback;