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

package/src/Combobox/Combobox.tsx

@@ -1,31 +1,41 @@
-import { FC, forwardRef } from 'react';
-import type * as React from 'react';
+import type { FC } from 'react';
+import { forwardRef } from 'react';
+import * as React from 'react';
+import type {
+  ComboboxProps as ComboboxPropsCore,
+  ComboboxInputProps as ComboboxInputPropsCore,
+  ComboboxLabelProps as ComboboxLabelPropsCore,
+  ComboboxListProps as ComboboxListPropsCore,
+  ComboboxOptionProps as ComboboxOptionPropsCore,
+  ComboboxPopoverProps as ComboboxPopoverPropsCore,
+  ComboboxButtonProps as ComboboxButtonPropsCore,
+  PopperProps as PopperCoreProps,
+} from '@basic-ui/core';
 import {
   Combobox as _ComboboxCore,
-  ComboboxProps as ComboboxPropsCore,
   ComboboxInput as _ComboboxInputCore,
-  ComboboxInputProps as ComboboxInputPropsCore,
   ComboboxLabel as _ComboboxLabelCore,
-  ComboboxLabelProps as ComboboxLabelPropsCore,
   ComboboxList as _ComboboxListCore,
-  ComboboxListProps as ComboboxListPropsCore,
   ComboboxOption as _ComboboxOptionCore,
-  ComboboxOptionProps as ComboboxOptionPropsCore,
   ComboboxPopover as _ComboboxPopoverCore,
-  ComboboxPopoverProps as ComboboxPopoverPropsCore,
   ComboboxButton as _ComboboxButtonCore,
-  ComboboxButtonProps as ComboboxButtonPropsCore,
   Popper as _PopperCore,
-  PopperProps as PopperCoreProps,
   useComboBoxContext,
 } from '@basic-ui/core';
-import { Box, BoxProps } from '../Box';
-import { TextField, TextFieldProps } from '../TextField';
-import { List, ListProps } from '../List';
-import { ListItem, ListItemProps } from '../ListItem';
-import { Text, TextProps } from '../Text';
-import { Button, ButtonProps } from '../Button';
 import { rem } from 'polished';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
+import type { TextFieldProps } from '../TextField';
+import { TextField } from '../TextField';
+import type { ListProps } from '../List';
+import { List } from '../List';
+import type { ListItemProps } from '../ListItem';
+import { ListItem } from '../ListItem';
+import type { TextProps } from '../Text';
+import { Text } from '../Text';
+import type { ButtonProps } from '../Button';
+import { Button } from '../Button';
 import { alpha } from '../color';
 
 export { useComboBoxContext } from '@basic-ui/core';
