Skip to content

Commit b2aba1f

Browse files
authored
update Banner into MessageBar (#981)
* update Banner into MessageBar * Consolidate logic for Status and MessageBar appropriately * Update snapshots
1 parent e83a302 commit b2aba1f

File tree

27 files changed

+684
-734
lines changed

27 files changed

+684
-734
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818

1919
- `Button*` font sizes updated to match design specifications
2020
- `theme.colors` shape has been significantly refactored (documentation updates to follow)
21+
- `Banner` is now `MessageBar`
22+
- Major style changes to be more Material-esque
23+
- `warning` is now `warn`
24+
- `error` is now `critical`
25+
- `info` is now `inform`
26+
- `confirmation` is now `positive`
27+
- ``
28+
- `Badge` - `default` intent is now `key`
2129
- `CheckboxGroup` and `RadioGroup` `name` is now optional
2230
- Updated `LookerLogo` and `LogoRings` to match new branding
2331

packages/components/src/Badge/Badge.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ test('Badge renders all sizes', () => {
3737
test('Badge renders all intents', () => {
3838
assertSnapshot(<Badge intent="plain">plain</Badge>)
3939
assertSnapshot(<Badge intent="positive">positive</Badge>)
40-
assertSnapshot(<Badge intent="info">info</Badge>)
40+
assertSnapshot(<Badge intent="inform">info</Badge>)
4141
assertSnapshot(<Badge intent="neutral">neutral</Badge>)
42-
assertSnapshot(<Badge intent="warning">warning</Badge>)
42+
assertSnapshot(<Badge intent="warn">warning</Badge>)
4343
assertSnapshot(<Badge intent="critical">critical</Badge>)
4444
})

packages/components/src/Badge/Badge.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ export interface BadgeProps
4949
* @default `default`
5050
**/
5151
intent?:
52-
| 'warning'
52+
| 'warn'
5353
| 'positive'
5454
| 'critical'
55-
| 'info'
55+
| 'inform'
5656
| 'neutral'
5757
| 'plain'
58-
| 'default'
58+
| 'key'
5959
/**
6060
* Defines the size of Badge diameter.
6161
* @default "medium"
@@ -89,7 +89,7 @@ const intent = variant({
8989
prop: 'intent',
9090
variants: {
9191
critical: { bg: 'palette.red100', color: 'palette.red600' },
92-
default: { bg: 'palette.purple100', color: 'palette.purple600' },
92+
key: { bg: 'palette.purple100', color: 'palette.purple600' },
9393
info: { bg: 'palette.blue100', color: 'palette.blue600' },
9494
neutral: { bg: 'palette.charcoal200', color: 'palette.charcoal600' },
9595
plain: { bg: 'palette.white', color: 'palette.purple500' },
@@ -116,6 +116,6 @@ export const Badge = styled(BadgeLayout).attrs({ fontWeight: 'semiBold' })`
116116
`
117117

118118
Badge.defaultProps = {
119-
intent: 'default',
119+
intent: 'key',
120120
size: 'medium',
121121
}

packages/components/src/Badge/__snapshots__/Badge.test.tsx.snap

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ exports[`Badge renders all intents 3`] = `
5959
line-height: 24px;
6060
padding-left: 0.5rem;
6161
padding-right: 0.5rem;
62-
background-color: #e0f2ff;
63-
color: #0059b2;
6462
display: -webkit-inline-box;
6563
display: -webkit-inline-flex;
6664
display: -ms-inline-flexbox;
@@ -71,7 +69,7 @@ exports[`Badge renders all intents 3`] = `
7169
<span
7270
className="c0"
7371
fontWeight="semiBold"
74-
intent="info"
72+
intent="inform"
7573
size="medium"
7674
>
7775
info
@@ -111,8 +109,6 @@ exports[`Badge renders all intents 5`] = `
111109
line-height: 24px;
112110
padding-left: 0.5rem;
113111
padding-right: 0.5rem;
114-
background-color: #FFEBC4;
115-
color: #724B00;
116112
display: -webkit-inline-box;
117113
display: -webkit-inline-flex;
118114
display: -ms-inline-flexbox;
@@ -123,7 +119,7 @@ exports[`Badge renders all intents 5`] = `
123119
<span
124120
className="c0"
125121
fontWeight="semiBold"
126-
intent="warning"
122+
intent="warn"
127123
size="medium"
128124
>
129125
warning
@@ -175,7 +171,7 @@ exports[`Badge renders all sizes 1`] = `
175171
<span
176172
className="c0"
177173
fontWeight="semiBold"
178-
intent="default"
174+
intent="key"
179175
size="medium"
180176
>
181177
default (medium)
@@ -201,7 +197,7 @@ exports[`Badge renders all sizes 2`] = `
201197
<span
202198
className="c0"
203199
fontWeight="semiBold"
204-
intent="default"
200+
intent="key"
205201
size="small"
206202
>
207203
small
@@ -227,7 +223,7 @@ exports[`Badge renders all sizes 3`] = `
227223
<span
228224
className="c0"
229225
fontWeight="semiBold"
230-
intent="default"
226+
intent="key"
231227
size="medium"
232228
>
233229
medium
@@ -253,7 +249,7 @@ exports[`Badge renders all sizes 4`] = `
253249
<span
254250
className="c0"
255251
fontWeight="semiBold"
256-
intent="default"
252+
intent="key"
257253
size="large"
258254
>
259255
large

packages/components/src/Banner/Banner.tsx

Lines changed: 0 additions & 147 deletions
This file was deleted.

packages/components/src/Banner/Banner.test.tsx renamed to packages/components/src/MessageBar/MessageBar.test.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,44 @@
2727
import 'jest-styled-components'
2828
import React from 'react'
2929
import { assertSnapshot } from '@looker/components-test-utils'
30-
import { Banner } from './Banner'
30+
import { MessageBar } from './MessageBar'
3131

32-
test('Warning banner', () => {
32+
test('Warn MessageBar', () => {
3333
assertSnapshot(
34-
<Banner intent="warning" id="test-banner">
35-
Warning
36-
</Banner>
34+
<MessageBar intent="warn" id="test-message-bar">
35+
Warn
36+
</MessageBar>
3737
)
3838
})
3939

40-
test('Error banner', () => {
40+
test('Error MessageBar', () => {
4141
assertSnapshot(
42-
<Banner intent="error" id="test-banner">
42+
<MessageBar intent="critical" id="test-message-bar">
4343
Error
44-
</Banner>
44+
</MessageBar>
4545
)
4646
})
4747

48-
test('Info banner', () => {
48+
test('Info MessageBar', () => {
4949
assertSnapshot(
50-
<Banner intent="info" id="test-banner">
50+
<MessageBar intent="inform" id="test-message-bar">
5151
Info
52-
</Banner>
52+
</MessageBar>
5353
)
5454
})
5555

56-
test('Confirmation banner', () => {
56+
test('Confirmation MessageBar', () => {
5757
assertSnapshot(
58-
<Banner intent="confirmation" id="test-banner">
59-
Confirmation
60-
</Banner>
58+
<MessageBar intent="positive" id="test-message-bar">
59+
Positive
60+
</MessageBar>
6161
)
6262
})
6363

64-
test('Banner can be dismissed', () => {
64+
test('MessageBar can be dismissed', () => {
6565
assertSnapshot(
66-
<Banner intent="info" id="test-banner" canDismiss>
66+
<MessageBar intent="inform" id="test-message-bar" canDismiss>
6767
Info!
68-
</Banner>
68+
</MessageBar>
6969
)
7070
})

0 commit comments

Comments
 (0)