From a20855474b1c577b2c031257e1001b2708d5eb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= Date: Thu, 29 Jun 2023 19:37:29 +0200 Subject: [PATCH 1/2] upgraded electron to the latest version --- package-lock.json | 38 +++++++++++++++----------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 413bb9772bfc..84fc1cc8677d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,7 +144,7 @@ "css-loader": "^6.7.2", "diff-so-fancy": "^1.3.0", "dotenv": "^16.0.3", - "electron": "22.3.7", + "electron": "^25.2.0", "electron-builder": "24.5.0", "eslint": "^7.6.0", "eslint-config-expensify": "^2.0.38", @@ -15891,8 +15891,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.7.6", - "license": "MIT" + "version": "18.16.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", + "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==" }, "node_modules/@types/node-fetch": { "version": "2.6.2", @@ -22139,14 +22140,14 @@ } }, "node_modules/electron": { - "version": "22.3.7", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.7.tgz", - "integrity": "sha512-QUuRCl0QJk0w2yPAQXl6sk4YV1b9353w4e1eO/fF2OUmrGQV9Fy2pEpEDV1PIq/JJ/oeVVlI3H07LHpEcNb0TA==", + "version": "25.2.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz", + "integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^16.11.26", + "@types/node": "^18.11.18", "extract-zip": "^2.0.1" }, "bin": { @@ -22412,11 +22413,6 @@ "version": "1.4.284", "license": "ISC" }, - "node_modules/electron/node_modules/@types/node": { - "version": "16.11.60", - "dev": true, - "license": "MIT" - }, "node_modules/element-resize-detector": { "version": "1.2.4", "dev": true, @@ -54366,7 +54362,9 @@ "dev": true }, "@types/node": { - "version": "18.7.6" + "version": "18.16.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", + "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==" }, "@types/node-fetch": { "version": "2.6.2", @@ -58668,20 +58666,14 @@ } }, "electron": { - "version": "22.3.7", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.7.tgz", - "integrity": "sha512-QUuRCl0QJk0w2yPAQXl6sk4YV1b9353w4e1eO/fF2OUmrGQV9Fy2pEpEDV1PIq/JJ/oeVVlI3H07LHpEcNb0TA==", + "version": "25.2.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz", + "integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==", "dev": true, "requires": { "@electron/get": "^2.0.0", - "@types/node": "^16.11.26", + "@types/node": "^18.11.18", "extract-zip": "^2.0.1" - }, - "dependencies": { - "@types/node": { - "version": "16.11.60", - "dev": true - } } }, "electron-builder": { diff --git a/package.json b/package.json index 24fe6e5e692b..b18e2965edfe 100644 --- a/package.json +++ b/package.json @@ -180,7 +180,7 @@ "css-loader": "^6.7.2", "diff-so-fancy": "^1.3.0", "dotenv": "^16.0.3", - "electron": "22.3.7", + "electron": "^25.2.0", "electron-builder": "24.5.0", "eslint": "^7.6.0", "eslint-config-expensify": "^2.0.38", From 1c0b8a62fc56d858d579acdd98e7ffaaeb9e4144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= Date: Thu, 29 Jun 2023 19:38:16 +0200 Subject: [PATCH 2/2] fixed pressable bugs --- src/components/Pressable/GenericPressable/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Pressable/GenericPressable/index.js b/src/components/Pressable/GenericPressable/index.js index 7412d85d1b88..859552e10cf3 100644 --- a/src/components/Pressable/GenericPressable/index.js +++ b/src/components/Pressable/GenericPressable/index.js @@ -14,6 +14,7 @@ const WebGenericPressable = forwardRef((props, ref) => ( aria-label={props.accessibilityLabel} aria-labelledby={props.accessibilityLabelledBy} aria-valuenow={props.accessibilityValue} + nativeID={props.nativeID || 'no-drag-area'} /> ));