@veracity/vui 1.8.0-redesign.0 → 1.8.0

package/src/header/header.tsx

@@ -1,6 +1,6 @@
 import React, { useRef, useState } from 'react'
 
-import { styled, useDown, useLinks, useStyleConfig, useUp, vui, VuiComponent } from '../core'
+import { styled, useLinks, useStyleConfig, useUp, vui, VuiComponent } from '../core'
 import { cs, useClickOutside } from '../utils'
 import { HeaderProvider } from './context'
 import { HeaderProps } from './header.types'
@@ -41,8 +41,8 @@ export const Header = vui<'header', HeaderProps>((props, ref) => {
     setIsMobileOpen(false)
   })
 
-  const isDesktop = useUp('md')
-  const isMobile = useDown('md')
+  const isDesktop = useUp('lg')
+  const isMobile = !isDesktop
 
   const context = {
     headerHeight,

package/src/header/headerServices.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { RenderOnDesktop, RenderOnMobile, useStyleConfig } from '../core'
+import { RenderOnScreen, useStyleConfig } from '../core'
 import List from '../list'
 import Menu from '../menu'
 import { useHeaderContext } from './context'
@@ -31,7 +31,7 @@ export function HeaderServices(props: HeaderServicesProps) {
 
   return (
     <>
-      <RenderOnDesktop>
+      <RenderOnScreen minWidth="lg">
         <Menu isLazy={false} offset={[0, 8]} placement="bottom-end" size="lg" {...rest}>
           <Menu.Button
             colorScheme="prussian"
@@ -46,13 +46,13 @@ export function HeaderServices(props: HeaderServicesProps) {
             <ListContent links={links} />
           </Menu.List>
         </Menu>
-      </RenderOnDesktop>
+      </RenderOnScreen>
 
-      <RenderOnMobile>
+      <RenderOnScreen maxWidth="lg">
         <List borderBottom="1px solid grey.40" heading="My Services" {...styles.list}>
           <ListContent links={links} />
         </List>
-      </RenderOnMobile>
+      </RenderOnScreen>
     </>
   )
 }

package/src/header/loggedInHeader.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import Box from '../box'
-import { RenderOnDesktop, RenderOnMobile, vui } from '../core'
+import { RenderOnScreen, vui } from '../core'
 import { cs, isJsx } from '../utils'
 import Header from './header'
 import { LoggedInHeaderProps } from './header.types'
@@ -15,23 +15,23 @@ export const LoggedInHeader = vui<'div', LoggedInHeaderProps>((props, ref) => {
       <Header.Content>
         {isJsx(logo) ? logo : <Header.Logo {...logo} />}
 
-        <RenderOnDesktop>{children}</RenderOnDesktop>
+        <RenderOnScreen minWidth="lg">{children}</RenderOnScreen>
 
         <Box ml="auto" />
 
-        <RenderOnDesktop>
+        <RenderOnScreen minWidth="lg">
           {isJsx(mainLinks) ? mainLinks : <Header.MainLinks links={mainLinks} />}
 
           {mainLinks !== undefined && <Header.Divider mx={1} />}
 
           {isJsx(services) ? services : <Header.Services {...services} />}
-        </RenderOnDesktop>
+        </RenderOnScreen>
 
         {isJsx(notifications) ? notifications : <Header.Notifications {...notifications} />}
 
         {isJsx(account) ? account : <Header.Account {...account} />}
 
-        <RenderOnMobile>
+        <RenderOnScreen maxWidth="lg">
           {(account !== undefined || notifications !== undefined) && <Header.Divider ml={2} />}
 
           <Header.MobileToggle />
@@ -43,7 +43,7 @@ export const LoggedInHeader = vui<'div', LoggedInHeaderProps>((props, ref) => {
 
             {isJsx(services) ? services : <Header.Services {...services} />}
           </Header.MobileContent>
-        </RenderOnMobile>
+        </RenderOnScreen>
       </Header.Content>
     </Header>
   )

package/src/header/loggedOutHeader.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import Box from '../box'
-import { RenderOnDesktop, RenderOnMobile, vui } from '../core'
+import { RenderOnScreen, vui } from '../core'
 import { cs, isJsx } from '../utils'
 import Header from './header'
 import { LoggedOutHeaderProps } from './header.types'
@@ -15,11 +15,11 @@ export const LoggedOutHeader = vui<'div', LoggedOutHeaderProps>((props, ref) =>
       <Header.Content>
         {isJsx(logo) ? logo : <Header.Logo {...logo} />}
 
-        <RenderOnDesktop>{children}</RenderOnDesktop>
+        <RenderOnScreen minWidth="lg">{children}</RenderOnScreen>
 
         <Box ml="auto" />
 
-        <RenderOnDesktop>
+        <RenderOnScreen minWidth="lg">
           {isJsx(mainLinks) ? mainLinks : <Header.MainLinks links={mainLinks} />}
 
           {mainLinks !== undefined && <Header.Divider ml={1} mr={3} />}
@@ -27,9 +27,9 @@ export const LoggedOutHeader = vui<'div', LoggedOutHeaderProps>((props, ref) =>
           {isJsx(signIn) ? signIn : <Header.SignIn {...signIn} />}
 
           {isJsx(createAccount) ? createAccount : <Header.CreateAccount {...createAccount} />}
-        </RenderOnDesktop>
+        </RenderOnScreen>
 
-        <RenderOnMobile>
+        <RenderOnScreen maxWidth="lg">
           {isJsx(signIn) ? signIn : <Header.SignIn {...signIn} />}
 
           <Header.Divider ml={2} />
@@ -43,7 +43,7 @@ export const LoggedOutHeader = vui<'div', LoggedOutHeaderProps>((props, ref) =>
 
             {isJsx(mainLinks) ? mainLinks : <Header.MainLinks links={mainLinks} />}
           </Header.MobileContent>
-        </RenderOnMobile>
+        </RenderOnScreen>
       </Header.Content>
     </Header>
   )

package/src/heading/theme.ts

@@ -1,61 +1,39 @@
-const baseStyle = {
-  color: 'darkBlue.18'
-}
+const baseStyle = {}
 
 const defaultProps = {
   size: 'h2'
 }
 
 const sizes = {
-  title: {
-    as: 'h1',
-    fontFamily: 'DNV Display',
-    fontSize: '64px',
-    fontWeight: 'medium',
-    lineHeight: '74px'
-  },
   h1: {
     as: 'h1',
-    fontSize: '50px',
-    fontWeight: 'regular',
-    lineHeight: '62px'
-  },
-  lead: {
-    as: 'h2',
-    color: 'seaBlue.28',
-    fontSize: '28px',
-    fontWeight: 'regular',
-    lineHeight: '38px'
+    fontSize: '40px',
+    lineHeight: '52px'
   },
   h2: {
     as: 'h2',
     fontSize: '32px',
-    fontWeight: 'regular',
-    lineHeight: '42px'
+    lineHeight: '40px'
   },
   h3: {
     as: 'h3',
     fontSize: '24px',
-    fontWeight: 'regular',
     lineHeight: '32px'
   },
   h4: {
     as: 'h4',
     fontSize: '20px',
-    fontWeight: 'demi',
-    lineHeight: '24px'
+    lineHeight: '28px'
   },
   h5: {
     as: 'h5',
     fontSize: '18px',
-    fontWeight: 'demi',
-    lineHeight: '26px'
+    lineHeight: '24px'
   },
   h6: {
     as: 'h6',
     fontSize: '16px',
-    fontWeight: 'demi',
-    lineHeight: '22px'
+    lineHeight: '20px'
   }
 }
 

package/src/icon/icon.types.ts

@@ -20,7 +20,7 @@ export type IconProps = SvgProps &
     icon?: IconProp
     /** Name of the icon stored in Veracity CDN. */
     name?: IconProp
-    /** Rotates the icon by given amount of degrees clockwise. */
+    /** Rotates the icon by given amout of degrees clockwise. */
     rotate?: number
     /** Uses a scale of 1-10 and multiply of 16px to define icon size. */
     scale?: number

package/src/icon/theme.ts

@@ -20,11 +20,6 @@ const sizes = {
   lg: {
     height: 28,
     width: 28
-  },
-  /** the xl size is introduced for the xxl tabs; should not be listed. */
-  xl: {
-    height: 32,
-    width: 32
   }
 }
 

package/src/index.ts

@@ -1,6 +1,5 @@
 export * from './accordion'
 export * from './avatar'
-export * from './badge'
 export * from './box'
 export * from './breadcrumbs'
 export * from './button'

package/src/input/input.tsx

@@ -14,7 +14,7 @@ import InputInput from './inputInput'
 export const InputBase = styled.divBox`
   align-items: center;
   background-color: white;
-  border-radius: none;
+  border-radius: md;
   border-width: 1px;
   display: flex;
   flex-shrink: 0;

package/src/input/inputInput.tsx

@@ -9,7 +9,7 @@ export const InputInputBase = styled.input`
   align-self: stretch;
   background-color: transparent;
   border: none;
-  border-radius: none;
+  border-radius: md;
   flex: 1;
   font-size: inherit;
   min-width: 0;

package/src/link/link.tsx

@@ -9,7 +9,7 @@ import LinkText from './linkText'
 
 export const LinkBase = styled.aBox`
   align-items: center;
-  border-radius: none;
+  border-radius: sm;
   cursor: pointer;
   display: inline-flex;
   line-height: normal;
@@ -27,6 +27,7 @@ export const Link = vui<'a', LinkProps>((props, ref) => {
   const {
     children,
     className,
+    colorScheme,
     decoration,
     hoverDecoration = 'underline',
     iconLeft,
@@ -41,7 +42,7 @@ export const Link = vui<'a', LinkProps>((props, ref) => {
   } = props
   const styles = useStyleConfig('Link', props)
 
-  const context = useMemo(() => filterUndefined({ size, variant }), [size, variant])
+  const context = useMemo(() => filterUndefined({ colorScheme, size, variant }), [colorScheme, size, variant])
 
   const aliasedProps = filterUndefined({
     fontWeight: weight,

package/src/link/link.types.ts

@@ -4,6 +4,8 @@ import { ThemingProps } from '../theme'
 
 export type LinkProps = SystemProps &
   ThemingProps<'Link'> & {
+    /** Available theme colors for this component. @default blue */
+    colorScheme?: 'blue' | 'white'
     /** Alias for textDecoration prop. @deprecated */
     decoration?: TypographyProps['textDecoration']
     /** Alias for hoverTextDecoration prop. @deprecated */

package/src/link/theme.ts

@@ -1,25 +1,27 @@
-function variantDefault() {
-  const container = {
-    color: `seaBlue.28`,
-    hoverColor: `seaBlue.28`
-  }
+import { Dict } from '../utils'
 
-  return { container }
-}
+function variantDefault(props: Dict) {
+  const { colorScheme: c } = props
 
-function variantWhite() {
   const container = {
-    color: `white`,
-    hoverColor: `white`
+    color: `${c}.80`,
+    hoverColor: `${c}.60`
+  }
+
+  if (c === 'white') {
+    container.color = 'white'
+    container.hoverColor = 'white'
   }
 
   return { container }
 }
 
-function variantLight() {
+function variantLight(props: Dict) {
+  const { colorScheme: c } = props
+
   const container = {
-    color: `seaBlue.28`,
-    hoverColor: `seaBlue.28`
+    color: `${c}.60`,
+    hoverColor: `${c}.40`
   }
 
   return { container }
@@ -34,6 +36,7 @@ const variantPlain = {
 const baseStyle = {}
 
 const defaultProps = {
+  colorScheme: 'blue',
   size: 'md',
   variant: 'default'
 }
@@ -43,8 +46,7 @@ const parts = ['container', 'icon', 'text']
 const sizes = {
   sm: {
     container: {
-      fontSize: 'xs',
-      lineHeight: '16px'
+      fontSize: 'sm'
     },
     icon: {
       size: 'xs'
@@ -52,8 +54,7 @@ const sizes = {
   },
   md: {
     container: {
-      fontSize: 'sm',
-      lineHeight: '20px'
+      fontSize: 'md'
     },
     icon: {
       size: 'xs'
@@ -61,17 +62,7 @@ const sizes = {
   },
   lg: {
     container: {
-      fontSize: 'md',
-      lineHeight: '24px'
-    },
-    icon: {
-      size: 'sm'
-    }
-  },
-  xl: {
-    container: {
-      fontSize: 'lg',
-      lineHeight: '28px'
+      fontSize: 'lg'
     },
     icon: {
       size: 'sm'
@@ -82,8 +73,7 @@ const sizes = {
 const variants = {
   default: variantDefault,
   light: variantLight,
-  plain: variantPlain,
-  white: variantWhite
+  plain: variantPlain
 }
 
 export default {

package/src/list/listItem.tsx

@@ -29,15 +29,11 @@ export const ListItemBase = styled.liBox`
   transition-duration: fast;
 
   &[aria-disabled='true'] {
-    background-color: disabled .bg;
-    color: disabled .color;
+    background-color: disabled.bg;
+    color: disabled.color;
     cursor: not-allowed;
     user-select: none;
   }
-
-  &:focus-visible {
-    z-index: 1;
-  }
 `
 
 /**

package/src/notification/consts.ts

@@ -2,35 +2,35 @@ import { NotificationStatusMapping } from './notification.types'
 
 export const notificationStatusMapping: NotificationStatusMapping = {
   error: {
+    colorScheme: 'red',
     iconProps: {
       name: 'falTimesCircle'
-    },
-    variant: 'subtleRed'
+    }
   },
   info: {
+    colorScheme: 'blue',
     iconProps: {
       name: 'falInfoCircle'
-    },
-    variant: 'subtleBlue'
+    }
   },
   loading: {
+    colorScheme: 'blue',
     iconProps: {
       animation: 'vui-spin 0.6s linear infinite',
       name: 'fadSpinnerThird',
       pathFill: ['blue.40', 'blue.60']
-    },
-    variant: 'subtleBlue'
+    }
   },
   success: {
+    colorScheme: 'green',
     iconProps: {
       name: 'falCheckCircle'
-    },
-    variant: 'subtleGreen'
+    }
   },
   warning: {
+    colorScheme: 'yellow',
     iconProps: {
       name: 'falExclamationCircle'
-    },
-    variant: 'subtleYellow'
+    }
   }
 }

package/src/notification/notification.tsx

@@ -20,7 +20,7 @@ export const Notification = vui<'div', NotificationProps>((props, ref) => {
     action,
     children,
     className,
-    colorScheme: colorSchemeProp,
+    colorScheme: colorSchemeProp = 'blue',
     icon,
     onClose,
     size,
@@ -28,46 +28,40 @@ export const Notification = vui<'div', NotificationProps>((props, ref) => {
     statusMapping,
     text,
     title,
-    variant: variantProp = 'subtleBlue',
-    verticalAlign,
+    variant,
     ...rest
   } = props
   const statuses = { ...notificationStatusMapping, ...statusMapping }
-  const { variant = variantProp } = statuses[status ?? ''] ?? {}
-  const styles = useStyleConfig('Notification', { variant, ...props })
+  const { colorScheme = colorSchemeProp } = statuses[status ?? ''] ?? {}
+  const styles = useStyleConfig('Notification', { colorScheme, ...props })
 
   const iconName = isString(icon) ? icon : statuses[status ?? '']?.iconProps?.name
 
-  const context = filterUndefined<NotificationProps>({ size, status })
-
-  const titleDisplay = action ? 'block' : 'inline-flex'
-
-  const alignSelf = verticalAlign === 'center' ? 'center' : 'flex-start'
+  const context = filterUndefined<NotificationProps>({ colorScheme, size, status, variant })
 
   return (
     <NotificationProvider value={context}>
       <Box
         borderRadius="md"
-        borderWidth={1}
         className={cs('vui-notification', className)}
+        px={1.5}
+        py={1}
         ref={ref}
         w="fit-content"
         {...styles.container}
         {...rest}
       >
-        {iconName ? <NotificationIcon alignSelf={alignSelf} name={iconName} /> : icon}
+        {iconName ? <NotificationIcon name={iconName} /> : icon}
 
         {children ?? (
-          <NotificationText alignSelf={alignSelf}>
-            {isReactText(title) ? <NotificationTitle display={titleDisplay} text={title} /> : title} {text}
+          <NotificationText>
+            {isReactText(title) ? <NotificationTitle text={title} /> : title} {text}
           </NotificationText>
         )}
 
         {action}
 
-        {onClose && (
-          <NotificationButton alignSelf={alignSelf} icon="falTimes" onClick={onClose} variant={variant} w="32px" />
-        )}
+        {onClose && <NotificationButton icon="falTimes" onClick={onClose} />}
       </Box>
     </NotificationProvider>
   )

package/src/notification/notification.types.ts

@@ -8,7 +8,7 @@ export type NotificationProps = Omit<BoxProps, 'size' | 'variant'> &
   ThemingProps<'Notification'> & {
     /** Socket displaying a button on the right. */
     action?: ReactNode
-    /** Available theme colors for this component. @deprecated */
+    /** Available theme colors for this component. @default blue */
     colorScheme?: 'blue' | 'green' | 'red' | 'yellow'
     /** Socket displaying an icon on the left. */
     icon?: IconProp | JSX.Element
@@ -29,7 +29,7 @@ export type NotificationStatus = 'error' | 'info' | 'loading' | 'success' | 'war
 export type NotificationStatusMapping = Record<
   string,
   {
+    colorScheme?: NotificationProps['colorScheme']
     iconProps: IconProps
-    variant?: NotificationProps['variant']
   }
 >

package/src/notification/notificationButton.tsx

@@ -3,7 +3,6 @@ import React from 'react'
 import Button, { ButtonProps } from '../button'
 import { useStyleConfig, vui } from '../core'
 import { cs } from '../utils'
-import { notificationStatusMapping } from './consts'
 import { useNotificationContext } from './context'
 
 /** Displays an action button within the Notification. */
@@ -12,20 +11,16 @@ export const NotificationButton = vui<'button', ButtonProps>((props, ref) => {
   const mergedProps = { ...useNotificationContext(), ...props }
   const styles = useStyleConfig('Notification', useNotificationContext())
 
-  const { status = '' } = mergedProps
-  const { variant } = notificationStatusMapping[status] ?? {}
-
   return (
     <Button
       className={cs('vui-notificationButton', className)}
-      ml="0px"
-      mr="16px"
-      my="16px"
-      px="12px"
-      py="6px"
+      colorScheme={mergedProps.colorScheme}
+      ml={1}
+      mr={-0.5}
       ref={ref}
+      size="sm"
+      variant="text"
       {...styles.button}
-      variant={variant}
       {...rest}
     />
   )

package/src/notification/notificationIcon.tsx

@@ -8,21 +8,18 @@ import { useNotificationContext } from './context'
 
 /** Displays an icon based on the status within the Notification. */
 export const NotificationIcon = vui<'svg', IconProps>((props, ref) => {
-  const { className, alignSelf, ...rest } = props
+  const { className, ...rest } = props
   const mergedProps = { ...useNotificationContext(), ...props }
   const styles = useStyleConfig('Notification', useNotificationContext())
 
   const { status = '' } = mergedProps
   const { iconProps } = notificationStatusMapping[status] ?? {}
 
-  const marginTop = alignSelf === 'center' ? '0' : '16px'
-
   return (
     <Icon
-      alignSelf={alignSelf}
       className={cs('vui-notificationIcon', className)}
-      ml="16px"
-      mt={marginTop}
+      mr={1}
+      my={0.5}
       ref={ref}
       size="md"
       {...styles.icon}

package/src/notification/notificationText.tsx

@@ -16,8 +16,7 @@ export const NotificationText = vui<'p', TProps>((props, ref) => {
       flex="1"
       lineHeight="24px"
       minW={0}
-      mx="16px"
-      my="16px"
+      py={0.5}
       ref={ref}
       {...styles.text}
       {...rest}

package/src/notification/notificationTitle.tsx

@@ -1,17 +1,23 @@
 import React from 'react'
 
 import { useStyleConfig, vui } from '../core'
-import { T, TProps } from '../t'
+import { H6, HeadingProps } from '../heading'
 import { cs } from '../utils'
 import { useNotificationContext } from './context'
 
 /** Displays a title within the Notification. */
-export const NotificationTitle = vui<'span', TProps>((props, ref) => {
+export const NotificationTitle = vui<'h6', HeadingProps>((props, ref) => {
   const { className, ...rest } = props
   const styles = useStyleConfig('Notification', useNotificationContext())
 
   return (
-    <T className={cs('vui-notificationTitle', className)} fontWeight="demi" ref={ref} {...styles.title} {...rest} />
+    <H6
+      className={cs('vui-notificationTitle', className)}
+      display="inline-flex"
+      ref={ref}
+      {...styles.title}
+      {...rest}
+    />
   )
 })