Skip to content

Commit fe382b5

Browse files
markdevochtBeat-YT
andauthored
iOS add title customization to scroll edge appearance (#8239)
* Add title customization to scroll edge appearance (#8207) * update the missing pieces --------- Co-authored-by: Beat-YT <Beat-YT@users.noreply.github.com>
1 parent ec0ebe8 commit fe382b5

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

ios/TopBarAppearancePresenter.mm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ - (void)applyOptions:(RNNTopBarOptions *)options {
2222

2323
[self setTitleAttributes:options.title];
2424
[self setLargeTitleAttributes:options.largeTitle];
25-
if (options.scrollEdgeAppearance.title && [options.scrollEdgeAppearance.title hasValue]) {
25+
if (options.scrollEdgeAppearance.title.hasValue) {
2626
[self setScrollEdgeTitleAttributes:options.scrollEdgeAppearance.title];
27+
} else {
28+
[self setScrollEdgeTitleAttributes:options.title];
2729
}
2830

2931
[self setBorderColor:[options.borderColor withDefault:nil]];
@@ -53,6 +55,12 @@ - (void)mergeOptions:(RNNTopBarOptions *)options withDefault:(RNNTopBarOptions *
5355
if (options.scrollEdgeAppearance.noBorder.hasValue) {
5456
[self showScrollEdgeBorder:!options.scrollEdgeAppearance.noBorder.get];
5557
}
58+
59+
if (options.scrollEdgeAppearance.title.hasValue) {
60+
[self setScrollEdgeTitleAttributes:defaultOptions.scrollEdgeAppearance.title];
61+
} else if (options.title.hasValue && !defaultOptions.scrollEdgeAppearance.title.hasValue) {
62+
[self setScrollEdgeTitleAttributes:defaultOptions.title];
63+
}
5664
}
5765

5866
- (void)setTranslucent:(BOOL)translucent {
@@ -160,7 +168,6 @@ - (void)setTitleAttributes:(RNNTitleOptions *)titleOptions {
160168
}
161169

162170
self.getAppearance.titleTextAttributes = titleTextAttributes;
163-
self.getScrollEdgeAppearance.titleTextAttributes = titleTextAttributes;
164171
}
165172

166173
- (void)setScrollEdgeTitleAttributes:(RNNTitleOptions *)titleOptions {

0 commit comments

Comments
 (0)