Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ios/TopBarAppearancePresenter.mm
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ - (void)applyOptions:(RNNTopBarOptions *)options {

[self setTitleAttributes:options.title];
[self setLargeTitleAttributes:options.largeTitle];
if (options.scrollEdgeAppearance.title && [options.scrollEdgeAppearance.title hasValue]) {
if (options.scrollEdgeAppearance.title.hasValue) {
[self setScrollEdgeTitleAttributes:options.scrollEdgeAppearance.title];
} else {
[self setScrollEdgeTitleAttributes:options.title];
}

[self setBorderColor:[options.borderColor withDefault:nil]];
Expand Down Expand Up @@ -53,6 +55,12 @@ - (void)mergeOptions:(RNNTopBarOptions *)options withDefault:(RNNTopBarOptions *
if (options.scrollEdgeAppearance.noBorder.hasValue) {
[self showScrollEdgeBorder:!options.scrollEdgeAppearance.noBorder.get];
}

if (options.scrollEdgeAppearance.title.hasValue) {
[self setScrollEdgeTitleAttributes:defaultOptions.scrollEdgeAppearance.title];
} else if (options.title.hasValue && !defaultOptions.scrollEdgeAppearance.title.hasValue) {
[self setScrollEdgeTitleAttributes:defaultOptions.title];
}
}

- (void)setTranslucent:(BOOL)translucent {
Expand Down Expand Up @@ -160,7 +168,6 @@ - (void)setTitleAttributes:(RNNTitleOptions *)titleOptions {
}

self.getAppearance.titleTextAttributes = titleTextAttributes;
self.getScrollEdgeAppearance.titleTextAttributes = titleTextAttributes;
}

- (void)setScrollEdgeTitleAttributes:(RNNTitleOptions *)titleOptions {
Expand Down