@basic-ui/material 0.1.16 → 1.0.0-alpha.10

package/src/ListItem/ListItem.tsx

@@ -1,17 +1,16 @@
+import type { ElementType, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { BoxProps } from '../Box';
 import { rem } from 'polished';
-import { RippleBox } from '../Ripple';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 import { useTheme } from '../theme';
-import { ListItemProvider } from './context';
-import { get } from '@styled-system/css';
 import { alpha } from '../color';
 
 export interface ListItemProps extends BoxProps {
-  as?: React.ElementType<any>;
-  innerAs?: React.ElementType<any>;
-  children?: React.ReactNode;
+  as?: ElementType<any>;
+  innerAs?: ElementType<any>;
+  children?: ReactNode;
   disabled?: boolean;
   selected?: boolean;
   color?: string;
@@ -33,41 +32,67 @@ export const ListItem = forwardRef<HTMLDivElement, ListItemProps>(
       ...otherProps
     } = props;
     const selected = ariaSelectedProp || selectedProp;
-    const color = colorProp ? colorProp : selected ? 'primary' : 'on.surface';
+    const color = rippleColor || colorProp || 'primary';
     const theme = useTheme();
 
+    const baseOpacity = 0.12;
+    const hoverOpacity = 0.16;
+    const focusOpacity = 0.24;
+
     return (
-      <ListItemProvider value={{ color, disabled }}>
-        <RippleBox
-          ref={forwardedRef}
-          as={innerAs || as}
-          theme={theme}
-          display="flex"
-          data-disabled={disabled ? '' : undefined}
-          rippleColor={rippleColor || color}
-          baseOpacity={selected ? 0.12 : 0}
-          hoverOpacity={selected ? 0.16 : 0.04}
-          focusOpacity={selected ? 0.24 : 0.12}
-          aria-selected={selected ? 'true' : undefined}
-          disabled={disabled}
-          {...otherProps}
-          __css={{
-            px: 3,
-            py: rem(12),
-            backgroundColor: 'transparent',
-            color: disabled ? alpha(color, 0.6) : alpha(color, 0.87),
+      <Box
+        ref={forwardedRef}
+        as={innerAs || as}
+        theme={theme}
+        display="flex"
+        data-disabled={disabled ? '' : undefined}
+        aria-selected={selected ? 'true' : undefined}
+        disabled={disabled}
+        {...otherProps}
+        __css={{
+          variant: 'text.label-large',
+          px: 3,
+          py: rem(12),
+          transition: 'background-color 75ms linear',
+          backgroundColor: 'transparent',
+          color: alpha('on.surface', 0.87),
+          cursor: 'pointer',
+          ':hover': {
+            backgroundColor: alpha('on.surface', hoverOpacity),
+          },
+          ':focus': {
+            outline: 'none',
+            backgroundColor: alpha('on.surface', focusOpacity),
+          },
+          ':active': {
+            backgroundColor: alpha('on.surface', baseOpacity + 0.12),
+          },
+          '&[aria-selected="true"]': {
+            backgroundColor: alpha(color, baseOpacity + 0.12),
+            color,
+            ':hover': {
+              backgroundColor: alpha(color, hoverOpacity + 0.12),
+            },
             ':focus': {
               outline: 'none',
+              backgroundColor: alpha(color, focusOpacity + 0.12),
+            },
+            ':active': {
+              backgroundColor: alpha(color, baseOpacity + 0.24),
             },
-            textDecoration: 'none',
-            WebkitTapHighlightColor: 'transparent',
-            ...get(theme, 'text.subtitle1'),
-            ...__css,
-          }}
-        >
-          {children}
-        </RippleBox>
-      </ListItemProvider>
+          },
+          '&[data-disabled]': {
+            color: alpha('on.surface', 0.6),
+            backgroundColor: 'transparent',
+            cursor: 'default',
+          },
+          textDecoration: 'none',
+          WebkitTapHighlightColor: 'transparent',
+          ...__css,
+        }}
+      >
+        {children}
+      </Box>
     );
   }
 );

package/src/ListItem/ListItemText.tsx

