Nested
@@ -284,7 +284,7 @@ exports[`react-test-renderer nested 1`] = `
className="rn-alignItems-1oszu61 rn-backgroundColor-1mjtqww rn-borderTopStyle-1efd50x rn-borderRightStyle-14skgim rn-borderBottomStyle-rull8r rn-borderLeftStyle-mm0ijv rn-borderTopWidth-13yce4e rn-borderRightWidth-fnigne rn-borderBottomWidth-ndvcnb rn-borderLeftWidth-gxnn5r rn-boxSizing-deolkf rn-display-6koalj rn-flexShrink-1pxmb3b rn-flexBasis-7vfszb rn-flexDirection-eqz5dr rn-marginTop-1mnahxq rn-marginRight-61z16t rn-marginBottom-p1pxzi rn-marginLeft-11wrixw rn-minHeight-ifefl9 rn-minWidth-bcqeeo rn-paddingTop-m611by rn-paddingRight-1qfoi16 rn-paddingBottom-1mi0q7o rn-paddingLeft-1hfyk0a rn-position-bnwqim rn-zIndex-1lgpqti"
>
Hello World
diff --git a/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js b/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js
index 694d7961..074e0ee7 100644
--- a/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js
+++ b/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js
@@ -104,6 +104,5 @@ StyleSheetValidation.addValidStylePropTypes({
pointerEvents: string,
tableLayout: string,
/* @private */
- MozAppearance: string,
- font: string
+ MozAppearance: string
});
diff --git a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
index e2ba327f..472f6930 100644
--- a/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap
@@ -2,7 +2,7 @@
exports[`components/Text prop "onPress" 1`] = `
`;
exports[`components/Text prop "selectable" 2`] = `
`;
diff --git a/packages/react-native-web/src/exports/Text/index.js b/packages/react-native-web/src/exports/Text/index.js
index 30e188b4..de838bca 100644
--- a/packages/react-native-web/src/exports/Text/index.js
+++ b/packages/react-native-web/src/exports/Text/index.js
@@ -97,9 +97,12 @@ const styles = StyleSheet.create({
boxSizing: 'border-box',
color: 'inherit',
display: 'inline',
- font: 'inherit',
fontFamily: 'System',
fontSize: 14,
+ fontStyle: 'inherit',
+ fontVariant: ['inherit'],
+ fontWeight: 'inherit',
+ lineHeight: 'inherit',
margin: 0,
padding: 0,
textDecorationLine: 'none',
@@ -110,7 +113,6 @@ const styles = StyleSheet.create({
// inherit parent font styles
fontFamily: 'inherit',
fontSize: 'inherit',
- fontVariant: ['inherit'],
whiteSpace: 'inherit'
},
notSelectable: {
diff --git a/packages/react-native-web/src/modules/createDOMProps/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/modules/createDOMProps/__tests__/__snapshots__/index-test.js.snap
index a608668a..89253800 100644
--- a/packages/react-native-web/src/modules/createDOMProps/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/react-native-web/src/modules/createDOMProps/__tests__/__snapshots__/index-test.js.snap
@@ -18,7 +18,7 @@ Object {
exports[`modules/createDOMProps includes reset styles for "button" elements 1`] = `
Object {
- "className": "rn-appearance-30o5oe rn-backgroundColor-wib322 rn-color-homxoj rn-font-1lw9tu2 rn-textAlign-1ttztb7",
+ "className": "rn-appearance-30o5oe rn-backgroundColor-wib322 rn-color-homxoj rn-fontFamily-poiln3 rn-fontSize-7cikom rn-fontStyle-o11vmf rn-fontVariant-ebii48 rn-fontWeight-gul640 rn-lineHeight-t9a87b rn-textAlign-1ttztb7",
}
`;
diff --git a/packages/react-native-web/src/modules/createDOMProps/index.js b/packages/react-native-web/src/modules/createDOMProps/index.js
index 934c0650..60af2638 100644
--- a/packages/react-native-web/src/modules/createDOMProps/index.js
+++ b/packages/react-native-web/src/modules/createDOMProps/index.js
@@ -21,11 +21,21 @@ const resetStyles = StyleSheet.create({
appearance: 'none',
backgroundColor: 'transparent',
color: 'inherit',
- font: 'inherit',
+ fontFamily: 'inherit',
+ fontSize: 'inherit',
+ fontStyle: 'inherit',
+ fontVariant: ['inherit'],
+ fontWeight: 'inherit',
+ lineHeight: 'inherit',
textAlign: 'inherit'
},
heading: {
- font: 'inherit'
+ fontFamily: 'inherit',
+ fontSize: 'inherit',
+ fontStyle: 'inherit',
+ fontVariant: ['inherit'],
+ fontWeight: 'inherit',
+ lineHeight: 'inherit'
},
link: {
backgroundColor: 'transparent',