@loadsmart/loadsmart-ui 5.10.0 → 5.10.1

package/dist/theming/index.d.ts

@@ -1,5 +1,5 @@
-import { ThemeProps } from 'styled-components';
-import ThemeAlice from './themes/alice.theme';
+import type { ThemeProps } from 'styled-components';
+import type ThemeAlice from './themes/alice.theme';
 export declare type ThemeToken = keyof typeof ThemeAlice;
 export declare type ThemeTokenValue = string | number;
 export declare type CustomTheme = Record<ThemeToken, ThemeTokenValue>;

package/dist/theming/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/theming/index.ts"],"sourcesContent":["import { ThemeProps } from 'styled-components'\nimport { isFunction } from '@loadsmart/utils-function'\nimport ThemeAlice from './themes/alice.theme'\n\nexport type ThemeToken = keyof typeof ThemeAlice\nexport type ThemeTokenValue = string | number\n\nexport type CustomTheme = Record<ThemeToken, ThemeTokenValue>\nexport type ThemedProps = ThemeProps<CustomTheme>\n\ntype TokenLike<P extends ThemedProps = ThemedProps> = ThemeToken | ((props: P) => ThemeToken)\n\nfunction getTokenFromTheme<P extends ThemedProps>(token: TokenLike<P>, props: P): ThemeTokenValue {\n  const tokenName = isFunction(token) ? token(props) : token\n  return props.theme[tokenName]\n}\n\n/**\n * Return a design token value for the current theme.\n * @param {string} token - Token whose value should be returned.\n * @param {[ThemedStyledProps]} props - Component props.\n * @returns {ThemeTokenValue} Token value or `undefined` if the token was not found for the current theme.\n */\nexport function getToken<TProps extends ThemedProps>(\n  token: TokenLike<TProps>\n): (props: TProps) => ThemeTokenValue\n\nexport function getToken<TProps extends ThemedProps>(\n  token: TokenLike<TProps>,\n  props: TProps\n): ThemeTokenValue\n\nexport function getToken<TProps extends ThemedProps>(token: any, props?: any): any {\n  if (props === undefined) {\n    return (props: TProps) => getTokenFromTheme(token, props)\n  }\n\n  return getTokenFromTheme(token, props)\n}\n\nexport * as Themes from './themes'\n"],"names":["getTokenFromTheme","token","props","tokenName","isFunction","theme","undefined"],"mappings":"0LAYA,SAASA,EAAyCC,EAAqBC,GACrE,MAAMC,EAAYC,aAAWH,GAASA,EAAMC,GAASD,EACrD,OAAOC,EAAMG,MAAMF,8CAkBgCF,EAAYC,GAC/D,YAAcI,IAAVJ,EACMA,GAAkBF,EAAkBC,EAAOC,GAG9CF,EAAkBC,EAAOC"}
+{"version":3,"file":"index.js","sources":["../../src/theming/index.ts"],"sourcesContent":["import { isFunction } from '@loadsmart/utils-function'\n\nimport type { ThemeProps } from 'styled-components'\nimport type ThemeAlice from './themes/alice.theme'\n\nexport type ThemeToken = keyof typeof ThemeAlice\nexport type ThemeTokenValue = string | number\n\nexport type CustomTheme = Record<ThemeToken, ThemeTokenValue>\nexport type ThemedProps = ThemeProps<CustomTheme>\n\ntype TokenLike<P extends ThemedProps = ThemedProps> = ThemeToken | ((props: P) => ThemeToken)\n\nfunction getTokenFromTheme<P extends ThemedProps>(token: TokenLike<P>, props: P): ThemeTokenValue {\n  const tokenName = isFunction(token) ? token(props) : token\n  return props.theme[tokenName]\n}\n\n/**\n * Return a design token value for the current theme.\n * @param {string} token - Token whose value should be returned.\n * @param {[ThemedStyledProps]} props - Component props.\n * @returns {ThemeTokenValue} Token value or `undefined` if the token was not found for the current theme.\n */\nexport function getToken<TProps extends ThemedProps>(\n  token: TokenLike<TProps>\n): (props: TProps) => ThemeTokenValue\n\nexport function getToken<TProps extends ThemedProps>(\n  token: TokenLike<TProps>,\n  props: TProps\n): ThemeTokenValue\n\nexport function getToken<TProps extends ThemedProps>(token: any, props?: any): any {\n  if (props === undefined) {\n    return (props: TProps) => getTokenFromTheme(token, props)\n  }\n\n  return getTokenFromTheme(token, props)\n}\n\nexport * as Themes from './themes'\n"],"names":["getTokenFromTheme","token","props","tokenName","isFunction","theme","undefined"],"mappings":"0LAaA,SAASA,EAAyCC,EAAqBC,GACrE,MAAMC,EAAYC,aAAWH,GAASA,EAAMC,GAASD,EACrD,OAAOC,EAAMG,MAAMF,8CAkBgCF,EAAYC,GAC/D,YAAcI,IAAVJ,EACMA,GAAkBF,EAAkBC,EAAOC,GAG9CF,EAAkBC,EAAOC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loadsmart/loadsmart-ui",
-  "version": "5.10.0",
+  "version": "5.10.1",
   "description": "Miranda UI, a React UI library",
   "main": "dist",
   "files": [
@@ -78,7 +78,7 @@
     "@babel/preset-typescript": "7.13.0",
     "@commitlint/cli": "16.0.2",
     "@commitlint/config-conventional": "16.0.0",
-    "@loadsmart/stylelint-config": "0.0.3",
+    "@loadsmart/stylelint-config": "^1.2.1-beta.1",
     "@rollup/plugin-babel": "5.3.0",
     "@rollup/plugin-commonjs": "19.0.0",
     "@rollup/plugin-json": "4.1.0",
@@ -158,12 +158,7 @@
     "rollup-plugin-visualizer": "^5.5.2",
     "semantic-release": "17.4.2",
     "styled-components": "5.3.0",
-    "stylelint": "13.13.1",
-    "stylelint-config-prettier": "8.0.2",
-    "stylelint-config-rational-order": "0.1.2",
-    "stylelint-config-recommended": "5.0.0",
-    "stylelint-no-unsupported-browser-features": "5.0.1",
-    "stylelint-order": "4.1.0",
+    "stylelint": "^13.13.1",
     "tailwindcss": "npm:@tailwindcss/postcss7-compat",
     "ts-jest": "26.5.6",
     "ts-toolbelt": "^9.6.0",
@@ -175,8 +170,8 @@
     "@testing-library/dom": ">=5.12.0",
     "@testing-library/react": ">=11.2.6",
     "prop-types": ">=15.7.2",
-    "react": ">=17.0.2",
-    "react-dom": ">=17.0.2",
+    "react": ">=16.8.0",
+    "react-dom": ">=16.8.0",
     "styled-components": ">=5.3.0"
   },
   "dependencies": {
@@ -191,6 +186,10 @@
     "lodash.omit": "4.5.0",
     "lodash.range": "3.2.0"
   },
+  "browserslist": [
+    "last 1 chrome version",
+    "last 1 firefox version"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/loadsmart/miranda.git"

package/src/common/CloseButton/CloseButton.tsx

@@ -14,17 +14,6 @@ export interface CloseButtonProps extends ButtonProps {
 }
 
 const Button = styled(BaseButton)`
-  border: none;
-  border-radius: ${token('border-radius-circle')};
-
-  color: ${token('color-neutral-darker')};
-
-  background: ${token('color-transparent')};
-
-  padding: ${token('space-xs')};
-
-  font-size: ${token('font-size-3')};
-
   /*
    * button height is set in the BaseButton component
    * we set width here to ensure a perfectly rounded button
@@ -34,6 +23,13 @@ const Button = styled(BaseButton)`
     'button-small-height': whenProps({ scale: 'small' }),
     'button-large-height': whenProps({ scale: 'large' }),
   })};
