@nativescript-community/ui-pulltorefresh 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.1](https://github.com/nativescript-community/ui-pulltorefresh/compare/v2.5.0...v2.5.1) (2022-05-09)
+
+**Note:** Version bump only for package @nativescript-community/ui-pulltorefresh
+
+
+
+
+
 # [2.5.0](https://github.com/nativescript-community/ui-pulltorefresh/compare/v2.4.9...v2.5.0) (2021-10-21)
 
 

package/README.md

@@ -18,7 +18,7 @@ NativeScript plugin to use Pull to Refresh on any view.
 
 ## Installation
 
-`tns plugin add @nativescript-community/ui-pulltorefresh`
+`ns plugin add @nativescript-community/ui-pulltorefresh`
 
 #### [Android - _SwipeRefreshLayout_](http://developer.android.com/reference/android/support/v4/widget/SwipeRefreshLayout.html)
 
@@ -43,7 +43,7 @@ NativeScript plugin to use Pull to Refresh on any view.
     <PullRefresh:PullToRefresh refresh="refreshList">
         <list-view items="{{ users }}">
             <list-view.itemTemplate>
-                <label text="{{ name }}" row="0" col="1"textWrap="true" class="message" />
+                <label text="{{ name }}" row="0" col="1" textWrap="true" class="message" />
             </list-view.itemTemplate>
         </list-view>
     </PullRefresh:PullToRefresh>
@@ -146,6 +146,8 @@ export default {
 - **refresh : function** _required_
 - **refreshing: boolean** - Notifies the widget that the refresh state has
   changed.
+- **indicatorColor: Color** - The color of the indicator icon.
+- **indicatorFillColor: Color** - The background color of the indicator.
 
 ## [Changelog](./CHANGELOG.md)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript-community/ui-pulltorefresh",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A NativeScript plugin to provide the Pull to Refresh control on any view.",
   "main": "pulltorefresh",
   "typings": "index.d.ts",
@@ -42,5 +42,5 @@
   "readmeFilename": "README.md",
   "bugs": "https://github.com/nativescript-community/ui-pulltorefresh/issues",
   "homepage": "https://github.com/nativescript-community/ui-pulltorefresh",
-  "gitHead": "893ed66ace9018dfbfefeae57adb91dfd8b76b6a"
+  "gitHead": "05bcd5d022fbd29e5fe0952fba50ed1a6138637f"
 }

package/pulltorefresh-common.js

@@ -1,15 +1,16 @@
-import { Color, ContentView, CssProperty, CSSType, Property, Style, View } from '@nativescript/core';
+import { Color, ContentView, CssProperty, CSSType, Property, Style } from '@nativescript/core';
 let PullToRefreshBase = class PullToRefreshBase extends ContentView {
-    _addChildFromBuilder(name, value) {
-        // copy inheritable style property values
-        const originalColor = value.style.color || null;
-        const originaBackgroundColor = value.style.backgroundColor || null;
-        if (value instanceof View) {
-            this.content = value;
-        }
-        // reset inheritable style property values as we do not want those to be inherited
-        value.style.color = originalColor;
-        value.style.backgroundColor = originaBackgroundColor;
+    get indicatorColor() {
+        return this.style.indicatorColor;
+    }
+    set indicatorColor(value) {
+        this.style.indicatorColor = value;
+    }
+    get indicatorFillColor() {
+        return this.style.indicatorFillColor;
+    }
+    set indicatorFillColor(value) {
+        this.style.indicatorFillColor = value;
     }
 };
 PullToRefreshBase.refreshEvent = 'refresh';
@@ -22,50 +23,18 @@ export const refreshingProperty = new Property({
     defaultValue: false,
 });
 refreshingProperty.register(PullToRefreshBase);
-export const indicatorColorProperty = new Property({
+export const indicatorColorProperty = new CssProperty({
     name: 'indicatorColor',
-    affectsLayout: true,
-    valueConverter: (v) => {
-        if (!Color.isValid(v)) {
-            return null;
-        }
-        return new Color(v);
-    },
-});
-indicatorColorProperty.register(PullToRefreshBase);
-export const indicatorColorStyleProperty = new CssProperty({
-    name: 'indicatorColorStyle',
     cssName: 'indicator-color',
-    affectsLayout: true,
-    valueConverter: (v) => {
-        if (!Color.isValid(v)) {
-            return null;
-        }
-        return new Color(v);
-    },
+    equalityComparer: Color.equals,
+    valueConverter: (v) => new Color(v),
 });
-indicatorColorStyleProperty.register(Style);
-export const indicatorFillColorProperty = new Property({
+indicatorColorProperty.register(Style);
+export const indicatorFillColorProperty = new CssProperty({
     name: 'indicatorFillColor',
-    affectsLayout: true,
-    valueConverter: (v) => {
-        if (!Color.isValid(v)) {
-            return null;
-        }
-        return new Color(v);
-    },
-});
-indicatorFillColorProperty.register(PullToRefreshBase);
-export const indicatorFillColorStyleProperty = new CssProperty({
-    name: 'indicatorFillColorStyle',
     cssName: 'indicator-fill-color',
-    affectsLayout: true,
-    valueConverter: (v) => {
-        if (!Color.isValid(v)) {
-            return null;
-        }
-        return new Color(v);
-    },
+    equalityComparer: Color.equals,
+    valueConverter: (v) => new Color(v),
 });
-indicatorFillColorStyleProperty.register(Style);
+indicatorFillColorProperty.register(Style);
 //# sourceMappingURL=pulltorefresh-common.js.map

package/pulltorefresh.android.js

@@ -1,19 +1,12 @@
-import { backgroundColorProperty, colorProperty } from '@nativescript/core';
-import { Color } from '@nativescript/core/color';
-import { indicatorColorProperty, indicatorColorStyleProperty, indicatorFillColorProperty, indicatorFillColorStyleProperty, PullToRefreshBase, refreshingProperty } from './pulltorefresh-common';
+import { indicatorColorProperty, indicatorFillColorProperty, PullToRefreshBase, refreshingProperty } from './pulltorefresh-common';
 export * from './pulltorefresh-common';
 export class PullToRefresh extends PullToRefreshBase {
-    //@ts-ignore
-    get android() {
-        return this.nativeView;
-    }
     createNativeView() {
         const swipeRefreshLayout = new com.nativescript.swiperefreshlayout.CarouselFriendlySwipeRefreshLayout(this._context);
         return swipeRefreshLayout;
     }
     initNativeView() {
         super.initNativeView();
-        const nativeView = this.nativeView;
         const androidXListener = new androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener({
             onRefresh: () => {
                 this.refreshing = true;
@@ -23,51 +16,24 @@ export class PullToRefresh extends PullToRefreshBase {
                 });
             },
         });
-        nativeView.setOnRefreshListener(androidXListener);
-        nativeView.refreshListener = androidXListener;
+        this.nativeViewProtected.setOnRefreshListener(androidXListener);
+        this.nativeViewProtected.refreshListener = androidXListener;
     }
     disposeNativeView() {
-        const nativeView = this.nativeView;
-        nativeView.refreshListener = null;
+        this.nativeViewProtected.refreshListener = null;
         super.disposeNativeView();
     }
-    [refreshingProperty.getDefault]() {
-        return false;
-    }
     [refreshingProperty.setNative](value) {
-        this.nativeView.setRefreshing(value);
-    }
-    [colorProperty.setNative](value) {
-        const color = value instanceof Color ? value.android : value;
-        this.nativeView.setColorSchemeColors([color]);
-    }
-    [backgroundColorProperty.setNative](value) {
-        const color = value instanceof Color ? value.android : value;
-        this.nativeView.setProgressBackgroundColorSchemeColor(color);
+        this.nativeViewProtected.setRefreshing(value);
     }
     [indicatorColorProperty.setNative](value) {
-        const color = value ? value.android : this.color;
-        this.nativeView.setColorSchemeColors([color]);
-    }
-    [indicatorColorStyleProperty.setNative](value) {
-        // Inline property has priority
-        if (this.indicatorColor) {
-            return;
-        }
-        const color = value ? value.android : this.color;
-        this.nativeView.setColorSchemeColors([color]);
+        const colors = [];
+        value && colors.push(value.android);
+        this.nativeViewProtected.setColorSchemeColors(colors);
     }
     [indicatorFillColorProperty.setNative](value) {
-        const color = value ? value.android : this.backgroundColor;
-        this.nativeView.setProgressBackgroundColorSchemeColor(color);
-    }
-    [indicatorFillColorStyleProperty.setNative](value) {
-        // Inline property has priority
-        if (this.indicatorFillColor) {
-            return;
-        }
-        const color = value ? value.android : this.backgroundColor;
-        this.nativeView.setProgressBackgroundColorSchemeColor(color);
+        const color = value ? value.android : null;
+        this.nativeViewProtected.setProgressBackgroundColorSchemeColor(color);
     }
 }
 //# sourceMappingURL=pulltorefresh.android.js.map

package/pulltorefresh.ios.js

@@ -1,6 +1,5 @@
-import { Color } from '@nativescript/core/color';
-import { backgroundColorProperty, colorProperty, Utils, } from '@nativescript/core';
-import { indicatorColorProperty, indicatorColorStyleProperty, indicatorFillColorProperty, indicatorFillColorStyleProperty, PullToRefreshBase, refreshingProperty } from './pulltorefresh-common';
+import { Utils, } from '@nativescript/core';
+import { indicatorColorProperty, indicatorFillColorProperty, PullToRefreshBase, refreshingProperty } from './pulltorefresh-common';
 export * from './pulltorefresh-common';
 var PullToRefreshHandler = /** @class */ (function (_super) {
     __extends(PullToRefreshHandler, _super);
@@ -29,9 +28,9 @@ const SUPPORT_REFRESH_CONTROL = Utils.ios.MajorVersion >= 10;
 export class PullToRefresh extends PullToRefreshBase {
     constructor() {
         super();
-        this.refreshControl = UIRefreshControl.alloc().init();
-        this._handler = PullToRefreshHandler.initWithOnwer(new WeakRef(this));
-        this.refreshControl.addTargetActionForControlEvents(this._handler, 'handleRefresh', 4096 /* ValueChanged */);
+        this.mRefreshControl = UIRefreshControl.alloc().init();
+        this.mHandler = PullToRefreshHandler.initWithOnwer(new WeakRef(this));
+        this.mRefreshControl.addTargetActionForControlEvents(this.mHandler, 'handleRefresh', 4096 /* ValueChanged */);
     }
     onLoaded() {
         super.onLoaded();
@@ -41,112 +40,73 @@ export class PullToRefresh extends PullToRefreshBase {
         if (!newView || !newView.nativeViewProtected) {
             return;
         }
-        const nNewView = newView.nativeViewProtected;
-        if (nNewView instanceof UIScrollView) {
+        const owner = newView.nativeViewProtected;
+        if (owner instanceof UIScrollView) {
             if (SUPPORT_REFRESH_CONTROL) {
-                nNewView.refreshControl = this.refreshControl;
+                owner.refreshControl = this.mRefreshControl;
             }
             else {
                 // ensure that we can trigger the refresh, even if the content is not large enough
-                nNewView.alwaysBounceVertical = true;
-                nNewView.addSubview(this.refreshControl);
+                owner.alwaysBounceVertical = true;
+                owner.addSubview(this.mRefreshControl);
             }
         }
-        else if (nNewView instanceof WKWebView) {
+        else if (owner instanceof WKWebView) {
             if (SUPPORT_REFRESH_CONTROL) {
-                nNewView.scrollView.refreshControl = this.refreshControl;
+                owner.scrollView.refreshControl = this.mRefreshControl;
             }
             else {
                 // ensure that we can trigger the refresh, even if the content is not large enough
-                nNewView.scrollView.alwaysBounceVertical = true;
-                nNewView.scrollView.addSubview(this.refreshControl);
+                owner.scrollView.alwaysBounceVertical = true;
+                owner.scrollView.addSubview(this.mRefreshControl);
             }
         }
         else if (typeof TKListView !== 'undefined' &&
-            nNewView instanceof TKListView) {
+            owner instanceof TKListView) {
             if (SUPPORT_REFRESH_CONTROL) {
-                nNewView.collectionView.refreshControl = this.refreshControl;
+                owner.collectionView.refreshControl = this.mRefreshControl;
             }
             else {
                 // ensure that we can trigger the refresh, even if the content is not large enough
-                nNewView.collectionView.alwaysBounceVertical = true;
-                nNewView.collectionView.addSubview(this.refreshControl);
+                owner.collectionView.alwaysBounceVertical = true;
+                owner.collectionView.addSubview(this.mRefreshControl);
             }
         }
-        else if (nNewView instanceof WKWebView) {
+        else if (owner instanceof WKWebView) {
             if (SUPPORT_REFRESH_CONTROL) {
-                nNewView.scrollView.refreshControl = this.refreshControl;
+                owner.scrollView.refreshControl = this.mRefreshControl;
             }
             else {
                 // ensure that we can trigger the refresh, even if the content is not large enough
-                nNewView.scrollView.alwaysBounceVertical = true;
-                nNewView.scrollView.addSubview(this.refreshControl);
+                owner.scrollView.alwaysBounceVertical = true;
+                owner.scrollView.addSubview(this.mRefreshControl);
             }
         }
         else {
             throw new Error('Content must inherit from either UIScrollView or WKWebView!');
         }
     }
-    [refreshingProperty.getDefault]() {
-        return false;
-    }
     [refreshingProperty.setNative](value) {
         if (value) {
-            this.refreshControl.beginRefreshing();
+            this.mRefreshControl.beginRefreshing();
         }
         else {
-            this.refreshControl.endRefreshing();
+            this.mRefreshControl.endRefreshing();
         }
     }
-    [colorProperty.getDefault]() {
-        return this.refreshControl.tintColor;
-    }
-    [colorProperty.setNative](value) {
-        const color = value instanceof Color ? value.ios : value;
-        this.refreshControl.tintColor = color;
-    }
-    [backgroundColorProperty.getDefault]() {
-        return this.refreshControl.backgroundColor;
-    }
-    [backgroundColorProperty.setNative](value) {
-        const color = value instanceof Color ? value.ios : value;
-        this.refreshControl.backgroundColor = color;
-    }
     [indicatorColorProperty.getDefault]() {
-        return this.refreshControl.tintColor;
+        return this.mRefreshControl.tintColor;
     }
     [indicatorColorProperty.setNative](value) {
-        const color = value ? value.ios : this.color;
-        this.refreshControl.tintColor = color;
-    }
-    [indicatorColorStyleProperty.getDefault]() {
-        return this.refreshControl.tintColor;
-    }
-    [indicatorColorStyleProperty.setNative](value) {
-        // Inline property has priority
-        if (this.indicatorColor) {
-            return;
-        }
-        const color = value ? value.ios : this.color;
-        this.refreshControl.tintColor = color;
+        const color = value ? value.ios : null;
+        this.mRefreshControl.tintColor = color;
     }
     [indicatorFillColorProperty.getDefault]() {
-        return this.refreshControl.backgroundColor;
+        return this.mRefreshControl.backgroundColor;
     }
     [indicatorFillColorProperty.setNative](value) {
-        const color = value ? value.ios : this.backgroundColor;
-        this.refreshControl.backgroundColor = color;
-    }
-    [indicatorFillColorStyleProperty.getDefault]() {
-        return this.refreshControl.backgroundColor;
-    }
-    [indicatorFillColorStyleProperty.setNative](value) {
-        // Inline property has priority
-        if (this.indicatorFillColor) {
-            return;
-        }
-        const color = value ? value.ios : this.backgroundColor;
-        this.refreshControl.backgroundColor = color;
+        const color = value ? value.ios : null;
+        this.mRefreshControl.backgroundColor = color;
     }
 }
 //# sourceMappingURL=pulltorefresh.ios.js.map