Merge pull request #97 from archriss/dev

v3.8.1
meliorence · Feb 8, 2018 · bb8fbfa · bb8fbfa
2 parents 9adae7c + d820ef2
commit bb8fbfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Demo/package.json b/Demo/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "16.2.0",
     "react-native": "0.52.0",
-    "react-native-render-html": "3.8.0"
+    "react-native-render-html": "3.8.1"
   },
   "devDependencies": {
     "babel-jest": "22.0.6",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-render-html",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "author": "Archriss",
   "license": "BSD-2-Clause",
   "repository": "https://github.com/archriss/react-native-render-html",

diff --git a/src/HTML.js b/src/HTML.js
@@ -151,18 +151,20 @@ export default class HTML extends PureComponent {
 
         for (let i = 0; i < styles.length; i++) {
             const styleAttribute = styles[i];
+            const tagToCheck = tagName === 'rawtext' ? parentTag : tagName;
             const styleAttributeWithCSSDashes = styleAttribute.replace(/[A-Z]/, (match) => { return `-${match.toLowerCase()}`; });
             const overridenFromStyle = attribs && attribs.style && attribs.style.search(styleAttributeWithCSSDashes) !== -1;
             const overridenFromParentStyle = parent && parent.attribs && parent.attribs.style && parent.attribs.style.search(styleAttributeWithCSSDashes) !== -1;
 
-            const overridenFromTagStyle = tagName && tagsStyles[tagName] && tagsStyles[tagName][styleAttribute];
+            const overridenFromTagStyle = tagToCheck && tagsStyles[tagToCheck] && tagsStyles[tagToCheck][styleAttribute];
             const overridenFromParentTagStyle = parentTag && tagsStyles[parentTag] && tagsStyles[parentTag][styleAttribute];
 
             const overridenFromClassStyles = classStyles && classStyles[styleAttribute];
+            const overridenFromDefaultStyles = this.defaultTextStyles[tagToCheck] && this.defaultTextStyles[tagToCheck][styleAttribute];
 
             const notOverriden = !overridenFromStyle && !overridenFromParentStyle &&
                 !overridenFromTagStyle && !overridenFromParentTagStyle &&
-                !overridenFromClassStyles;
+                !overridenFromClassStyles && !overridenFromDefaultStyles;
 
             if (notOverriden) {
                 appliedStyles[styleAttribute] = baseFontStyle[styleAttribute];