Skip to content

Commit

Permalink
fix: various improvements
Browse files Browse the repository at this point in the history
- use default slot content as fallback for NavItem small view
- remove SearchBox from Shell for broader reuse
- provide barrel exports for components, search and actions
  • Loading branch information
dummdidumm committed Mar 28, 2023
1 parent 7bf43cf commit 497e1df
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .changeset/dry-brooms-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/site-kit': patch
---

fix: use default slot content as fallback for NavItem small view
5 changes: 5 additions & 0 deletions .changeset/fifty-clouds-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/site-kit': patch
---

chore: provide barrel exports for components, search and actions
5 changes: 5 additions & 0 deletions .changeset/wild-pots-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/site-kit': patch
---

fix: remove SearchBox from Shell for broader reuse
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { focusable_children, trap } from './focus.js';
6 changes: 4 additions & 2 deletions packages/site-kit/src/lib/components/NavItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
<li>
<a href={external} {title} rel="external">
<span class="large"><slot /></span>
<span class="small"><slot name="small" /></span>
<!-- if no slot="small" given, fall back to using content from large -->
<span class="small"><slot name="small"><slot /></slot></span>
</a>
</li>
{:else}
<li>
<a aria-current={selected} {href} {title}>
<span class="large"><slot /></span>
<span class="small"><slot name="small" /></span>
<!-- if no slot="small" given, fall back to using content from large -->
<span class="small"><slot name="small"><slot /></slot></span>
</a>
</li>
{/if}
Expand Down
6 changes: 0 additions & 6 deletions packages/site-kit/src/lib/components/Shell.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<script>
import { browser } from '$app/environment';
import { navigating } from '$app/stores';
import SearchBox from '../search/SearchBox.svelte';
import '../styles/index.css';
import Icons from './Icons.svelte';
import PreloadingIndicator from './PreloadingIndicator.svelte';
Expand Down Expand Up @@ -33,10 +31,6 @@
</div>
{/if}

{#if browser}
<SearchBox />
{/if}

<style>
main {
position: relative;
Expand Down
10 changes: 10 additions & 0 deletions packages/site-kit/src/lib/components/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export { default as Blurb } from './Blurb.svelte';
export { default as Icon } from './Icon.svelte';
export { default as Icons } from './Icons.svelte';
export { default as Nav } from './Nav.svelte';
export { default as NavItem } from './NavItem.svelte';
export { default as PreloadingIndicator } from './PreloadingIndicator.svelte';
export { default as Section } from './Section.svelte';
export { default as Separator } from './Separator.svelte';
export { default as Shell } from './Shell.svelte';
export { default as SkipLink } from './SkipLink.svelte';
12 changes: 12 additions & 0 deletions packages/site-kit/src/lib/search/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export { default as Search } from './Search.svelte';
export { default as Searchbox } from './Searchbox.svelte';
export { default as SearchResults } from './SearchResults.svelte';
export { init, inited, lookup, search } from './search.js';

/**
* @typedef {import('./types').Block} Block
*/

/**
* @typedef {import('./types').Tree} Tree
*/

0 comments on commit 497e1df

Please sign in to comment.