@@ -98,10 +108,12 @@ export const ComboboxList = forwardRef<HTMLUListElement, ComboboxListProps>(
         ref={forwardedRef}
         innerAs={as}
         outlined={false}
-        elevation={8}
+        elevation={2}
+        darkThemeBackgroundOverlay={2}
         __css={{
           maxHeight: rem(300),
           overflowY: 'auto',
+          borderRadius: 'default',
           '[data-popper-placement="top"] &': {
             transformOrigin: 'bottom center',
           },
@@ -144,7 +156,8 @@ const ComboboxPopperBox = forwardRef<HTMLDivElement, PopperProps>(
 
 export type ComboboxPopoverProps = ComboboxPopoverPropsCore & ListProps;
 
-const ComboboxPopoverCore: FC<ComboboxPopoverProps> = _ComboboxPopoverCore as any;
+const ComboboxPopoverCore: FC<ComboboxPopoverProps> =
+  _ComboboxPopoverCore as any;
 
 export const ComboboxPopover = forwardRef<HTMLDivElement, ComboboxPopoverProps>(
   (props, forwardedRef) => {

package/src/Dialog/Dialog.story.tsx

@@ -1,5 +1,7 @@
 import { useState } from 'react';
-import { Dialog, DialogAnimationModes } from './';
+
+import type { DialogAnimationModes } from './';
+import { Dialog } from './';
 import { Button } from '../Button';
 import { LoremIpsum } from '../Text/LoremIpsum';
 import { Box } from '../Box';

package/src/Dialog/Dialog.tsx

@@ -1,10 +1,15 @@
 import { forwardRef } from 'react';
 import { Portal } from '@basic-ui/core';
-import { Scrim, ScrimProps } from './Scrim';
-import { DialogContainer, DialogContainerProps } from './DialogContainer';
-import { DialogSurface, DialogSurfaceProps } from './DialogSurface';
+
+import type { ScrimProps } from './Scrim';
+import { Scrim } from './Scrim';
+import type { DialogContainerProps } from './DialogContainer';
+import { DialogContainer } from './DialogContainer';
+import type { DialogSurfaceProps } from './DialogSurface';
+import { DialogSurface } from './DialogSurface';
 import { useDialogAnimation } from './useDialogAnimation';
-import { DialogBackdrop, DialogBackdropProps } from './DialogBackdrop';
+import type { DialogBackdropProps } from './DialogBackdrop';
+import { DialogBackdrop } from './DialogBackdrop';
 import type { DialogAnimationModes } from './useDialogAnimation';
 export type { DialogAnimationModes } from './useDialogAnimation';
 

package/src/Dialog/DialogBackdrop.tsx

@@ -1,10 +1,10 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import {
-  ModalBackdrop as _ModalBackdrop,
-  ModalBackdropProps,
-} from '@basic-ui/core';
-import { Box, BoxProps } from '../Box';
+import * as React from 'react';
+import type { ModalBackdropProps } from '@basic-ui/core';
+import { ModalBackdrop as _ModalBackdrop } from '@basic-ui/core';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 
 const ModalBackdrop = _ModalBackdrop as React.FC<
   DialogBackdropProps & { ref?: React.Ref<HTMLDivElement> }

package/src/Dialog/DialogContainer.tsx

@@ -1,5 +1,7 @@
 import { forwardRef } from 'react';
-import { Box, BoxProps } from '../Box';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 
 export type DialogContainerProps = BoxProps;
 

package/src/Dialog/DialogSurface.tsx

@@ -1,36 +1,53 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { Modal as _Modal, ModalProps } from '@basic-ui/core';
-import { Paper, PaperProps } from '../Paper';
-import { useTheme } from '../theme';
+import * as React from 'react';
+import type { ModalProps } from '@basic-ui/core';
+import { Modal as _Modal } from '@basic-ui/core';
 import { rem } from 'polished';
+import { get, variant } from 'styled-system';
+
+import type { PaperProps } from '../Paper';
+import { Paper } from '../Paper';
+import { useTheme } from '../theme';
 
 const Modal = _Modal as React.FC<
   DialogSurfaceProps & { ref?: React.Ref<HTMLDivElement> }
 >;
 
-export type DialogSurfaceProps = ModalProps & PaperProps;
+export type DialogSurfaceProps = ModalProps &
+  PaperProps & {
+    variant?: 'base';
+  };
 
 export const DialogSurface = forwardRef<HTMLDivElement, DialogSurfaceProps>(
   function DialogSurface(props, forwardedRef) {
-    const { __css, ...otherProps } = props;
+    const { __css, variant: variantProp = 'base', ...otherProps } = props;
     const theme = useTheme();
 
+    const overlayValue =
+      (get(theme, 'dialogs.backgroundColorOverlay') as number) || 0;
+
     return (
       <Modal
         ref={forwardedRef}
         as={Paper}
         theme={theme}
-        elevation={24}
+        elevation={3}
+        darkThemeBackgroundOverlay={overlayValue}
         __css={{
           position: 'relative',
-          bg: 'surface',
-          borderRadius: rem(8),
+          borderRadius: 'small',
           width: '100%',
           maxWidth: rem(600),
           maxHeight: '100%',
           overflow: 'auto',
           pointerEvents: 'auto',
+          ...variant({
+            scale: 'dialogs.variants',
+            prop: 'variant',
+            variants: {
+              base: {},
+            },
+          })({ variant: variantProp, theme }),
           ...__css,
         }}
         {...otherProps}

package/src/Dialog/Scrim.tsx

@@ -1,5 +1,7 @@
 import { forwardRef } from 'react';
-import { Box, BoxProps } from '../Box';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 import { alpha } from '../color';
 
 export type ScrimProps = BoxProps;

package/src/Divider/Divider.tsx

@@ -1,7 +1,9 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { Box, BoxProps } from '../Box';
+import * as React from 'react';
 import { rem } from 'polished';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 import { alpha } from '../color';
 
 export interface DividerProps extends BoxProps {

package/src/FloatingLabel/FloatingLabel.story.tsx

@@ -1,4 +1,5 @@
 import { useRef, useState } from 'react';
+
 import { FloatingLabel as FloatingLabelComponent } from './FloatingLabel';
 import { Box } from '../Box';
 import { Button } from '../Button';

package/src/FloatingLabel/FloatingLabel.tsx

@@ -1,7 +1,8 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { Text as _Text } from '../Text';
+import * as React from 'react';
 import { rem } from 'polished';
+
+import { Text as _Text } from '../Text';
 import { useNotchedOutlineContext } from '../NotchedOutline/context';
 
 export interface FloatingLabelProps
@@ -11,7 +12,6 @@ export interface FloatingLabelProps
   offsetX?: number;
   height?: number;
   scale?: number;
-  top?: number;
   px?: number;
   translateX?: number;
   translateY?: number;
@@ -29,7 +29,6 @@ export const FloatingLabel = forwardRef<HTMLLabelElement, FloatingLabelProps>(
       style = {},
       translateX: translateXProp,
       translateY: translateYProp,
-      top = 0,
       children,
       ...otherProps
     } = props;
@@ -58,7 +57,6 @@ export const FloatingLabel = forwardRef<HTMLLabelElement, FloatingLabelProps>(
           fontWeight: 'regular',
           display: 'inline-flex',
           alignItems: 'center',
-          top: rem(top),
           left: rem(offsetX),
           height: typeof height === 'number' ? rem(height) : height,
           transformOrigin: 'left center',

package/src/LineRipple/LineRipple.story.tsx

@@ -1,4 +1,5 @@
 import { useRef, useState } from 'react';
+
 import { LineRipple } from './';
 import { Box } from '../Box';
 import { Text } from '../Text';

package/src/LineRipple/LineRipple.tsx

@@ -1,8 +1,11 @@
-import { forwardRef, useState, useRef, useEffect, CSSProperties } from 'react';
-import type * as React from 'react';
+import type { CSSProperties } from 'react';
+import { forwardRef, useState, useRef, useEffect } from 'react';
+import * as React from 'react';
 import { rem } from 'polished';
+
 import { useTheme } from '../theme';
-import { Box, BoxProps } from '../Box';
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 
 export interface LineRippleProps extends BoxProps {
   active?: boolean;

package/src/Link/Link.tsx

@@ -1,7 +1,9 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { Box, BoxProps } from '../Box';
+import * as React from 'react';
 import { rem } from 'polished';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
 import { alpha } from '../color';
 
 export interface LinkProps

package/src/List/List.tsx

@@ -1,6 +1,8 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { Paper, PaperProps } from '../Paper';
+import * as React from 'react';
+
+import type { PaperProps } from '../Paper';
+import { Paper } from '../Paper';
 
 export interface ListProps extends PaperProps {
   as?: React.ElementType<any>;
@@ -31,6 +33,7 @@ export const List = forwardRef<HTMLDivElement, ListProps>(function List(
       py={py}
       px={px}
       elevation={elevation}
+      darkThemeBackgroundOverlay={elevation}
       variant={variant}
       outlined={outlined}
       __css={{

package/src/ListItem/ListItem.story.tsx

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import { ListItem, ListItemText } from './';
 import { List } from '../List';
 // import './styles.css';

package/src/ListItem/ListItem.tsx

@@ -1,11 +1,11 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
-import { BoxProps } from '../Box';
+import * as React from 'react';
 import { rem } from 'polished';
-import { RippleBox } from '../Ripple';
-import { useTheme } from '../theme';
-import { ListItemProvider } from './context';
 import { get } from '@styled-system/css';
+
+import type { BoxProps } from '../Box';
+import { Box } from '../Box';
+import { useTheme } from '../theme';
 import { alpha } from '../color';
 
 export interface ListItemProps extends BoxProps {
@@ -33,41 +33,66 @@ 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={{
+          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),
+            ':hover': {
+              backgroundColor: alpha(color, hoverOpacity + 0.12),
+            },
             ':focus': {
               outline: 'none',
+              backgroundColor: alpha(color, focusOpacity + 0.12),
             },
-            textDecoration: 'none',
-            WebkitTapHighlightColor: 'transparent',
-            ...get(theme, 'text.subtitle1'),
-            ...__css,
-          }}
-        >
-          {children}
-        </RippleBox>
-      </ListItemProvider>
+            ':active': {
+              backgroundColor: alpha(color, baseOpacity + 0.24),
+            },
+          },
+          '&[data-disabled]': {
+            color: alpha('on.surface', 0.6),
+            backgroundColor: 'transparent',
+            cursor: 'default',
+          },
+          textDecoration: 'none',
+          WebkitTapHighlightColor: 'transparent',
+          ...get(theme, 'text.subtitle1'),
+          ...__css,
+        }}
+      >
+        {children}
+      </Box>
     );
   }
 );

package/src/ListItem/ListItemText.tsx

@@ -1,8 +1,7 @@
 import { forwardRef } from 'react';
-import type * as React from 'react';
+import * as React from 'react';
+
 import { Text } from '../Text';
-import { alpha } from '../color';
-import { useListItemContext } from './context';
 
 export interface ListItemTextProps
   extends React.HTMLAttributes<HTMLDivElement> {
@@ -14,7 +13,6 @@ export interface ListItemTextProps
 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}>
@@ -25,7 +23,8 @@ export const ListItemText = forwardRef<HTMLDivElement, ListItemTextProps>(
             variant="body2"
             display="block"
             __css={{
-              color: alpha(color, disabled ? 0.3 : 0.57),
+              color: 'currentColor',
+              opacity: 0.65,
             }}
           >
             {secondaryText}

package/src/Menu/Menu.tsx

@@ -1,23 +1,30 @@
-import { forwardRef, FC } from 'react';
-import type * as React from 'react';
-import {
-  MenuButton as MenuButtonCore,
+import type { FC } from 'react';
+import { forwardRef } from 'react';
+import * as React 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';
 
 /////////////////////////////////////////////////////
 // MenuList
@@ -34,14 +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',
         overflowY: 'auto',
         '[data-popper-placement="top"] &': {
           transformOrigin: 'bottom center',

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/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,6 +1,7 @@
 import { forwardRef } from 'react';
-import type * as React 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';

package/src/NotchedOutline/styledComponents.ts

@@ -1,10 +1,11 @@
 import styled from '@emotion/styled';
-import { Theme } from '../theme';
 import { rem } from 'polished';
-import { alpha } from '../color';
 import shouldForwardProp from '@styled-system/should-forward-prop';
 import { css } from '@styled-system/css';
 
+import { alpha } from '../color';
+import type { Theme } from '../theme';
+
 export const NOTCH_PADDING = 4;
 
 const makeSelector = (
@@ -15,7 +16,7 @@ const makeSelector = (
 ) =>
   `input:${state} ~ & [data-notch-outline-item],` +
   `select:${state} ~ & [data-notch-outline-item],` +
-  `button:${state} ~ & [data-notch-outline-item],` +
+  `[role="button"]:${state} ~ & [data-notch-outline-item],` +
   `textarea:${state} ~ & [data-notch-outline-item]`;
 
 export const InnerContainer = styled('div', {
@@ -78,18 +79,18 @@ export const InnerContainer = styled('div', {
     }
 
     const inactiveStyle = {
-      color: alpha('on.surface', 0.6),
-      borderColor: alpha('on.surface', 0.38),
+      color: 'on.surface-variant',
+      borderColor: 'outline',
       ...borderStyling(borderRadius, borderWidth),
     };
 
     const hoverStyle = {
-      borderColor: alpha('on.surface', 0.87),
-      color: alpha('on.surface', 0.6),
+      borderColor: 'on.surface',
+      color: 'on.surface-variant',
     };
 
     const focusStyle = {
-      borderColor: alpha(color, 0.87),
+      borderColor: color,
       color: alpha(color, 0.87),
       ...borderStyling(borderRadius, borderWidthWhenFocused),
     };

package/src/Paper/Paper.story.tsx

@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import { Paper } from './';
 import { Text } from '../Text';
 import { Box } from '../Box';
@@ -11,8 +12,21 @@ const Example = ({}) => {
   const [elevation, setElevation] = useState(0);
 
   return (
-    <Box p="6" bg={'surface'} color={'on.surface'} width="100%" height="100vh">
-      <Paper outlined width="300px" height="300px" elevation={elevation} mb="4">
+    <Box
+      p="6"
+      bg={'surface'}
+      color={'on.primary-container'}
+      width="100%"
+      height="100vh"
+    >
+      <Paper
+        width="216px"
+        height="216px"
+        elevation={elevation}
+        darkThemeBackgroundOverlay={elevation}
+        mb="4"
+        sx={{ borderRadius: 'large' }}
+      >
         <Text variant="h3">Hello</Text>
         <Text variant="body1">This is looking cool</Text>
         Pretty cool.
@@ -24,7 +38,7 @@ const Example = ({}) => {
         <input
           type="range"
           min={0}
-          max={24}
+          max={5}
           value={elevation}
           onChange={(e) => setElevation(Number(e.target.value))}
         />