@moises.ai/design-system 3.6.5 → 3.6.6

package/package.json

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

package/src/components/DataTable/DataTable.jsx

@@ -155,6 +155,7 @@ export const DataTable = ({
   onSelectAll,
   onSelectRow,
   stickyOffset = 0,
+  stickyBodyOffset = 0,
   ...props
 }) => {
   const [isHeaderHovering, setIsHeaderHovering] = useState(false)
@@ -279,12 +280,16 @@ export const DataTable = ({
   const stickyOffsetValue =
     typeof stickyOffset === 'number' ? `${stickyOffset}px` : stickyOffset
 
+  const stickyBodyOffsetValue =
+    typeof stickyBodyOffset === 'number' ? `${stickyBodyOffset}px` : stickyBodyOffset
+
   return (
     <Table.Root
       className={classNames(styles.DataTable, className)}
       size="1"
       style={{
         '--datatable-sticky-offset': stickyOffsetValue,
+        '--datatable-sticky-body-offset': stickyBodyOffsetValue,
         ...style,
       }}
       {...restProps}
@@ -360,7 +365,7 @@ export const DataTable = ({
         </Table.Row>
       </Table.Header>
 
-      <Table.Body>
+      <Table.Body >
         {data.map((row, index) => (
           <DataRow
             key={row.id}

package/src/components/DataTable/DataTable.module.css

@@ -54,6 +54,12 @@
   background-color: var(--neutral-1) !important;
 }
 
+.DataTable :global(.rt-TableBody) {
+  position: relative;
+  top: var(--datatable-sticky-body-offset, 0px) !important;
+}
+
+
 .DataTable :global(.rt-TableHeader) :global(.rt-TableRow) {
   background-color: var(--neutral-1) !important;
 }

package/src/components/SetlistList/SetlistList.jsx

@@ -2,10 +2,7 @@ import { Flex, Text, Avatar, ScrollArea } from '@radix-ui/themes'
 import styles from './SetlistList.module.css'
 import classNames from 'classnames'
 import {
-  DotsVerticalIcon,
   SetlistIcon,
-  UserGroupIcon,
-  GlobeIcon,
   PlusIcon,
 } from '../../icons'
 import { DropdownMenu } from '../DropdownMenu/DropdownMenu'
@@ -16,6 +13,55 @@ import { useMobileDrawerContext } from '../../contexts/MobileDrawerContext'
 
 const SetlistIconFallback = () => <SetlistIcon width={16} height={16} />
 
+function SetlistExpandButton({ onExpand, className, style, collapsed = false }) {
+  return (
+    <button
+      type="button"
+      className={classNames(
+        styles.newSetlistItem,
+        styles.collapsedStackItem,
+        styles.collapsedTransition,
+        styles.setlistExpandButton,
+        { [styles.collapsed]: collapsed },
+        className,
+      )}
+      style={style}
+      onClick={(e) => {
+        e.stopPropagation()
+        onExpand?.(e)
+      }}
+      aria-label="Expand setlist"
+    >
+      <Flex gap="3" align="center" className={styles.collapsedInner}>
+        <div className={styles.avatarSetlist}>
+          <SetlistIcon width={16} height={16} />
+        </div>
+      </Flex>
+    </button>
+  )
+}
+
+function NewSetlistButton({ onClick, className, collapsed = false }) {
+  return (
+    <SetlistItem
+      isSelected={false}
+      onClick={onClick}
+      avatar={
+        <div className={styles.iconSwap}>
+          <PlusIcon
+            width={16}
+            height={16}
+            className={classNames(styles.iconSwapLayer, styles.iconVisible, styles.plusIcon)}
+          />
+        </div>
+      }
+      text="New Setlist"
+      className={classNames(styles.newSetlistItemButton, styles.collapsedTransition, className)}
+      collapsed={collapsed}
+    />
+  )
+}
+
 function renderSetlistAvatar(icon) {
   if (!icon) return <SetlistIconFallback />
   if (typeof icon === 'string') {
@@ -69,7 +115,6 @@ export const SetlistItem = ({
   moises = false,
   collapsed = false,
   isMobile = false,
-  onAvatarClick,
 }) => {
   const [isHovering, setIsHovering] = useState(false)
 
@@ -93,8 +138,8 @@ export const SetlistItem = ({
     <Flex
       gap="3"
       align="center"
-      role="button"
-      tabIndex={0}
+      role={onClick ? 'button' : undefined}
+      tabIndex={onClick ? 0 : undefined}
       onClick={onClick}
       className={classNames(styles.newSetlistItem, className, {
         [styles.navItemSelected]: isSelected,
@@ -103,12 +148,16 @@ export const SetlistItem = ({
       })}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
-      onKeyDown={(e) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          e.preventDefault()
-          onClick?.()
-        }
-      }}
+      onKeyDown={
+        onClick
+          ? (e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault()
+              onClick?.()
+            }
+          }
+          : undefined
+      }
       style={style}
     >
       <Flex
@@ -119,32 +168,7 @@ export const SetlistItem = ({
         })}
       >
         {avatar && (
-          <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
-            }
-          >
+          <div className={styles.avatarSetlist}>
             {typeof avatar === 'string' ? (
               <Avatar
                 src={avatar}
@@ -307,28 +331,6 @@ export const SetlistList = ({
     }
   }, [])
 
-  const renderNewSetlistAvatar = () => (
-    <div className={styles.iconSwap}>
-      <SetlistIcon
-        width={16}
-        height={16}
-        className={classNames(styles.iconSwapLayer, {
-          [styles.iconVisible]: showCollapsedStack,
-          [styles.iconHidden]: !showCollapsedStack,
-        })}
-      />
-      <PlusIcon
-        width={16}
-        height={16}
-        className={classNames(
-          styles.iconSwapLayer,
-          styles.plusIcon,
-          showCollapsedStack ? styles.iconHidden : styles.iconVisible,
-        )}
-      />
-    </div>
-  )
-
   const getCollapsedStackStyle = (index) => {
     if (!collapsed) return undefined
     if (!showCollapsedStack) {
@@ -386,16 +388,10 @@ export const SetlistList = ({
         >
           {onNewSetlistClick &&
             (showCollapsedStack ? (
-              <SetlistItem
-                isSelected={false}
-                onClick={handleNewSetlistClick}
-                onAvatarClick={handleSetlistIconClick}
-                avatar={renderNewSetlistAvatar()}
-                className={classNames(
-                  styles.collapsedStackItem,
-                  styles.collapsedTransition,
-                )}
+              <SetlistExpandButton
+                onExpand={handleSetlistIconClick}
                 collapsed={collapsed}
+                className={styles.collapsedStackItem}
                 style={{
                   position: 'relative',
                   marginTop: 0,
@@ -403,14 +399,9 @@ export const SetlistList = ({
                 }}
               />
             ) : (
-              <SetlistItem
-                isSelected={false}
+              <NewSetlistButton
                 onClick={handleNewSetlistClick}
-                avatar={renderNewSetlistAvatar()}
-                text="New Setlist"
-                className={classNames(styles.newSetlistItemButton, {
-                  [styles.collapsedTransition]: collapsed,
-                })}
+                className={styles.collapsedTransition}
                 collapsed={collapsed}
               />
             ))}

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

@@ -233,10 +233,33 @@
 
 .collapsedStackItem {
   position: relative;
-  /* justify-content: flex-start; */
-  /* :hover {
-    background: #212225 !important;
-  } */
+}
+
+.setlistExpandButton {
+  display: flex;
+  align-items: center;
+  width: fit-content;
+  margin: 0 10px;
+  padding: 2px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  cursor: pointer;
+  font: inherit;
+  color: inherit;
+}
+
+.setlistExpandButton:hover {
+  background: var(--neutral-alpha-2);
+}
+
+.setlistExpandButton:hover .avatarSetlist {
+  background: var(--neutral-alpha-3);
+}
+
+.setlistExpandButton:focus-visible {
+  outline: 2px solid var(--neutral-alpha-8);
+  outline-offset: -1px;
 }
 
 .collapsedMask {
@@ -297,6 +320,11 @@
   pointer-events: none;
 }
 
+.iconSwap.iconClickable {
+  pointer-events: auto;
+  cursor: pointer;
+}
+
 .iconSwapLayer {
   position: absolute;
   inset: 0;
@@ -305,6 +333,12 @@
   justify-content: center;
   opacity: 0;
   transition: opacity 160ms ease-in-out;
+  pointer-events: none;
+}
+
+.iconSwapLayer.iconClickable {
+  pointer-events: auto;
+  cursor: pointer;
 }
 
 .iconVisible {