+  padding: ${token('space-xs')};
+  font-size: ${token('font-size-3')};
+  color: ${token('color-neutral-darker')};
+  background: ${token('color-transparent')};
+
+  border: none;
+  border-radius: ${token('border-radius-circle')};
 
   ${focusable`
     box-shadow: ${token('button-icon-outline')};

package/src/common/SelectionWrapper.tsx

@@ -2,7 +2,7 @@ import React, { LabelHTMLAttributes, ReactNode } from 'react'
 import clsx from 'clsx'
 import styled from 'styled-components'
 
-import ColorScheme from 'utils/types/ColorScheme'
+import type ColorScheme from 'utils/types/ColorScheme'
 import conditional, { whenProps } from 'tools/conditional'
 import disableable from 'styles/disableable'
 import font from 'styles/font'
@@ -54,18 +54,11 @@ const Children = styled.span`
 const StyledLabel = styled.label<SelectionStyleProps>`
   box-sizing: border-box;
 
-  ${transition()}
-  ${font({
-    weight: 'checkbox-font-weight',
-  })}
-
   display: inline-flex;
   flex-flow: row nowrap;
   align-items: center;
   justify-content: flex-start;
 
-  cursor: pointer;
-
   font-size: ${conditional({
     'checkbox-font-size': whenProps({ scale: 'default' }),
     'checkbox-small-font-size': whenProps({ scale: 'small' }),
@@ -76,6 +69,13 @@ const StyledLabel = styled.label<SelectionStyleProps>`
     'checkbox-dark-color': whenProps({ scheme: 'dark' }),
   })};
 
