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

package/src/ListItem/ListItem.tsx

@@ -1,7 +1,6 @@
+import type { ElementType, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 import { rem } from 'polished';
-import { get } from '@styled-system/css';
 
 import type { BoxProps } from '../Box';
 import { Box } from '../Box';
@@ -9,9 +8,9 @@ import { useTheme } from '../theme';
 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;
@@ -51,6 +50,7 @@ export const ListItem = forwardRef<HTMLDivElement, ListItemProps>(
         disabled={disabled}
         {...otherProps}
         __css={{
+          variant: 'text.label-large',
           px: 3,
           py: rem(12),
           transition: 'background-color 75ms linear',
@@ -69,6 +69,7 @@ export const ListItem = forwardRef<HTMLDivElement, ListItemProps>(
           },
           '&[aria-selected="true"]': {
             backgroundColor: alpha(color, baseOpacity + 0.12),
+            color,
             ':hover': {
               backgroundColor: alpha(color, hoverOpacity + 0.12),
             },
@@ -87,7 +88,6 @@ export const ListItem = forwardRef<HTMLDivElement, ListItemProps>(
           },
           textDecoration: 'none',
           WebkitTapHighlightColor: 'transparent',
-          ...get(theme, 'text.subtitle1'),
           ...__css,
         }}
       >

package/src/ListItem/ListItemText.tsx

@@ -1,13 +1,12 @@
+import type { ElementType, HTMLAttributes, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 
 import { Text } from '../Text';
 
-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>(
@@ -20,7 +19,7 @@ export const ListItemText = forwardRef<HTMLDivElement, ListItemTextProps>(
         {secondaryText && (
           <Text
             as="span"
-            variant="body2"
+            variant="body-small"
             display="block"
             __css={{
               color: 'currentColor',

package/src/Menu/Menu.tsx

@@ -1,6 +1,5 @@
-import type { FC } from 'react';
+import type { FC, HTMLAttributes } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 import type {
   MenuButtonProps as MenuButtonPropsCore,
   MenuListProps as MenuListPropsCore,
@@ -25,13 +24,14 @@ import type { BoxProps } from '../Box';
 import { Box } from '../Box';
 import { growAnimation } from './animation';
 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;
 
@@ -49,7 +49,7 @@ export const MenuList = forwardRef<HTMLUListElement, MenuListProps>(
         minWidth: rem(112),
         maxWidth: rem(280),
         maxHeight: rem(300),
-        borderRadius: 'default',
+        borderRadius: 'extra-small',
         overflowY: 'auto',
         '[data-popper-placement="top"] &': {
           transformOrigin: 'bottom center',
@@ -57,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/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.tsx

@@ -1,13 +1,12 @@
+import type { HTMLAttributes, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import * 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;
@@ -16,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>(

package/src/NotchedOutline/styledComponents.ts

@@ -5,6 +5,7 @@ import { css } from '@styled-system/css';
 
 import { alpha } from '../color';
 import type { Theme } from '../theme';
+import { EASING_STANDARD } from '../motion';
 
 export const NOTCH_PADDING = 4;
 
@@ -105,7 +106,7 @@ export const InnerContainer = styled('div', {
       ['[data-notch-outline-item]']: {
         boxSizing: 'border-box',
         borderStyle,
-        transition: `border-color .15s cubic-bezier(.4,0,.2,1)`,
+        transition: `border-color .15s ${EASING_STANDARD}`,
         ...(forceActive ? focusStyle : inactiveStyle),
       },
       // notch items styles when input is hovered

package/src/Paper/Paper.story.tsx

@@ -27,12 +27,12 @@ const Example = ({}) => {
         mb="4"
         sx={{ borderRadius: 'large' }}
       >
-        <Text variant="h3">Hello</Text>
-        <Text variant="body1">This is looking cool</Text>
+        <Text variant="headline-medium">Hello</Text>
+        <Text variant="body-medium">This is looking cool</Text>
         Pretty cool.
       </Paper>
       <label>
-        <Text as="span" variant="body1">
+        <Text as="span" variant="body-medium">
           Elevation: {elevation}
         </Text>
         <input

package/src/Paper/Paper.tsx

@@ -1,5 +1,5 @@
+import type { ElementType, ReactNode } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 import { rem } from 'polished';
 
 import type { BoxProps } from '../Box';
@@ -12,12 +12,12 @@ import {
 } from '../color';
 
 export interface PaperProps extends BoxProps {
-  as?: React.ElementType<any>;
+  as?: ElementType<any>;
   elevation?: number;
   outlined?: boolean;
   backgroundOverlay?: number | string;
   darkThemeBackgroundOverlay?: number | string;
-  children?: React.ReactNode;
+  children?: ReactNode;
 }
 
 export const Paper = forwardRef<HTMLDivElement, PaperProps>(function Paper(

package/src/ProgressSpinner/ProgressSpinner.tsx

@@ -5,6 +5,7 @@ import { rem } from 'polished';
 
 import type { BoxProps } from '../Box';
 import { Box } from '../Box';
+import { EASING_STANDARD } from '../motion';
 
 export type ProgressSpinnerProps = BoxProps & {
   progress?: number;
@@ -105,8 +106,7 @@ export const ProgressSpinner = forwardRef<HTMLDivElement, ProgressSpinnerProps>(
                       strokeDashoffset: '0px',
                     }
                   : {
-                      transition:
-                        'stroke-dashoffset 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms',
+                      transition: `stroke-dashoffset 300ms ${EASING_STANDARD} 0ms`,
                       strokeDasharray: circumference.toFixed(3),
                     }
               }

package/src/RadioButton/RadioButton.story.tsx

@@ -1,5 +1,5 @@
+import type { ChangeEvent } from 'react';
 import { useState } from 'react';
-import * as React from 'react';
 
 import { RadioButton, RadioGroup, Box } from '../';
 // import './styles.css';
@@ -35,7 +35,7 @@ const Example = (props) => {
 
 const StandaloneExample = (props) => {
   const [selectedValue, setSelectedValue] = useState('a');
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
     setSelectedValue(e.target.value);
   };
 

package/src/RadioButton/RadioButton.tsx

@@ -21,7 +21,7 @@ export type RadioButtonProps = RadioButtonCoreProps;
 const RadioButtonInner = forwardRef<
   HTMLInputElement,
   RadioButtonProps &
-    BoxProps<HTMLInputElement, React.InputHTMLAttributes<HTMLInputElement>>
+    BoxProps<HTMLInputElement, InputHTMLAttributes<HTMLInputElement>>
 >(function RadioButtonInner(props, forwardedRef) {
   const { innerAs: as, checked, disabled, __css, ...otherProps } = props;
   const color = 'primary';

package/src/RadioButton/RadioButtonIcon.tsx

@@ -1,11 +1,11 @@
+import type { HTMLAttributes } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 import { rem } from 'polished';
 
 import { Box } from '../Box';
+import { EASING_STANDARD } from '../motion';
 
-export interface RadioButtonIconProps
-  extends React.HTMLAttributes<HTMLDivElement> {
+export interface RadioButtonIconProps extends HTMLAttributes<HTMLDivElement> {
   checked?: boolean;
   disabled?: boolean;
 }
@@ -34,8 +34,7 @@ export const RadioButtonIcon = forwardRef<HTMLDivElement, RadioButtonIconProps>(
             borderRadius: 'full',
             width: '100%',
             height: '100%',
-            transition:
-              'transform .12s cubic-bezier(0,0,.2,1) 0ms,background-color .12s cubic-bezier(0,0,.2,1) 0ms',
+            transition: `transform .12s ${EASING_STANDARD} 0ms,background-color .12s ${EASING_STANDARD} 0ms`,
             transform: checked ? 'scale(1)' : 'scale(0)',
           }}
         />

package/src/Ripple/Ripple.story.tsx

@@ -46,7 +46,7 @@ const Example = () => {
         }}
       >
         <Ripple animation={animation} style={rippleStyle} />
-        <Text variant="h3" style={{ zIndex: 1, color: textColor }}>
+        <Text variant="headline-medium" style={{ zIndex: 1, color: textColor }}>
           Hello
         </Text>
       </Box>

package/src/Ripple/RippleBox.tsx

@@ -1,6 +1,5 @@
 import type { HTMLAttributes } from 'react';
 import { forwardRef } from 'react';
-import * as React from 'react';
 
 import type { UseRippleSurfaceOptions } from './useRippleSurface';
 import { useRippleSurface } from './useRippleSurface';
@@ -9,7 +8,7 @@ import { Box } from '../Box';
 
 export type RippleBoxProps<
   H extends HTMLElement = HTMLDivElement,
-  Attr = React.HTMLAttributes<H>
+  Attr = HTMLAttributes<H>
 > = BoxProps<H, Attr> & UseRippleSurfaceOptions<H>;
 
 export const RippleBox: <