global-input-react - npm Package Compare versions

Comparing version 3.2.2 to 3.2.3

dist/__tests__/missing-parameters.test.js

@@ -21,3 +21,3 @@ "use strict";
       asFragment
-    } = (0, _react2.render)(_react.default.createElement(_index.GlobalInputConnect, null)); //const firstRender = asFragment();
+    } = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.GlobalInputConnect, null)); //const firstRender = asFragment();
     // const secondRender=asFragment();
@@ -31,3 +31,3 @@ // expect(secondRender).toMatchSnapshot();
       getByTestId
-    } = (0, _react2.render)(_react.default.createElement(_index.GlobalInputConnect, {
+    } = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.GlobalInputConnect, {
       mobileConfig: {}
@@ -43,3 +43,3 @@ })); // const resolvedDiv = await waitForElement(() =>
       getByTestId
-    } = (0, _react2.render)(_react.default.createElement(_index.GlobalInputConnect, {
+    } = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.GlobalInputConnect, {
       mobileConfig: {
@@ -46,0 +46,0 @@ initData: {}

dist/__tests__/utils/utils.js

@@ -108,3 +108,3 @@ "use strict";
     getByTestId
-  } = (0, _react2.render)(_react.default.createElement(_index.GlobalInputConnect, {
+  } = (0, _react2.render)( /*#__PURE__*/_react.default.createElement(_index.GlobalInputConnect, {
     ref: globalInputController,
@@ -111,0 +111,0 @@ mobileConfig: mobileConfig,

dist/DisplayQRCode.js

@@ -16,3 +16,3 @@ "use strict";
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
@@ -63,11 +63,11 @@ const styles = {
   });
-  return _react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", {
     style: styles.container
-  }, _react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     style: styles.qrCodeContainer
-  }, _react.default.createElement(_qrcode.default, {
+  }, /*#__PURE__*/_react.default.createElement(_qrcode.default, {
     value: code,
     level: level,
     size: size ? size : defaultSize
-  })), _react.default.createElement("div", {
+  })), /*#__PURE__*/_react.default.createElement("div", {
     style: styles.label,
@@ -74,0 +74,0 @@ "data-testid": "globalinput-qr-code-label"

dist/index.js

@@ -52,3 +52,3 @@ "use strict";
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
@@ -119,3 +119,3 @@ const generateRandomString = _globalInputMessage.generatateRandomString;
   if (error) {
-    return _react.default.createElement(_DisplayQRCode.default, {
+    return /*#__PURE__*/_react.default.createElement(_DisplayQRCode.default, {
       code: error,
@@ -129,7 +129,7 @@ label: error,
     case _globalInputController.default.STATUS.CONNECTING:
-      return connectingMessage ? _react.default.createElement("div", null, connectingMessage) : null;
+      return connectingMessage ? /*#__PURE__*/_react.default.createElement("div", null, connectingMessage) : null;
 
     case _globalInputController.default.STATUS.CONNECTED:
       console.log("[[" + code + "]]");
-      return _react.default.createElement(_DisplayQRCode.default, {
+      return /*#__PURE__*/_react.default.createElement(_DisplayQRCode.default, {
         code: code,
@@ -144,7 +144,7 @@ label: connectedMessage,
       } else if (senderConnectedMessage) {
-        return _react.default.createElement("div", null, senderConnectedMessage);
+        return /*#__PURE__*/_react.default.createElement("div", null, senderConnectedMessage);
       } else if (children) {
         return children;
       } else {
-        return _react.default.createElement("span", null);
+        return /*#__PURE__*/_react.default.createElement("span", null);
       }
@@ -156,11 +156,11 @@
       } else if (senderDisconnectedMessage) {
-        return _react.default.createElement("div", null, senderDisconnectedMessage);
+        return /*#__PURE__*/_react.default.createElement("div", null, senderDisconnectedMessage);
       } else if (children) {
         return children;
       } else {
-        return _react.default.createElement("span", null);
+        return /*#__PURE__*/_react.default.createElement("span", null);
       }
 
     default:
-      return _react.default.createElement("div", null, "Unknown State");
+      return /*#__PURE__*/_react.default.createElement("div", null, "Unknown State");
   }
@@ -167,0 +167,0 @@ };

dist/useGlobalInputApp.js

@@ -18,3 +18,3 @@ "use strict";
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
@@ -174,3 +174,4 @@ const ACTION_TYPES = {
     index,
-    value
+    value,
+    field
   } = action;
@@ -182,15 +183,20 @@ const {
 
-  if (!values || values.length <= index || index < 0) {
-    console.log("index out of range, ignored:" + index);
+  if (!fields || fields.length <= index || index < 0) {
+    console.warn("index out of range, ignored:" + index);
     return state;
   }
 
+  if (field.id && fields[index].id !== field.id) {
+    console.warn("field is does not match:" + field.id + ":" + fields[index].id);
+    return;
+  }
+
   const newValues = values.map((v, ind) => ind === index ? value : v);
-  const field = { ...fields[index],
+  const nf = { ...fields[index],
     value
   };
-  const newFields = fields.map((f, ind) => ind === index ? field : f);
+  const newFields = fields.map((f, ind) => ind === index ? nf : f);
   return { ...state,
     values: newValues,
-    field,
+    field: nf,
     fields: newFields
@@ -276,3 +282,3 @@ };
   children
-}) => _react.default.createElement("div", {
+}) => /*#__PURE__*/_react.default.createElement("div", {
   style: styles.barcode
@@ -283,3 +289,3 @@ }, children);
   children
-}) => _react.default.createElement("div", {
+}) => /*#__PURE__*/_react.default.createElement("div", {
   style: styles.label
@@ -302,4 +308,4 @@ }, children);
   const disconnect = () => {
-    if (state.mobile) {
-      state.mobile.disconnect();
+    if (mobile) {
+      mobile.disconnect();
     }
@@ -313,59 +319,8 @@
   const setInitData = (initData, options) => {
-    if (typeof initData === 'function') {
-      initData = initData();
-    }
-
-    if (!initData) {
-      return;
-    }
-
-    const waitForMobileToConnect = () => dispatch({
-      type: ACTION_TYPES.SET_CONNECTION_CODE
+    processInitData({
+      receivedInitData: initData,
+      options,
+      mobile,
+      dispatch
     });
-
-    const onSenderConnected = (sender, senders) => {
-      dispatch({
-        type: ACTION_TYPES.MOBILE_CONNECTED,
-        senders
-      });
-    };
-
-    const onSenderDisconnected = (sender, senders) => {
-      disconnect();
-    };
-
-    const onError = errorMessage => {
-      dispatch({
-        type: ACTION_TYPES.SET_ERROR,
-        errorMessage
-      });
-    };
-
-    const mobileConfig = {
-      onRegistered: next => {
-        next();
-        waitForMobileToConnect();
-      },
-      onRegisterFailed: onError,
-      onSenderConnected,
-      onSenderDisconnected,
-      onError,
-      ...options
-    };
-    const {
-      fields,
-      values,
-      setters
-    } = buildFieldsAndValuesFromInitData({
-      dispatch,
-      initData
-    });
-    dispatch({
-      type: ACTION_TYPES.CONNECT,
-      initData,
-      mobileConfig,
-      fields,
-      values,
-      setters
-    });
   };
@@ -402,3 +357,3 @@
     if (mobileState === MobileState.INITIALIZING) {
-      return _react.default.createElement(QRCodeContainer, null, _react.default.createElement("svg", {
+      return /*#__PURE__*/_react.default.createElement(QRCodeContainer, null, /*#__PURE__*/_react.default.createElement("svg", {
         xmlns: "http://www.w3.org/2000/svg",
@@ -408,6 +363,6 @@ width: "50",
         viewBox: "0 0 50 50"
-      }, _react.default.createElement("path", {
+      }, /*#__PURE__*/_react.default.createElement("path", {
         fill: "#C779D0",
         d: "M25,5A20.14,20.14,0,0,1,45,22.88a2.51,2.51,0,0,0,2.49,2.26h0A2.52,2.52,0,0,0,50,22.33a25.14,25.14,0,0,0-50,0,2.52,2.52,0,0,0,2.5,2.81h0A2.51,2.51,0,0,0,5,22.88,20.14,20.14,0,0,1,25,5Z"
-      }, _react.default.createElement("animateTransform", {
+      }, /*#__PURE__*/_react.default.createElement("animateTransform", {
         attributeName: "transform",
@@ -424,10 +379,10 @@ type: "rotate",
       if (!connectionCode) {
-        return _react.default.createElement(QRCodeContainer, null, "Empty connection code");
+        return /*#__PURE__*/_react.default.createElement(QRCodeContainer, null, "Empty connection code");
       }
 
-      return _react.default.createElement(QRCodeContainer, null, _react.default.createElement(_qrcode.default, {
+      return /*#__PURE__*/_react.default.createElement(QRCodeContainer, null, /*#__PURE__*/_react.default.createElement(_qrcode.default, {
         value: connectionCode,
         level: "H",
         size: qrCodeSize
-      }), _react.default.createElement(LabelContainer, null, "Scan with", _react.default.createElement("a", {
+      }), /*#__PURE__*/_react.default.createElement(LabelContainer, null, "Scan with", /*#__PURE__*/_react.default.createElement("a", {
         href: "https://globalinput.co.uk/global-input-app/get-app",
@@ -447,3 +402,3 @@ target: "_blank"
 
-    return _react.default.createElement(_react.default.Fragment, null, children);
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
   }, [mobileState === MobileState.WAITING_FOR_MOBILE || mobileState === MobileState.INITIALIZING]);
@@ -457,3 +412,3 @@ const WhenConnected = (0, _react.useCallback)(({
 
-    return _react.default.createElement(_react.default.Fragment, null, children);
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
   }, [mobileState === MobileState.MOBILE_CONNECTED]);
@@ -467,3 +422,3 @@ const WhenDisconnected = (0, _react.useCallback)(({
 
-    return _react.default.createElement(_react.default.Fragment, null, children);
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
   }, [mobileState === MobileState.DISCONNECTED]);
@@ -477,3 +432,3 @@ const WhenError = (0, _react.useCallback)(({
 
-    return _react.default.createElement(_react.default.Fragment, null, children);
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
   }, [mobileState === MobileState.ERROR]);
@@ -520,23 +475,25 @@
 
-const buildFieldsAndValuesFromInitData = ({
-  initData,
+const processInitData = ({
+  receivedInitData,
+  options,
+  mobile,
   dispatch
 }) => {
-  let fields = [];
-  let values = [];
-  let setters = [];
+  if (typeof receivedInitData === 'function') {
+    receivedInitData = receivedInitData();
+  }
 
-  if (!initData || !initData.form || !initData.form.fields || !initData.form.fields.length) {
-    return {
-      fields,
-      values,
-      setters
-    };
+  if (!receivedInitData || !receivedInitData.form || !receivedInitData.form.fields || !receivedInitData.form.fields.length) {
+    console.warn("will not send empty form");
+    return;
   }
 
   ;
-  initData.form.fields.forEach((f, index) => {
+  const fields = [];
+  const values = [];
+  const setters = [];
+  const formFields = receivedInitData.form.fields.map((f, index) => {
     if (!f) {
-      console.error("The form contains a null field:" + index + " in " + initData.form.title);
-      return;
+      console.error("The form contains a null field:" + index + " in " + receivedInitData.form.title);
+      return f;
     }
@@ -562,27 +519,77 @@
 
-    if (f.operations && f.operations.onInput) {
-      return;
-    }
-
     if (f.type === 'info') {
-      return;
+      return f;
     }
 
-    if (!f.operations) {
-      f.operations = {};
+    if (f.operations && f.operations.onInput) {
+      return f;
     }
 
-    f.operations.onInput = value => {
-      dispatch({
-        type: ACTION_TYPES.INPUT_RECEIVED,
-        value,
-        index
-      });
+    return { ...f,
+      operations: {
+        onInput: value => {
+          dispatch({
+            type: ACTION_TYPES.INPUT_RECEIVED,
+            value,
+            index,
+            field: f
+          });
+        }
+      }
     };
   });
-  return {
+
+  const waitForMobileToConnect = () => dispatch({
+    type: ACTION_TYPES.SET_CONNECTION_CODE
+  });
+
+  const onSenderConnected = (sender, senders) => {
+    dispatch({
+      type: ACTION_TYPES.MOBILE_CONNECTED,
+      senders
+    });
+  };
+
+  const onSenderDisconnected = (sender, senders) => {
+    if (mobile) {
+      mobile.disconnect();
+    }
+
+    dispatch({
+      type: ACTION_TYPES.DISCONNECT
+    });
+  };
+
+  const onError = errorMessage => {
+    dispatch({
+      type: ACTION_TYPES.SET_ERROR,
+      errorMessage
+    });
+  };
+
+  const mobileConfig = {
+    onRegistered: next => {
+      next();
+      waitForMobileToConnect();
+    },
+    onRegisterFailed: onError,
+    onSenderConnected,
+    onSenderDisconnected,
+    onError,
+    ...options
+  };
+  const form = { ...receivedInitData.form,
+    fields: formFields
+  };
+  const initData = { ...receivedInitData,
+    form
+  };
+  dispatch({
+    type: ACTION_TYPES.CONNECT,
+    initData,
+    mobileConfig,
     fields,
     values,
     setters
-  };
+  });
 };
@@ -589,0 +596,0 @@

package.json

 {
   "name": "global-input-react",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "global input react component",
@@ -44,28 +44,28 @@ "repository": {
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/register": "^7.5.5",
-    "@storybook/addon-actions": "^5.3.14",
-    "@storybook/addon-links": "^5.3.14",
-    "@storybook/addons": "^5.3.14",
-    "@storybook/react": "^5.3.14",
-    "@testing-library/jest-dom": "^4.1.2",
-    "@testing-library/react": "^9.3.0",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.9.4",
+    "@babel/register": "^7.9.0",
+    "@storybook/addon-actions": "^5.3.18",
+    "@storybook/addon-links": "^5.3.18",
+    "@storybook/addons": "^5.3.18",
+    "@storybook/react": "^5.3.18",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.5.0",
     "babel-jest": "^25.2.6",
-    "babel-loader": "^8.0.6",
-    "eslint": "^6.5.1",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-plugin-import": "^2.18.2",
+    "babel-loader": "^8.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-airbnb": "^18.1.0",
+    "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.16.0",
+    "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^1.7.0",
-    "jest": "^25.1.0",
-    "jest-canvas-mock": "^2.1.2",
-    "prettier": "^1.18.2",
-    "react": "^16.12.0",
-    "react-dom": "^16.9.0",
+    "jest": "^25.2.7",
+    "jest-canvas-mock": "^2.2.0",
+    "prettier": "^1.19.1",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "webpack": "^4.39.3",
-    "webpack-dev-server": "^3.8.0"
+    "webpack-dev-server": "^3.10.3"
   },
@@ -72,0 +72,0 @@ "dependencies": {

No alert changes

Improved metrics

Total package byte prevSize

94718

increased by1.02%

Lines of code

2241

increased by0.31%

No dependency changes