+  cursor: pointer;
+
+  ${transition()}
+  ${font({
+    weight: 'checkbox-font-weight',
+  })}
+
   ${Children} {
     margin: 0 ${token('space-xs')};
   }

package/src/components/Accordion/Accordion.stories.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Meta } from '@storybook/react/types-6-0'
+import type { Meta } from '@storybook/react/types-6-0'
 import Accordion from './Accordion'
 import type { AccordionProps } from './Accordion'
 

package/src/components/Accordion/Accordion.tsx

@@ -1,4 +1,5 @@
-import React, { Fragment, HTMLAttributes, PropsWithChildren, ReactNode } from 'react'
+import React, { Fragment } from 'react'
+import type { PropsWithChildren, HTMLAttributes, ReactNode } from 'react'
 import clsx from 'clsx'
 import styled from 'styled-components'
 import { identity, isFunction } from '@loadsmart/utils-function'
@@ -30,70 +31,64 @@ const StyledWrapper = styled.article<{ open: boolean }>`
 `
 
 const StyledToggle = styled.button<{ open: boolean }>`
-  ${font({
-    height: 'font-height-2',
-  })}
-
-  ${transition()}
-
   display: flex;
   flex-direction: row;
-  justify-content: flex-start;
   align-items: center;
+  justify-content: flex-start;
+
+  width: 100%;
+  padding: ${token('space-s')} ${token('space-m')};
 
   font-size: ${token('font-size-3')};
   font-weight: ${conditional({
     'font-weight-regular': whenProps({ open: false }),
     'font-weight-bold': whenProps({ open: true }),
   })};
-  text-align: left;
-
-  cursor: pointer;
 
   color: ${token('color-neutral-darker')};
-
+  text-align: left;
+  cursor: pointer;
   background-color: ${token('color-transparent')};
-  border-radius: ${token('border-radius-s')};
   border: none;
+  border-radius: ${token('border-radius-s')};
 
-  padding: ${token('space-s')} ${token('space-m')};
-
-  width: 100%;
-
+  ${font({
+    height: 'font-height-2',
+  })}
+  ${transition()}
   ${hoverable`
     background: ${token('color-neutral-lighter')};
   `}
-
   ${focusable`
     box-shadow: ${token('shadow-glow-primary')};
   `}
 `
 
 const StyledContent = styled.section<{ open: boolean }>`
-  ${font({
-    height: 'font-height-2',
-    weight: 'font-weight-medium',
-  })}
-
-  padding-left: ${conditional({
+  padding-top: ${conditional({
     '0': whenProps({ open: false }),
-    'space-m': whenProps({ open: true }),
+    'space-xl': whenProps({ open: true }),
   })};
   padding-right: ${conditional({
     '0': whenProps({ open: false }),
     'space-m': whenProps({ open: true }),
   })};
-  padding-top: ${conditional({
-    '0': whenProps({ open: false }),
-    'space-xl': whenProps({ open: true }),
-  })};
   padding-bottom: ${conditional({
     '0': whenProps({ open: false }),
     'space-s': whenProps({ open: true }),
   })};
+  padding-left: ${conditional({
+    '0': whenProps({ open: false }),
+    'space-m': whenProps({ open: true }),
+  })};
 
   overflow-x: hidden;
   overflow-y: auto;
+
+  ${font({
+    height: 'font-height-2',
+    weight: 'font-weight-medium',
+  })}
 `
 
 const HiddenInput = styled.input`

package/src/components/Banner/Banner.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Meta } from '@storybook/react/types-6-0'
+import type { Meta } from '@storybook/react/types-6-0'
 import Banner, { BannerLarge, BannerAction, BannerActionLarge } from './Banner'
 import type { BannerProps, BannerActionProps } from './Banner'
 import { Icon } from 'components/Icon'

package/src/components/Banner/Banner.tsx

@@ -32,15 +32,15 @@ interface VariantProps {
 }
 
 const Description = styled.div`
