fix(ios-tabview): crash when setting tab text color (#7188) · NativeScript/NativeScript@77c45da · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 775
• Pull requests 73
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 77c45da

Browse filesBrowse the repository at this point in the historyBrowse files

MartoYankov

authored

fix(ios-tabview): crash when setting tab text color (#7188)

1 parent dfb08c1 commit 77c45da
Copy full SHA for 77c45da

3 files changed

+26-1Lines changed: 26 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• apps/app/ui-tests-app/tab-view
  • main-page.ts
  • tab-text-color.xml
• tns-core-modules/ui/tab-view
  • tab-view.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎apps/app/ui-tests-app/tab-view/main-page.ts‎

Copy file name to clipboardExpand all lines: apps/app/ui-tests-app/tab-view/main-page.ts

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -27,5 +27,6 @@ export function loadExamples() {
27	27	examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size");
28	28	examples.set("tab-view-android-swipe", "tab-view/tab-view-android-swipe");
29	29	examples.set("tab-view-icon-title-placement", "tab-view/icon-title-placement");
	30	+ examples.set("tab-text-color", "tab-view/tab-text-color");
30	31	return examples;
31	32	}

Collapse file

‎apps/app/ui-tests-app/tab-view/tab-text-color.xml‎

Copy file name to clipboard

+24Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,24 @@
	1	+ <Page>
	2	+ <TabView tabTextColor="red">
	3	+ <TabView.items>
	4	+
	5	+ <TabViewItem title="Tab 1">
	6	+ <TabViewItem.view>
	7	+ <Label text="Label 1" />
	8	+ </TabViewItem.view>
	9	+ </TabViewItem>
	10	+
	11	+ <TabViewItem title="Tab 2">
	12	+ <TabViewItem.view>
	13	+ <Label text="Label 2" />
	14	+ </TabViewItem.view>
	15	+ </TabViewItem>
	16	+
	17	+ <TabViewItem title="Tab 3">
	18	+ <TabViewItem.view>
	19	+ <Label text="Label 3" />
	20	+ </TabViewItem.view>
	21	+ </TabViewItem>
	22	+ </TabView.items>
	23	+ </TabView>
	24	+ </Page>

Collapse file

‎tns-core-modules/ui/tab-view/tab-view.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/tab-view/tab-view.ios.ts

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -576,7 +576,7 @@ function getTitleAttributesForStates(tabView: TabView): TabStates {
576	576	}
577	577
578	578	const tabSelectedItemTextColor = tabView.style.selectedTabTextColor;
579		- const selectedTextColor = tabItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
	579	+ const selectedTextColor = tabSelectedItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
580	580	result.selectedState = { [NSFontAttributeName]: font }
581	581	if (selectedTextColor) {
582	582	result.selectedState[UITextAttributeTextColor] = selectedTextColor

0 commit comments

Comments

0 (0)