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

refactor!: use :global() for custom styles #1940

Merged
merged 1 commit into from
Mar 23, 2024
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
18 changes: 9 additions & 9 deletions COMPONENT_INDEX.md
Original file line number Diff line number Diff line change
Expand Up @@ -1624,12 +1624,12 @@ None.

### Slots

| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---- | :--------------------------------------------------------------------- |
| -- | Yes | -- | -- |
| closeIcon | No | -- | <code>&lt;svelte:component this="{closeIcon}" size="{20}" /&gt;</code> |
| icon | No | -- | <code>&lt;svelte:component this="{icon}" size="{20}" /&gt;</code> |
| text | No | -- | <code>{#if text}&lt;span&gt;{text}&lt;/span&gt;{/if}</code> |
| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---- | :--------------------------------------------------------------------------------------------------- |
| -- | Yes | -- | -- |
| closeIcon | No | -- | <code>&lt;svelte:component this="{closeIcon}" size="{20}" /&gt;</code> |
| icon | No | -- | <code>&lt;svelte:component this="{icon}" size="{20}" /&gt;</code> |
| text | No | -- | <code>{#if text}&lt;span class:bx--header\_\_action-text="{true}"&gt;{text}&lt;/span&gt;{/if}</code> |

### Events

Expand Down Expand Up @@ -1835,9 +1835,9 @@ export interface HeaderSearchResult {

### Slots

| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------ |
| -- | Yes | <code>{ result: HeaderSearchResult; index: number } </code> | <code>{result.text}<br /> {#if result.description}&lt;span&gt;– {result.description}&lt;/span&gt;{/if}</code> |
| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| -- | Yes | <code>{ result: HeaderSearchResult; index: number } </code> | <code>{result.text}<br /> {#if result.description}&lt;span<br /> class:bx--header-search-menu-description="{true}"<br /> &gt;– {result.description}&lt;/span<br /> &gt;{/if}</code> |

### Events

Expand Down
4 changes: 2 additions & 2 deletions docs/src/COMPONENT_API.json
Original file line number Diff line number Diff line change
Expand Up @@ -4998,7 +4998,7 @@
{
"name": "text",
"default": false,
"fallback": "{#if text}<span>{text}</span>{/if}",
"fallback": "{#if text}<span class:bx--header__action-text=\"{true}\">{text}</span>{/if}",
"slot_props": "{}"
}
],
Expand Down Expand Up @@ -5396,7 +5396,7 @@
{
"name": "__default__",
"default": true,
"fallback": "{result.text}\n {#if result.description}<span>– {result.description}</span>{/if}",
"fallback": "{result.text}\n {#if result.description}<span\n class:bx--header-search-menu-description=\"{true}\"\n >– {result.description}</span\n >{/if}",
"slot_props": "{ result: HeaderSearchResult; index: number }"
}
],
Expand Down
8 changes: 4 additions & 4 deletions src/UIShell/HeaderAction.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
type="button"
class:bx--header__action="{true}"
class:bx--header__action--active="{isOpen}"
class:action-text="{text}"
class:bx--header__action--text="{text}"
{...$$restProps}
on:click
on:click|stopPropagation="{() => {
Expand All @@ -88,7 +88,7 @@
</slot>
{/if}
<slot name="text">
{#if text}<span>{text}</span>{/if}
{#if text}<span class:bx--header__action-text="{true}">{text}</span>{/if}
</slot>
</button>
{#if isOpen}
Expand All @@ -106,7 +106,7 @@
{/if}

<style>
.action-text {
:global(.bx--header__action--text) {
display: inline-flex;
align-items: center;
width: auto;
Expand All @@ -123,7 +123,7 @@
color: #f4f4f4;
}

.action-text > span {
:global(.bx--header__action-text) {
margin-left: 0.75rem;
}
</style>
2 changes: 1 addition & 1 deletion src/UIShell/HeaderActionLink.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</a>

<style>
.bx--header__action {
:global(.bx--header__action) {
display: flex;
align-items: center;
justify-content: center;
Expand Down
11 changes: 3 additions & 8 deletions src/UIShell/HeaderPanelDivider.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{#if $$slots.default}
<li>
<span>
<slot />
</span>
<li class:bx--header-panel-divider={true}>
<slot />
</li>
{/if}
<hr class:bx--switcher__item--divider="{true}" />
Expand All @@ -14,11 +12,8 @@
* from https://carbondesignsystem.com/ as a reference.
*/

li {
:global(.bx--header-panel-divider) {
margin: 2rem 1rem 0;
color: #525252;
}
span {
font-size: 0.75rem;
line-height: 1.3;
letter-spacing: 0.02rem;
Expand Down
76 changes: 51 additions & 25 deletions src/UIShell/HeaderSearch.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,30 @@
}}"
/>

<div bind:this="{refSearch}" role="search" class:active>
<label for="search-input" id="search-label">Search</label>
<div aria-owns="search-menu" aria-haspopup="menu">
<div
bind:this="{refSearch}"
class:bx--header__search="{true}"
role="search"
class:bx--header__search--active="{active}"
>
<label
class:bx--header__search-label="{true}"
for="search-input"
id="search-label">Search</label
>
<div
class:bx--header__search-menu="{true}"
aria-owns="search-menu"
aria-haspopup="menu"
>
<button
type="button"
aria-label="Search"
aria-expanded="{active}"
tabindex="{active ? '-1' : '0'}"
class:bx--header-search-button="{true}"
class:bx--header__action="{true}"
class:disabled="{active}"
class:bx--header-search-button--disabled="{active}"
on:click="{() => {
active = true;
}}"
Expand All @@ -82,7 +96,8 @@
autocomplete="off"
placeholder="Search..."
tabindex="{active ? '0' : '-1'}"
class:active
class:bx--header__search-input="{true}"
class:bx--header__search--active="{active}"
{...$$restProps}
id="search-input"
aria-autocomplete="list"
Expand Down Expand Up @@ -135,7 +150,8 @@
aria-label="Clear search"
tabindex="{active ? '0' : '-1'}"
class:bx--header__action="{true}"
class:hidden="{!active}"
class:bx--header-search-button="{true}"
class:bx--header-search-button--hidden="{!active}"
on:click="{() => {
reset();
dispatch('clear');
Expand All @@ -147,15 +163,22 @@

{#if active && results.length > 0}
<!-- svelte-ignore a11y-no-noninteractive-element-to-interactive-role -->
<ul aria-labelledby="search-label" role="menu" id="search-menu">
<ul
aria-labelledby="search-label"
role="menu"
id="search-menu"
class:bx--header-search-menu="{true}"
>
{#each results as result, i}
<li role="none">
<a
tabindex="-1"
id="search-menuitem-{i}"
role="menuitem"
href="{result.href}"
class:selected="{selectedId === `search-menuitem-${i}`}"
class:bx--header-search-menu-item="{true}"
class:bx--header-search-menu-item--selected="{selectedId ===
`search-menuitem-${i}`}"
on:click|preventDefault="{async () => {
selectedResultIndex = i;
await tick();
Expand All @@ -164,7 +187,10 @@
>
<slot result="{result}" index="{i}">
{result.text}
{#if result.description}<span>– {result.description}</span>{/if}
{#if result.description}<span
class:bx--header-search-menu-description="{true}"
>– {result.description}</span
>{/if}
</slot>
</a>
</li>
Expand All @@ -174,7 +200,7 @@
</div>

<style>
label {
:global(.bx--header__search-label) {
position: absolute;
width: 1px;
height: 1px;
Expand All @@ -187,7 +213,7 @@
clip: rect(0, 0, 0, 0);
}

[role="search"] {
:global(.bx--header__search) {
position: relative;
display: flex;
max-width: 28rem;
Expand All @@ -200,23 +226,23 @@
background 0.11s cubic-bezier(0.2, 0, 0.38, 0.9);
}

[role="search"]:not(.active) {
:global(.bx--header__search:not(.bx--header__search--active)) {
max-width: 3rem;
background-color: #161616;
}

[role="search"].active {
:global(.bx--header__search.bx--header__search--active) {
outline: 2px solid #fff;
outline-offset: -2px;
}

[aria-haspopup="menu"] {
:global(.bx--header__search-menu) {
display: flex;
flex-grow: 1;
border-bottom: 1px solid #393939;
}

input {
:global(.bx--header__search-input) {
width: 100%;
height: 3rem;
padding: 0;
Expand All @@ -232,12 +258,12 @@
transition: opacity 0.11s cubic-bezier(0.2, 0, 0.38, 0.9);
}

input:not(.active) {
:global(.bx--header__search-input:not(.bx--header__search--active)) {
opacity: 0;
pointer-events: none;
}

button {
:global(.bx--header-search-button) {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -250,21 +276,21 @@
opacity 0.11s cubic-bezier(0.2, 0, 0.38, 0.9);
}

.disabled {
:global(.bx--header-search-button--disabled) {
border: none;
pointer-events: none;
}

[aria-label="Clear search"]:hover {
:global(.bx--header-search-button:hover) {
background-color: #4c4c4c;
}

.hidden {
:global(.bx--header-search-button--hidden) {
opacity: 0;
display: none;
}

ul {
:global(.bx--header-search-menu) {
position: absolute;
z-index: 10000;
padding: 1rem 0;
Expand All @@ -277,7 +303,7 @@
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.5);
}

[role="menuitem"] {
:global(.bx--header-search-menu-item) {
padding: 6px 1rem;
cursor: pointer;
font-size: 0.875rem;
Expand All @@ -293,13 +319,13 @@
color: #c6c6c6;
}

.selected,
[role="menuitem"]:hover {
:global(.bx--header-search-menu-item--selected),
:global(.bx--header-search-menu-item:hover) {
background-color: #353535;
color: #f4f4f4;
}

[role="menuitem"] span {
:global(.bx--header-search-menu-description) {
font-size: 0.75rem;
font-weight: 400;
line-height: 1.34;
Expand Down
Loading