yogevbd 6 years ago
parent
commit
d28d633954

+ 4
- 2
lib/ios/RNNTitleOptions.m View File

11
 	
11
 	
12
 	NSDictionary* fontAttributes = [self fontAttributes];
12
 	NSDictionary* fontAttributes = [self fontAttributes];
13
 	
13
 	
14
-	viewController.navigationController.navigationBar.titleTextAttributes = fontAttributes;
15
-
14
+	if (fontAttributes.allKeys.count > 0) {
15
+		viewController.navigationController.navigationBar.titleTextAttributes = fontAttributes;
16
+	}
17
+	
16
 	if (self.subtitle.text) {
18
 	if (self.subtitle.text) {
17
 		RNNTitleViewHelper* titleViewHelper = [[RNNTitleViewHelper alloc] init:viewController title:self.text subtitle:self.subtitle.text titleImageData:nil isSetSubtitle:NO];
19
 		RNNTitleViewHelper* titleViewHelper = [[RNNTitleViewHelper alloc] init:viewController title:self.text subtitle:self.subtitle.text titleImageData:nil isSetSubtitle:NO];
18
 		[titleViewHelper setup:self];
20
 		[titleViewHelper setup:self];

+ 1
- 2
playground/src/screens/PushedScreen.js View File

50
 
50
 
51
   componentDidMount() {
51
   componentDidMount() {
52
     this.listeners.push(
52
     this.listeners.push(
53
-      this.subscription = Navigation.events().registerComponentDidAppearListener((event) => {
53
+      Navigation.events().registerComponentDidAppearListener((event) => {
54
         if (this.state.previewComponentId === event.componentId) {
54
         if (this.state.previewComponentId === event.componentId) {
55
           this.setState({ disabled: event.type === 'ComponentDidAppear' });
55
           this.setState({ disabled: event.type === 'ComponentDidAppear' });
56
         }
56
         }
69
   }
69
   }
70
 
70
 
71
   componentWillUnmount() {
71
   componentWillUnmount() {
72
-    this.subscription.remove();
73
     this.listeners.forEach(listener => listener.remove && listener.remove());
72
     this.listeners.forEach(listener => listener.remove && listener.remove());
74
   }
73
   }
75
 
74
 

+ 1
- 1
playground/src/screens/WelcomeScreen.js View File

24
         },
24
         },
25
         drawBehind: true,
25
         drawBehind: true,
26
         visible: false,
26
         visible: false,
27
-        animate: false
27
+        animate: true
28
       }
28
       }
29
     };
29
     };
30
   }
30
   }