From d348bc10ea600d70ee006316fdcb56eb1dba457b Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 21 Jul 2023 10:52:49 +0530 Subject: Revert "update react-router-dom to version 6.14.1" and "update react-router-dom,react-tooltip& react-transition-group" This reverts commit 0a4a0497bb630dc85cfa0145d57f954feb9c052a and 345fd98dc52a3b7f0d69022b6a19818e559e4557. --- package.json | 11 +- pnpm-lock.yaml | 117 ++++++++++----------- src/components/layout/Sidebar.tsx | 34 +++--- src/components/services/tabs/TabItem.tsx | 3 +- .../settings/account/AccountDashboard.tsx | 9 +- src/components/settings/services/ServiceItem.tsx | 20 +--- src/components/settings/team/TeamDashboard.tsx | 9 +- src/components/ui/effects/Appear.tsx | 27 +++-- .../webControls/components/WebControls.tsx | 22 +--- .../workspaces/components/WorkspaceDrawer.tsx | 13 +-- .../workspaces/components/WorkspaceDrawerItem.tsx | 3 +- src/routes.tsx | 1 - src/styles/main.scss | 1 - 13 files changed, 107 insertions(+), 163 deletions(-) diff --git a/package.json b/package.json index 05a5c820e..6cca591fe 100644 --- a/package.json +++ b/package.json @@ -108,11 +108,11 @@ "react-jss": "10.10.0", "react-loader": "2.4.7", "react-modal": "3.16.1", - "react-router-dom": "6.14.2", + "react-router-dom": "6.4.2", "react-sortable-hoc": "2.0.0", - "react-tooltip": "5.13.1", + "react-tooltip": "4.5.1", "react-topbar-progress-indicator": "4.1.1", - "react-transition-group": "4.4.5", + "react-transition-group": "1.2.1", "route-parser": "0.0.5", "sanitize-filename": "1.6.3", "semver": "7.5.4", @@ -136,9 +136,8 @@ "@types/lodash": "4.14.195", "@types/ms": "0.7.31", "@types/node": "18.15.3", - "@types/react": "18.2.15", - "@types/react-dom": "18.2.7", - "@types/react-transition-group": "4.4.6", + "@types/react": "18.2.12", + "@types/react-dom": "18.2.5", "@types/route-parser": "0.1.4", "@types/tar": "6.1.5", "@types/uuid": "9.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 410dcba2e..b47b513c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -204,20 +204,20 @@ dependencies: specifier: 3.16.1 version: 3.16.1(react-dom@18.2.0)(react@18.2.0) react-router-dom: - specifier: 6.14.2 - version: 6.14.2(react-dom@18.2.0)(react@18.2.0) + specifier: 6.4.2 + version: 6.4.2(react-dom@18.2.0)(react@18.2.0) react-sortable-hoc: specifier: 2.0.0 version: 2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) react-tooltip: - specifier: 5.13.1 - version: 5.13.1(react-dom@18.2.0)(react@18.2.0) + specifier: 4.5.1 + version: 4.5.1(react-dom@18.2.0)(react@18.2.0) react-topbar-progress-indicator: specifier: 4.1.1 version: 4.1.1(react@18.2.0) react-transition-group: - specifier: 4.4.5 - version: 4.4.5(react-dom@18.2.0)(react@18.2.0) + specifier: 1.2.1 + version: 1.2.1(react-dom@18.2.0)(react@18.2.0) route-parser: specifier: 0.0.5 version: 0.0.5 @@ -292,14 +292,11 @@ devDependencies: specifier: 18.15.3 version: 18.15.3 '@types/react': - specifier: 18.2.15 - version: 18.2.15 + specifier: 18.2.12 + version: 18.2.12 '@types/react-dom': - specifier: 18.2.7 - version: 18.2.7 - '@types/react-transition-group': - specifier: 4.4.6 - version: 4.4.6 + specifier: 18.2.5 + version: 18.2.5 '@types/route-parser': specifier: 0.1.4 version: 0.1.4 @@ -1514,16 +1511,6 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@floating-ui/core@1.3.1: - resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==} - dev: false - - /@floating-ui/dom@1.4.3: - resolution: {integrity: sha512-nB/68NyaQlcdY22L+Fgd1HERQ7UGv7XFN+tPxwrEfQL4nKtAP/jIZnZtpUlXbtV+VEGHh6W/63Gy2C5biWI3sA==} - dependencies: - '@floating-ui/core': 1.3.1 - dev: false - /@formatjs/cli@6.1.3: resolution: {integrity: sha512-PdTXZTY8LqxwmvFqdifn89gjXnPUpGtGyFs0BnoeLuOuxZFSnBfIs5WQCVMaJnr1+0vNNlXyT0VAIAwjRpf6BA==} engines: {node: '>= 16'} @@ -2208,8 +2195,8 @@ packages: dev: true optional: true - /@remix-run/router@1.7.2: - resolution: {integrity: sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==} + /@remix-run/router@1.0.2: + resolution: {integrity: sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==} engines: {node: '>=14'} dev: false @@ -2452,7 +2439,7 @@ packages: /@types/hoist-non-react-statics@3.3.1: resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} dependencies: - '@types/react': 18.2.15 + '@types/react': 18.2.12 hoist-non-react-statics: 3.3.2 dev: false @@ -2536,20 +2523,14 @@ packages: /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} - /@types/react-dom@18.2.7: - resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} - dependencies: - '@types/react': 18.2.15 - dev: true - - /@types/react-transition-group@4.4.6: - resolution: {integrity: sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==} + /@types/react-dom@18.2.5: + resolution: {integrity: sha512-sRQsOS/sCLnpQhR4DSKGTtWFE3FZjpQa86KPVbhUqdYMRZ9FEFcfAytKhR/vUG2rH1oFbOOej6cuD7MFSobDRQ==} dependencies: - '@types/react': 18.2.15 + '@types/react': 18.2.12 dev: true - /@types/react@18.2.15: - resolution: {integrity: sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==} + /@types/react@18.2.12: + resolution: {integrity: sha512-ndmBMLCgn38v3SntMeoJaIrO6tGHYKMEBohCUmw8HoLLQdRMOIGXfeYaBTLe2lsFaSB3MOK1VXscYFnmLtTSmw==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -3906,6 +3887,10 @@ packages: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} dev: false + /chain-function@1.0.1: + resolution: {integrity: sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==} + dev: false + /chainsaw@0.1.0: resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==} dependencies: @@ -4791,11 +4776,10 @@ packages: esutils: 2.0.3 dev: true - /dom-helpers@5.2.1: - resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} + /dom-helpers@3.4.0: + resolution: {integrity: sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==} dependencies: '@babel/runtime': 7.21.5 - csstype: 3.1.2 dev: false /dot-prop@5.3.0: @@ -10064,7 +10048,7 @@ packages: '@formatjs/intl-displaynames': 6.5.0 '@formatjs/intl-listformat': 7.4.0 '@types/hoist-non-react-statics': 3.3.1 - '@types/react': 18.2.15 + '@types/react': 18.2.12 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.5.0 react: 18.2.0 @@ -10130,26 +10114,26 @@ packages: warning: 4.0.3 dev: false - /react-router-dom@6.14.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==} + /react-router-dom@6.4.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==} engines: {node: '>=14'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.7.2 + '@remix-run/router': 1.0.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.14.2(react@18.2.0) + react-router: 6.4.2(react@18.2.0) dev: false - /react-router@6.14.2(react@18.2.0): - resolution: {integrity: sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==} + /react-router@6.4.2(react@18.2.0): + resolution: {integrity: sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==} engines: {node: '>=14'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.7.2 + '@remix-run/router': 1.0.2 react: 18.2.0 dev: false @@ -10167,16 +10151,17 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-tooltip@5.13.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-9NstDFdjyy6cIH9zjeT70zXTHlW/TIGCOWQmhkAyqLFeQioLg1FXvb9ec7AxSpn0zyFUkFSLdFYxZRuewti3Aw==} + /react-tooltip@4.5.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Zo+CSFUGXar1uV+bgXFFDe7VeS2iByeIp5rTgTcc2HqtuOS5D76QapejNNfx320MCY91TlhTQat36KGFTqgcvw==} + engines: {npm: '>=6.13'} peerDependencies: - react: '>=16.14.0' - react-dom: '>=16.14.0' + react: '>=16.0.0' + react-dom: '>=16.0.0' dependencies: - '@floating-ui/dom': 1.4.3 - classnames: 2.3.2 + prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + uuid: 7.0.3 dev: false /react-topbar-progress-indicator@4.1.1(react@18.2.0): @@ -10188,18 +10173,19 @@ packages: topbar: 0.1.4 dev: false - /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} + /react-transition-group@1.2.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==} peerDependencies: - react: '>=16.6.0' - react-dom: '>=16.6.0' + react: ^15.0.0 || ^16.0.0 + react-dom: ^15.0.0 || ^16.0.0 dependencies: - '@babel/runtime': 7.21.5 - dom-helpers: 5.2.1 + chain-function: 1.0.1 + dom-helpers: 3.4.0 loose-envify: 1.4.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + warning: 3.0.0 dev: false /react-window@1.8.8(react-dom@18.2.0)(react@18.2.0): @@ -11997,6 +11983,11 @@ packages: hasBin: true dev: false + /uuid@7.0.3: + resolution: {integrity: sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==} + hasBin: true + dev: false + /uuid@8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true @@ -12101,6 +12092,12 @@ packages: engines: {node: '>=0.10.0'} dev: false + /warning@3.0.0: + resolution: {integrity: sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==} + dependencies: + loose-envify: 1.4.0 + dev: false + /warning@4.0.3: resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} dependencies: diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index 2b1e87023..fac424477 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx @@ -1,5 +1,5 @@ import { Component } from 'react'; -import { Tooltip as ReactTooltip } from 'react-tooltip'; +import ReactTooltip from 'react-tooltip'; import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; import { inject, observer } from 'mobx-react'; import { @@ -123,6 +123,10 @@ class Sidebar extends Component { }; } + componentDidUpdate() { + ReactTooltip.rebuild(); + } + enableToolTip() { this.setState({ tooltipEnabled: true }); } @@ -228,8 +232,7 @@ class Sidebar extends Component { type="button" onClick={() => openSettings({ path: 'recipes' })} className="sidebar__button sidebar__button--new-service" - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( messages.addNewService, )} (${addNewServiceShortcutKey(false)})`} > @@ -248,8 +251,7 @@ class Sidebar extends Component { }); }} className="sidebar__button sidebar__button--split-mode-toggle" - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( messages.splitModeToggle, )} (${splitModeToggleShortcutKey(false)})`} > @@ -266,8 +268,7 @@ class Sidebar extends Component { className={`sidebar__button sidebar__button--workspaces ${ isWorkspaceDrawerOpen ? 'is-active' : '' }`} - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( workspaceToggleMessage, )} (${workspaceToggleShortcutKey(false)})`} > @@ -284,8 +285,7 @@ class Sidebar extends Component { className={`sidebar__button sidebar__button--audio ${ isAppMuted ? 'is-muted' : '' }`} - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( isAppMuted ? messages.unmute : messages.mute, )} (${muteFerdiumShortcutKey(false)})`} > @@ -303,8 +303,7 @@ class Sidebar extends Component { className={`sidebar__button sidebar__button--todos ${ todosStore.isTodosPanelVisible ? 'is-active' : '' }`} - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( todosToggleMessage, )} (${todosToggleShortcutKey(false)})`} > @@ -323,8 +322,7 @@ class Sidebar extends Component { }, }); }} - data-tooltip-id="tooltip-sidebar-button" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( messages.lockFerdium, )} (${lockFerdiumShortcutKey(false)})`} > @@ -333,20 +331,14 @@ class Sidebar extends Component { ) : null} {this.state.tooltipEnabled && ( - + )} {!hideSettingsButton && !isMenuCollapsed ? ( - ); } diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx index 1c827e9dd..61284d81a 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.tsx +++ b/src/features/workspaces/components/WorkspaceDrawer.tsx @@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react'; import { observer } from 'mobx-react'; import withStyles, { WithStylesProps } from 'react-jss'; import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; -import { Tooltip as ReactTooltip } from 'react-tooltip'; +import ReactTooltip from 'react-tooltip'; import { mdiPlusBox, mdiCog } from '@mdi/js'; import { noop } from 'lodash'; import { H1 } from '../../../components/ui/headline'; @@ -96,6 +96,7 @@ interface IProps extends WithStylesProps, WrappedComponentProps { class WorkspaceDrawer extends Component { componentDidMount(): void { try { + ReactTooltip.rebuild(); getUserWorkspacesRequest.execute(); } catch (error) { console.log(error); @@ -120,8 +121,7 @@ class WorkspaceDrawer extends Component { onClick={() => { workspaceActions.openWorkspaceSettings(); }} - data-tooltip-id="tooltip-workspaces-drawer" - data-tooltip-content={`${intl.formatMessage( + data-tip={`${intl.formatMessage( messages.workspacesSettingsTooltip, )}`} > @@ -176,12 +176,7 @@ class WorkspaceDrawer extends Component { {intl.formatMessage(messages.addNewWorkspaceLabel)} - + ); } diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx index 172b4192c..cf8c3b2ba 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx +++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx @@ -119,8 +119,7 @@ class WorkspaceDrawerItem extends Component { } }} onKeyDown={noop} - data-tooltip-id="tooltip-workspaces-drawer" - data-tooltip-content={acceleratorString( + data-tip={acceleratorString( shortcutIndex, `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, )} diff --git a/src/routes.tsx b/src/routes.tsx index beada5c96..04b6fa96f 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -51,7 +51,6 @@ class FerdiumRoutes extends Component { const errorProps = { error: routeProps.stores.globalError.error || {} }; return ( - // @ts-expect-error }> diff --git a/src/styles/main.scss b/src/styles/main.scss index eb7649bfa..8369c9298 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,6 +1,5 @@ @import '../../node_modules/electron-react-titlebar/assets/style'; - // modules @import './globals.scss'; @import './reset.scss'; -- cgit v1.2.3-54-g00ecf