Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tokens package #1282

Merged
merged 1 commit into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .storybook/themeDecorator.jsx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hell yeah

Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from 'react'
import { ThemeProvider } from '../packages/admin-ui/dist/vtex-admin-ui.esm'
import '../packages/tokens/dist/styles.min.css'

export function themeDecorator(storyFn) {
return <ThemeProvider experimentalDisabledGlobalStyles>{storyFn()}</ThemeProvider>
return (
<ThemeProvider experimentalDisabledGlobalStyles>{storyFn()}</ThemeProvider>
)
}
8 changes: 3 additions & 5 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@
"import": "./dist/esm/index.js",
"types": "./dist/index.d.ts"
},
"./styles": "./dist/styles.min.css"
"./styles": "./dist/index.css"
},
"engines": {
"node": ">=16"
},
"scripts": {
"prebuild": "rm -rf dist && rm -rf shoreline && pnpm run theme",
"prebuild": "rm -rf dist",
"dev": "tsup --watch",
"build": "npm run prebuild && tsup && npm run build:css",
"build:css": "lightningcss --minify --bundle --targets '>= 0.25%' ./src/styles.css -o ./dist/styles.min.css",
"theme": "shorelinecss theme"
"build": "tsup"
},
"repository": {
"directory": "packages/admin-ui",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bye bye

import React from 'react'

import { Action } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/alert/alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from '@vtex/shoreline-icons'
import type { ComponentPropsWithoutRef, MouseEventHandler } from 'react'
import React, { forwardRef } from 'react'
import './alert.css'

import { IconButton } from '../icon-button'

Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/alert/stories/alert.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../alert.css'
import React, { useState } from 'react'

import { Alert } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/bleed/bleed.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { CSSProperties, ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { cssVar } from '@vtex/shoreline-utils'
import './bleed.css'

const defaultBleed = '0rem'

Expand Down
1 change: 0 additions & 1 deletion packages/components/src/bleed/stories/bleed.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React from 'react'

import { Bleed } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Button as BaseButton } from '@ariakit/react'
import { Spinner } from '../spinner'
import { Center } from '../center'
import { Compose, Composable } from '../compose'
import './button.css'

/**
* Buttons triggers allow users to identify and start the most important actions in a container.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import './style.css'

import React, { Fragment } from 'react'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/center/center.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import './center.css'

export const Center = forwardRef<HTMLDivElement, CenterProps>(function Center(
props,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React from 'react'

import { Center } from '../index'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/checkbox/checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { IconCheckSmall, IconMinusSmall } from '@vtex/shoreline-icons'

import { VisuallyHidden } from '../visually-hidden'
import { useAriaCheckbox } from './use-aria-checkbox'

import type { AriaCheckboxProps } from './use-aria-checkbox'
import { Text } from '../text'
import './checkbox.css'

/**
* Checkbox controls allow users to make multiple independent choices in a form where there are at most five options and each option is binary.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../checkbox.css'
import React, { useMemo, useState } from 'react'
import { useForm, Controller } from 'react-hook-form'
import { FixedSizeList } from 'react-window'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React, { useState } from 'react'
import '../../../dist/styles.min.css'
import '../checkbox.css'

import { Checkbox, CheckboxField, CheckboxGroup } from '../index'
import { VisuallyHidden } from '@ariakit/react'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/clickable/clickable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { Compose } from '../compose'
import { hasSomeTextSelected } from '@vtex/shoreline-utils'
import './clickable.css'

/**
* Represents clickable surfaces
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../clickable.css'
import React from 'react'

import { Clickable, ClickableBubble } from '../index'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React, { startTransition, useMemo, useState } from 'react'
import { matchSorter } from 'match-sorter'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React, { useRef } from 'react'

import { Compose, Composable } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/content/content.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import './content.css'

import type { ContentContainerAs } from './types'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import './styles.css'

import React from 'react'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/field/field.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import './field.css'

export const Field = forwardRef<HTMLDivElement, FieldProps>(function Field(
props,
Expand Down
8 changes: 2 additions & 6 deletions packages/components/src/field/stories/field.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import '../../../dist/styles.min.css'
import './style.css'
import '../field.css'

import React from 'react'
import { Checkbox, Radio } from '@ariakit/react'

import { Field, FieldLabel, FieldMessage } from '../index'
import { Stack } from '../../stack'

import { Checkbox, Radio } from '@ariakit/react'
import './style.css'

export default {
title: 'shoreline-components/field',
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/filter/filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { FilterTrigger } from './filter-trigger'
import type { FilterPopoverProps } from './filter-popover'
import { FilterPopover } from './filter-popover'
import { FilterList } from './filter-list'
import './filter.css'

/**
* Filter component
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/filter/stories/filter.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../filter.css'
import React, { useState, useMemo, startTransition } from 'react'
import { matchSorter } from 'match-sorter'

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/flex/flex.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { CSSProperties, ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import type { CSSProperty } from '@vtex/shoreline-utils'
import './flex.css'

export const Flex = forwardRef<HTMLDivElement, FlexProps>(function Flex(
props,
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/flex/stories/flex.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React from 'react'

import { Flex } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/grid/grid.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { CSSProperties, ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import type { CSSProperty } from '@vtex/shoreline-utils'
import './grid.css'

export const Grid = forwardRef<HTMLDivElement, GridProps>(function Grid(
props,
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/grid/stories/grid.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import '../../../dist/styles.min.css'
import React from 'react'

import { Grid, GridCell } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/icon-button/icon-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, { forwardRef } from 'react'
import type { ButtonProps } from '../button'
import { Button } from '../button'
import { AccessibleIcon } from '../accessible-icon'
import './icon-button.css'

/**
* A button designed specifically for usage with a single icon.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import '../../../dist/styles.min.css'

import React, { useState } from 'react'
import { IconButton } from '../index'
import { Stack } from '../../stack'
import { IconTrash } from '@vtex/shoreline-icons'

import { AccessibleIcon } from '../../accessible-icon'
import { Stack } from '../../stack'
import { IconButton } from '../index'

export default {
title: 'shoreline-components/icon-button',
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/link-box/link-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { ClickableProps } from '../clickable'
import { Clickable } from '../clickable'
import type { NavigationTarget } from './link-box-utils'
import { navigate } from './link-box-utils'
import './link-box.css'

/**
* A container that acts as a link. It allows text selection and stop its children event propagation.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../link-box.css'
import React from 'react'
import { Button } from '../../button'
import { Menu, MenuTrigger, MenuItem, MenuProvider } from '../../menu'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/link/link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'

import { Compose } from '../compose'
import './link.css'

/**
* Anchor component
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/link/stories/link.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../link.css'
import React from 'react'

import { Link } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/menu/menu.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { Menu as BaseMenu } from '@ariakit/react'
import './menu.css'

export const Menu = forwardRef<HTMLDivElement, MenuProps>(function Menu(
props,
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/menu/stories/menu.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../menu.css'
import React from 'react'
import {
IconCaretDown,
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/modal/modal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { Dialog } from '@ariakit/react'

import { Container } from '../content'
import './modal.css'

export const Modal = forwardRef<HTMLDivElement, ModalProps>(function Modal(
props,
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/modal/stories/modal.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../modal.css'
import React, { useState } from 'react'

import { Modal, ModalHeader } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import { AccessibleIcon } from '../accessible-icon'
import { VisuallyHidden } from '../visually-hidden'
import { useId } from '@vtex/shoreline-utils'
import './pagination.css'

/**
* Pagination triggers allow merchants to view the size of a list and navigate between pages.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../pagination.css'
import './style.css'
import React, { useState } from 'react'

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/popover/popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { Popover as BasePopover } from '@ariakit/react'
import { Container } from '../content'
import './popover.css'

/**
* Popover containers allow merchants to access and interact with more
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/popover/stories/popover.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react'

import '../../../dist/styles.min.css'
import '../popover.css'
import './styles.css'

import { Content } from '../../content'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/radio/radio-group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import { Field, FieldLabel, FieldMessage } from '../field'
import { Stack } from '../stack'
import { useId } from '@vtex/shoreline-utils'
import './radio-group.css'

export const RadioGroup = forwardRef<HTMLInputElement, RadioGroupProps>(
function Radio(props, ref) {
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/radio/radio.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@

&:hover {
border: var(--sl-element-border-hover);
};
}

&:checked {
background-color: var(--sl-element-bg-checked);
border: var(--sl-element-border-checked);

&:hover {
border: var(--sl-element-border-checked);
};
}

&:after {
background-color: var(--sl-element-check-bg);
Expand All @@ -42,7 +42,7 @@
}

&:after {
content: "";
content: '';
width: 0.5rem;
height: 0.5rem;
display: block;
Expand Down Expand Up @@ -84,5 +84,5 @@
--sl-element-focus-ring-checked: none;
}
}
};
}
}
1 change: 1 addition & 0 deletions packages/components/src/radio/radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, { forwardRef } from 'react'
import { Radio as BaseRadio } from '@ariakit/react'
import { Field, FieldLabel } from '../field'
import { useId } from '@vtex/shoreline-utils'
import './radio.css'

export const Radio = forwardRef<HTMLInputElement, RadioProps>(function Radio(
props,
Expand Down
4 changes: 0 additions & 4 deletions packages/components/src/radio/stories/radio.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import '../../../dist/styles.min.css'
import '../radio.css'
import '../radio-group.css'
import '../../field/field.css'
import React, { useEffect, useState } from 'react'

import { Radio, RadioGroup, useRadioState } from '../index'
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/scroll-area/scroll-area.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ComponentPropsWithoutRef } from 'react'
import React, { forwardRef } from 'react'
import { Root, Viewport, Scrollbar, Thumb } from '@radix-ui/react-scroll-area'
import './scroll-area.css'

/**
* Cross-browser scroll styling
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import '../../../dist/styles.min.css'
import '../scroll-area.css'
import React from 'react'

import { ScrollArea } from '../index'
Expand Down
Loading