Merge tag '5.1.2' into develop

Release 5.1.2

Author: awesomejerry

README.md

@@ -104,6 +104,7 @@ logoMargin | 2 | logo's distance to its wrapper
 logoBorderRadius | 0 | the border-radius of logo image (Android is not supported)
 getRef          | null       | Get SVG ref for further usage
 ecl             | 'M'        | Error correction level
+onError(error)  | undefined  | Callback fired when exception happened during the code generating process
 
 
 ## Saving generated code to gallery

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-qrcode-svg",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "A QR Code generator for React Native based on react-native-svg and javascript-qrcode.",
   "main": "index.js",
   "types": "index.d.ts",

src/__tests__/QRCode-test.js

@@ -18,4 +18,30 @@ describe('QRCode', () => {
     ).toJSON()
     expect(tree).toMatchSnapshot()
   })
+
+  // Let's simulate too big data passed to QRCode and check if onError Callback
+  // Called properly
+  it('calls onError in case of issue with code generating', () => {
+    const onErrorMock = jest.fn()
+    // Let's try to render with too big amount of data that should
+    // throw an exception
+    renderer.create(
+      <QRCode
+        value={(new Array(1000000)).join('123')}
+        onError={onErrorMock}
+      />
+    )
+    expect(onErrorMock.mock.calls.length).toBe(1)
+  })
+
+  it('does not call onError in case if value is fine', () => {
+    const onErrorMock = jest.fn()
+    renderer.create(
+      <QRCode
+        value='123'
+        onError={onErrorMock}
+      />
+    )
+    expect(onErrorMock.mock.calls.length).toBe(0)
+  })
 })

src/index.js

@@ -34,7 +34,12 @@ export default class QRCode extends PureComponent {
     /* get svg ref for further usage */
     getRef: PropTypes.func,
     /* error correction level */
-    ecl: PropTypes.oneOf(['L', 'M', 'Q', 'H'])
+    ecl: PropTypes.oneOf(['L', 'M', 'Q', 'H']),
+    /* Callback function that's called in case if any errors
+     * appeared during the process of code generating.
+     * Error object is passed to the callback.
+     */
+    onError: PropTypes.func
   };
   static defaultProps = {
     value: 'This is a QR Code.',
@@ -45,7 +50,8 @@ export default class QRCode extends PureComponent {
     logoBackgroundColor: DEFAULT_BG_COLOR,
     logoMargin: 2,
     logoBorderRadius: 0,
-    ecl: 'M'
+    ecl: 'M',
+    onError: undefined
   };
   constructor (props) {
     super(props)
@@ -62,10 +68,19 @@ export default class QRCode extends PureComponent {
   }
   /* calculate the size of the cell and draw the path */
   setMatrix (props) {
-    const { value, size, ecl } = props
-    this._matrix = genMatrix(value, ecl)
-    this._cellSize = size / this._matrix.length
-    this._path = this.transformMatrixIntoPath()
+    const { value, size, ecl, onError } = props
+    try {
+      this._matrix = genMatrix(value, ecl)
+      this._cellSize = size / this._matrix.length
+      this._path = this.transformMatrixIntoPath()
+    } catch (error) {
+      if (onError && typeof onError === 'function') {
+        onError(error)
+      } else {
+        // Pass the error when no handler presented
+        throw error
+      }
+    }
   }
   /* project the matrix into path draw */
   transformMatrixIntoPath () {
@@ -129,11 +144,13 @@ export default class QRCode extends PureComponent {
           height={size}
           fill={backgroundColor}
         />
-        <Path
-          d={this._path}
-          stroke={color}
-          strokeWidth={this._cellSize}
-        />
+        { this._path && this._cellSize && (
+          <Path
+            d={this._path}
+            stroke={color}
+            strokeWidth={this._cellSize}
+          />
+        )}
         {logo && (
           <G x={logoPosition} y={logoPosition}>
             <Rect