-  color: ${token('banner-description-color')};
   font-size: ${token('banner-font-size')};
   line-height: ${token('banner-font-height')};
+  color: ${token('banner-description-color')};
   text-align: left;
 `
 
 const Title = styled.div<VariantProps>`
-  font-weight: ${token('banner-title-font-weight')};
   font-size: ${token('banner-font-size')};
+  font-weight: ${token('banner-title-font-weight')};
   line-height: ${token('banner-font-height')};
   text-align: left;
 `

package/src/components/Breadcrumbs/Breadcrumb.tsx

@@ -31,12 +31,11 @@ const StyledLi = styled.li<BreadcrumbProps>`
   display: inline-flex;
   align-items: center;
 
+  font-size: ${token('breadcrumbs-font-size')};
   font-weight: ${conditional({
     'breadcrumbs-font-weight': whenProps({ active: false }),
     'breadcrumbs-font-weight--active': whenProps({ active: true }),
   })};
-
-  font-size: ${token('breadcrumbs-font-size')};
   line-height: ${token('breadcrumbs-font-height')};
 
   & + & {
@@ -46,9 +45,9 @@ const StyledLi = styled.li<BreadcrumbProps>`
   &:not(:only-child):not(:last-child)::after {
     position: absolute;
     left: calc(100% + 14px);
+    font-size: ${token('breadcrumbs-font-size')};
 
     font-weight: ${token('font-weight-bold')};
-    font-size: ${token('breadcrumbs-font-size')};
 
     line-height: ${token('breadcrumbs-font-height')};
 
@@ -68,7 +67,7 @@ function getWrappedLabel(props: Partial<BreadcrumbProps>) {
       href={url}
       target="_self"
       onClick={onClick}
-      {...(active && {'aria-current': 'page'})}
+      {...(active && { 'aria-current': 'page' })}
       {...rest}
     >
       {label}

package/src/components/Breadcrumbs/Breadcrumbs.stories.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import Breadcrumbs, { BreadcrumbsProps } from './Breadcrumbs'
-import { Story, Meta } from '@storybook/react/types-6-0'
+import type { Story, Meta } from '@storybook/react/types-6-0'
 
 export default {
   title: 'Components/Breadcrumbs',

package/src/components/Breadcrumbs/Breadcrumbs.tsx

@@ -20,9 +20,9 @@ const StyledWrapper = styled.nav`
 const StyledOl = styled.ol`
   display: flex;
   flex-direction: row;
-  margin: 0;
 
   padding: 0;
+  margin: 0;
 
   list-style: none;
 `

package/src/components/Button/Button.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Meta } from '@storybook/react/types-6-0'
+import type { Meta } from '@storybook/react/types-6-0'
 import BackButton from '../../common/BackButton'
 import Button, { SelectorButton, IconButton, Caret, BaseButton } from './Button'
 import CloseButton from '../../common/CloseButton'

