|
19 | 19 | "medium", |
20 | 20 | "large", |
21 | 21 | ]); |
| 22 | + const [CalloutEmphasis, validateCalloutEmphasis] = typeValidator( |
| 23 | + "Callout emphasis", |
| 24 | + ["high", "medium", "low"], |
| 25 | + ); |
22 | 26 | const [AriaLive, validateAriaLive] = typeValidator("Aria live", [ |
23 | 27 | "off", |
24 | 28 | "assertive", |
25 | 29 | "polite", |
26 | 30 | ]); |
| 31 | + const [Version, validateVersion] = typeValidator("Version", ["1", "2"]); |
27 | 32 |
|
28 | 33 | // Types |
29 | 34 | type CalloutType = (typeof Types)[number]; |
30 | 35 | type CalloutSize = (typeof CalloutSizes)[number]; |
| 36 | + type CalloutEmphasisType = (typeof CalloutEmphasis)[number]; |
31 | 37 | type AriaLiveType = (typeof AriaLive)[number]; |
| 38 | + type VersionType = (typeof Version)[number]; |
32 | 39 |
|
33 | 40 | // margin |
34 | 41 | export let mt: Spacing = null; |
|
38 | 45 |
|
39 | 46 | export let size: CalloutSize = "large"; |
40 | 47 | export let type: CalloutType; |
| 48 | + export let emphasis: CalloutEmphasisType = "medium"; |
41 | 49 | export let heading: string = ""; |
42 | 50 | export let maxwidth: string = "none"; |
43 | 51 | export let testid: string = ""; |
44 | 52 | export let arialive: AriaLiveType = "off"; |
45 | 53 | export let icontheme: IconTheme = "outline"; |
| 54 | + export let version: VersionType = "1"; |
46 | 55 |
|
47 | 56 | // Private |
48 | 57 |
|
|
68 | 77 |
|
69 | 78 | onMount(() => { |
70 | 79 | validateCalloutSize(size); |
| 80 | + validateCalloutEmphasis(emphasis); |
71 | 81 | validateAriaLive(arialive); |
| 82 | + validateVersion(version); |
72 | 83 |
|
73 | 84 | setTimeout(() => { |
74 | 85 | validateType(type); |
|
85 | 96 | ${calculateMargin(mt, mr, mb, ml)}; |
86 | 97 | max-width: ${maxwidth}; |
87 | 98 | `} |
88 | | - class="notification {type}" |
| 99 | + class="notification {type} emphasis-{emphasis}" |
89 | 100 | class:medium={isMediumCallout} |
| 101 | + class:v2={version === "2"} |
90 | 102 | data-testid={testid} |
91 | 103 | aria-live={arialive} |
92 | 104 | > |
93 | | - <span class="icon {type}"> |
94 | | - <goa-icon |
95 | | - type={iconType} |
96 | | - size={iconSize} |
97 | | - theme={icontheme} |
98 | | - /> |
99 | | - </span> |
100 | | - <span class="content {type}"> |
101 | | - {#if heading} |
102 | | - <h3 class:medium={isMediumCallout}>{heading}</h3> |
103 | | - {/if} |
104 | | - <slot /> |
105 | | - </span> |
| 105 | + {#if version === "2"} |
| 106 | + <div class="heading"> |
| 107 | + <goa-icon |
| 108 | + type={iconType} |
| 109 | + size={iconSize} |
| 110 | + theme={emphasis === "high" ? "outline" : "filled"} |
| 111 | + /> |
| 112 | + <h3 class="heading-label">{heading}</h3> |
| 113 | + </div> |
| 114 | + <div class="body"> |
| 115 | + <slot /> |
| 116 | + </div> |
| 117 | + {:else} |
| 118 | + <span class="icon {type}"> |
| 119 | + <goa-icon type={iconType} size={iconSize} theme={icontheme} /> |
| 120 | + </span> |
| 121 | + <span class="content {type}"> |
| 122 | + {#if heading} |
| 123 | + <h3 class:medium={isMediumCallout}>{heading}</h3> |
| 124 | + {/if} |
| 125 | + <slot /> |
| 126 | + </span> |
| 127 | + {/if} |
106 | 128 | </div> |
107 | 129 |
|
108 | 130 | <!-- Style --> |
|
221 | 243 | .notification.medium .icon { |
222 | 244 | padding: var(--goa-callout-m-statusbar-padding); |
223 | 245 | } |
| 246 | +
|
| 247 | + /* Version two: Layout */ |
| 248 | +
|
| 249 | + .v2.notification { |
| 250 | + flex-direction: column; |
| 251 | + border: var(--goa-callout-border); |
| 252 | + } |
| 253 | +
|
| 254 | + .v2.notification .heading { |
| 255 | + display: flex; |
| 256 | + flex-direction: row; |
| 257 | + align-items: center; |
| 258 | + padding: var(--goa-callout-heading-padding); |
| 259 | + gap: var(--goa-callout-heading-gap); |
| 260 | + color: var(--goa-callout-heading-color); |
| 261 | + } |
| 262 | +
|
| 263 | + .v2.notification .heading-label { |
| 264 | + margin-bottom: 0; |
| 265 | + font: var(--goa-callout-heading-typography); |
| 266 | + } |
| 267 | +
|
| 268 | + .v2.notification .body { |
| 269 | + padding: var(--goa-callout-body-padding); |
| 270 | + color: var(--goa-callout-body-color); |
| 271 | + font: var(--goa-callout-body-typography); |
| 272 | + } |
| 273 | +
|
| 274 | + /* Version two: Low emphasis layout */ |
| 275 | +
|
| 276 | + .v2.emphasis-low .body { |
| 277 | + padding: var(--goa-callout-l-with-heading-body-padding); |
| 278 | + } |
| 279 | +
|
| 280 | + .v2.emphasis-low:has(.heading-label:empty) { |
| 281 | + flex-direction: row; |
| 282 | + align-items: start; |
| 283 | + } |
| 284 | +
|
| 285 | + .v2.emphasis-low .heading-label:empty { |
| 286 | + display: none; |
| 287 | + } |
| 288 | +
|
| 289 | + .v2.emphasis-low:has(.heading-label:empty) .body { |
| 290 | + padding: var(--goa-callout-l-without-heading-body-padding); |
| 291 | + } |
| 292 | +
|
| 293 | + .v2.information { |
| 294 | + background-color: var(--goa-callout-info-content-bg-color); |
| 295 | + } |
| 296 | +
|
| 297 | + /* Version two: Types */ |
| 298 | +
|
| 299 | + .v2.information .heading { |
| 300 | + background-color: var(--goa-callout-info-heading-bg-color); |
| 301 | + --fill-color: var(--goa-callout-info-icon-color); |
| 302 | + } |
| 303 | +
|
| 304 | + .v2.information.emphasis-low { |
| 305 | + border-color: var(--goa-callout-l-info-border-color); |
| 306 | + background-color: var(--goa-callout-l-info-content-bg-color); |
| 307 | + } |
| 308 | +
|
| 309 | + .v2.information.emphasis-high { |
| 310 | + border-color: var(--goa-callout-h-info-border-color); |
| 311 | + background-color: var(--goa-callout-h-info-content-bg-color); |
| 312 | + } |
| 313 | +
|
| 314 | + .v2.information.emphasis-high .heading { |
| 315 | + background-color: var(--goa-callout-h-info-heading-bg-color); |
| 316 | + color: var(--goa-callout-h-info-heading-color); |
| 317 | + --fill-color: var(--goa-callout-h-info-icon-color); |
| 318 | + } |
| 319 | +
|
| 320 | + .v2.emergency { |
| 321 | + background-color: var(--goa-callout-emergency-content-bg-color); |
| 322 | + } |
| 323 | +
|
| 324 | + .v2.emergency .heading { |
| 325 | + background-color: var(--goa-callout-emergency-heading-bg-color); |
| 326 | + --fill-color: var(--goa-callout-emergency-icon-color); |
| 327 | + } |
| 328 | +
|
| 329 | + .v2.emergency.emphasis-low { |
| 330 | + border-color: var(--goa-callout-l-emergency-border-color); |
| 331 | + background-color: var(--goa-callout-l-emergency-content-bg-color); |
| 332 | + } |
| 333 | +
|
| 334 | + .v2.emergency.emphasis-high { |
| 335 | + border-color: var(--goa-callout-h-emergency-border-color); |
| 336 | + background-color: var(--goa-callout-h-emergency-content-bg-color); |
| 337 | + } |
| 338 | +
|
| 339 | + .v2.emergency.emphasis-high .heading { |
| 340 | + background-color: var(--goa-callout-h-emergency-heading-bg-color); |
| 341 | + color: var(--goa-callout-h-emergency-heading-color); |
| 342 | + --fill-color: var(--goa-callout-h-emergency-icon-color); |
| 343 | + } |
| 344 | +
|
| 345 | + .v2.important { |
| 346 | + background-color: var(--goa-callout-important-content-bg-color); |
| 347 | + } |
| 348 | +
|
| 349 | + .v2.important .heading { |
| 350 | + background-color: var(--goa-callout-important-heading-bg-color); |
| 351 | + --fill-color: var(--goa-callout-important-icon-color); |
| 352 | + } |
| 353 | +
|
| 354 | + .v2.important.emphasis-low { |
| 355 | + border-color: var(--goa-callout-l-important-border-color); |
| 356 | + background-color: var(--goa-callout-l-important-content-bg-color); |
| 357 | + } |
| 358 | +
|
| 359 | + .v2.important.emphasis-high { |
| 360 | + border-color: var(--goa-callout-h-important-border-color); |
| 361 | + background-color: var(--goa-callout-h-important-content-bg-color); |
| 362 | + } |
| 363 | +
|
| 364 | + .v2.important.emphasis-high .heading { |
| 365 | + background-color: var(--goa-callout-h-important-heading-bg-color); |
| 366 | + color: var(--goa-callout-h-important-heading-color); |
| 367 | + --fill-color: var(--goa-callout-h-important-icon-color); |
| 368 | + } |
| 369 | +
|
| 370 | + .v2.success { |
| 371 | + background-color: var(--goa-callout-success-content-bg-color); |
| 372 | + } |
| 373 | +
|
| 374 | + .v2.success .heading { |
| 375 | + background-color: var(--goa-callout-success-heading-bg-color); |
| 376 | + --fill-color: var(--goa-callout-success-icon-color); |
| 377 | + } |
| 378 | +
|
| 379 | + .v2.success.emphasis-low { |
| 380 | + border-color: var(--goa-callout-l-success-border-color); |
| 381 | + background-color: var(--goa-callout-l-success-content-bg-color); |
| 382 | + } |
| 383 | +
|
| 384 | + .v2.success.emphasis-high { |
| 385 | + border-color: var(--goa-callout-h-success-border-color); |
| 386 | + background-color: var(--goa-callout-h-success-content-bg-color); |
| 387 | + } |
| 388 | +
|
| 389 | + .v2.success.emphasis-high .heading { |
| 390 | + background-color: var(--goa-callout-h-success-heading-bg-color); |
| 391 | + color: var(--goa-callout-h-success-heading-color); |
| 392 | + --fill-color: var(--goa-callout-h-success-icon-color); |
| 393 | + } |
| 394 | +
|
| 395 | + .v2.information.emphasis-low .heading, |
| 396 | + .v2.important.emphasis-low .heading, |
| 397 | + .v2.emergency.emphasis-low .heading, |
| 398 | + .v2.success.v2.emphasis-low .heading { |
| 399 | + background-color: transparent; |
| 400 | + } |
224 | 401 | </style> |
0 commit comments