javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(tabs): iconSource support for sys:// and font:// icons

Browse Source 
closes https://github.com/NativeScript/NativeScript/issues/10729
This commit is contained in:
Nathan Walker
2025-08-18 22:17:04 -07:00
parent dc1e2d761e
commit 226dc85efb
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/core/ui/tab-view/index.ios.ts
View File

@@ -12,7 +12,8 @@ import { CoreTypes } from '../../core-types';
import { ImageSource } from '../../image-source';
import { profile } from '../../profiling';
import { Frame } from '../frame';
import { layout } from '../../utils';
import { layout } from '../../utils/layout-helper';
import { isFontIconURI, isSystemURI, SYSTEM_PREFIX } from '../../utils/common';
import { SDK_VERSION } from '../../utils/constants';
import { Device } from '../../platform';
export * from './tab-view-common';
@@ -239,7 +240,7 @@ export class TabViewItem extends TabViewItemBase {
const parent = <TabView>this.parent;
const controller = this.__controller;
if (parent && controller) {
const icon = parent._getIcon(this.iconSource);
const icon = parent._getIcon(this);
const index = parent.items.indexOf(this);
const title = getTransformedText(this.title, this.style.textTransform);
@@ -456,7 +457,7 @@ export class TabView extends TabViewBase {
items.forEach((item, i) => {
const controller = this.getViewController(item);
const icon = this._getIcon(item.iconSource);
const icon = this._getIcon(item);
const tabBarItem = UITabBarItem.alloc().initWithTitleImageTag(item.title || '', icon, i);
updateTitleAndIconPositions(item, tabBarItem, controller);
@@ -492,20 +493,27 @@ export class TabView extends TabViewBase {
}
}
public _getIcon(iconSource: string): UIImage {
if (!iconSource) {
public _getIcon(item: TabViewItem): UIImage {
if (!item || !item.iconSource) {
return null;
}
let image: UIImage = this._iconsCache[iconSource];
let image: UIImage = this._iconsCache[item.iconSource];
if (!image) {
const is = ImageSource.fromFileOrResourceSync(iconSource);
let is: ImageSource;
if (isSystemURI(item.iconSource)) {
is = ImageSource.fromSystemImageSync(item.iconSource.slice(SYSTEM_PREFIX.length));
} else if (isFontIconURI(item.iconSource)) {
is = ImageSource.fromFontIconCodeSync(item.iconSource, item.style.fontInternal, item.style.color);
} else {
is = ImageSource.fromFileOrResourceSync(item.iconSource);
}
if (is && is.ios) {
const originalRenderedImage = is.ios.imageWithRenderingMode(this._getIconRenderingMode());
this._iconsCache[iconSource] = originalRenderedImage;
this._iconsCache[item.iconSource] = originalRenderedImage;
image = originalRenderedImage;
} else {
traceMissingIcon(iconSource);
traceMissingIcon(item.iconSource);
}
}