package/src/components/Button/Button.tsx

@@ -68,16 +68,6 @@ const BaseStyledButton = styled.button<{
   $scale: ButtonProps['scale']
   $loading?: ButtonProps['loading']
 }>`
-  ${transition()}
-
-  ${typography(
-    conditional({
-      'button-md': whenProps({ $scale: 'default' }),
-      'button-sm': whenProps({ $scale: 'small' }),
-      'button-lg': whenProps({ $scale: 'large' }),
-    })
-  )}
-
   box-sizing: border-box;
 
   display: inline-flex;
@@ -85,16 +75,6 @@ const BaseStyledButton = styled.button<{
   align-items: center;
   justify-content: center;
 
-  text-transform: uppercase;
-  text-align: center;
-
-  cursor: pointer;
-
-  border-radius: ${token('border-radius-s')};
-  border-width: ${token('border-width-thin')};
-  border-style: solid;
-  border-color: ${token('color-neutral-darker')};
-
   height: ${conditional({
     'button-height': whenProps({ $scale: 'default' }),
     'button-small-height': whenProps({ $scale: 'small' }),
@@ -102,8 +82,25 @@ const BaseStyledButton = styled.button<{
   })};
 
   padding: 0 8px;
+  text-align: center;
+  text-transform: uppercase;
+
+  cursor: pointer;
+
+  border-color: ${token('color-neutral-darker')};
+  border-style: solid;
+  border-width: ${token('border-width-thin')};
+  border-radius: ${token('border-radius-s')};
 
   ${disableable()}
+  ${transition()}
+  ${typography(
+    conditional({
+      'button-md': whenProps({ $scale: 'default' }),
+      'button-sm': whenProps({ $scale: 'small' }),
+      'button-lg': whenProps({ $scale: 'large' }),
+    })
+  )}
 
   ${({ $loading }) => $loading && 'pointer-events: none;'}
 

package/src/components/Calendar/Calendar.tsx

@@ -23,23 +23,19 @@ const Container = styled(Stack)`
 `
 
 const BorderlessButton = styled(BaseButton)`
-  ${typography('body-bold')}
-  border-color: transparent;
-  background-color: transparent;
-
   color: ${token('color-neutral')};
-
-  inline-size: 40px;
-
   visibility: ${conditional({
     visible: whenProps({ 'aria-hidden': false }),
     hidden: whenProps({ 'aria-hidden': true }),
   })};
+  background-color: transparent;
+  border-color: transparent;
+  inline-size: 40px;
 
+  ${typography('body-bold')}
   ${hoverable`
     color: ${token('color-neutral-dark')};
   `}
-
   ${focusable`
     box-shadow: ${token('button-primary-outline')};
   `}

package/src/components/Calendar/PickerModeToggle.tsx

@@ -12,7 +12,10 @@ import typography from 'styles/typography'
 import type { ButtonProps } from 'components/Button'
 
 const Button = styled(BaseButton)`
+  color: ${token('color-neutral-dark')};
   user-select: none;
+  background-color: transparent;
+  border-color: transparent;
 
   ${typography(
     conditional({
@@ -20,15 +23,9 @@ const Button = styled(BaseButton)`
       body: whenProps({ 'aria-expanded': false }),
     })
   )};
-  border-color: transparent;
-  background-color: transparent;
-
-  color: ${token('color-neutral-dark')};
-
   ${focusable`
     box-shadow: ${token('button-primary-outline')};
   `}
