diff options
author | 2023-05-27 16:33:26 +0530 | |
---|---|---|
committer | 2023-07-20 02:16:09 +0000 | |
commit | 345fd98dc52a3b7f0d69022b6a19818e559e4557 (patch) | |
tree | 839ff0c1ad74b0d5a9e705cf208e9b22aa11b5ae | |
parent | Upgrade 'electron' to '25.3.1' (diff) | |
download | ferdium-app-345fd98dc52a3b7f0d69022b6a19818e559e4557.tar.gz ferdium-app-345fd98dc52a3b7f0d69022b6a19818e559e4557.tar.zst ferdium-app-345fd98dc52a3b7f0d69022b6a19818e559e4557.zip |
update react-router-dom,react-tooltip& react-transition-group
-rw-r--r-- | package.json | 7 | ||||
-rw-r--r-- | pnpm-lock.yaml | 99 | ||||
-rw-r--r-- | src/components/layout/Sidebar.tsx | 34 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.tsx | 3 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.tsx | 9 | ||||
-rw-r--r-- | src/components/settings/services/ServiceItem.tsx | 20 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.tsx | 9 | ||||
-rw-r--r-- | src/components/ui/effects/Appear.tsx | 27 | ||||
-rw-r--r-- | src/features/webControls/components/WebControls.tsx | 22 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.tsx | 13 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawerItem.tsx | 3 | ||||
-rw-r--r-- | src/routes.tsx | 1 | ||||
-rw-r--r-- | src/styles/main.scss | 1 |
13 files changed, 152 insertions, 96 deletions
diff --git a/package.json b/package.json index 912548621..34ff3c02e 100644 --- a/package.json +++ b/package.json | |||
@@ -108,11 +108,11 @@ | |||
108 | "react-jss": "10.10.0", | 108 | "react-jss": "10.10.0", |
109 | "react-loader": "2.4.7", | 109 | "react-loader": "2.4.7", |
110 | "react-modal": "3.16.1", | 110 | "react-modal": "3.16.1", |
111 | "react-router-dom": "6.4.2", | 111 | "react-router-dom": "6.11.2", |
112 | "react-sortable-hoc": "2.0.0", | 112 | "react-sortable-hoc": "2.0.0", |
113 | "react-tooltip": "4.5.1", | 113 | "react-tooltip": "5.13.1", |
114 | "react-topbar-progress-indicator": "4.1.1", | 114 | "react-topbar-progress-indicator": "4.1.1", |
115 | "react-transition-group": "1.2.1", | 115 | "react-transition-group": "4.4.5", |
116 | "route-parser": "0.0.5", | 116 | "route-parser": "0.0.5", |
117 | "sanitize-filename": "1.6.3", | 117 | "sanitize-filename": "1.6.3", |
118 | "semver": "7.5.4", | 118 | "semver": "7.5.4", |
@@ -138,6 +138,7 @@ | |||
138 | "@types/node": "18.15.3", | 138 | "@types/node": "18.15.3", |
139 | "@types/react": "18.2.12", | 139 | "@types/react": "18.2.12", |
140 | "@types/react-dom": "18.2.5", | 140 | "@types/react-dom": "18.2.5", |
141 | "@types/react-transition-group": "4.4.6", | ||
141 | "@types/route-parser": "0.1.4", | 142 | "@types/route-parser": "0.1.4", |
142 | "@types/tar": "6.1.5", | 143 | "@types/tar": "6.1.5", |
143 | "@types/uuid": "9.0.2", | 144 | "@types/uuid": "9.0.2", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13ccf3434..a4b7851a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -204,20 +204,20 @@ dependencies: | |||
204 | specifier: 3.16.1 | 204 | specifier: 3.16.1 |
205 | version: 3.16.1(react-dom@18.2.0)(react@18.2.0) | 205 | version: 3.16.1(react-dom@18.2.0)(react@18.2.0) |
206 | react-router-dom: | 206 | react-router-dom: |
207 | specifier: 6.4.2 | 207 | specifier: 6.11.2 |
208 | version: 6.4.2(react-dom@18.2.0)(react@18.2.0) | 208 | version: 6.11.2(react-dom@18.2.0)(react@18.2.0) |
209 | react-sortable-hoc: | 209 | react-sortable-hoc: |
210 | specifier: 2.0.0 | 210 | specifier: 2.0.0 |
211 | version: 2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) | 211 | version: 2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) |
212 | react-tooltip: | 212 | react-tooltip: |
213 | specifier: 4.5.1 | 213 | specifier: 5.13.1 |
214 | version: 4.5.1(react-dom@18.2.0)(react@18.2.0) | 214 | version: 5.13.1(react-dom@18.2.0)(react@18.2.0) |
215 | react-topbar-progress-indicator: | 215 | react-topbar-progress-indicator: |
216 | specifier: 4.1.1 | 216 | specifier: 4.1.1 |
217 | version: 4.1.1(react@18.2.0) | 217 | version: 4.1.1(react@18.2.0) |
218 | react-transition-group: | 218 | react-transition-group: |
219 | specifier: 1.2.1 | 219 | specifier: 4.4.5 |
220 | version: 1.2.1(react-dom@18.2.0)(react@18.2.0) | 220 | version: 4.4.5(react-dom@18.2.0)(react@18.2.0) |
221 | route-parser: | 221 | route-parser: |
222 | specifier: 0.0.5 | 222 | specifier: 0.0.5 |
223 | version: 0.0.5 | 223 | version: 0.0.5 |
@@ -297,6 +297,9 @@ devDependencies: | |||
297 | '@types/react-dom': | 297 | '@types/react-dom': |
298 | specifier: 18.2.5 | 298 | specifier: 18.2.5 |
299 | version: 18.2.5 | 299 | version: 18.2.5 |
300 | '@types/react-transition-group': | ||
301 | specifier: 4.4.6 | ||
302 | version: 4.4.6 | ||
300 | '@types/route-parser': | 303 | '@types/route-parser': |
301 | specifier: 0.1.4 | 304 | specifier: 0.1.4 |
302 | version: 0.1.4 | 305 | version: 0.1.4 |
@@ -1511,6 +1514,16 @@ packages: | |||
1511 | engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} | 1514 | engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} |
1512 | dev: true | 1515 | dev: true |
1513 | 1516 | ||
1517 | /@floating-ui/core@1.3.1: | ||
1518 | resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==} | ||
1519 | dev: false | ||
1520 | |||
1521 | /@floating-ui/dom@1.4.3: | ||
1522 | resolution: {integrity: sha512-nB/68NyaQlcdY22L+Fgd1HERQ7UGv7XFN+tPxwrEfQL4nKtAP/jIZnZtpUlXbtV+VEGHh6W/63Gy2C5biWI3sA==} | ||
1523 | dependencies: | ||
1524 | '@floating-ui/core': 1.3.1 | ||
1525 | dev: false | ||
1526 | |||
1514 | /@formatjs/cli@6.1.3: | 1527 | /@formatjs/cli@6.1.3: |
1515 | resolution: {integrity: sha512-PdTXZTY8LqxwmvFqdifn89gjXnPUpGtGyFs0BnoeLuOuxZFSnBfIs5WQCVMaJnr1+0vNNlXyT0VAIAwjRpf6BA==} | 1528 | resolution: {integrity: sha512-PdTXZTY8LqxwmvFqdifn89gjXnPUpGtGyFs0BnoeLuOuxZFSnBfIs5WQCVMaJnr1+0vNNlXyT0VAIAwjRpf6BA==} |
1516 | engines: {node: '>= 16'} | 1529 | engines: {node: '>= 16'} |
@@ -2169,8 +2182,8 @@ packages: | |||
2169 | dev: true | 2182 | dev: true |
2170 | optional: true | 2183 | optional: true |
2171 | 2184 | ||
2172 | /@remix-run/router@1.0.2: | 2185 | /@remix-run/router@1.6.2: |
2173 | resolution: {integrity: sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==} | 2186 | resolution: {integrity: sha512-LzqpSrMK/3JBAVBI9u3NWtOhWNw5AMQfrUFYB0+bDHTSw17z++WJLsPsxAuK+oSddsxk4d7F/JcdDPM1M5YAhA==} |
2174 | engines: {node: '>=14'} | 2187 | engines: {node: '>=14'} |
2175 | dev: false | 2188 | dev: false |
2176 | 2189 | ||
@@ -2498,6 +2511,12 @@ packages: | |||
2498 | '@types/react': 18.2.12 | 2511 | '@types/react': 18.2.12 |
2499 | dev: true | 2512 | dev: true |
2500 | 2513 | ||
2514 | /@types/react-transition-group@4.4.6: | ||
2515 | resolution: {integrity: sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==} | ||
2516 | dependencies: | ||
2517 | '@types/react': 18.2.12 | ||
2518 | dev: true | ||
2519 | |||
2501 | /@types/react@18.2.12: | 2520 | /@types/react@18.2.12: |
2502 | resolution: {integrity: sha512-ndmBMLCgn38v3SntMeoJaIrO6tGHYKMEBohCUmw8HoLLQdRMOIGXfeYaBTLe2lsFaSB3MOK1VXscYFnmLtTSmw==} | 2521 | resolution: {integrity: sha512-ndmBMLCgn38v3SntMeoJaIrO6tGHYKMEBohCUmw8HoLLQdRMOIGXfeYaBTLe2lsFaSB3MOK1VXscYFnmLtTSmw==} |
2503 | dependencies: | 2522 | dependencies: |
@@ -3856,10 +3875,6 @@ packages: | |||
3856 | resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} | 3875 | resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} |
3857 | dev: false | 3876 | dev: false |
3858 | 3877 | ||
3859 | /chain-function@1.0.1: | ||
3860 | resolution: {integrity: sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==} | ||
3861 | dev: false | ||
3862 | |||
3863 | /chainsaw@0.1.0: | 3878 | /chainsaw@0.1.0: |
3864 | resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==} | 3879 | resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==} |
3865 | dependencies: | 3880 | dependencies: |
@@ -4412,7 +4427,7 @@ packages: | |||
4412 | /css-jss@10.10.0: | 4427 | /css-jss@10.10.0: |
4413 | resolution: {integrity: sha512-YyMIS/LsSKEGXEaVJdjonWe18p4vXLo8CMA4FrW/kcaEyqdIGKCFXao31gbJddXEdIxSXFFURWrenBJPlKTgAA==} | 4428 | resolution: {integrity: sha512-YyMIS/LsSKEGXEaVJdjonWe18p4vXLo8CMA4FrW/kcaEyqdIGKCFXao31gbJddXEdIxSXFFURWrenBJPlKTgAA==} |
4414 | dependencies: | 4429 | dependencies: |
4415 | '@babel/runtime': 7.20.7 | 4430 | '@babel/runtime': 7.21.5 |
4416 | jss: 10.10.0 | 4431 | jss: 10.10.0 |
4417 | jss-preset-default: 10.10.0 | 4432 | jss-preset-default: 10.10.0 |
4418 | dev: false | 4433 | dev: false |
@@ -4745,10 +4760,11 @@ packages: | |||
4745 | esutils: 2.0.3 | 4760 | esutils: 2.0.3 |
4746 | dev: true | 4761 | dev: true |
4747 | 4762 | ||
4748 | /dom-helpers@3.4.0: | 4763 | /dom-helpers@5.2.1: |
4749 | resolution: {integrity: sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==} | 4764 | resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} |
4750 | dependencies: | 4765 | dependencies: |
4751 | '@babel/runtime': 7.21.5 | 4766 | '@babel/runtime': 7.21.5 |
4767 | csstype: 3.1.2 | ||
4752 | dev: false | 4768 | dev: false |
4753 | 4769 | ||
4754 | /dot-prop@5.3.0: | 4770 | /dot-prop@5.3.0: |
@@ -7905,7 +7921,7 @@ packages: | |||
7905 | /jss-preset-default@10.10.0: | 7921 | /jss-preset-default@10.10.0: |
7906 | resolution: {integrity: sha512-GL175Wt2FGhjE+f+Y3aWh+JioL06/QWFgZp53CbNNq6ZkVU0TDplD8Bxm9KnkotAYn3FlplNqoW5CjyLXcoJ7Q==} | 7922 | resolution: {integrity: sha512-GL175Wt2FGhjE+f+Y3aWh+JioL06/QWFgZp53CbNNq6ZkVU0TDplD8Bxm9KnkotAYn3FlplNqoW5CjyLXcoJ7Q==} |
7907 | dependencies: | 7923 | dependencies: |
7908 | '@babel/runtime': 7.20.7 | 7924 | '@babel/runtime': 7.21.5 |
7909 | jss: 10.10.0 | 7925 | jss: 10.10.0 |
7910 | jss-plugin-camel-case: 10.10.0 | 7926 | jss-plugin-camel-case: 10.10.0 |
7911 | jss-plugin-compose: 10.10.0 | 7927 | jss-plugin-compose: 10.10.0 |
@@ -10017,26 +10033,26 @@ packages: | |||
10017 | warning: 4.0.3 | 10033 | warning: 4.0.3 |
10018 | dev: false | 10034 | dev: false |
10019 | 10035 | ||
10020 | /react-router-dom@6.4.2(react-dom@18.2.0)(react@18.2.0): | 10036 | /react-router-dom@6.11.2(react-dom@18.2.0)(react@18.2.0): |
10021 | resolution: {integrity: sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==} | 10037 | resolution: {integrity: sha512-JNbKtAeh1VSJQnH6RvBDNhxNwemRj7KxCzc5jb7zvDSKRnPWIFj9pO+eXqjM69gQJ0r46hSz1x4l9y0651DKWw==} |
10022 | engines: {node: '>=14'} | 10038 | engines: {node: '>=14'} |
10023 | peerDependencies: | 10039 | peerDependencies: |
10024 | react: '>=16.8' | 10040 | react: '>=16.8' |
10025 | react-dom: '>=16.8' | 10041 | react-dom: '>=16.8' |
10026 | dependencies: | 10042 | dependencies: |
10027 | '@remix-run/router': 1.0.2 | 10043 | '@remix-run/router': 1.6.2 |
10028 | react: 18.2.0 | 10044 | react: 18.2.0 |
10029 | react-dom: 18.2.0(react@18.2.0) | 10045 | react-dom: 18.2.0(react@18.2.0) |
10030 | react-router: 6.4.2(react@18.2.0) | 10046 | react-router: 6.11.2(react@18.2.0) |
10031 | dev: false | 10047 | dev: false |
10032 | 10048 | ||
10033 | /react-router@6.4.2(react@18.2.0): | 10049 | /react-router@6.11.2(react@18.2.0): |
10034 | resolution: {integrity: sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==} | 10050 | resolution: {integrity: sha512-74z9xUSaSX07t3LM+pS6Un0T55ibUE/79CzfZpy5wsPDZaea1F8QkrsiyRnA2YQ7LwE/umaydzXZV80iDCPkMg==} |
10035 | engines: {node: '>=14'} | 10051 | engines: {node: '>=14'} |
10036 | peerDependencies: | 10052 | peerDependencies: |
10037 | react: '>=16.8' | 10053 | react: '>=16.8' |
10038 | dependencies: | 10054 | dependencies: |
10039 | '@remix-run/router': 1.0.2 | 10055 | '@remix-run/router': 1.6.2 |
10040 | react: 18.2.0 | 10056 | react: 18.2.0 |
10041 | dev: false | 10057 | dev: false |
10042 | 10058 | ||
@@ -10054,17 +10070,16 @@ packages: | |||
10054 | react-dom: 18.2.0(react@18.2.0) | 10070 | react-dom: 18.2.0(react@18.2.0) |
10055 | dev: false | 10071 | dev: false |
10056 | 10072 | ||
10057 | /react-tooltip@4.5.1(react-dom@18.2.0)(react@18.2.0): | 10073 | /react-tooltip@5.13.1(react-dom@18.2.0)(react@18.2.0): |
10058 | resolution: {integrity: sha512-Zo+CSFUGXar1uV+bgXFFDe7VeS2iByeIp5rTgTcc2HqtuOS5D76QapejNNfx320MCY91TlhTQat36KGFTqgcvw==} | 10074 | resolution: {integrity: sha512-9NstDFdjyy6cIH9zjeT70zXTHlW/TIGCOWQmhkAyqLFeQioLg1FXvb9ec7AxSpn0zyFUkFSLdFYxZRuewti3Aw==} |
10059 | engines: {npm: '>=6.13'} | ||
10060 | peerDependencies: | 10075 | peerDependencies: |
10061 | react: '>=16.0.0' | 10076 | react: '>=16.14.0' |
10062 | react-dom: '>=16.0.0' | 10077 | react-dom: '>=16.14.0' |
10063 | dependencies: | 10078 | dependencies: |
10064 | prop-types: 15.8.1 | 10079 | '@floating-ui/dom': 1.4.3 |
10080 | classnames: 2.3.2 | ||
10065 | react: 18.2.0 | 10081 | react: 18.2.0 |
10066 | react-dom: 18.2.0(react@18.2.0) | 10082 | react-dom: 18.2.0(react@18.2.0) |
10067 | uuid: 7.0.3 | ||
10068 | dev: false | 10083 | dev: false |
10069 | 10084 | ||
10070 | /react-topbar-progress-indicator@4.1.1(react@18.2.0): | 10085 | /react-topbar-progress-indicator@4.1.1(react@18.2.0): |
@@ -10076,19 +10091,18 @@ packages: | |||
10076 | topbar: 0.1.4 | 10091 | topbar: 0.1.4 |
10077 | dev: false | 10092 | dev: false |
10078 | 10093 | ||
10079 | /react-transition-group@1.2.1(react-dom@18.2.0)(react@18.2.0): | 10094 | /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.2.0): |
10080 | resolution: {integrity: sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==} | 10095 | resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} |
10081 | peerDependencies: | 10096 | peerDependencies: |
10082 | react: ^15.0.0 || ^16.0.0 | 10097 | react: '>=16.6.0' |
10083 | react-dom: ^15.0.0 || ^16.0.0 | 10098 | react-dom: '>=16.6.0' |
10084 | dependencies: | 10099 | dependencies: |
10085 | chain-function: 1.0.1 | 10100 | '@babel/runtime': 7.21.5 |
10086 | dom-helpers: 3.4.0 | 10101 | dom-helpers: 5.2.1 |
10087 | loose-envify: 1.4.0 | 10102 | loose-envify: 1.4.0 |
10088 | prop-types: 15.8.1 | 10103 | prop-types: 15.8.1 |
10089 | react: 18.2.0 | 10104 | react: 18.2.0 |
10090 | react-dom: 18.2.0(react@18.2.0) | 10105 | react-dom: 18.2.0(react@18.2.0) |
10091 | warning: 3.0.0 | ||
10092 | dev: false | 10106 | dev: false |
10093 | 10107 | ||
10094 | /react-window@1.8.8(react-dom@18.2.0)(react@18.2.0): | 10108 | /react-window@1.8.8(react-dom@18.2.0)(react@18.2.0): |
@@ -11886,11 +11900,6 @@ packages: | |||
11886 | hasBin: true | 11900 | hasBin: true |
11887 | dev: false | 11901 | dev: false |
11888 | 11902 | ||
11889 | /uuid@7.0.3: | ||
11890 | resolution: {integrity: sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==} | ||
11891 | hasBin: true | ||
11892 | dev: false | ||
11893 | |||
11894 | /uuid@8.3.2: | 11903 | /uuid@8.3.2: |
11895 | resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} | 11904 | resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} |
11896 | hasBin: true | 11905 | hasBin: true |
@@ -11995,12 +12004,6 @@ packages: | |||
11995 | engines: {node: '>=0.10.0'} | 12004 | engines: {node: '>=0.10.0'} |
11996 | dev: false | 12005 | dev: false |
11997 | 12006 | ||
11998 | /warning@3.0.0: | ||
11999 | resolution: {integrity: sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==} | ||
12000 | dependencies: | ||
12001 | loose-envify: 1.4.0 | ||
12002 | dev: false | ||
12003 | |||
12004 | /warning@4.0.3: | 12007 | /warning@4.0.3: |
12005 | resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} | 12008 | resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} |
12006 | dependencies: | 12009 | dependencies: |
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index fac424477..2b1e87023 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import ReactTooltip from 'react-tooltip'; | 2 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import { inject, observer } from 'mobx-react'; | 4 | import { inject, observer } from 'mobx-react'; |
5 | import { | 5 | import { |
@@ -123,10 +123,6 @@ class Sidebar extends Component<IProps, IState> { | |||
123 | }; | 123 | }; |
124 | } | 124 | } |
125 | 125 | ||
126 | componentDidUpdate() { | ||
127 | ReactTooltip.rebuild(); | ||
128 | } | ||
129 | |||
130 | enableToolTip() { | 126 | enableToolTip() { |
131 | this.setState({ tooltipEnabled: true }); | 127 | this.setState({ tooltipEnabled: true }); |
132 | } | 128 | } |
@@ -232,7 +228,8 @@ class Sidebar extends Component<IProps, IState> { | |||
232 | type="button" | 228 | type="button" |
233 | onClick={() => openSettings({ path: 'recipes' })} | 229 | onClick={() => openSettings({ path: 'recipes' })} |
234 | className="sidebar__button sidebar__button--new-service" | 230 | className="sidebar__button sidebar__button--new-service" |
235 | data-tip={`${intl.formatMessage( | 231 | data-tooltip-id="tooltip-sidebar-button" |
232 | data-tooltip-content={`${intl.formatMessage( | ||
236 | messages.addNewService, | 233 | messages.addNewService, |
237 | )} (${addNewServiceShortcutKey(false)})`} | 234 | )} (${addNewServiceShortcutKey(false)})`} |
238 | > | 235 | > |
@@ -251,7 +248,8 @@ class Sidebar extends Component<IProps, IState> { | |||
251 | }); | 248 | }); |
252 | }} | 249 | }} |
253 | className="sidebar__button sidebar__button--split-mode-toggle" | 250 | className="sidebar__button sidebar__button--split-mode-toggle" |
254 | data-tip={`${intl.formatMessage( | 251 | data-tooltip-id="tooltip-sidebar-button" |
252 | data-tooltip-content={`${intl.formatMessage( | ||
255 | messages.splitModeToggle, | 253 | messages.splitModeToggle, |
256 | )} (${splitModeToggleShortcutKey(false)})`} | 254 | )} (${splitModeToggleShortcutKey(false)})`} |
257 | > | 255 | > |
@@ -268,7 +266,8 @@ class Sidebar extends Component<IProps, IState> { | |||
268 | className={`sidebar__button sidebar__button--workspaces ${ | 266 | className={`sidebar__button sidebar__button--workspaces ${ |
269 | isWorkspaceDrawerOpen ? 'is-active' : '' | 267 | isWorkspaceDrawerOpen ? 'is-active' : '' |
270 | }`} | 268 | }`} |
271 | data-tip={`${intl.formatMessage( | 269 | data-tooltip-id="tooltip-sidebar-button" |
270 | data-tooltip-content={`${intl.formatMessage( | ||
272 | workspaceToggleMessage, | 271 | workspaceToggleMessage, |
273 | )} (${workspaceToggleShortcutKey(false)})`} | 272 | )} (${workspaceToggleShortcutKey(false)})`} |
274 | > | 273 | > |
@@ -285,7 +284,8 @@ class Sidebar extends Component<IProps, IState> { | |||
285 | className={`sidebar__button sidebar__button--audio ${ | 284 | className={`sidebar__button sidebar__button--audio ${ |
286 | isAppMuted ? 'is-muted' : '' | 285 | isAppMuted ? 'is-muted' : '' |
287 | }`} | 286 | }`} |
288 | data-tip={`${intl.formatMessage( | 287 | data-tooltip-id="tooltip-sidebar-button" |
288 | data-tooltip-content={`${intl.formatMessage( | ||
289 | isAppMuted ? messages.unmute : messages.mute, | 289 | isAppMuted ? messages.unmute : messages.mute, |
290 | )} (${muteFerdiumShortcutKey(false)})`} | 290 | )} (${muteFerdiumShortcutKey(false)})`} |
291 | > | 291 | > |
@@ -303,7 +303,8 @@ class Sidebar extends Component<IProps, IState> { | |||
303 | className={`sidebar__button sidebar__button--todos ${ | 303 | className={`sidebar__button sidebar__button--todos ${ |
304 | todosStore.isTodosPanelVisible ? 'is-active' : '' | 304 | todosStore.isTodosPanelVisible ? 'is-active' : '' |
305 | }`} | 305 | }`} |
306 | data-tip={`${intl.formatMessage( | 306 | data-tooltip-id="tooltip-sidebar-button" |
307 | data-tooltip-content={`${intl.formatMessage( | ||
307 | todosToggleMessage, | 308 | todosToggleMessage, |
308 | )} (${todosToggleShortcutKey(false)})`} | 309 | )} (${todosToggleShortcutKey(false)})`} |
309 | > | 310 | > |
@@ -322,7 +323,8 @@ class Sidebar extends Component<IProps, IState> { | |||
322 | }, | 323 | }, |
323 | }); | 324 | }); |
324 | }} | 325 | }} |
325 | data-tip={`${intl.formatMessage( | 326 | data-tooltip-id="tooltip-sidebar-button" |
327 | data-tooltip-content={`${intl.formatMessage( | ||
326 | messages.lockFerdium, | 328 | messages.lockFerdium, |
327 | )} (${lockFerdiumShortcutKey(false)})`} | 329 | )} (${lockFerdiumShortcutKey(false)})`} |
328 | > | 330 | > |
@@ -331,14 +333,20 @@ class Sidebar extends Component<IProps, IState> { | |||
331 | ) : null} | 333 | ) : null} |
332 | </> | 334 | </> |
333 | {this.state.tooltipEnabled && ( | 335 | {this.state.tooltipEnabled && ( |
334 | <ReactTooltip place="right" type="dark" effect="solid" /> | 336 | <ReactTooltip |
337 | id="tooltip-sidebar-button" | ||
338 | place="right" | ||
339 | variant="dark" | ||
340 | style={{ height: 'auto', overflowY: 'unset' }} | ||
341 | /> | ||
335 | )} | 342 | )} |
336 | {!hideSettingsButton && !isMenuCollapsed ? ( | 343 | {!hideSettingsButton && !isMenuCollapsed ? ( |
337 | <button | 344 | <button |
338 | type="button" | 345 | type="button" |
339 | onClick={() => openSettings({ path: 'app' })} | 346 | onClick={() => openSettings({ path: 'app' })} |
340 | className="sidebar__button sidebar__button--settings" | 347 | className="sidebar__button sidebar__button--settings" |
341 | data-tip={`${intl.formatMessage( | 348 | data-tooltip-id="tooltip-sidebar-button" |
349 | data-tooltip-content={`${intl.formatMessage( | ||
342 | globalMessages.settings, | 350 | globalMessages.settings, |
343 | )} (${settingsShortcutKey(false)})`} | 351 | )} (${settingsShortcutKey(false)})`} |
344 | > | 352 | > |
diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx index c883066ce..c25af4427 100644 --- a/src/components/services/tabs/TabItem.tsx +++ b/src/components/services/tabs/TabItem.tsx | |||
@@ -359,7 +359,8 @@ class TabItem extends Component<IProps, IState> { | |||
359 | onKeyDown={noop} | 359 | onKeyDown={noop} |
360 | role="presentation" | 360 | role="presentation" |
361 | onContextMenu={() => menu.popup()} | 361 | onContextMenu={() => menu.popup()} |
362 | data-tip={`${service.name} ${acceleratorString( | 362 | data-tooltip-id="tooltip-sidebar-button" |
363 | data-tooltip-content={`${service.name} ${acceleratorString( | ||
363 | shortcutIndex, | 364 | shortcutIndex, |
364 | cmdOrCtrlShortcutKey(false), | 365 | cmdOrCtrlShortcutKey(false), |
365 | )}`} | 366 | )}`} |
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx index 163b0a160..de323c06e 100644 --- a/src/components/settings/account/AccountDashboard.tsx +++ b/src/components/settings/account/AccountDashboard.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import ReactTooltip from 'react-tooltip'; | 4 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
5 | import { H1, H2 } from '../../ui/headline'; | 5 | import { H1, H2 } from '../../ui/headline'; |
6 | 6 | ||
7 | import Loader from '../../ui/Loader'; | 7 | import Loader from '../../ui/Loader'; |
@@ -215,7 +215,12 @@ class AccountDashboard extends Component<IProp> { | |||
215 | </> | 215 | </> |
216 | )} | 216 | )} |
217 | </div> | 217 | </div> |
218 | <ReactTooltip place="right" type="dark" effect="solid" /> | 218 | <ReactTooltip |
219 | place="right" | ||
220 | variant="dark" | ||
221 | float | ||
222 | style={{ height: 'auto' }} | ||
223 | /> | ||
219 | </div> | 224 | </div> |
220 | ); | 225 | ); |
221 | } | 226 | } |
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx index bf2dfa9da..babe06b5a 100644 --- a/src/components/settings/services/ServiceItem.tsx +++ b/src/components/settings/services/ServiceItem.tsx | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, ReactElement } from 'react'; |
2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
3 | import ReactTooltip from 'react-tooltip'; | 3 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; | 6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; |
@@ -73,7 +73,8 @@ class ServiceItem extends Component<IProps> { | |||
73 | {service.isMuted && ( | 73 | {service.isMuted && ( |
74 | <Icon | 74 | <Icon |
75 | icon={mdiBellOff} | 75 | icon={mdiBellOff} |
76 | data-tip={intl.formatMessage(messages.tooltipIsMuted)} | 76 | data-tooltip-id="tooltip-service-item" |
77 | data-tooltip-content={intl.formatMessage(messages.tooltipIsMuted)} | ||
77 | /> | 78 | /> |
78 | )} | 79 | )} |
79 | </td> | 80 | </td> |
@@ -85,7 +86,10 @@ class ServiceItem extends Component<IProps> { | |||
85 | {!service.isEnabled && ( | 86 | {!service.isEnabled && ( |
86 | <Icon | 87 | <Icon |
87 | icon={mdiPower} | 88 | icon={mdiPower} |
88 | data-tip={intl.formatMessage(messages.tooltipIsDisabled)} | 89 | data-tooltip-id="tooltip-service-item" |
90 | data-tooltip-content={intl.formatMessage( | ||
91 | messages.tooltipIsDisabled, | ||
92 | )} | ||
89 | /> | 93 | /> |
90 | )} | 94 | )} |
91 | </td> | 95 | </td> |
@@ -97,12 +101,18 @@ class ServiceItem extends Component<IProps> { | |||
97 | {!service.isNotificationEnabled && ( | 101 | {!service.isNotificationEnabled && ( |
98 | <Icon | 102 | <Icon |
99 | icon={mdiMessageBulletedOff} | 103 | icon={mdiMessageBulletedOff} |
100 | data-tip={intl.formatMessage( | 104 | data-tooltip-id="tooltip-service-item" |
105 | data-tooltip-content={intl.formatMessage( | ||
101 | messages.tooltipNotificationsDisabled, | 106 | messages.tooltipNotificationsDisabled, |
102 | )} | 107 | )} |
103 | /> | 108 | /> |
104 | )} | 109 | )} |
105 | <ReactTooltip place="top" type="dark" effect="solid" /> | 110 | <ReactTooltip |
111 | id="tooltip-service-item" | ||
112 | place="right" | ||
113 | variant="dark" | ||
114 | style={{ height: 'auto' }} | ||
115 | /> | ||
106 | </td> | 116 | </td> |
107 | </tr> | 117 | </tr> |
108 | ); | 118 | ); |
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx index 6fd2d4426..77bccb8c3 100644 --- a/src/components/settings/team/TeamDashboard.tsx +++ b/src/components/settings/team/TeamDashboard.tsx | |||
@@ -3,7 +3,7 @@ | |||
3 | import { Component, ReactElement } from 'react'; | 3 | import { Component, ReactElement } from 'react'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
6 | import ReactTooltip from 'react-tooltip'; | 6 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
7 | import withStyles, { WithStylesProps } from 'react-jss'; | 7 | import withStyles, { WithStylesProps } from 'react-jss'; |
8 | import classnames from 'classnames'; | 8 | import classnames from 'classnames'; |
9 | import Loader from '../../ui/Loader'; | 9 | import Loader from '../../ui/Loader'; |
@@ -173,7 +173,12 @@ class TeamDashboard extends Component<IProps> { | |||
173 | </> | 173 | </> |
174 | )} | 174 | )} |
175 | </div> | 175 | </div> |
176 | <ReactTooltip place="right" type="dark" effect="solid" /> | 176 | <ReactTooltip |
177 | place="right" | ||
178 | variant="dark" | ||
179 | float | ||
180 | style={{ height: 'auto' }} | ||
181 | /> | ||
177 | </div> | 182 | </div> |
178 | ) : ( | 183 | ) : ( |
179 | <div className="settings__main"> | 184 | <div className="settings__main"> |
diff --git a/src/components/ui/effects/Appear.tsx b/src/components/ui/effects/Appear.tsx index 2076f6ba6..06f63a029 100644 --- a/src/components/ui/effects/Appear.tsx +++ b/src/components/ui/effects/Appear.tsx | |||
@@ -1,5 +1,5 @@ | |||
1 | import { ReactElement, ReactNode, useEffect, useState } from 'react'; | 1 | import { ReactElement, ReactNode, useEffect, useState } from 'react'; |
2 | import { CSSTransitionGroup } from 'react-transition-group'; | 2 | import { CSSTransition, TransitionGroup } from 'react-transition-group'; |
3 | 3 | ||
4 | interface IProps { | 4 | interface IProps { |
5 | children: ReactNode; | 5 | children: ReactNode; |
@@ -33,17 +33,20 @@ const Appear = ({ | |||
33 | } | 33 | } |
34 | 34 | ||
35 | return ( | 35 | return ( |
36 | <CSSTransitionGroup | 36 | <TransitionGroup component={null}> |
37 | transitionName={transitionName} | 37 | <CSSTransition |
38 | transitionAppear={transitionAppear} | 38 | classNames={transitionName || className} |
39 | transitionLeave={transitionLeave} | 39 | appear={transitionAppear} |
40 | transitionAppearTimeout={transitionAppearTimeout} | 40 | exit={transitionLeave} |
41 | transitionEnterTimeout={transitionEnterTimeout} | 41 | timeout={{ |
42 | transitionLeaveTimeout={transitionLeaveTimeout} | 42 | enter: transitionEnterTimeout, |
43 | className={className} | 43 | appear: transitionAppearTimeout, |
44 | > | 44 | exit: transitionLeaveTimeout, |
45 | {children} | 45 | }} |
46 | </CSSTransitionGroup> | 46 | > |
47 | {children} | ||
48 | </CSSTransition> | ||
49 | </TransitionGroup> | ||
47 | ); | 50 | ); |
48 | }; | 51 | }; |
49 | 52 | ||
diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx index e76fca6a2..54f45c843 100644 --- a/src/features/webControls/components/WebControls.tsx +++ b/src/features/webControls/components/WebControls.tsx | |||
@@ -9,6 +9,7 @@ import { | |||
9 | mdiHomeOutline, | 9 | mdiHomeOutline, |
10 | mdiEarth, | 10 | mdiEarth, |
11 | } from '@mdi/js'; | 11 | } from '@mdi/js'; |
12 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | ||
12 | import Icon from '../../../components/ui/icon'; | 13 | import Icon from '../../../components/ui/icon'; |
13 | 14 | ||
14 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
@@ -151,7 +152,8 @@ class WebControls extends Component<IProps, IState> { | |||
151 | onClick={goHome} | 152 | onClick={goHome} |
152 | type="button" | 153 | type="button" |
153 | className={classes.button} | 154 | className={classes.button} |
154 | data-tip={intl.formatMessage(messages.goHome)} | 155 | data-tooltip-id="tooltip-web-controls" |
156 | data-tooltip-content={intl.formatMessage(messages.goHome)} | ||
155 | data-place="bottom" | 157 | data-place="bottom" |
156 | > | 158 | > |
157 | <Icon icon={mdiHomeOutline} className={classes.icon} /> | 159 | <Icon icon={mdiHomeOutline} className={classes.icon} /> |
@@ -161,7 +163,8 @@ class WebControls extends Component<IProps, IState> { | |||
161 | type="button" | 163 | type="button" |
162 | className={classes.button} | 164 | className={classes.button} |
163 | disabled={!canGoBack} | 165 | disabled={!canGoBack} |
164 | data-tip={intl.formatMessage(messages.back)} | 166 | data-tooltip-id="tooltip-web-controls" |
167 | data-tooltip-content={intl.formatMessage(messages.back)} | ||
165 | data-place="bottom" | 168 | data-place="bottom" |
166 | > | 169 | > |
167 | <Icon icon={mdiArrowLeft} className={classes.icon} /> | 170 | <Icon icon={mdiArrowLeft} className={classes.icon} /> |
@@ -171,7 +174,8 @@ class WebControls extends Component<IProps, IState> { | |||
171 | type="button" | 174 | type="button" |
172 | className={classes.button} | 175 | className={classes.button} |
173 | disabled={!canGoForward} | 176 | disabled={!canGoForward} |
174 | data-tip={intl.formatMessage(messages.forward)} | 177 | data-tooltip-id="tooltip-web-controls" |
178 | data-tooltip-content={intl.formatMessage(messages.forward)} | ||
175 | data-place="bottom" | 179 | data-place="bottom" |
176 | > | 180 | > |
177 | <Icon icon={mdiArrowRight} className={classes.icon} /> | 181 | <Icon icon={mdiArrowRight} className={classes.icon} /> |
@@ -180,7 +184,8 @@ class WebControls extends Component<IProps, IState> { | |||
180 | onClick={reload} | 184 | onClick={reload} |
181 | type="button" | 185 | type="button" |
182 | className={classes.button} | 186 | className={classes.button} |
183 | data-tip={intl.formatMessage(messages.reload)} | 187 | data-tooltip-id="tooltip-web-controls" |
188 | data-tooltip-content={intl.formatMessage(messages.reload)} | ||
184 | data-place="bottom" | 189 | data-place="bottom" |
185 | > | 190 | > |
186 | <Icon icon={mdiReload} className={classes.icon} /> | 191 | <Icon icon={mdiReload} className={classes.icon} /> |
@@ -232,11 +237,18 @@ class WebControls extends Component<IProps, IState> { | |||
232 | onClick={openInBrowser} | 237 | onClick={openInBrowser} |
233 | type="button" | 238 | type="button" |
234 | className={classes.button} | 239 | className={classes.button} |
235 | data-tip={intl.formatMessage(messages.openInBrowser)} | 240 | data-tooltip-id="tooltip-web-controls" |
241 | data-tooltip-content={intl.formatMessage(messages.openInBrowser)} | ||
236 | data-place="bottom" | 242 | data-place="bottom" |
237 | > | 243 | > |
238 | <Icon icon={mdiEarth} className={classes.icon} /> | 244 | <Icon icon={mdiEarth} className={classes.icon} /> |
239 | </button> | 245 | </button> |
246 | <ReactTooltip | ||
247 | id="tooltip-web-controls" | ||
248 | place="bottom" | ||
249 | variant="dark" | ||
250 | style={{ height: 'auto' }} | ||
251 | /> | ||
240 | </div> | 252 | </div> |
241 | ); | 253 | ); |
242 | } | 254 | } |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx index 61284d81a..1c827e9dd 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.tsx +++ b/src/features/workspaces/components/WorkspaceDrawer.tsx | |||
@@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react'; | |||
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import withStyles, { WithStylesProps } from 'react-jss'; |
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
5 | import ReactTooltip from 'react-tooltip'; | 5 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
6 | import { mdiPlusBox, mdiCog } from '@mdi/js'; | 6 | import { mdiPlusBox, mdiCog } from '@mdi/js'; |
7 | import { noop } from 'lodash'; | 7 | import { noop } from 'lodash'; |
8 | import { H1 } from '../../../components/ui/headline'; | 8 | import { H1 } from '../../../components/ui/headline'; |
@@ -96,7 +96,6 @@ interface IProps extends WithStylesProps<typeof styles>, WrappedComponentProps { | |||
96 | class WorkspaceDrawer extends Component<IProps> { | 96 | class WorkspaceDrawer extends Component<IProps> { |
97 | componentDidMount(): void { | 97 | componentDidMount(): void { |
98 | try { | 98 | try { |
99 | ReactTooltip.rebuild(); | ||
100 | getUserWorkspacesRequest.execute(); | 99 | getUserWorkspacesRequest.execute(); |
101 | } catch (error) { | 100 | } catch (error) { |
102 | console.log(error); | 101 | console.log(error); |
@@ -121,7 +120,8 @@ class WorkspaceDrawer extends Component<IProps> { | |||
121 | onClick={() => { | 120 | onClick={() => { |
122 | workspaceActions.openWorkspaceSettings(); | 121 | workspaceActions.openWorkspaceSettings(); |
123 | }} | 122 | }} |
124 | data-tip={`${intl.formatMessage( | 123 | data-tooltip-id="tooltip-workspaces-drawer" |
124 | data-tooltip-content={`${intl.formatMessage( | ||
125 | messages.workspacesSettingsTooltip, | 125 | messages.workspacesSettingsTooltip, |
126 | )}`} | 126 | )}`} |
127 | > | 127 | > |
@@ -176,7 +176,12 @@ class WorkspaceDrawer extends Component<IProps> { | |||
176 | <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span> | 176 | <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span> |
177 | </div> | 177 | </div> |
178 | </div> | 178 | </div> |
179 | <ReactTooltip place="right" type="dark" effect="solid" /> | 179 | <ReactTooltip |
180 | id="tooltip-workspaces-drawer" | ||
181 | place="right" | ||
182 | variant="dark" | ||
183 | style={{ height: 'auto', zIndex: 210 }} | ||
184 | /> | ||
180 | </div> | 185 | </div> |
181 | ); | 186 | ); |
182 | } | 187 | } |
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx index cf8c3b2ba..172b4192c 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx +++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx | |||
@@ -119,7 +119,8 @@ class WorkspaceDrawerItem extends Component<IProps> { | |||
119 | } | 119 | } |
120 | }} | 120 | }} |
121 | onKeyDown={noop} | 121 | onKeyDown={noop} |
122 | data-tip={acceleratorString( | 122 | data-tooltip-id="tooltip-workspaces-drawer" |
123 | data-tooltip-content={acceleratorString( | ||
123 | shortcutIndex, | 124 | shortcutIndex, |
124 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, | 125 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, |
125 | )} | 126 | )} |
diff --git a/src/routes.tsx b/src/routes.tsx index 04b6fa96f..beada5c96 100644 --- a/src/routes.tsx +++ b/src/routes.tsx | |||
@@ -51,6 +51,7 @@ class FerdiumRoutes extends Component<IProps> { | |||
51 | const errorProps = { error: routeProps.stores.globalError.error || {} }; | 51 | const errorProps = { error: routeProps.stores.globalError.error || {} }; |
52 | 52 | ||
53 | return ( | 53 | return ( |
54 | // @ts-expect-error | ||
54 | <HistoryRouter history={history}> | 55 | <HistoryRouter history={history}> |
55 | <Routes> | 56 | <Routes> |
56 | <Route path="/auth" element={<AuthLayoutContainer {...routeProps} />}> | 57 | <Route path="/auth" element={<AuthLayoutContainer {...routeProps} />}> |
diff --git a/src/styles/main.scss b/src/styles/main.scss index 8369c9298..eb7649bfa 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
@@ -1,5 +1,6 @@ | |||
1 | @import '../../node_modules/electron-react-titlebar/assets/style'; | 1 | @import '../../node_modules/electron-react-titlebar/assets/style'; |
2 | 2 | ||
3 | |||
3 | // modules | 4 | // modules |
4 | @import './globals.scss'; | 5 | @import './globals.scss'; |
5 | @import './reset.scss'; | 6 | @import './reset.scss'; |