Merge branch 'master' of github.com:nativescript-community/ui-material-components

farfromrefug · farfromrefug · commit 30ec42d31e83 · 2023-04-30T15:42:05.000+02:00
diff --git a/.project b/.project
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1604680591551</id>
+			<id>1682616481632</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/demo-ng b/demo-ng
@@ -1 +1 @@
-Subproject commit ecdc5ccc92550c54f7e5fd7f1548e82586248ab6
+Subproject commit d065fa0d31dbe4c486f4221f5dbd69f880b7bad4
diff --git a/demo-react b/demo-react
@@ -1 +1 @@
-Subproject commit 85d9b7163f65ecc3d483443cf17abbeeb77885cc
+Subproject commit 9f7d15025a3785938c5eb3a59c9f43263b2a74e2
diff --git a/demo-snippets/vue/TextView.vue b/demo-snippets/vue/TextView.vue
@@ -27,7 +27,19 @@
                     </FormattedString>
                 </MDTextView>
                 <MDTextView id="textView2" editable="false" counterMaxLength="10" maxLength="10" hint="hint me" @textChange="onTextChange" @returnPress="onReturnPress" />
-                <MDTextView id="textView3" placeholderColor="green" floatingColor="yellow" color="red" variant="outline" hint="text should be red" @textChange="onTextChange" v-model="value" @returnPress="onReturnPress"  height="200" backgroundColor="blue"/>
+                <MDTextView
+                    id="textView3"
+                    placeholderColor="green"
+                    floatingColor="yellow"
+                    color="red"
+                    variant="outline"
+                    hint="text should be red"
+                    helper="test"
+                    @textChange="onTextChange"
+                    v-model="value"
+                    @returnPress="onReturnPress"
+                    backgroundColor="blue"
+                />
                 <MDTextView variant="filled" required="true" email="true" hint="fill this out..." @textChange="onTextChange" @returnPress="onReturnPress" />
                 <MDTextView hint="fill this out..." />
             </StackLayout>
@@ -46,7 +58,7 @@ export default Vue.extend({
 
     data() {
         return {
-            title: title,
+            title,
             value: 'test'
         };
     },
diff --git a/demo-svelte b/demo-svelte
@@ -1 +1 @@
-Subproject commit ee2da5e65c4e822e10d871144e2e09f45a3f77b8
+Subproject commit a6faf93ba203b310b7550ee69dc4265242b30b7e
diff --git a/demo-vue b/demo-vue
@@ -1 +1 @@
-Subproject commit ed1615348cffc5ecad93394953e14767a95bd5a9
+Subproject commit 795f5a65135f05a210777f177cb653de1ff0f651
diff --git a/demo-vue3 b/demo-vue3
@@ -1 +1 @@
-Subproject commit 47a99e5cf0ca6051d6c82edae6f215d04239c7f6
+Subproject commit 04d7f35bff242bef7b9bc0996435f2d70dfe7e3d
diff --git a/packages/bottomsheet/tsconfig.json b/packages/bottomsheet/tsconfig.json
@@ -9,5 +9,11 @@
         }
     },
     "include": ["../../src/bottomsheet/**/*.ts", "../../references.d.ts", "../../tools/references.d.ts", "../../src/references.d.ts"],
-    "exclude": ["../../src/bottomsheet/angular/**"]
-}
+    "exclude": ["../../src/bottomsheet/angular/**"],
+    "references": [
+        {
+            //Need for tsc
+            "path": "../../tsconfig.vue3.json"
+        }
+    ]
+}
diff --git a/src/bottom-navigation/index.ios.ts b/src/bottom-navigation/index.ios.ts
@@ -6,7 +6,7 @@ import { TabStrip } from '@nativescript-community/ui-material-core-tabs/tab-stri
 import { TabStripItem } from '@nativescript-community/ui-material-core-tabs/tab-strip-item';
 // Types
 // Requires
