From cb8fa2f20f0bcedb066ed06d59ecaa3cc6105696 Mon Sep 17 00:00:00 2001
From: Andrew Prifer <2991360+AndrewPrifer@users.noreply.github.com>
Date: Mon, 7 Nov 2022 14:40:17 +0100
Subject: [PATCH] Move notifications trigger to toolbar (#333)

* Move notification trigger to toolbar

* Make notifications unpinned by default
---
 theatre/studio/src/notify.tsx                 | 76 +++++++------------
 theatre/studio/src/toolbars/GlobalToolbar.tsx | 28 ++++++-
 .../studio/src/uiComponents/icons/Bell.tsx    | 22 ++++++
 .../studio/src/uiComponents/icons/index.ts    |  1 +
 4 files changed, 74 insertions(+), 53 deletions(-)
 create mode 100644 theatre/studio/src/uiComponents/icons/Bell.tsx

diff --git a/theatre/studio/src/notify.tsx b/theatre/studio/src/notify.tsx
index 25deba3..3f04436 100644
--- a/theatre/studio/src/notify.tsx
+++ b/theatre/studio/src/notify.tsx
@@ -302,28 +302,16 @@ const Button = styled.button<{danger?: boolean}>`
   }
 `
 
-const Dots = styled.span`
-  display: flex;
-  gap: 4px;
-`
-
-const NotificationsDot = styled.div<{type: NotificationType}>`
-  width: 8px;
-  height: 8px;
-  border-radius: 999999px;
-  background-color: ${({type}) => COLORS[type]};
-`
-
 const NotifierContainer = styled.div`
-  z-index: 9999;
+  z-index: 10;
   display: flex;
-  flex-direction: column-reverse;
+  flex-direction: column;
   gap: 8px;
   position: fixed;
   right: 8px;
-  bottom: 8px;
+  top: 50px;
   width: 500px;
-  height: 50vh;
+  height: 85vh;
   min-height: 400px;
 `
 
@@ -371,42 +359,10 @@ export const Notifier = () => {
   const {startPause, endPause} = handlers
 
   const pinNotifications =
-    useVal(getStudio().atomP.ahistoric.pinNotifications) ?? true
-  const togglePinNotifications = () =>
-    getStudio().transaction(({stateEditors, drafts}) => {
-      stateEditors.studio.ahistoric.setPinNotifications(
-        !(drafts.ahistoric.pinNotifications ?? true),
-      )
-    })
+    useVal(getStudio().atomP.ahistoric.pinNotifications) ?? false
 
   return (
     <NotifierContainer>
-      <ButtonContainer align="side">
-        <>
-          {pinNotifications && toasts.length > 0 && (
-            <Button
-              onClick={() => {
-                notificationTypeChecker.clear()
-                notificationUniquenessChecker.clear()
-                toast.remove()
-              }}
-              danger
-            >
-              Clear
-            </Button>
-          )}
-          <Button onClick={() => togglePinNotifications()}>
-            <span>Notifications</span>
-            {notificationTypeChecker.types.length > 0 && (
-              <Dots>
-                {notificationTypeChecker.types.map((type) => (
-                  <NotificationsDot type={type} key={type} />
-                ))}
-              </Dots>
-            )}
-          </Button>
-        </>
-      </ButtonContainer>
       {!pinNotifications ? null : toasts.length > 0 ? (
         <NotificationScroller onMouseEnter={startPause} onMouseLeave={endPause}>
           <div>
@@ -427,6 +383,28 @@ export const Notifier = () => {
           Notifications will appear here when you get them.
         </EmptyState>
       )}
+      <ButtonContainer align="side">
+        {pinNotifications && toasts.length > 0 && (
+          <Button
+            onClick={() => {
+              notificationTypeChecker.clear()
+              notificationUniquenessChecker.clear()
+              toast.remove()
+            }}
+            danger
+          >
+            Clear
+          </Button>
+        )}
+      </ButtonContainer>
     </NotifierContainer>
   )
 }
+
+export const useNotifications = () => {
+  const {toasts} = useToaster()
+
+  return {
+    hasNotifications: toasts.length > 0,
+  }
+}
diff --git a/theatre/studio/src/toolbars/GlobalToolbar.tsx b/theatre/studio/src/toolbars/GlobalToolbar.tsx
index 4efe57b..85b5df0 100644
--- a/theatre/studio/src/toolbars/GlobalToolbar.tsx
+++ b/theatre/studio/src/toolbars/GlobalToolbar.tsx
@@ -9,12 +9,18 @@ import BasicTooltip from '@theatre/studio/uiComponents/Popover/BasicTooltip'
 import {val} from '@theatre/dataverse'
 import ExtensionToolbar from './ExtensionToolbar/ExtensionToolbar'
 import PinButton from './PinButton'
-import {Details, Ellipsis, Outline} from '@theatre/studio/uiComponents/icons'
+import {
+  Details,
+  Ellipsis,
+  Outline,
+  Bell,
+} from '@theatre/studio/uiComponents/icons'
 import DoubleChevronLeft from '@theatre/studio/uiComponents/icons/DoubleChevronLeft'
 import DoubleChevronRight from '@theatre/studio/uiComponents/icons/DoubleChevronRight'
 import ToolbarIconButton from '@theatre/studio/uiComponents/toolbar/ToolbarIconButton'
 import usePopover from '@theatre/studio/uiComponents/Popover/usePopover'
 import MoreMenu from './MoreMenu/MoreMenu'
+import {useNotifications} from '@theatre/studio/notify'
 
 const Container = styled.div`
   height: 36px;
@@ -47,9 +53,9 @@ const SubContainer = styled.div`
   gap: 8px;
 `
 
-const HasUpdatesBadge = styled.div`
+const HasUpdatesBadge = styled.div<{type: 'info' | 'warning'}>`
   position: absolute;
-  background: #40aaa4;
+  background: ${({type}) => (type === 'info' ? '#40aaa4' : '#f59e0b')};
   width: 6px;
   height: 6px;
   border-radius: 50%;
@@ -139,6 +145,8 @@ const GlobalToolbar: React.FC = () => {
     return hasUpdates
   }, [hasUpdates])
 
+  const {hasNotifications} = useNotifications()
+
   return (
     <Container>
       <SubContainer>
@@ -166,6 +174,18 @@ const GlobalToolbar: React.FC = () => {
         <ExtensionToolbar showLeftDivider toolbarId="global" />
       </SubContainer>
       <SubContainer>
+        <ToolbarIconButton
+          onClick={() => {
+            getStudio().transaction(({stateEditors, drafts}) => {
+              stateEditors.studio.ahistoric.setPinNotifications(
+                !(drafts.ahistoric.pinNotifications ?? false),
+              )
+            })
+          }}
+        >
+          <Bell />
+          {hasNotifications && <HasUpdatesBadge type="warning" />}
+        </ToolbarIconButton>
         {moreMenu.node}
         <ToolbarIconButton
           ref={moreMenuTriggerRef}
@@ -174,7 +194,7 @@ const GlobalToolbar: React.FC = () => {
           }}
         >
           <Ellipsis />
-          {showUpdatesBadge && <HasUpdatesBadge />}
+          {showUpdatesBadge && <HasUpdatesBadge type="info" />}
         </ToolbarIconButton>
         <PinButton
           ref={triggerButtonRef as $IntentionalAny}
diff --git a/theatre/studio/src/uiComponents/icons/Bell.tsx b/theatre/studio/src/uiComponents/icons/Bell.tsx
new file mode 100644
index 0000000..2e5a1e9
--- /dev/null
+++ b/theatre/studio/src/uiComponents/icons/Bell.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+function Bell(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width={16}
+      height={16}
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M8 1.57c-.416 0-.752.36-.752.804v.482c-1.715.372-3.006 1.994-3.006 3.938v.473c0 1.18-.407 2.32-1.14 3.205l-.173.208a.85.85 0 00-.125.864.75.75 0 00.686.475h9.019a.752.752 0 00.686-.475.845.845 0 00-.125-.864l-.174-.208a5.026 5.026 0 01-1.139-3.205v-.473c0-1.944-1.291-3.566-3.006-3.938v-.482c0-.445-.336-.804-.752-.804zm1.063 12.39c.282-.301.44-.71.44-1.138H6.496c0 .428.158.837.44 1.138.281.302.664.47 1.063.47.4 0 .783-.168 1.064-.47z"
+        fill="#fff"
+        fillOpacity={0.6}
+      />
+    </svg>
+  )
+}
+
+export default Bell
diff --git a/theatre/studio/src/uiComponents/icons/index.ts b/theatre/studio/src/uiComponents/icons/index.ts
index 8f61bb1..0af97b5 100644
--- a/theatre/studio/src/uiComponents/icons/index.ts
+++ b/theatre/studio/src/uiComponents/icons/index.ts
@@ -14,3 +14,4 @@ export {default as Ellipsis} from './Ellipsis'
 export {default as GlobeSimple} from './GlobeSimple'
 export {default as Resize} from './Resize'
 export {default as Package} from './Package'
+export {default as Bell} from './Bell'