-
   ${disableable`
     pointer-events: none;
     opacity: 1;

package/src/components/Calendar/Pickers/DayPicker.tsx

@@ -53,9 +53,9 @@ const Text = styled(DefaultText)`
 
 const Grid = styled.div`
   display: grid;
-  grid-gap: ${token('space-2xs')};
   grid-template-rows: 1.25rem repeat(auto-fill, 2.5rem);
   grid-template-columns: repeat(7, 2.5rem);
+  grid-gap: ${token('space-2xs')};
 `
 
 /**

package/src/components/Calendar/Pickers/MonthPicker.tsx

@@ -10,9 +10,9 @@ import type { CalendarMonth, CalendarMonthAlias } from '../Month.helper'
 
 const Container = styled.div`
   display: grid;
+  grid-template-columns: repeat(3, 1fr);
   grid-auto-rows: 3.75rem;
   grid-gap: ${token('space-2xs')};
-  grid-template-columns: repeat(3, 1fr);
 `
 
 function getStatus(calendar: useCalendarReturn, month: CalendarMonth) {

package/src/components/Calendar/Pickers/PickerButton.tsx

@@ -19,20 +19,8 @@ const PickerButton = styled(BaseButton)<{
     | 'selection'
     | 'next-month-day'
 }>`
-  ${typography(
-    conditional({
-      body: whenProps({ $status: ['default', 'faded'] }),
-      'body-bold': whenProps({
-        $status: ['current-day', 'selection-start', 'selection', 'selection-end'],
-      }),
-    })
-  )}
-
-  user-select: none;
-
   height: 100%;
-
-  border-radius: 0;
+  padding: ${token('space-xs')} ${token('space-s')};
 
   color: ${conditional({
     'color-neutral-lighter': whenProps({
@@ -42,30 +30,45 @@ const PickerButton = styled(BaseButton)<{
     'color-neutral-dark': whenProps({ $status: 'next-month-day' }),
     'color-accent': whenProps({ $status: 'current-day' }),
   })};
-
+  visibility: ${conditional({
+    visible: whenProps({ 'aria-hidden': false }),
+    hidden: whenProps({ 'aria-hidden': true }),
+  })};
+  user-select: none;
   background: ${conditional({
     'color-transparent': whenProps({ $status: ['default', 'faded', 'next-month-day'] }),
     'color-neutral-darker': whenProps({ $status: ['selection-start', 'selection-end'] }),
     'color-neutral': whenProps({ $status: 'selection' }),
     'color-neutral-lightest': whenProps({ $status: 'current-day' }),
   })};
-
   border-color: ${conditional({
     'color-transparent': whenProps({ $status: ['default', 'faded', 'next-month-day'] }),
     'color-neutral-darker': whenProps({ $status: ['selection-start', 'selection-end'] }),
     'color-neutral': whenProps({ $status: 'selection' }),
     'color-neutral-light': whenProps({ $status: 'current-day' }),
   })};
+  border-radius: 0;
 
   ${conditional({
     'opacity: 0.4;': whenProps({ $status: 'faded' }),
     'opacity: 1;': whenProps({ $status: (status) => status !== 'faded' }),
   })}
-
-  padding: ${token('space-xs')} ${token('space-s')};
-
+  ${typography(
+    conditional({
+      body: whenProps({ $status: ['default', 'faded'] }),
+      'body-bold': whenProps({
+        $status: ['current-day', 'selection-start', 'selection', 'selection-end'],
+      }),
+    })
+  )}
   ${hoverable`
-    border-color: ${token('color-neutral')};
+    font-weight: ${token('font-weight-bold')};
+    color: ${conditional({
+      'color-neutral-dark': whenProps({ $status: ['default', 'faded'] }),
+      'color-neutral-lightest': whenProps({
+        $status: ['selection-start', 'selection', 'selection-end'],
+      }),
+    })};
     background-color: ${conditional({
       'color-transparent': whenProps({ $status: ['default', 'faded', 'next-month-day'] }),
       'color-neutral-dark': whenProps({
@@ -73,14 +76,7 @@ const PickerButton = styled(BaseButton)<{
       }),
       'color-neutral-lightest': whenProps({ $status: 'current-day' }),
     })};
-    color: ${conditional({
-      'color-neutral-dark': whenProps({ $status: ['default', 'faded'] }),
-      'color-neutral-lightest': whenProps({
-        $status: ['selection-start', 'selection', 'selection-end'],
-      }),
-    })};
-
-    font-weight: ${token('font-weight-bold')};
+    border-color: ${token('color-neutral')};
   `}
 
   ${focusable`
@@ -89,31 +85,25 @@ const PickerButton = styled(BaseButton)<{
   `}
 
   ${activatable`
-    border-color: ${token('color-neutral')};
-    background-color: ${conditional({
-      'color-transparent': whenProps({ 'aria-checked': false }),
-      'color-neutral': whenProps({ 'aria-checked': true }),
-    })};
     color: ${conditional({
       'color-neutral': whenProps({ 'aria-checked': false }),
       'color-neutral-white': whenProps({ 'aria-checked': true }),
     })};
+    background-color: ${conditional({
+      'color-transparent': whenProps({ 'aria-checked': false }),
+      'color-neutral': whenProps({ 'aria-checked': true }),
+    })};
+    border-color: ${token('color-neutral')};
   `}
 
   ${disableable`
+    color: ${token('color-neutral-darker')};
     background-color: ${token('color-transparent')};
     border-color: ${conditional({
       'color-neutral-darkest': whenProps({ 'aria-checked': true }),
       'color-transparent': whenProps({ 'aria-checked': false }),
     })};
-
-    color: ${token('color-neutral-darker')};
   `}
-
-  visibility: ${conditional({
-    visible: whenProps({ 'aria-hidden': false }),
-    hidden: whenProps({ 'aria-hidden': true }),
-  })};
 `
 
 export default styled(PickerButton)({})

package/src/components/Calendar/Pickers/YearPicker.tsx

@@ -9,9 +9,9 @@ import type { useCalendarReturn, CalendarPickerProps } from '../Calendar.types'
 
 const Container = styled.div`
   display: grid;
+  grid-template-columns: repeat(4, 1fr);
   grid-auto-rows: 2.875rem;
   grid-gap: ${token('space-2xs')};
-  grid-template-columns: repeat(4, 1fr);
 `
 
 const PickerButton = styled(DefaultPickerButton)`

package/src/components/Card/Card.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Story, Meta } from '@storybook/react/types-6-0'
+import type { Story, Meta } from '@storybook/react/types-6-0'
 
 import Card from './Card'
 import generator from '../../../tests/generator'

package/src/components/Card/Card.tsx

@@ -15,10 +15,10 @@ export interface CardProps extends HTMLAttributes<HTMLElement> {
 
 const CardSubtitle = styled.div`
   padding: 0 ${token('card-padding-x')} ${token('card-padding-y')};
+  font-size: ${token('card-subtitle-font-size')};
+  font-weight: ${token('card-subtitle-font-weight')};
 
   color: ${token('card-color')};
-  font-weight: ${token('card-subtitle-font-weight')};
-  font-size: ${token('card-subtitle-font-size')};
 `
 
 const CardSeparator = styled.hr`
@@ -35,12 +35,13 @@ const CardBody = styled.div`
 `
 
 const Wrapper = styled.div`
-  ${font({})}
-
   display: flex;
   flex-direction: row;
-
   color: ${token('card-color')};
+  background: ${token('card-background')};
+  border: 1px solid ${token('card-border-color')};
+  border-radius: ${token('card-border-radius')};
+  ${font({})}
 
   ${CardTitleWrapper} + ${CardSubtitle} {
     margin-top: ${token('space-xs')};
@@ -49,10 +50,6 @@ const Wrapper = styled.div`
   ${CardTitleWrapper} + ${CardSeparator} {
     margin-top: ${token('card-padding-y')};
   }
-
-  border: 1px solid ${token('card-border-color')};
-  border-radius: ${token('card-border-radius')};
-  background: ${token('card-background')};
 `
 
 const Container = styled.div<{ flagged: boolean }>`