support to new text (ios) implementation on react native 0.54+ (#39)

* support to new text (ios) implementation on react native 0.54+

* add more coverage

Author: Canedo

package.json

@@ -24,26 +24,26 @@
     "react-native": ">=0.49.3"
   },
   "dependencies": {
-    "stringz": "0.4.0"
+    "stringz": "1.0.0"
   },
   "devDependencies": {
     "babel-eslint": "8.2.2",
-    "babel-jest": "22.4.1",
+    "babel-jest": "22.4.3",
     "babel-preset-react-native": "4.0.0",
     "coveralls": "3.0.0",
-    "eslint": "4.18.1",
+    "eslint": "4.19.1",
     "eslint-config-airbnb": "16.1.0",
     "eslint-plugin-flowtype": "2.46.1",
-    "eslint-plugin-import": "2.9.0",
+    "eslint-plugin-import": "2.10.0",
     "eslint-plugin-jsx-a11y": "6.0.3",
     "eslint-plugin-react": "7.7.0",
     "eslint-plugin-react-native": "3.2.1",
-    "flow-bin": "0.66.0",
-    "jest": "22.4.2",
-    "react": "16.2.0",
-    "react-dom": "16.2.0",
-    "react-native": "0.53.3",
-    "react-test-renderer": "16.2.0"
+    "flow-bin": "0.69.0",
+    "jest": "22.4.3",
+    "react": "16.3.1",
+    "react-dom": "16.3.1",
+    "react-native": "0.55.2",
+    "react-test-renderer": "16.3.1"
   },
   "jest": {
     "preset": "react-native",

sample/__tests__/components/__snapshots__/TextStyled.test.js.snap

@@ -7,14 +7,17 @@ exports[`renders correctly with customStyles and multiple types 1`] = `
   ellipsizeMode="tail"
   style={
     Array [
-      Object {
-        "fontStyle": "italic",
-        "fontWeight": "bold",
-      },
-      Object {
-        "fontStyle": "italic",
-        "fontWeight": "bold",
-      },
+      Array [
+        Object {
+          "fontStyle": "italic",
+          "fontWeight": "bold",
+        },
+        Object {
+          "fontStyle": "italic",
+          "fontWeight": "bold",
+        },
+      ],
+      undefined,
     ]
   }
 >
@@ -29,12 +32,15 @@ exports[`renders correctly with customStyles and single type 1`] = `
   ellipsizeMode="tail"
   style={
     Array [
-      Object {
-        "fontWeight": "bold",
-      },
-      Object {
-        "fontWeight": "bold",
-      },
+      Array [
+        Object {
+          "fontWeight": "bold",
+        },
+        Object {
+          "fontWeight": "bold",
+        },
+      ],
+      undefined,
     ]
   }
 >
@@ -50,6 +56,9 @@ exports[`renders correctly with onPress 1`] = `
   onPress={[Function]}
   style={
     Array [
+      Array [
+        undefined,
+      ],
       undefined,
     ]
   }
@@ -65,6 +74,9 @@ exports[`renders correctly without onPress 1`] = `
   ellipsizeMode="tail"
   style={
     Array [
+      Array [
+        undefined,
+      ],
       undefined,
     ]
   }

sample/__tests__/loadAttributes.test.js

@@ -182,3 +182,87 @@ it('have correct length with multiple inlineStyles and text with substring witho
   expect(result).toHaveLength(2);
   expect(result[0].props.children).toBe(params.text);
 });
+
+it('have inlineStyles with substring and type is given', () => {
+  const params = {
+    text: 'Hello World Hello World Hello World',
+    inlineStyles: [{
+      offset: 300,
+      length: 2,
+      style: 'BOLD',
+    }],
+    entityMap: {},
+    entityRanges: [],
+    type: 'unstyled',
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+  expect(result[0].props.children).toBe(params.text);
+});
+
+
+it('have inlineStyles with substring and type is given with proper customStyles to that type', () => {
+  const params = {
+    text: 'Hello World Hello World Hello World',
+    inlineStyles: [{
+      offset: 300,
+      length: 2,
+      style: 'BOLD',
+    }],
+    entityMap: {},
+    entityRanges: [],
+    type: 'unstyled',
+    customStyles: {
+      unstyled: {
+        lineHeight: 30,
+      },
+    },
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+  expect(result[0].props.children).toBe(params.text);
+});
+
+it('have inlineStyles with substring and type is given without proper customStyles to that type', () => {
+  const params = {
+    text: 'Hello World Hello World Hello World',
+    inlineStyles: [{
+      offset: 300,
+      length: 2,
+      style: 'BOLD',
+    }],
+    entityMap: {},
+    entityRanges: [],
+    type: 'unstyled',
+    customStyles: {
+      other: {
+        lineHeight: 30,
+      },
+    },
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+  expect(result[0].props.children).toBe(params.text);
+});
+
+it('have inlineStyles with substring and type is given without lineHeight customStyles to that type', () => {
+  const params = {
+    text: 'Hello World Hello World Hello World',
+    inlineStyles: [{
+      offset: 300,
+      length: 2,
+      style: 'BOLD',
+    }],
+    entityMap: {},
+    entityRanges: [],
+    type: 'unstyled',
+    customStyles: {
+      unstyled: {
+        fontSize: 30,
+      },
+    },
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+  expect(result[0].props.children).toBe(params.text);
+});

sample/package.json

@@ -11,15 +11,15 @@
 		"watch-index": "sync-files --watch ../index.js react-native-draftjs-render/index.js"
 	},
 	"dependencies": {
-		"react": "16.2.0",
-		"react-native": "0.53.3",
-		"stringz": "0.4.0"
+		"react": "16.3.1",
+		"react-native": "0.55.2",
+		"stringz": "1.0.0"
 	},
 	"devDependencies": {
-		"babel-jest": "22.4.1",
+		"babel-jest": "22.4.3",
 		"babel-preset-react-native": "4.0.0",
-		"jest": "22.4.2",
-		"react-test-renderer": "16.2.0",
+		"jest": "22.4.3",
+		"react-test-renderer": "16.3.1",
 		"sync-files": "1.0.3"
 	},
 	"jest": {

sample/src/resourceMock.json

@@ -81,7 +81,7 @@
     },
     {
       "key": "5r8641253",
-      "text": "Etiam ultricies nisi vel augue.",
+      "text": "Etiam ultricies nisi vel augue vel augue vel augue.",
       "type": "unstyled",
       "depth": 0,
       "inlineStyleRanges": [