Skip to content

Commit 352cbc7

Browse files
authored
* upgrade ui-box and stop using `css` prop * resolve react types * update snapshots and prune some
1 parent 4e88a52 commit 352cbc7

File tree

48 files changed

+223
-669
lines changed

Some content is hidden

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

48 files changed

+223
-669
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Evergreen v4 supports theming partially. It is still complex to theme Evergreen.
6767

6868
Evergreen offers easy Server Side Rendering (SSR) and automatic hydration.
6969

70-
Evergreen bundles 2 CSS-in-JS solutions, from glamor and ui-box. To make it super easy to do server side rendering and hydration, Evergreen exposes a `extractStyles()` function that will do SSR for both at once.
70+
Evergreen provides a CSS-in-JS solution from `ui-box`. To make it super easy to do server side rendering and hydration, Evergreen exposes a `extractStyles()` function that will do SSR for both at once.
7171

7272
- How to use it with Next.js in the [ssr-next example app](examples/ssr-next).
7373
- [How to use it with GatsbyJS](https://github.com/segmentio/evergreen/issues/154)

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"dependencies": {
4949
"@babel/runtime": "^7.1.2",
5050
"@blueprintjs/icons": "^3.2.0",
51-
"@types/ui-box": "^1.4.0",
5251
"arrify": "^1.0.1",
5352
"classnames": "^2.2.6",
5453
"dom-helpers": "^3.2.1",
@@ -60,7 +59,7 @@
6059
"react-tiny-virtual-list": "^2.1.4",
6160
"react-transition-group": "^2.5.0",
6261
"tinycolor2": "^1.4.1",
63-
"ui-box": "^1.4.0"
62+
"ui-box": "^2.0.0"
6463
},
6564
"peerDependencies": {
6665
"react": "^16.3.0",

src/alert/src/Alert.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { PureComponent } from 'react'
22
import PropTypes from 'prop-types'
3-
import { BoxProps } from 'ui-box'
3+
import Box from 'ui-box'
44
import { withTheme } from '../../theme'
55
import { Pane } from '../../layers'
66
import { Heading, Paragraph } from '../../typography'
77
import { IconButton } from '../../buttons'
88
import { Icon } from '../../icon'
99

10-
class Alert extends PureComponent<any & BoxProps> {
10+
class Alert extends PureComponent<any & React.ComponentProps<typeof Box>> {
1111
static propTypes = {
1212
/**
1313
* The content of the alert. When a string is passed it is wrapped in a `<Text size={400} />` component.

src/alert/src/InlineAlert.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import React, { PureComponent } from 'react'
22
import PropTypes from 'prop-types'
3-
import { BoxProps } from 'ui-box'
3+
import Box from 'ui-box'
44
import { withTheme } from '../../theme'
55
import { Pane } from '../../layers'
66
import { Text } from '../../typography'
77
import { Icon } from '../../icon'
88

9-
class InlineAlert extends PureComponent<any & BoxProps> {
9+
class InlineAlert extends PureComponent<
10+
any & React.ComponentProps<typeof Box>
11+
> {
1012
static propTypes = {
1113
/**
1214
* The content of the alert.

src/alert/test/snapshots/index.ts.md

Lines changed: 0 additions & 216 deletions
This file was deleted.
-1.38 KB
Binary file not shown.

0 commit comments

Comments
 (0)