Add Tooltips to header buttons and replace reach/ui

ui/component/channelStakedIndicator/view.jsx

@@ -1,5 +1,4 @@
 // @flow
-import { SIMPLE_SITE } from 'config';
 import * as ICONS from 'constants/icons';
 import React from 'react';
 import classnames from 'classnames';
@@ -39,9 +38,8 @@ function ChannelStakedIndicator(props: Props) {
   const icon = getChannelIcon(level);
 
   return (
-    SIMPLE_SITE && (
     <Tooltip
-        label={
+      title={
         <div className="channel-staked__tooltip">
           <div className="channel-staked__tooltip-icons">
             <LevelIcon icon={icon} isControlling={isControlling} size={isControlling ? 14 : 10} />
@@ -65,7 +63,6 @@ function ChannelStakedIndicator(props: Props) {
         <LevelIcon icon={icon} large={large} isControlling={isControlling} />
       </div>
     </Tooltip>
-    )
   );
 }
 

ui/component/comment/view.jsx

@@ -241,7 +241,7 @@ function Comment(props: Props) {
           <div className="comment__meta">
             <div className="comment__meta-information">
               {isGlobalMod && (
-                <Tooltip label={__('Admin')}>
+                <Tooltip title={__('Admin')}>
                   <span className="comment__badge comment__badge--global-mod">
                     <Icon icon={ICONS.BADGE_MOD} size={20} />
                   </span>
@@ -249,7 +249,7 @@ function Comment(props: Props) {
               )}
 
               {isModerator && (
-                <Tooltip label={__('Moderator')}>
+                <Tooltip title={__('Moderator')}>
                   <span className="comment__badge comment__badge--mod">
                     <Icon icon={ICONS.BADGE_MOD} size={20} />
                   </span>

ui/component/common/tooltip.jsx

@@ -1,18 +1,30 @@
 // @flow
-import type { Node } from 'react';
 import React from 'react';
-import ReachTooltip from '@reach/tooltip';
+import MUITooltip from '@mui/material/Tooltip';
-// import '@reach/tooltip/styles.css'; --> 'scss/third-party.scss'
+import type { Node } from 'react';
 
 type Props = {
-  label: string | Node,
+  arrow?: boolean,
   children: Node,
+  disableInteractive?: boolean,
+  enterDelay?: number,
+  title?: string | Node,
 };
 
 function Tooltip(props: Props) {
-  const { children, label } = props;
+  const { arrow = true, children, disableInteractive = true, enterDelay = 300, title } = props;
 
-  return <ReachTooltip label={label}>{children}</ReachTooltip>;
+  return (
+    <MUITooltip
+      arrow={arrow}
+      disableInteractive={disableInteractive}
+      enterDelay={enterDelay}
+      enterNextDelay={enterDelay}
+      title={title}
+    >
+      {children}
+    </MUITooltip>
+  );
 }
 
 export default Tooltip;

ui/component/header/view.jsx

@@ -11,6 +11,7 @@ import Logo from 'component/logo';
 import NotificationBubble from 'component/notificationBubble';
 import React from 'react';
 import SkipNavigationButton from 'component/skipNavigationButton';
+import Tooltip from 'component/common/tooltip';
 import WunderBar from 'component/wunderbar';
 import * as remote from '@electron/remote';
 import { IS_MAC } from 'component/app/view';
@@ -121,12 +122,20 @@ const Header = (props: Props) => {
 
   const userButtons = (className: string) => (
     <div className={classnames('header__menu', { 'header__menu--with-balance': authenticated })}>
-      <Button
+      <Tooltip
         title={
           balance > 0
             ? __('Immediately spendable: %spendable_balance%', { spendable_balance: roundedSpendableBalance })
             : __('Your Wallet')
         }
+      >
+        <div>
+          <Button
+            // title={
+            //   balance > 0
+            //     ? __('Immediately spendable: %spendable_balance%', { spendable_balance: roundedSpendableBalance })
+            //     : __('Your Wallet')
+            // }
             navigate={`/$/${PAGES.WALLET}`}
             className={classnames(className, 'header__navigation-item--balance')}
             label={hideBalance || Number(roundedBalance) === 0 ? __('Your Wallet') : roundedBalance}
@@ -137,6 +146,8 @@ const Header = (props: Props) => {
             }}
             // @endif
           />
+        </div>
+      </Tooltip>
 
       <HeaderProfileMenuButton />
     </div>

ui/component/headerMenuButtons/view.jsx

@@ -7,6 +7,7 @@ import HeaderMenuLink from 'component/common/header-menu-link';
 import Icon from 'component/common/icon';
 import NotificationHeaderButton from 'component/headerNotificationButton';
 import React from 'react';
+import Tooltip from 'component/common/tooltip';
 
 type HeaderMenuButtonProps = {
   authenticated: boolean,
@@ -24,13 +25,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) {
   return (
     <div className="header__buttons">
       <Menu>
-        <MenuButton
+        <Tooltip title={__('Publish a file, or create a channel')}>
-          aria-label={__('Publish a file, or create a channel')}
+          <MenuButton className="header__navigation-item menu__title header__navigation-item--icon mobile-hidden">
-          title={__('Publish a file, or create a channel')}
-          className="header__navigation-item menu__title header__navigation-item--icon mobile-hidden"
-        >
             <Icon size={18} icon={ICONS.PUBLISH} aria-hidden />
           </MenuButton>
+        </Tooltip>
 
         <MenuList className="menu__list--header">
           <HeaderMenuLink page={PAGES.UPLOAD} icon={ICONS.PUBLISH} name={__('Upload')} />
@@ -41,13 +40,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) {
       {notificationsEnabled && <NotificationHeaderButton />}
 
       <Menu>
-        <MenuButton
+        <Tooltip title={__('Settings')}>
-          aria-label={__('Settings')}
+          <MenuButton className="header__navigation-item menu__title header__navigation-item--icon  mobile-hidden">
-          title={__('Settings')}
-          className="header__navigation-item menu__title header__navigation-item--icon  mobile-hidden"
-        >
             <Icon size={18} icon={ICONS.SETTINGS} aria-hidden />
           </MenuButton>
+        </Tooltip>
 
         <MenuList className="menu__list--header">
           <HeaderMenuLink page={PAGES.SETTINGS} icon={ICONS.SETTINGS} name={__('Settings')} />

ui/component/headerNotificationButton/view.jsx

@@ -7,6 +7,7 @@ import Button from 'component/button';
 import Icon from 'component/common/icon';
 import NotificationBubble from 'component/notificationBubble';
 import React from 'react';
+import Tooltip from 'component/common/tooltip';
 
 type Props = {
   unseenCount: number,
@@ -28,14 +29,14 @@ export default function NotificationHeaderButton(props: Props) {
   if (!notificationsEnabled) return null;
 
   return (
+    <Tooltip title={__('Notifications')}>
       <Button
         onClick={handleMenuClick}
-      aria-label={__('Notifications')}
-      title={__('Notifications')}
         className="header__navigation-item menu__title header__navigation-item--icon mobile-hidden"
       >
         <Icon size={18} icon={ICONS.NOTIFICATION} aria-hidden />
         <NotificationBubble />
       </Button>
+    </Tooltip>
   );
 }

ui/scss/component/_channel.scss

@@ -363,17 +363,6 @@ $actions-z-index: 2;
   }
 }
 
-.channel-staked__tooltip {
-  display: flex;
-  align-items: center;
-  line-height: 1rem;
-}
-
-.channel-staked__tooltip-text {
-  margin-left: var(--spacing-xs);
-  font-size: var(--font-xsmall);
-}
-
 .channel-staked__wrapper {
   display: flex;
   position: absolute;

ui/scss/component/_tooltip.scss

@@ -1,8 +1,24 @@
-[data-reach-tooltip] {
+.MuiTooltip-tooltip {
-  border-radius: var(--border-radius);
+  border-radius: var(--border-radius) !important;
-  background-color: var(--color-tooltip-bg);
+  background-color: var(--color-tooltip-bg) !important;
-  color: var(--color-tooltip-text);
+  color: var(--color-tooltip-text) !important;
-  border: none;
+  font-size: var(--font-small) !important;
-  padding: var(--spacing-s);
+}
-  overflow: hidden;
+
+.MuiTooltip-arrow {
+  color: var(--color-tooltip-bg) !important;
+  font-size: var(--font-xxsmall) !important;
+}
+
+.channel-staked__tooltip {
+  display: flex;
+  align-items: center;
+  line-height: 1rem;
+  padding: var(--spacing-xs);
+
+  .channel-staked__tooltip-text {
+    margin-left: var(--spacing-xs);
+    font-size: var(--font-xsmall);
+    font-size: var(--font-small);
+  }
 }

ui/scss/themes/dark.scss

@@ -123,6 +123,7 @@
   --color-purchased-text: var(--color-gray-5);
   --color-thumbnail-background: var(--color-gray-5);
   --color-tooltip-bg: #2f3337;
+  --color-tooltip-text: #fafafa;
   --color-help-warning-bg: #d97706;
   --color-help-warning-text: white;
   --color-blockquote: var(--color-gray-5);