From 8bea530a60ed658cd8f2a51731ff39f6640ffd75 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Tue, 17 Sep 2019 10:29:37 +0200 Subject: [PATCH] Updated ESLint --- .eslintrc | 16 +---- package-lock.json | 141 ++++++++++++++++++++++++--------------- package.json | 2 +- src/App.js | 3 +- src/spatialNavigation.js | 100 +++++++++++++-------------- 5 files changed, 141 insertions(+), 121 deletions(-) diff --git a/.eslintrc b/.eslintrc index d91b14b..8cd8f5e 100755 --- a/.eslintrc +++ b/.eslintrc @@ -1,20 +1,6 @@ { "extends": "norigin/react", - "rules": { - "indent": ["error", 2], - "new-cap": ["error", {"capIsNew": false}], - "quotes": ["error", "single", "avoid-escape"], - "react/jsx-indent": ["error", 2], - "react/jsx-indent-props": ["error", 2], - "react/jsx-closing-bracket-location": ["off"], - "react/jsx-closing-tag-location": ["off"], - "react/jsx-curly-brace-presence": ["error", {"props": "always"}], - "react/boolean-prop-naming": ["off"], - "arrow-body-style": ["error", "as-needed"], - "import/extensions": ["error", "never"], - "no-console": ["error", {"allow": ["warn", "error", "log"]}], - "id-length": ["error", {"min": 1, "max": 60}] - }, + "rules": {}, "parser": "babel-eslint", "parserOptions": { "ecmaVersion": 7 diff --git a/package-lock.json b/package-lock.json index 566335a..93b30b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3516,9 +3516,9 @@ } }, "aria-query": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.1.tgz", - "integrity": "sha1-Jsu1r/ZBRLCoJb4YRuCxbPoAsR4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", + "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", "dev": true, "requires": { "ast-types-flow": "0.0.7", @@ -3683,9 +3683,9 @@ "dev": true }, "axobject-query": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz", - "integrity": "sha1-YvWdvFnJ+SQnWco0mWDnov48NsA=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", + "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", "dev": true, "requires": { "ast-types-flow": "0.0.7" @@ -4812,12 +4812,6 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", @@ -5950,9 +5944,9 @@ } }, "emoji-regex": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz", - "integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "encodeurl": { @@ -6163,14 +6157,15 @@ } }, "eslint-config-norigin": { - "version": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#4ad9d233cc69470bbc4065c92ab2af34421b9104", - "from": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#v3.7.0", + "version": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#59e1bc04f3a00fad277e179bb005fe4040d045d4", + "from": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#v3.7.5", "dev": true, "requires": { - "eslint-plugin-import": "2.9.0", - "eslint-plugin-jsx-a11y": "6.0.3", - "eslint-plugin-react": "7.7.0", - "eslint-plugin-react-native": "3.2.1" + "eslint-plugin-import": "^2.17.3", + "eslint-plugin-jsx-a11y": "^6.2.1", + "eslint-plugin-react": "^7.13.0", + "eslint-plugin-react-hooks": "^1.6.1", + "eslint-plugin-react-native": "^3.7.0" } }, "eslint-import-resolver-node": { @@ -6194,21 +6189,22 @@ } }, "eslint-plugin-import": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz", - "integrity": "sha1-JgAu+/ylmJtyiKwEdQi9JPIXsWk=", + "version": "2.18.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", + "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", "dev": true, "requires": { - "builtin-modules": "^1.1.1", + "array-includes": "^3.0.3", "contains-path": "^0.1.0", - "debug": "^2.6.8", + "debug": "^2.6.9", "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.1", - "eslint-module-utils": "^2.1.1", - "has": "^1.0.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.3", - "read-pkg-up": "^2.0.0" + "eslint-import-resolver-node": "^0.3.2", + "eslint-module-utils": "^2.4.0", + "has": "^1.0.3", + "minimatch": "^3.0.4", + "object.values": "^1.1.0", + "read-pkg-up": "^2.0.0", + "resolve": "^1.11.0" }, "dependencies": { "doctrine": { @@ -6224,36 +6220,49 @@ } }, "eslint-plugin-jsx-a11y": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz", - "integrity": "sha1-VFg9GuRCSDFi4EDhPMMYZUZRAOU=", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz", + "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==", "dev": true, "requires": { - "aria-query": "^0.7.0", + "@babel/runtime": "^7.4.5", + "aria-query": "^3.0.0", "array-includes": "^3.0.3", - "ast-types-flow": "0.0.7", - "axobject-query": "^0.1.0", - "damerau-levenshtein": "^1.0.0", - "emoji-regex": "^6.1.0", - "jsx-ast-utils": "^2.0.0" + "ast-types-flow": "^0.0.7", + "axobject-query": "^2.0.2", + "damerau-levenshtein": "^1.0.4", + "emoji-regex": "^7.0.2", + "has": "^1.0.3", + "jsx-ast-utils": "^2.2.1" } }, "eslint-plugin-react": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz", - "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz", + "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==", "dev": true, "requires": { - "doctrine": "^2.0.2", - "has": "^1.0.1", - "jsx-ast-utils": "^2.0.1", - "prop-types": "^15.6.0" + "array-includes": "^3.0.3", + "doctrine": "^2.1.0", + "has": "^1.0.3", + "jsx-ast-utils": "^2.1.0", + "object.entries": "^1.1.0", + "object.fromentries": "^2.0.0", + "object.values": "^1.1.0", + "prop-types": "^15.7.2", + "resolve": "^1.10.1" } }, + "eslint-plugin-react-hooks": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz", + "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==", + "dev": true + }, "eslint-plugin-react-native": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-3.2.1.tgz", - "integrity": "sha512-1AnJO3JUCAoLpyOEsWCwN9hPJ0aQ72OT+JvLMuHjEWYb6QWxiNOszp24CEwegMzbREtJKI9OoRqYYDYxMxmjgQ==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-3.7.0.tgz", + "integrity": "sha512-krLtQmGih/uJDPxF8DBpnU8J3kRUsDm/Dey5yEhOO8LN1I3Wesbk4PGCg8Zah57azKFU+9YtGooFjJcDJWUs+g==", "dev": true, "requires": { "eslint-plugin-react-native-globals": "^0.1.1" @@ -7775,9 +7784,9 @@ } }, "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz", + "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==", "dev": true }, "hsl-regex": { @@ -9184,6 +9193,30 @@ "object-keys": "^1.0.11" } }, + "object.entries": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz", + "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "object.fromentries": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz", + "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.11.0", + "function-bind": "^1.1.1", + "has": "^1.0.1" + } + }, "object.getownpropertydescriptors": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", diff --git a/package.json b/package.json index 5e5d557..af1f3fb 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", "eslint": "4.19.1", - "eslint-config-norigin": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#v3.7.0", + "eslint-config-norigin": "git+https://github.com/NoriginMedia/eslint-config-norigin.git#v3.7.5", "parcel-bundler": "^1.11.0", "pre-commit": "^1.2.2", "react": "^16.5.2", diff --git a/src/App.js b/src/App.js index 7728392..e336170 100644 --- a/src/App.js +++ b/src/App.js @@ -238,7 +238,8 @@ class Active extends React.PureComponent { Active.propTypes = { program: PropTypes.shape({ - title: PropTypes.string.isRequired + title: PropTypes.string.isRequired, + color: PropTypes.string.isRequired }) }; diff --git a/src/spatialNavigation.js b/src/spatialNavigation.js index e05fce8..2f44813 100644 --- a/src/spatialNavigation.js +++ b/src/spatialNavigation.js @@ -86,72 +86,72 @@ class SpatialNavigation { }; switch (direction) { - case DIRECTION_UP: { - const y = isSibling ? itemY + itemHeight : itemY; + case DIRECTION_UP: { + const y = isSibling ? itemY + itemHeight : itemY; - result.a = { - x: itemX, - y - }; + result.a = { + x: itemX, + y + }; - result.b = { - x: itemX + itemWidth, - y - }; + result.b = { + x: itemX + itemWidth, + y + }; - break; - } + break; + } - case DIRECTION_DOWN: { - const y = isSibling ? itemY : itemY + itemHeight; + case DIRECTION_DOWN: { + const y = isSibling ? itemY : itemY + itemHeight; - result.a = { - x: itemX, - y - }; + result.a = { + x: itemX, + y + }; - result.b = { - x: itemX + itemWidth, - y - }; + result.b = { + x: itemX + itemWidth, + y + }; - break; - } + break; + } - case DIRECTION_LEFT: { - const x = isSibling ? itemX + itemWidth : itemX; + case DIRECTION_LEFT: { + const x = isSibling ? itemX + itemWidth : itemX; - result.a = { - x, - y: itemY - }; + result.a = { + x, + y: itemY + }; - result.b = { - x, - y: itemY + itemHeight - }; + result.b = { + x, + y: itemY + itemHeight + }; - break; - } + break; + } - case DIRECTION_RIGHT: { - const x = isSibling ? itemX : itemX + itemWidth; + case DIRECTION_RIGHT: { + const x = isSibling ? itemX : itemX + itemWidth; - result.a = { - x, - y: itemY - }; + result.a = { + x, + y: itemY + }; - result.b = { - x, - y: itemY + itemHeight - }; + result.b = { + x, + y: itemY + itemHeight + }; - break; - } + break; + } - default: - break; + default: + break; } return result;