[WIP] Added support for italics and additional font weights

Examples/2048/Game2048.js

@@ -233,7 +233,7 @@ var styles = StyleSheet.create({
   tryAgainText: {
     color: '#ffffff',
     fontSize: 20,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   cell: {
     width: CELL_SIZE,
@@ -259,7 +259,7 @@ var styles = StyleSheet.create({
     fontSize: 24,
     color: '#776666',
     fontFamily: 'Verdana',
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   tile2: {
     backgroundColor: '#eeeeee',

Examples/Movies/MovieCell.js

@@ -62,7 +62,7 @@ var styles = StyleSheet.create({
   movieTitle: {
     flex: 1,
     fontSize: 16,
-    fontWeight: 'bold',
+    fontWeight: '500',
     marginBottom: 2,
   },
   movieYear: {

Examples/Movies/MovieScreen.js

@@ -109,7 +109,7 @@ var styles = StyleSheet.create({
   movieTitle: {
     flex: 1,
     fontSize: 16,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   rating: {
     marginTop: 10,
@@ -119,7 +119,7 @@ var styles = StyleSheet.create({
   },
   ratingValue: {
     fontSize: 28,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   mpaaWrapper: {
     alignSelf: 'flex-start',
@@ -131,7 +131,7 @@ var styles = StyleSheet.create({
   mpaaText: {
     fontFamily: 'Palatino',
     fontSize: 13,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   mainSection: {
     flexDirection: 'row',
@@ -148,7 +148,7 @@ var styles = StyleSheet.create({
     marginVertical: 10,
   },
   castTitle: {
-    fontWeight: 'bold',
+    fontWeight: '500',
     marginBottom: 3,
   },
   castActor: {

Examples/UIExplorer/ActionSheetIOSExample.js

@@ -101,7 +101,7 @@ var ShareActionSheetExample = React.createClass({
 var style = StyleSheet.create({
   button: {
     marginBottom: 10,
-    fontWeight: 'bold',
+    fontWeight: '500',
   }
 });
 

Examples/UIExplorer/AdSupportIOSExample.js

@@ -94,6 +94,6 @@ var AdSupportIOSExample = React.createClass({
 
 var styles = StyleSheet.create({
   title: {
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
 });

Examples/UIExplorer/DatePickerExample.js

@@ -149,14 +149,14 @@ var styles = StyleSheet.create({
     paddingVertical: 2,
   },
   label: {
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   headingContainer: {
     padding: 4,
     backgroundColor: '#f6f7f8',
   },
   heading: {
-    fontWeight: 'bold',
+    fontWeight: '500',
     fontSize: 14,
   },
 });

Examples/UIExplorer/GeolocationExample.js

@@ -74,6 +74,6 @@ var GeolocationExample = React.createClass({
 
 var styles = StyleSheet.create({
   title: {
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
 });

Examples/UIExplorer/NavigatorIOSExample.js

@@ -214,7 +214,7 @@ var styles = StyleSheet.create({
   },
   rowText: {
     fontSize: 17,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
 });
 

Examples/UIExplorer/ReactNavigator/BreadcrumbNavSample.js

@@ -254,7 +254,7 @@ var styles = StyleSheet.create({
     fontSize: 18,
     color: '#666666',
     textAlign: 'center',
-    fontWeight: 'bold',
+    fontWeight: '500',
     lineHeight: 32,
   },
   filterText: {

Examples/UIExplorer/ReactNavigator/NavigationBarSample.js

@@ -107,7 +107,7 @@ var styles = StyleSheet.create({
   },
   navBarTitleText: {
     color: cssVar('fbui-bluegray-60'),
-    fontWeight: 'bold',
+    fontWeight: '500',
     marginVertical: 9,
   },
   navBarButtonText: {

Examples/UIExplorer/ReactNavigator/NestedBreadcrumbNavSample.js

@@ -176,7 +176,7 @@ var styles = StyleSheet.create({
     fontSize: 18,
     color: '#666666',
     textAlign: 'center',
-    fontWeight: 'bold',
+    fontWeight: '500',
     lineHeight: 32,
   },
   filterText: {

Examples/UIExplorer/SliderIOSExample.js

@@ -47,7 +47,7 @@ var styles = StyleSheet.create({
   text: {
     fontSize: 14,
     textAlign: 'center',
-    fontWeight: 'bold',
+    fontWeight: '500',
     margin: 10,
   },
 });

Examples/UIExplorer/TextExample.ios.js

@@ -29,7 +29,7 @@ var Entity = React.createClass({
 
 var AttributeToggler = React.createClass({
   getInitialState: function() {
-    return {fontWeight: 'bold', fontSize: 15};
+    return {fontWeight: '500', fontSize: 15};
   },
   increaseSize: function() {
     this.setState({
@@ -129,9 +129,37 @@ exports.examples = [
   title: 'Font Weight',
   render: function() {
     return (
-      <Text style={{fontWeight: 'bold'}}>
-        Move fast and be bold
-      </Text>
+      <View>
+        <Text style={{fontWeight: '100'}}>
+          Move fast and be ultralight
+        </Text>
+        <Text style={{fontWeight: '200'}}>
+          Move fast and be light
+        </Text>
+        <Text style={{fontWeight: 'normal'}}>
+          Move fast and be normal
+        </Text>
+        <Text style={{fontWeight: 'bold'}}>
+          Move fast and be bold
+        </Text>
+        <Text style={{fontWeight: '900'}}>
+          Move fast and be ultrabold
+        </Text>
+      </View>
+    );
+  },
+},  {
+  title: 'Font Style',
+  render: function() {
+    return (
+      <View>
+        <Text style={{fontStyle: 'normal'}}>
+          Normal text
+        </Text>
+        <Text style={{fontStyle: 'italic'}}>
+          Italic text
+        </Text>
+      </View>
     );
   },
 }, {
@@ -279,7 +307,7 @@ var styles = StyleSheet.create({
     backgroundColor: 'rgba(100, 100, 100, 0.3)'
   },
   entity: {
-    fontWeight: 'bold',
+    fontWeight: '500',
     color: '#527fe4',
   },
 });

Examples/UIExplorer/TouchableExample.js

@@ -187,7 +187,7 @@ var styles = StyleSheet.create({
     backgroundColor: '#f9f9f9',
   },
   textBlock: {
-    fontWeight: 'bold',
+    fontWeight: '500',
     color: 'blue',
   },
 });

Examples/UIExplorer/UIExplorerBlock.js

@@ -76,7 +76,7 @@ var styles = StyleSheet.create({
   },
   titleText: {
     fontSize: 14,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   descriptionText: {
     fontSize: 14,

Examples/UIExplorer/UIExplorerList.js

@@ -204,7 +204,7 @@ var styles = StyleSheet.create({
     backgroundColor: 'white',
   },
   sectionHeaderTitle: {
-    fontWeight: 'bold',
+    fontWeight: '500',
     fontSize: 11,
   },
   row: {
@@ -220,7 +220,7 @@ var styles = StyleSheet.create({
   },
   rowTitleText: {
     fontSize: 17,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   rowDetailText: {
     fontSize: 15,

Examples/UIExplorer/UIExplorerTitle.js

@@ -42,7 +42,7 @@ var styles = StyleSheet.create({
   },
   text: {
     fontSize: 19,
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
 });
 

Examples/UIExplorer/WebViewExample.js

@@ -239,7 +239,7 @@ var styles = StyleSheet.create({
   },
   errorTextTitle: {
     fontSize: 15,
-    fontWeight: 'bold',
+    fontWeight: '500',
     marginBottom: 10,
   },
   errorText: {

IntegrationTests/IntegrationTestsApp.js

@@ -81,7 +81,7 @@ var styles = StyleSheet.create({
     padding: 10,
   },
   testName: {
-    fontWeight: 'bold',
+    fontWeight: '500',
   },
   separator: {
     height: 1,

Libraries/Text/RCTShadowText.h

@@ -21,6 +21,7 @@ extern NSString *const RCTReactTagAttributeName;
 @property (nonatomic, copy) NSString *fontFamily;
 @property (nonatomic, assign) CGFloat fontSize;
 @property (nonatomic, copy) NSString *fontWeight;
+@property (nonatomic, copy) NSString *fontStyle;
 @property (nonatomic, assign) BOOL isHighlighted;
 @property (nonatomic, assign) CGFloat lineHeight;
 @property (nonatomic, assign) NSInteger maxNumberOfLines;

Libraries/Text/RCTShadowText.m

@@ -50,12 +50,14 @@ - (NSAttributedString *)attributedString
 {
   return [self _attributedStringWithFontFamily:nil
                                       fontSize:0
-                                    fontWeight:nil];
+                                    fontWeight:nil
+                                     fontStyle:nil];
 }
 
 - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
                                                fontSize:(CGFloat)fontSize
                                              fontWeight:(NSString *)fontWeight
+                                              fontStyle:(NSString *)fontStyle
 {
   if (![self isTextDirty] && _cachedAttributedString) {
     return _cachedAttributedString;
@@ -67,6 +69,9 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
   if (_fontWeight) {
     fontWeight = _fontWeight;
   }
+  if (_fontStyle) {
+    fontStyle = _fontStyle;
+  }
   if (_fontFamily) {
     fontFamily = _fontFamily;
   }
@@ -75,7 +80,7 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
   for (RCTShadowView *child in [self reactSubviews]) {
     if ([child isKindOfClass:[RCTShadowText class]]) {
       RCTShadowText *shadowText = (RCTShadowText *)child;
-      [attributedString appendAttributedString:[shadowText _attributedStringWithFontFamily:fontFamily fontSize:fontSize fontWeight:fontWeight]];
+      [attributedString appendAttributedString:[shadowText _attributedStringWithFontFamily:fontFamily fontSize:fontSize fontWeight:fontWeight fontStyle:fontStyle]];
     } else if ([child isKindOfClass:[RCTShadowRawText class]]) {
       RCTShadowRawText *shadowRawText = (RCTShadowRawText *)child;
       [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[shadowRawText text] ?: @""]];
@@ -96,7 +101,7 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
     [self _addAttribute:NSBackgroundColorAttributeName withValue:self.textBackgroundColor toAttributedString:attributedString];
   }
 
-  _font = [RCTConvert UIFont:nil withFamily:fontFamily size:@(fontSize) weight:fontWeight];
+  _font = [RCTConvert UIFont:nil withFamily:fontFamily size:@(fontSize) weight:fontWeight style:fontStyle];
   [self _addAttribute:NSFontAttributeName withValue:_font toAttributedString:attributedString];
   [self _addAttribute:RCTReactTagAttributeName withValue:self.reactTag toAttributedString:attributedString];
   [self _setParagraphStyleOnAttributedString:attributedString];
@@ -110,7 +115,7 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
 
 - (UIFont *)font
 {
-  return _font ?: [RCTConvert UIFont:nil withFamily:_fontFamily size:@(_fontSize) weight:_fontWeight];
+  return _font ?: [RCTConvert UIFont:nil withFamily:_fontFamily size:@(_fontSize) weight:_fontWeight style:_fontStyle];
 }
 
 - (void)_addAttribute:(NSString *)attribute withValue:(id)attributeValue toAttributedString:(NSMutableAttributedString *)attributedString

ReactKit/Base/RCTConvert.h

@@ -12,6 +12,7 @@
 
 #import "Layout.h"
 #import "RCTAnimationType.h"
+#import "RCTLog.h"
 #import "RCTPointerEvents.h"
 
 /**
@@ -69,8 +70,13 @@
 
 + (UIFont *)UIFont:(UIFont *)font withSize:(id)json;
 + (UIFont *)UIFont:(UIFont *)font withWeight:(id)json;
++ (UIFont *)UIFont:(UIFont *)font withStyle:(id)json;
 + (UIFont *)UIFont:(UIFont *)font withFamily:(id)json;
-+ (UIFont *)UIFont:(UIFont *)font withFamily:(id)json size:(id)json weight:(id)json;
++ (UIFont *)UIFont:(UIFont *)font
+        withFamily:(id)family
+              size:(id)size
+            weight:(id)weight
+             style:(id)style;
 
 + (NSArray *)NSStringArray:(id)json;
 + (NSArray *)NSURLArray:(id)json;