-import { CSSType, Color, CoreTypes, Device, Font, Frame, IOSHelper, ImageSource, Property, Utils, View, booleanConverter } from '@nativescript/core';
+import { CSSType, Color, CoreTypes, Device, Font, Frame, IOSHelper, ImageSource, ImageAsset, Property, Utils, View, booleanConverter } from '@nativescript/core';
 import { getTransformedText } from '@nativescript/core/ui/text-base';
 import { iOSNativeHelper } from '@nativescript/core/utils';
 export { TabContentItem, TabStrip, TabStripItem };
@@ -690,19 +690,28 @@ export class BottomNavigation extends TabNavigationBase {
         }
         const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(';');
 
-        let isFontIcon = false;
+        const isFontIcon = false;
         let image: UIImage = this.mIconsCache[iconTag];
         if (!image) {
-            let is;
-            if (Utils.isFontIconURI(iconSource)) {
-                isFontIcon = true;
-                const fontIconCode = iconSource.split('//')[1];
-                is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
+            let is: ImageSource | ImageAsset;
+            if (typeof iconSource === 'string') {
+                if (Utils.isFontIconURI(iconSource)) {
+                    const fontIconCode = iconSource.split('//')[1];
+                    const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
+                    const font = target.style.fontInternal;
+                    if (!color) {
+                        color = target.style.color;
+                    }
+                    is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
+                } else {
+                    is = ImageSource.fromFileOrResourceSync(iconSource);
+                }
             } else {
-                is = ImageSource.fromFileOrResourceSync(iconSource);
+                is = iconSource;
             }
 
-            if (is && is.ios) {
+            image = is?.ios;
+            if (image) {
                 image = is.ios;
 
                 if (this.tabStrip && this.tabStrip.isIconSizeFixed) {
diff --git a/src/bottomsheet/vue3/index.ts b/src/bottomsheet/vue3/index.ts
@@ -1,11 +1,11 @@
-import { App, createApp } from 'nativescript-vue3';
+import { App, createApp } from 'nativescript-vue';
 import { Frame, View, ViewBase } from '@nativescript/core';
 import { BottomSheetOptions } from '../bottomsheet';
 import { ComponentCustomProperties } from '@vue/runtime-core';
 
 declare module '@vue/runtime-core' {
     interface ComponentCustomProperties {
-        $showBottomSheet: (component: any, options: VueBottomSheetOptions) => Promise<any>;
+        $showBottomSheet(component: any, options: VueBottomSheetOptions): Promise<any>;
         $closeBottomSheet(...args);
     }
 }
diff --git a/src/core-tabs/tab-navigation/index.android.ts b/src/core-tabs/tab-navigation/index.android.ts
@@ -1,4 +1,4 @@
-import { Application, Color, CoreTypes, Font, ImageSource, Utils, getTransformedText } from '@nativescript/core';
+import { Application, Color, CoreTypes, Font, ImageAsset, ImageSource, Utils, getTransformedText } from '@nativescript/core';
 import { TabContentItem } from '../tab-content-item';
 import { getIconSpecSize, itemsProperty, selectedIndexProperty, tabStripProperty } from '../tab-navigation-base';
 import { TabStrip } from '../tab-strip';
@@ -459,25 +459,29 @@ export abstract class TabNavigation<T extends android.view.ViewGroup = any> exte
     }
 
     private getOriginalIcon(tabStripItem: TabStripItem, color?: Color): android.graphics.Bitmap {
-        const iconSource = tabStripItem.image && tabStripItem.image.src;
+        const iconSource = tabStripItem.image?.src;
         if (!iconSource) {
             return null;
         }
 
-        let is: ImageSource;
-        if (Utils.isFontIconURI(iconSource)) {
-            const fontIconCode = iconSource.split('//')[1];
-            const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
-            const font = target.style.fontInternal;
-            if (!color) {
-                color = target.style.color;
+        let is: ImageSource | ImageAsset;
+        if (typeof iconSource === 'string') {
+            if (Utils.isFontIconURI(iconSource)) {
+                const fontIconCode = iconSource.split('//')[1];
+                const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
+                const font = target.style.fontInternal;
+                if (!color) {
+                    color = target.style.color;
+                }
+                is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
+            } else {
+                is = ImageSource.fromFileOrResourceSync(iconSource);
             }
-            is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
         } else {
-            is = ImageSource.fromFileOrResourceSync(iconSource);
+            is = iconSource;
         }
 
-        return is && is.android;
+        return is?.android;
     }
 
     private getDrawableInfo(image: android.graphics.Bitmap): IconInfo {
diff --git a/src/core-tabs/tab-navigation/index.ios.ts b/src/core-tabs/tab-navigation/index.ios.ts
@@ -1,7 +1,7 @@
 ﻿/**
  * @module @nativescript-community/ui-material-core-tabs/tab-navigation
  */
-import { Color, CoreTypes, Device, Font, Frame, IOSHelper, ImageSource, Property, Utils, View, ViewBase, booleanConverter, getTransformedText } from '@nativescript/core';
+import { Color, CoreTypes, Device, Font, Frame, IOSHelper, ImageAsset, ImageSource, Property, Utils, View, ViewBase, booleanConverter, getTransformedText } from '@nativescript/core';
 import { TabContentItem } from '../tab-content-item';
 import { getIconSpecSize, itemsProperty, selectedIndexProperty, tabStripProperty } from '../tab-navigation-base';
 import { TabStrip } from '../tab-strip';
@@ -253,6 +253,7 @@ export abstract class TabNavigation<
     public nativeViewProtected: UIView;
     public selectedIndex: number;
     public mCanSelectItem: boolean;
+    //@ts-ignore
     public isLoaded: boolean;
     public viewController: T;
     public items: TabContentItem[];
@@ -630,21 +631,28 @@ export abstract class TabNavigation<
         }
         const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(';');
 
-        let isFontIcon = false;
+        const isFontIcon = false;
         let image: UIImage = this.mIconsCache[iconTag];
         if (!image) {
-            let is: ImageSource;
-            if (Utils.isFontIconURI(iconSource)) {
-                isFontIcon = true;
-                const fontIconCode = iconSource.split('//')[1];
-                is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
+            let is: ImageSource | ImageAsset;
+            if (typeof iconSource === 'string') {
+                if (Utils.isFontIconURI(iconSource)) {
+                    const fontIconCode = iconSource.split('//')[1];
+                    const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
+                    const font = target.style.fontInternal;
+                    if (!color) {
+                        color = target.style.color;
+                    }
+                    is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
+                } else {
+                    is = ImageSource.fromFileOrResourceSync(iconSource);
+                }
             } else {
-                is = ImageSource.fromFileOrResourceSync(iconSource);
+                is = iconSource;
             }
 
-            if (is && is.ios) {
-                image = is.ios;
-
+            image = is?.ios;
+            if (image) {
                 if (this.tabStrip && this.tabStrip.isIconSizeFixed) {
                     image = this.getFixedSizeIcon(image);
                 }
diff --git a/src/core-tabs/tab-strip-item/index.ts b/src/core-tabs/tab-strip-item/index.ts
@@ -1,7 +1,7 @@
 /**
  * @module @nativescript-community/ui-material-core-tabs/tab-strip-item
  */
-import { AddChildFromBuilder, CSSType, Color, CoreTypes, Image, Label, PropertyChangeData, PseudoClassHandler, View, ViewBase } from '@nativescript/core';
+import { AddChildFromBuilder, CSSType, Color, CoreTypes, Image, ImageAsset, ImageSource, Label, PropertyChangeData, PseudoClassHandler, View, ViewBase } from '@nativescript/core';
 import { backgroundColorProperty, backgroundInternalProperty } from '@nativescript/core/ui/styling/style-properties';
 import { textTransformProperty } from '@nativescript/core/ui/text-base';
 import { TabStripItem as TabStripItemDefinition } from '.';
@@ -19,7 +19,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
     private mIndex: number;
 
     private mTitle: string;
-    private mIconSource: string;
+    private mIconSource: string | ImageSource | ImageAsset;
     private mIconClass: string;
 
     private mHighlightedHandler: () => void;
@@ -73,15 +73,15 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
         }
     }
 
-    get iconSource() {
+    get iconSource(): string | ImageSource | ImageAsset {
         if (this.isLoaded) {
             return this.image.src;
         }
 
         return this.mIconSource;
     }
 
-    set iconSource(value: string) {
+    set iconSource(value: string | ImageSource | ImageAsset) {
         this.mIconSource = value;
 
         if (this.isLoaded) {
diff --git a/src/speeddial/index.ts b/src/speeddial/index.ts
@@ -6,7 +6,7 @@
 import { Animation, AnimationDefinition, CSSType, Color, CoreTypes, EventData, FlexboxLayout, GridLayout, ImageSource, isUserInteractionEnabledProperty } from '@nativescript/core';
 import { Button } from '@nativescript-community/ui-material-button';
 import { LinearGradient } from '@nativescript/core/ui/styling/linear-gradient';
-import { NotifyData } from '@nativescript/core/data/observable';
+import { Optional } from '@nativescript/core/utils/typescript-utils';
 
 export class SpeedDialItemBase extends GridLayout {}
 
@@ -139,7 +139,7 @@ export class SpeedDialItem extends SpeedDialItemBase {
     }
 
     notifyChildEvent(child, superNotifyMethod) {
-        return <T extends NotifyData>(data: T) => {
+        return <T extends Optional<EventData, 'object'>>(data: T) => {
             (data as any).speeddialItem = this;
             if (data.eventName === 'tap') {
                 if (this.isMain) {
diff --git a/src/tabs/index.android.ts b/src/tabs/index.android.ts
@@ -87,9 +87,9 @@ export class Tabs extends TabNavigation<TabsBar> {
     protected override setTabBarItems(tabItems: com.nativescript.material.core.TabItemSpec[]) {
         this.mTabsBar.setItems(tabItems);
         // The setTimeout below is necessary to ensure the scrollToTab is executed only after
-        // all tabs are recreated. The tabs' recreation is triggered by the setItems call above. 
+        // all tabs are recreated. The tabs' recreation is triggered by the setItems call above.
         //
-        // The setTimeout is necessary to fix an Android issue: 
+        // The setTimeout is necessary to fix an Android issue:
         // Android Issue: Active Tab item not displaying after nav back
         // Reproduce steps:
         //      1. On app with multiple (overflown) tab items, Switch to the last tab item
diff --git a/src/tabs/index.ios.ts b/src/tabs/index.ios.ts
@@ -23,30 +23,35 @@ class MDCTabBarViewDelegateImpl extends NSObject implements MDCTabBarViewDelegat
     }
 
     public tabBarViewShouldSelectItem(tabBar: MDCTabBarView, item: UITabBarItem): boolean {
-        const owner = this._owner.get();
-        const shouldSelectItem = owner.mCanSelectItem;
-        const selectedIndex = owner.tabBarItems.indexOf(item);
+        const owner = this._owner?.get();
+        if (owner) {
+            const shouldSelectItem = owner.mCanSelectItem;
+            const selectedIndex = owner.tabBarItems.indexOf(item);
 
-        if (owner.selectedIndex !== selectedIndex) {
-            owner.beginTabTransition();
-        }
+            if (owner.selectedIndex !== selectedIndex) {
+                owner.beginTabTransition();
+            }
 
-        const tabStrip = owner.tabStrip;
-        const tabStripItems = tabStrip && tabStrip.items;
+            const tabStrip = owner.tabStrip;
+            const tabStripItems = tabStrip && tabStrip.items;
 
-        if (tabStripItems && tabStripItems[selectedIndex]) {
-            tabStripItems[selectedIndex]._emit(TabStripItem.tapEvent);
-            tabStrip.notify({ eventName: TabStrip.itemTapEvent, object: tabStrip, index: selectedIndex });
-        }
+            if (tabStripItems && tabStripItems[selectedIndex]) {
+                tabStripItems[selectedIndex]._emit(TabStripItem.tapEvent);
+                tabStrip.notify({ eventName: TabStrip.itemTapEvent, object: tabStrip, index: selectedIndex });
+            }
 
-        return shouldSelectItem;
+            return shouldSelectItem;
+        }
+        return false;
     }
 
     public tabBarViewDidSelectItem(tabBar: MDCTabBarView, selectedItem: UITabBarItem): void {
-        const owner = this._owner.get();
-        const tabBarItems = owner.tabBarItems;
-        const selectedIndex = tabBarItems.indexOf(selectedItem);
-        owner.selectedIndex = selectedIndex;
+        const owner = this._owner?.get();
+        if (owner) {
+            const tabBarItems = owner.tabBarItems;
+            const selectedIndex = tabBarItems.indexOf(selectedItem);
+            owner.selectedIndex = selectedIndex;
+        }
     }
 }
 
diff --git a/src/textfield/textfield.ios.old b/src/textfield/textfield.ios.old
diff --git a/src/textfield/textfield.ios.ts b/src/textfield/textfield.ios.ts
@@ -123,6 +123,7 @@ declare module '@nativescript/core/ui/text-field' {
 export class TextField extends TextFieldBase {
     nativeViewProtected: MDCBaseTextField;
     nativeTextViewProtected: MDCBaseTextField;
+    //@ts-ignore
     public readonly style: Style & { variant: 'outline' | 'underline' | 'filled' };
     public nsdigits?: NSCharacterSet;
     firstEdit: boolean;
diff --git a/src/textview/textview.ios.ts b/src/textview/textview.ios.ts
@@ -154,6 +154,7 @@ export class TextView extends TextViewBase {
     nativeViewProtected: MDCMultilineTextField;
     private _controller: MDCTextInputControllerBase;
     public _isEditing: boolean;
+    //@ts-ignore
     public readonly style: Style & { variant: 'outline' | 'underline' | 'filled' };
 
     public clearFocus() {
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit 9ca758771b7cc930f1cae7b517201ea48418285d
+Subproject commit 836a9ad35d287b59297113c6aa667c0fc02c92ae
diff --git a/tsconfig.json b/tsconfig.json
@@ -38,5 +38,11 @@
             "@nativescript-community/ui-material-speeddial": ["src/speeddial/index"],
             "@nativescript-community/ui-material-speeddial/*": ["src/speeddial/*"],
         }
-    }
+    },
+    "references": [
+        {
+            //Need for IDE
+            "path": "./tsconfig.vue3.json"
+        }
+    ]
 }
diff --git a/tsconfig.vue3.json b/tsconfig.vue3.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-import { App, createApp } from 'nativescript-vue3';`
	`1`	`+import { App, createApp } from 'nativescript-vue';`
`2`	`2`	`import { Frame, View, ViewBase } from '@nativescript/core';`
`3`	`3`	`import { BottomSheetOptions } from '../bottomsheet';`
`4`	`4`	`import { ComponentCustomProperties } from '@vue/runtime-core';`
`5`	`5`
`6`	`6`	`declare module '@vue/runtime-core' {`
`7`	`7`	`interface ComponentCustomProperties {`
`8`		`- $showBottomSheet: (component: any, options: VueBottomSheetOptions) => Promise<any>;`
	`8`	`+ $showBottomSheet(component: any, options: VueBottomSheetOptions): Promise<any>;`
`9`	`9`	`$closeBottomSheet(...args);`
`10`	`10`	`}`
`11`	`11`	`}`