支持最新版本的RN，添加getIsEmpty方法来获取最新是否有过手写

yz1311 · Mar 25, 2024 · 1ea5969 · 1ea5969
1 parent 6a36114
commit 1ea5969
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -131,8 +131,12 @@ export default class Demo extends Component {
         let base64Str = await this.signaturePad.getDataURL();
     } catch(e) {
 
-    }
-
+    }  
+  }
+
+  getIsEmpty = async () => {
+    //获取是否有手写,true/false表示有结果，undefined表示获取失败
+    const isEmpty = await this.signaturePad.getIsEmpty();
   }
 }
 ```

diff --git a/index.js b/index.js
@@ -3,10 +3,10 @@
 import React, {Component} from 'react';
 import {PropTypes} from 'prop-types';
 import {
-    ViewPropTypes,
-    StyleSheet,
+    StyleSheet
 } from 'react-native';
 import {WebView} from 'react-native-webview';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
 
 
 import htmlContent from './injectedHtml';
@@ -74,7 +74,7 @@ class SignaturePad extends Component {
         //  React Native app, the JS is re-injected every time a stroke is drawn.
     }
 
-    componentWillReceiveProps = (nextProps) => {
+    UNSAFE_componentWillReceiveProps = (nextProps) => {
         if (this.props.useFont && this.state.name !== nextProps.name) {
             var escapedName = nextProps.name.replace(/"/, `\\"`);
             this.setState({name: escapedName});
@@ -171,6 +171,10 @@ class SignaturePad extends Component {
         this.props.onResult({base64DataUrl});
     };
 
+    _bridged_getIsEmpty = ({data}) => {
+        this.tempIsEmptyResolve&&this.tempIsEmptyResolve(data);
+    };
+
     _bridged_canvasSize = (data) => {
         this.props.onChange(data);
         // this.setState({base64DataUrl});
@@ -195,6 +199,9 @@ class SignaturePad extends Component {
             case 'getDataURL':
                 this._bridged_getDataURL(data);
                 break;
+            case 'getIsEmpty':
+                this._bridged_getIsEmpty(data);
+                break;
         }
     }
 
@@ -212,6 +219,16 @@ class SignaturePad extends Component {
         })
     }
 
+    getIsEmpty = async () => {
+        return new Promise((resolve,reject)=>{
+            this.tempIsEmptyResolve=resolve;
+            this._webview.postMessage(JSON.stringify({ action: 'getIsEmpty' }));
+            setTimeout(()=>{
+                resolve(undefined);
+            },2000);
+        })
+    }
+
     render = () => {
         return (
             <WebView

diff --git a/injectedJavaScript/application.js b/injectedJavaScript/application.js
@@ -23,7 +23,7 @@ var showSignaturePad = function (signaturePadCanvas, bodyWidth, bodyHeight) {
     });
     signaturePad.minWidth = ${penMinWidth || 1};
     signaturePad.maxWidth = ${penMaxWidth || 4};
-    if ("${dataURL}") {
+    if (${dataURL}) {
       signaturePad.fromDataURL("${dataURL}");
     }
     ${Platform.OS==='ios'?'window':'document'}.addEventListener('message', function (event) {
@@ -47,6 +47,10 @@ var showSignaturePad = function (signaturePadCanvas, bodyWidth, bodyHeight) {
         var data = signaturePad.toDataURL();
         executeNativeFunction('getDataURL',{ base64DataUrl: data, type:'getDataURL' });
         return;
+      } else if(action === 'getIsEmpty') {
+        var data = signaturePad.isEmpty();
+        executeNativeFunction('getIsEmpty', { data: data, type:'getIsEmpty' });
+        return;
       }
     });
   };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yz1311/react-native-signature-pad",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "React Native wrapper around szimek's Canvas based Signature Pad",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,8 @@
   "peerDependencies": {
     "react": "^16.8.4",
     "react-native": "^0.58.6",
-    "react-native-webview": "^5.3.0"
+    "react-native-webview": "^5.3.0",
+    "deprecated-react-native-prop-types": "*"
   },
   "dependencies": {
     "prop-types": "^15.6.0"