@@ -1,20 +1,17 @@
+import type { ElementType, HTMLAttributes, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import type * as React from 'react';
+
 import { Text } from '../Text';
-import { alpha } from '../color';
-import { useListItemContext } from './context';
 
-export interface ListItemTextProps
-  extends React.HTMLAttributes<HTMLDivElement> {
-  as?: React.ElementType<any>;
-  text?: React.ReactNode;
-  secondaryText?: React.ReactNode;
+export interface ListItemTextProps extends HTMLAttributes<HTMLDivElement> {
+  as?: ElementType<any>;
+  text?: ReactNode;
+  secondaryText?: ReactNode;
 }
 
 export const ListItemText = forwardRef<HTMLDivElement, ListItemTextProps>(
   function ListItemText(props, forwardedRef) {
     const { as: Comp = 'div', text, secondaryText, ...otherProps } = props;
-    const { color, disabled } = useListItemContext();
 
     return (
       <Comp ref={forwardedRef} {...otherProps}>
@@ -22,10 +19,11 @@ export const ListItemText = forwardRef<HTMLDivElement, ListItemTextProps>(
         {secondaryText && (
           <Text
             as="span"
-            variant="body2"
+            variant="body-small"
             display="block"
             __css={{
-              color: alpha(color, disabled ? 0.3 : 0.57),
+              color: 'currentColor',
+              opacity: 0.65,
             }}
           >
             {secondaryText}

package/src/Menu/Menu.tsx

@@ -1,30 +1,37 @@
-import { forwardRef, FC } from 'react';
-import type * as React from 'react';
-import {
-  MenuButton as MenuButtonCore,
+import type { FC, HTMLAttributes } from 'react';
+import { forwardRef } from 'react';
+import type {
   MenuButtonProps as MenuButtonPropsCore,
-  MenuList as _MenuListCore,
   MenuListProps as MenuListPropsCore,
-  MenuItem as MenuItemCore,
   MenuItemProps as MenuItemPropsCore,
-  MenuPopover as _MenuPopoverCore,
   MenuPopoverProps as MenuPopoverPropsCore,
   MenuProps as MenuPropsCore,
 } from '@basic-ui/core';
-import { List } from '../List';
-import { ListItem, ListItemProps } from '../ListItem';
-import { Button, ButtonProps } from '../Button';
-import { BoxProps, Box } from '../Box';
+import {
+  MenuButton as MenuButtonCore,
+  MenuList as _MenuListCore,
+  MenuItem as MenuItemCore,
+  MenuPopover as _MenuPopoverCore,
+} from '@basic-ui/core';
 import { rem } from 'polished';
+
+import { List } from '../List';
+import type { ListItemProps } from '../ListItem';
+import { ListItem } from '../ListItem';
+import type { ButtonProps } from '../Button';
+import { Button } from '../Button';
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 import { growAnimation } from './animation';
-import { PaperProps } from '../Paper';
+import type { PaperProps } from '../Paper';
+import { EASING_STANDARD } from '../motion';
 
 /////////////////////////////////////////////////////
 // MenuList
 
 export type MenuListProps = MenuListPropsCore &
   PaperProps &
-  BoxProps<HTMLUListElement, React.HTMLAttributes<HTMLUListElement>>;
+  BoxProps<HTMLUListElement, HTMLAttributes<HTMLUListElement>>;
 
 const MenuListCore: FC<MenuListProps> = _MenuListCore as any;
 
@@ -34,15 +41,15 @@ export const MenuList = forwardRef<HTMLUListElement, MenuListProps>(
       as={List}
       innerAs={as}
       ref={ref as any}
-      elevation={8}
+      elevation={2}
+      darkThemeBackgroundOverlay={2}
       outlined={false}
       variant="default"
       __css={{
-        width: 0,
         minWidth: rem(112),
         maxWidth: rem(280),
         maxHeight: rem(300),
-        borderRadius: 'default',
+        borderRadius: 'extra-small',
         overflowY: 'auto',
         '[data-popper-placement="top"] &': {
           transformOrigin: 'bottom center',
@@ -50,7 +57,7 @@ export const MenuList = forwardRef<HTMLUListElement, MenuListProps>(
         '[data-popper-placement="bottom"] &': {
           transformOrigin: 'top center',
         },
-        animation: `${growAnimation} .12s cubic-bezier(0,0,0.2,1)`,
+        animation: `${growAnimation} .12s ${EASING_STANDARD}`,
         ...__css,
       }}
       {...props}

package/src/Menu/animation.ts

@@ -1,5 +1,5 @@
 import { keyframes } from '@emotion/react';
-import { Keyframes } from '@emotion/serialize';
+import type { Keyframes } from '@emotion/serialize';
 
 export const growAnimation: Keyframes = keyframes({
   '0%': {

package/src/NavRail/NavRail.story.tsx

@@ -0,0 +1,190 @@
+import { rem } from 'polished';
+import { forwardRef, useState } from 'react';
+
+import { Box } from '../Box';
+import { NavRailItem, NavRailIndicator, NavRailLabel } from './';
+import type { NavRailLabelProps } from './';
+import { EASING_STANDARD } from '../motion';
+// import './styles.css';
+
+export default {
+  title: 'components/NavRail',
+};
+
+const ListIcon = (props) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    height={16}
+    width={16}
+    viewBox="0 0 24 24"
+    {...props}
+  >
+    <path
+      fill="currentColor"
+      d="M8 17q.425 0 .713-.288Q9 16.425 9 16t-.287-.713Q8.425 15 8 15t-.713.287Q7 15.575 7 16t.287.712Q7.575 17 8 17Zm0-4q.425 0 .713-.288Q9 12.425 9 12t-.287-.713Q8.425 11 8 11t-.713.287Q7 11.575 7 12t.287.712Q7.575 13 8 13Zm0-4q.425 0 .713-.288Q9 8.425 9 8t-.287-.713Q8.425 7 8 7t-.713.287Q7 7.575 7 8t.287.712Q7.575 9 8 9Zm3 8h6v-2h-6Zm0-4h6v-2h-6Zm0-4h6V7h-6ZM5 21q-.825 0-1.413-.587Q3 19.825 3 19V5q0-.825.587-1.413Q4.175 3 5 3h14q.825 0 1.413.587Q21 4.175 21 5v14q0 .825-.587 1.413Q19.825 21 19 21Zm0-2h14V5H5v14ZM5 5v14V5Z"
+    />
+  </svg>
+);
+
+const KitchenIcon = (props) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    height={16}
+    width={16}
+    viewBox="0 0 24 24"
+    {...props}
+  >
+    <path
+      fill="currentColor"
+      d="M8 8V5h2v3Zm0 9v-5h2v5Zm-2 5q-.825 0-1.412-.587Q4 20.825 4 20V4q0-.825.588-1.413Q5.175 2 6 2h12q.825 0 1.413.587Q20 3.175 20 4v16q0 .825-.587 1.413Q18.825 22 18 22Zm0-2h12v-9H6v9ZM6 9h12V4H6Z"
+    />
+  </svg>
+);
+
+const MenuIcon = (props) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    height={16}
+    width={16}
+    viewBox="0 0 24 24"
+    {...props}
+  >
+    <path
+      fill="currentColor"
+      d="M17 22v-8h-3V7q0-2.075 1.463-3.537Q16.925 2 19 2v20ZM7 22v-9.15q-1.275-.35-2.137-1.4Q4 10.4 4 9V2h2v7h1V2h2v7h1V2h2v7q0 1.4-.863 2.45-.862 1.05-2.137 1.4V22Z"
+    />
+  </svg>
+);
+
+export const Default = () => {
+  const [selectedItem, setSelectedItem] = useState('0');
+
+  return (
+    <Box
+      bg="surface"
+      width="80px"
+      position="fixed"
+      top="0"
+      bottom="0"
+      left="0"
+      py={rem(80)}
+      display="flex"
+      flexDirection="column"
+    >
+      <NavRailItem
+        selected={selectedItem === '0'}
+        onClick={() => setSelectedItem('0')}
+      >
+        <NavRailIndicator>
+          <MenuIcon />
+        </NavRailIndicator>
+        <NavRailLabel>Menu</NavRailLabel>
+      </NavRailItem>
+      <NavRailItem
+        selected={selectedItem === '1'}
+        onClick={() => setSelectedItem('1')}
+      >
+        <NavRailIndicator>
+          <KitchenIcon />
+        </NavRailIndicator>
+        <NavRailLabel>Kitchen</NavRailLabel>
+      </NavRailItem>
+      <NavRailItem
+        selected={selectedItem === '2'}
+        onClick={() => setSelectedItem('2')}
+      >
+        <NavRailIndicator>
+          <ListIcon />
+        </NavRailIndicator>
+        <NavRailLabel>Orders</NavRailLabel>
+      </NavRailItem>
+    </Box>
+  );
+};
+
+const DisappearingNavRailLabel = forwardRef<
+  HTMLDivElement,
+  NavRailLabelProps & { selected: boolean }
+>(function AnimatedNavRailLabel({ selected, height = '28px', ...props }, ref) {
+  const transitionDuration = '0.2s';
+  const transitionTimingFunction = EASING_STANDARD;
+  return (
+    <Box
+      ref={ref}
+      style={{
+        height: selected ? height : '0px',
+      }}
+      sx={{
+        transition: `height ${transitionDuration} ${transitionTimingFunction}`,
+      }}
+    >
+      <NavRailLabel
+        style={{
+          transform: selected
+            ? 'scale(1) translateY(0)'
+            : `scale(0.8, 0.64) translateY(calc(${height} * -0.5 * 0.64))`,
+          opacity: selected ? '1' : '0',
+        }}
+        sx={{
+          transformOrigin: 'center top',
+          transition:
+            `transform ${transitionDuration} ${transitionTimingFunction}, ` +
+            `opacity ${transitionDuration} ${transitionTimingFunction}`,
+        }}
+        {...props}
+      />
+    </Box>
+  );
+});
+
+export const WithHiddenLabels = () => {
+  const [selectedItem, setSelectedItem] = useState('0');
+
+  return (
+    <Box
+      bg="surface"
+      width="80px"
+      position="fixed"
+      top="0"
+      bottom="0"
+      left="0"
+      py={rem(80)}
+      display="flex"
+      flexDirection="column"
+    >
+      <NavRailItem
+        selected={selectedItem === '0'}
+        onClick={() => setSelectedItem('0')}
+      >
+        <NavRailIndicator>
+          <MenuIcon />
+        </NavRailIndicator>
+        <DisappearingNavRailLabel selected={selectedItem === '0'}>
+          Menu
+        </DisappearingNavRailLabel>
+      </NavRailItem>
+      <NavRailItem
+        selected={selectedItem === '1'}
+        onClick={() => setSelectedItem('1')}
+      >
+        <NavRailIndicator>
+          <KitchenIcon />
+        </NavRailIndicator>
+        <DisappearingNavRailLabel selected={selectedItem === '1'}>
+          Kitchen
+        </DisappearingNavRailLabel>
+      </NavRailItem>
+      <NavRailItem
+        selected={selectedItem === '2'}
+        onClick={() => setSelectedItem('2')}
+      >
+        <NavRailIndicator>
+          <ListIcon />
+        </NavRailIndicator>
+        <DisappearingNavRailLabel selected={selectedItem === '2'}>
+          Orders
+        </DisappearingNavRailLabel>
+      </NavRailItem>
+    </Box>
+  );
+};

package/src/NavRail/NavRailItem.tsx

@@ -0,0 +1,176 @@
+import type { ElementType, ReactNode } from 'react';
+import { forwardRef, useMemo } from 'react';
+import { rem } from 'polished';
+import { get } from 'styled-system';
+
+import type { BoxProps, SxStyleProp } from '../Box';
+import { Box } from '../Box';
+import { useTheme } from '../theme';
+import { Text } from '../Text';
+import type { TextProps } from '../Text';
+import { useRippleSurface } from '../Ripple';
+import { EASING_STANDARD } from '../motion';
+
+export interface NavRailItemProps extends Omit<BoxProps, 'color'> {
+  as?: ElementType<any>;
+  children?: ReactNode;
+  disabled?: boolean;
+  selected?: boolean;
+  color?: string;
+}
+
+export type NavRailIndicatorProps = BoxProps;
+
+export const NavRailIndicator = forwardRef<
+  HTMLDivElement,
+  NavRailIndicatorProps
+>(function NavRailIndicator(props, forwardedRef) {
+  const { as = 'div', children, __css, ...otherProps } = props;
+
+  return (
+    <Box
+      color="currentColor"
+      ref={forwardedRef}
+      as={as}
+      data-nav-rail-item-indicator=""
+      {...otherProps}
+      __css={{
+        width: '100%',
+        height: '100%',
+        maxWidth: rem(56),
+        maxHeight: rem(56),
+        borderRadius: 'full',
+        bg: 'var(--indicator-background-color)',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        minHeight: rem(32),
+        transition: `background-color .2s ${EASING_STANDARD}`,
+        pointerEvents: 'none',
+        ...__css,
+      }}
+    >
+      {children}
+    </Box>
+  );
+});
+
+export type NavRailLabelProps = TextProps;
+
+export const NavRailLabel = forwardRef<HTMLDivElement, NavRailLabelProps>(
+  function NavRailLabel(props, forwardedRef) {
+    const { as = 'div', children, __css, ...otherProps } = props;
+
+    return (
+      <Text
+        ref={forwardedRef}
+        as={as}
+        variant="label-small"
+        lineHeight={1}
+        {...otherProps}
+        __css={{
+          pt: rem(4),
+          pb: rem(12),
+          color: 'inherit',
+          pointerEvents: 'none',
+          ...__css,
+        }}
+      >
+        {children}
+      </Text>
+    );
+  }
+);
+
+export const NavRailItem = forwardRef<HTMLDivElement, NavRailItemProps>(
+  function NavRailItem(props, forwardedRef) {
+    const {
+      as = 'button',
+      children,
+      color = 'primary-container',
+      selected = false,
+      disabled = false,
+      style,
+      onKeyDown,
+      onPointerDown,
+      __css,
+      ...otherProps
+    } = props;
+    const theme = useTheme();
+    const baseOpacity = 0,
+      hoverOpacity = 0.04,
+      focusOpacity = 0.12,
+      pressedOpacity = 0.12;
+    const ripple = useRippleSurface({
+      rippleColor: 'currentColor',
+      onKeyDown,
+      onPointerDown,
+      baseOpacity,
+      hoverOpacity,
+      focusOpacity,
+      pressedOpacity,
+    });
+
+    // Apply ripple from nav item to nav indicator
+    const rippleCss = useMemo(() => {
+      const ret: SxStyleProp = {};
+      const keys = Object.keys(ripple.__css);
+      for (const key of keys) {
+        if (!key.startsWith('&')) {
+          ret['& [data-nav-rail-item-indicator]'] =
+            ret['& [data-nav-rail-item-indicator]'] || {};
+          ret['& [data-nav-rail-item-indicator]'][key] = ripple.__css[key];
+          continue;
+        }
+
+        const newKey = key.replace(
+          /(.+?)::(before|after)/g,
+          '$1 [data-nav-rail-item-indicator]::$2'
+        );
+        ret[newKey] = ripple.__css[key];
+      }
+      return ret;
+    }, [ripple.__css]);
+
+    return (
+      <Box
+        ref={forwardedRef}
+        as={as}
+        {...otherProps}
+        onPointerDown={ripple.onPointerDown}
+        onKeyDown={ripple.onKeyDown}
+        aria-pressed={selected}
+        type="button"
+        style={{ ...ripple.style, ...style }}
+        disabled={disabled}
+        __css={{
+          display: 'flex',
+          flexDirection: 'column',
+          alignItems: 'center',
+          transition: `color .2s ${EASING_STANDARD}`,
+          color: selected ? `on.${color}` : 'on.surface-variant',
+          '--indicator-background-color': selected
+            ? get(theme, `colors.${color}`)
+            : 'transparent',
+          border: 'none',
+          ':focus': {
+            outline: 'none',
+          },
+          backgroundColor: 'transparent',
+          margin: 0,
+          padding: 0,
+          px: rem(12),
+          minHeight: rem(60),
+          height: rem(60),
+          cursor: 'pointer',
+          textDecoration: 'none',
+          WebkitTapHighlightColor: 'transparent',
+          ...rippleCss,
+          ...__css,
+        }}
+      >
+        {children}
+      </Box>
+    );
+  }
+);

package/src/NavRail/index.ts

@@ -0,0 +1 @@
+export * from './NavRailItem';

package/src/NotchedOutline/NotchedOutline.story.tsx

@@ -1,8 +1,9 @@
 import {} from './';
+import { rem } from 'polished';
+
 import { NotchedOutline } from './NotchedOutline';
 import { Box } from '../Box';
 import { FloatingLabel } from '../FloatingLabel';
-import { rem } from 'polished';
 // import './styles.css';
 
 export default {
@@ -17,7 +18,7 @@ const Example = () => {
       <Box
         m={3}
         display="inline-block"
-        sx={{ position: 'relative', bg: 'muted', borderRadius: 4 }}
+        sx={{ position: 'relative', bg: 'muted', borderRadius: 'extra-small' }}
       >
         <NotchedOutline
           borderColor="primary"

package/src/NotchedOutline/NotchedOutline.tsx

@@ -1,12 +1,12 @@
+import type { HTMLAttributes, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import type * as React from 'react';
 import { rem } from 'polished';
+
 import { NotchedOutlineProvider } from './context';
 import { useTheme } from '../theme';
 import { NOTCH_PADDING, InnerContainer } from './styledComponents';
 
-export interface NotchedOutlineProps
-  extends React.HTMLAttributes<HTMLDivElement> {
+export interface NotchedOutlineProps extends HTMLAttributes<HTMLDivElement> {
   borderColor: string;
   borderStyle?: string;
   borderWidth: number;
@@ -15,8 +15,8 @@ export interface NotchedOutlineProps
   notchWidth: number;
   notchActive?: boolean;
   forceActive?: boolean;
-  label?: React.ReactNode;
-  children?: React.ReactNode;
+  label?: ReactNode;
+  children?: ReactNode;
 }
 
 export const NotchedOutline = forwardRef<HTMLDivElement, NotchedOutlineProps>(