Skip to content

Commit b953df7

Browse files
committed
Merge branch 'beta' into refactor/pagination-vanilla
2 parents f50cf1f + 4d56ac4 commit b953df7

File tree

80 files changed

+655
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+655
-419
lines changed

.changeset/cute-carrots-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ultraviolet/plus": minor
3+
---
4+
5+
Refactor component `FAQ` to use vanilla extract instead of Emotion

.changeset/eight-glasses-warn.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
"@ultraviolet/ui": major
33
---
44

5-
⚠️ BREAKING CHANGES ⚠️
5+
! BREAKING CHANGES !
66
In order to start using the new style, you will need to import new `<ThemeProvider />` and import new CSS generated at build time:
77

88
```tsx
99
import { ThemeProvider } from '@emotion/react'
10-
import { consoleLightTheme } from '@ultraviolet/themes'
10+
import { consoleLightTheme, ThemeProvider as ThemeProviderUV } from '@ultraviolet/themes'
1111

12-
import { ThemeProvider as ThemeProviderUV } from "@ultraviolet/ui" // ThemeProvider that generate the theme applied to components
1312
import "@ultraviolet/ui/styles" // Generated CSS used by components
1413
1514
export const App = (children) => {

.changeset/hungry-laws-joke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ultraviolet/ui": minor
3+
---
4+
5+
Refactor `<Pagination />` to use vanilla extract

.changeset/pre.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
"breezy-hounds-bake",
2222
"bumpy-walls-sort",
2323
"clean-hotels-kneel",
24+
"cold-monkeys-flow",
2425
"cuddly-kids-taste",
26+
"cute-carrots-smell",
2527
"cute-moments-shine",
2628
"dark-pugs-worry",
2729
"deep-peas-live",
@@ -32,6 +34,7 @@
3234
"evil-loops-check",
3335
"famous-stars-marry",
3436
"few-horses-wash",
37+
"fifty-streets-check",
3538
"fine-buttons-call",
3639
"fluffy-bananas-type",
3740
"fuzzy-icons-carry",
@@ -44,6 +47,7 @@
4447
"icy-camels-swim",
4548
"icy-jobs-smile",
4649
"lazy-lights-invent",
50+
"little-buckets-thank",
4751
"little-dogs-type",
4852
"major-clocks-throw",
4953
"modern-terms-know",
@@ -61,6 +65,7 @@
6165
"real-streets-ring",
6266
"real-suns-repair",
6367
"rich-crabs-cough",
68+
"ripe-tigers-jump",
6469
"rotten-coins-glow",
6570
"rotten-hairs-boil",
6671
"rotten-kings-dig",
@@ -77,11 +82,14 @@
7782
"strong-cameras-crash",
7883
"strong-cats-float",
7984
"swift-wombats-arrive",
85+
"tall-trains-sleep",
8086
"tangy-bars-retire",
87+
"tangy-news-own",
8188
"ten-wolves-battle",
8289
"tender-flowers-drive",
8390
"tender-oranges-relax",
8491
"three-worms-poke",
92+
"two-colts-look",
8593
"vast-carrots-post",
8694
"violet-jobs-reply",
8795
"whole-actors-prove",

.changeset/ripe-tigers-jump.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ultraviolet/plus": minor
3+
---
4+
5+
Refactor component `CodeEditor` to use vanilla extract instead of Emotion

.changeset/seven-teeth-shine.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@ultraviolet/illustrations": major
3+
"@ultraviolet/themes": major
4+
"@ultraviolet/icons": major
5+
"@ultraviolet/plus": major
6+
"@ultraviolet/ui": major
7+
---
8+
9+
Theme provider has been moved to `@ultraviolet/themes` package. `@ultraviolet/ui` imports it internally and export `ThemeProvider` and `useTheme` hook for convenience.

.changeset/tangy-news-own.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ultraviolet/ui": patch
3+
---
4+
5+
`Checkbox`: fix classname

.storybook/components/DocsContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import {
55
DocsContainer as BaseContainer,
66
Unstyled,
77
} from '@storybook/addon-docs/blocks'
8-
import { consoleLightTheme as lightTheme } from '@ultraviolet/themes'
8+
import { consoleLightTheme as lightTheme, ThemeProvider as ThemeProviderUV } from '@ultraviolet/themes'
99
import type { ReactNode } from 'react'
1010
import { cloneElement, isValidElement, useState } from 'react'
1111
import { globalStyles } from './globalStyle'
1212
import '@ultraviolet/fonts/fonts.css'
13-
import { GlobalAlert, ThemeProvider as ThemeProviderUV } from '@ultraviolet/ui'
13+
import { GlobalAlert } from '@ultraviolet/ui'
1414

1515
type ExtraProps = {
1616
/**

.storybook/preview.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import {
66
consoleDarkTheme as darkTheme,
77
consoleDarkerTheme as darkerTheme,
88
consoleLightTheme as lightTheme,
9+
ThemeProvider as ThemeProviderUI
910
} from '@ultraviolet/themes'
1011
import DocsContainer from './components/DocsContainer'
1112
import Page from './components/Page'
1213
import { globalStyles } from './components/globalStyle'
1314
import { dark, light } from './storybookThemes'
1415
import '@ultraviolet/fonts/fonts.css'
1516
import { scan } from "react-scan"
16-
import { ThemeProvider as ThemeProviderUI } from '@ultraviolet/ui'
1717

1818
const BREAKPOINT_ORDER = [
1919
'xlarge',
@@ -155,7 +155,7 @@ const decorators = [
155155

156156
return darkerTheme
157157
}
158-
158+
159159
return (
160160
<>
161161
<ThemeProviderUI theme={finalTheme()}>

examples/next/src/components/CopyBoxCommand.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { useTheme } from '@emotion/react'
21
import styled from '@emotion/styled'
2+
import { useTheme } from '@ultraviolet/themes'
33
import { Stack, Tabs } from '@ultraviolet/ui'
44
import type { ReactElement } from 'react'
55
import { Children, isValidElement, useState } from 'react'

0 commit comments

Comments
 (0)