fix case wherer entityRange exists but entityMap is undefined or emptyObject

Author: Igor Canedo

sample/__tests__/helpers/getItemType.js …le/__tests__/helpers/getItemType.test.jssample/__tests__/helpers/getItemType.js renamed to sample/__tests__/helpers/getItemType.test.js sample/__tests__/helpers/getItemType.js renamed to sample/__tests__/helpers/getItemType.test.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2017, Globo.com (https://github.com/globocom)
+ *
+ * License: MIT
+ */
+
+/* eslint-env jest */
+
+import isEmptyObject from '../../../src/helpers/isEmptyObject';
+
+it('returns true if object is empty', () => {
+  const mock = {};
+  const result = isEmptyObject(mock);
+  expect(result).toEqual(true);
+});
+
+it('returns false if object is empty', () => {
+  const mock = { a: 1 };
+  const result = isEmptyObject(mock);
+  expect(result).toEqual(false);
+});

sample/__tests__/helpers/isEmptyObject.test.js

@@ -129,6 +129,8 @@ it('have correct length with inlineStyles, entityMap and text', () => {
   };
   const result = loadAttributes(params);
   expect(result).toHaveLength(4);
+  const typeOfFunc = typeof result[0].props.onPress;
+  expect(typeOfFunc).toBe('function');
 });
 
 it('have correct length with multiple inlineStyles and text with substring without style', () => {
@@ -266,3 +268,41 @@ it('have inlineStyles with substring and type is given without lineHeight custom
   expect(result).toHaveLength(2);
   expect(result[0].props.children).toBe(params.text);
 });
+
+it('have entityRanges but undefined entityMap', () => {
+  const params = {
+    text: 'Hello World',
+    inlineStyles: [],
+    entityMap: undefined,
+    entityRanges: [{
+      offset: 0,
+      length: 5,
+      key: 0,
+    }],
+    type: 'unstyled',
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+
+  const typeOfFunc = typeof result[0].props.onPress;
+  expect(typeOfFunc).toBe('undefined');
+});
+
+it('have entityRanges but empty object entityMap', () => {
+  const params = {
+    text: 'Hello World',
+    inlineStyles: [],
+    entityMap: {},
+    entityRanges: [{
+      offset: 0,
+      length: 5,
+      key: 0,
+    }],
+    type: 'unstyled',
+  };
+  const result = loadAttributes(params);
+  expect(result).toHaveLength(2);
+
+  const typeOfFunc = typeof result[0].props.onPress;
+  expect(typeOfFunc).toBe('undefined');
+});

sample/__tests__/loadAttributes.test.js

@@ -321,12 +321,5 @@
      }
   ],
   "entityMap": {
-    "0": {
-      "type": "LINK",
-      "mutability": "MUTABLE",
-      "data": {
-        "url": "https://github.com/globocom/react-native-draftjs-render"
-      }
-    }
   }
 }

sample/src/resourceMock.json

@@ -13,7 +13,7 @@ export type BlockQuotePropsType = {
   customStyles?: Object,
   inlineStyles: Array<Object>,
   entityRanges: Array<Object>,
-  entityMap: Object,
+  entityMap: ?Object,
   textProps: ?Object,
 };
 
@@ -24,7 +24,7 @@ export type DraftJsTextPropsType = {
   customStyles?: Object,
   inlineStyles: Array<Object>,
   entityRanges: Array<Object>,
-  entityMap: Object,
+  entityMap: ?Object,
   navigate?: Function,
   textProps: ?Object,
 };
@@ -36,7 +36,7 @@ export type OrderedListItemPropsType = {
   customStyles?: Object,
   inlineStyles: Array<Object>,
   entityRanges: Array<Object>,
-  entityMap: Object,
+  entityMap: ?Object,
   counter: number,
   separator?: string,
   depth: number,
@@ -51,7 +51,7 @@ export type UnorderedListItemPropsType = {
   customStyles?: Object,
   inlineStyles: Array<Object>,
   entityRanges: Array<Object>,
-  entityMap: Object,
+  entityMap: ?Object,
   depth: number,
   defaultMarginLeft: number,
   textProps: ?Object,

src/components/types.js

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2017, Globo.com (https://github.com/globocom)
+ *
+ * License: MIT
+ */
+
+// @flow
+
+const isEmptyObject = (obj: Object): boolean => Object.keys(obj).length === 0;
+
+export default isEmptyObject;

src/helpers/isEmptyObject.js

@@ -18,9 +18,11 @@ import defaultStyles from './components/defaultStyles';
 import generateKey from './utils/generateKey';
 import flatAttributesList from './flatAttributesList';
 import getItemType from './helpers/getItemType';
+import isEmptyObject from './helpers/isEmptyObject';
 
-export const getItemOnPress = (item: Object, entityMap: Object, navigate: Function) => {
-  if (item.key !== undefined) {
+export const getItemOnPress = (item: Object, entityMap: ?Object, navigate: Function) => {
+  if (item.key !== undefined && entityMap && !isEmptyObject(entityMap)) {
+    // $$FlowFixMe entityMap is valid here
     return () => { navigate(entityMap[item.key].data.url); };
   }
   return undefined;
@@ -32,7 +34,7 @@ type ParamsType = {
   customStyles?: Object,
   inlineStyles: Array<Object>,
   entityRanges: Array<Object>,
-  entityMap: Object,
+  entityMap: ?Object,
   navigate?: Function,
   textProps: ?Object,
 };