@moises.ai/design-system 3.6.4 → 3.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moises.ai/design-system",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "description": "Design System package based on @radix-ui/themes with custom defaults",
   "private": false,
   "type": "module",

package/src/components/AdditionalItems/AdditionalItems.jsx

@@ -1,12 +1,15 @@
 import { Flex, Text } from '@radix-ui/themes'
 import styles from './AdditionalItems.module.css'
 import classNames from 'classnames'
+import { useMobileDrawerContext } from '../../contexts/MobileDrawerContext'
 
 export const AdditionalItems = ({
   additionalItems,
   collapsed = false,
   selectedAdditionalItemId,
 }) => {
+  const { close, isMobile } = useMobileDrawerContext()
+
   if (!additionalItems) return null
   return (
     <Flex direction="column">
@@ -15,6 +18,10 @@ export const AdditionalItems = ({
           selectedAdditionalItemId !== undefined
             ? selectedAdditionalItemId === item.id
             : item.selected
+        const handleClick = () => {
+          item.onClick?.()
+          if (isMobile) close()
+        }
         return (
           <Flex
             key={item.id || index}
@@ -25,11 +32,11 @@ export const AdditionalItems = ({
               [styles.upgradeItemCollapsed]: collapsed,
               [styles.upgradeItemSelected]: isSelected,
             })}
-            onClick={item.onClick}
+            onClick={handleClick}
             onKeyDown={(e) => {
               if ((e.key === 'Enter' || e.key === ' ') && item.onClick) {
                 e.preventDefault()
-                item.onClick()
+                handleClick()
               }
             }}
           >

package/src/components/ProductsList/ProductsList.jsx

@@ -1,6 +1,7 @@
 import { Flex, Text, Badge } from '@radix-ui/themes'
 import styles from './ProductsList.module.css'
 import classNames from 'classnames'
+import { useMobileDrawerContext } from '../../contexts/MobileDrawerContext'
 
 export const ProductsList = ({
   products = [],
@@ -8,6 +9,13 @@ export const ProductsList = ({
   onProductClick,
   collapsed,
 }) => {
+  const { close, isMobile } = useMobileDrawerContext()
+
+  const handleProductClick = (product) => {
+    onProductClick?.(product.id, product)
+    if (isMobile) close()
+  }
+
   return (
     <Flex direction="column">
       {products.map((product) => {
@@ -24,11 +32,11 @@ export const ProductsList = ({
               [styles.navItemSelected]: isSelected,
               [styles.collapsed]: collapsed,
             })}
-            onClick={() => onProductClick?.(product.id, product)}
+            onClick={() => handleProductClick(product)}
             onKeyDown={(e) => {
               if (e.key === 'Enter' || e.key === ' ') {
                 e.preventDefault()
-                onProductClick?.(product.id, product)
+                handleProductClick(product)
               }
             }}
           >

package/src/components/ProfileMenu/ProfileMenu.jsx

@@ -5,24 +5,32 @@ import { useIsMobileViewport } from '../../utils/useIsMobileViewport'
 import { DropdownMenu } from '../DropdownMenu/DropdownMenu'
 import { MenuTrigger } from './MenuTrigger'
 import styles from './ProfileMenu.module.css'
+import { useMobileDrawerContext } from '../../contexts/MobileDrawerContext'
 
 export const ProfileMenu = ({
   className,
   user,
   menuOptions = [],
   collapsed,
+  onSelectionChange,
   ...props
 }) => {
-  const isMobile = useIsMobileViewport()
+  const isMobileViewport = useIsMobileViewport()
+  const { close, isMobile } = useMobileDrawerContext()
 
+  const handleSelectionChange = (option) => {
+    onSelectionChange?.(option)
+    if (isMobile) close()
+  }
 
   return (
     <DropdownMenu
       className={classNames(styles.profileMenu, className)}
       trigger={<MenuTrigger user={user} collapsed={collapsed} />}
       options={menuOptions}
-      side={isMobile ? 'left' : 'right'}
+      side={isMobileViewport ? 'top' : 'right'}
       {...props}
+      onSelectionChange={handleSelectionChange}
     />
   )
 }

package/src/components/SetlistList/SetlistList.jsx

@@ -12,6 +12,7 @@ import { DropdownMenu } from '../DropdownMenu/DropdownMenu'
 import { Tooltip } from '../Tooltip/Tooltip'
 import { useState, useEffect, useRef, useMemo, Fragment } from 'react'
 import { MoreButton } from '../MoreButton/MoreButton'
+import { useMobileDrawerContext } from '../../contexts/MobileDrawerContext'
 
 const SetlistIconFallback = () => <SetlistIcon width={16} height={16} />
 
@@ -68,6 +69,7 @@ export const SetlistItem = ({
   moises = false,
   collapsed = false,
   isMobile = false,
+  onAvatarClick,
 }) => {
   const [isHovering, setIsHovering] = useState(false)
 
@@ -117,7 +119,32 @@ export const SetlistItem = ({
         })}
       >
         {avatar && (
-          <div className={styles.avatarSetlist}>
+          <div
+            className={classNames(styles.avatarSetlist, {
+              [styles.avatarClickable]: onAvatarClick,
+            })}
+            onClick={
+              onAvatarClick
+                ? (e) => {
+                  e.stopPropagation()
+                  onAvatarClick(e)
+                }
+                : undefined
+            }
+            role={onAvatarClick ? 'button' : undefined}
+            tabIndex={onAvatarClick ? 0 : undefined}
+            onKeyDown={
+              onAvatarClick
+                ? (e) => {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    e.preventDefault()
+                    e.stopPropagation()
+                    onAvatarClick(e)
+                  }
+                }
+                : undefined
+            }
+          >
             {typeof avatar === 'string' ? (
               <Avatar
                 src={avatar}
@@ -188,7 +215,18 @@ export const SetlistList = ({
   collapsed = false,
   isMobile = false,
 }) => {
+  const { close, isMobile: isMobileDrawer } = useMobileDrawerContext()
   const [openSetlistMenuId, setOpenSetlistMenuId] = useState(null)
+
+  const handleSetlistClick = (setlistId) => {
+    onSetlistClick?.(setlistId)
+    if (isMobileDrawer) close()
+  }
+
+  const handleNewSetlistClick = () => {
+    onNewSetlistClick?.()
+    if (isMobileDrawer) close()
+  }
   const [isHoveredWhenCollapsed, setIsHoveredWhenCollapsed] = useState(false)
   const [isShrinking, setIsShrinking] = useState(false)
   const hoverTimeoutRef = useRef(null)
@@ -204,6 +242,8 @@ export const SetlistList = ({
     ? setlists.slice(0, maxCollapsedItems)
     : setlists
 
+  const leaveCollapseDelay = 2750
+
   const handleMouseEnter = () => {
     if (!collapsed) return
     if (hoverTimeoutRef.current) {
@@ -215,10 +255,11 @@ export const SetlistList = ({
       shrinkTimeoutRef.current = null
     }
     setIsShrinking(false)
-    setIsHoveredWhenCollapsed(true)
   }
+
   const handleMouseLeave = () => {
     if (!collapsed) return
+    if (!isHoveredWhenCollapsed) return
     if (hoverTimeoutRef.current) {
       clearTimeout(hoverTimeoutRef.current)
     }
@@ -230,7 +271,18 @@ export const SetlistList = ({
         setIsHoveredWhenCollapsed(false)
         setIsShrinking(false)
       }, shrinkDuration)
-    }, 180)
+    }, leaveCollapseDelay)
+  }
+
+  const handleSetlistIconClick = (e) => {
+    if (!collapsed) return
+    e.stopPropagation()
+    if (hoverTimeoutRef.current) {
+      clearTimeout(hoverTimeoutRef.current)
+      hoverTimeoutRef.current = null
+    }
+    setIsShrinking(false)
+    setIsHoveredWhenCollapsed(true)
   }
 
   const handleFocus = () => {
@@ -336,7 +388,8 @@ export const SetlistList = ({
             (showCollapsedStack ? (
               <SetlistItem
                 isSelected={false}
-                onClick={onNewSetlistClick}
+                onClick={handleNewSetlistClick}
+                onAvatarClick={handleSetlistIconClick}
                 avatar={renderNewSetlistAvatar()}
                 className={classNames(
                   styles.collapsedStackItem,
@@ -352,7 +405,7 @@ export const SetlistList = ({
             ) : (
               <SetlistItem
                 isSelected={false}
-                onClick={onNewSetlistClick}
+                onClick={handleNewSetlistClick}
                 avatar={renderNewSetlistAvatar()}
                 text="New Setlist"
                 className={classNames(styles.newSetlistItemButton, {
@@ -366,7 +419,7 @@ export const SetlistList = ({
             const setlistItem = (
               <SetlistItem
                 isSelected={isSelected}
-                onClick={() => onSetlistClick?.(setlist.id)}
+                onClick={() => handleSetlistClick(setlist.id)}
                 dropdownMenuOpen={openSetlistMenuId === setlist.id}
                 onDropdownMenuOpenChange={(nextOpen) => {
                   setOpenSetlistMenuId(nextOpen ? setlist.id : null)

package/src/components/SetlistList/SetlistList.module.css

@@ -21,7 +21,8 @@
 
     &:hover,
     &.menuOpen {
-      background: var(--neutral-alpha-2);
+      background: #212225 !important;
+
       .avatarSetlist {
         background: var(--neutral-alpha-3);
       }
@@ -90,6 +91,10 @@
   z-index: 1;
   }
 
+  .avatarClickable {
+    cursor: pointer;
+  }
+
   .iconGrid {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -147,12 +152,13 @@
     opacity: 0;
   }
 
+  
   .navItemSelected {
     border-radius: var(--Radius-3-max, 6px);
     background: var(--neutral-alpha-3);
 
     &.collapsed {
-      background: transparent;
+      /* background: transparent; */
 
       .avatarSetlist {
         background: var(--neutral-2);
@@ -228,6 +234,9 @@
 .collapsedStackItem {
   position: relative;
   /* justify-content: flex-start; */
+  /* :hover {
+    background: #212225 !important;
+  } */
 }
 
 .collapsedMask {

package/src/components/Sidebar/Sidebar.jsx

@@ -11,6 +11,7 @@ import {
   CloseIcon,
 } from '../../icons'
 import { useMobileDrawer } from '../../utils/useMobileDrawer'
+import { MobileDrawerProvider } from '../../contexts/MobileDrawerContext'
 
 export const Sidebar = ({
   className,
@@ -50,12 +51,13 @@ export const Sidebar = ({
   }
 
   return (
-    <div
-      className={classNames(styles.root, {
-        [styles.rootCollapsed]: effectiveCollapsed,
-      })}
-      {...props}
-    >
+    <MobileDrawerProvider value={{ close, isMobile }}>
+      <div
+        className={classNames(styles.root, {
+          [styles.rootCollapsed]: effectiveCollapsed,
+        })}
+        {...props}
+      >
       <div className={styles.mobileTopBarWrapper}>
         <Flex
           align="center"
@@ -170,6 +172,7 @@ export const Sidebar = ({
         </Flex>
       </Flex>
     </div>
+    </MobileDrawerProvider>
   )
 }
 

package/src/contexts/MobileDrawerContext.jsx

@@ -0,0 +1,10 @@
+import { createContext, useContext } from 'react'
+
+const MobileDrawerContext = createContext({
+  close: () => {},
+  isMobile: false,
+})
+
+export const useMobileDrawerContext = () => useContext(MobileDrawerContext)
+
+export const MobileDrawerProvider = MobileDrawerContext.Provider