From 497e1df5eafb51a9aa5f8bbe3d8c3f27ba8de89c Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Tue, 28 Mar 2023 10:31:47 +0200
Subject: [PATCH] fix: various improvements

- 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
---
 .changeset/dry-brooms-call.md                       |  5 +++++
 .changeset/fifty-clouds-deliver.md                  |  5 +++++
 .changeset/wild-pots-kneel.md                       |  5 +++++
 packages/site-kit/src/lib/actions/index.js          |  1 +
 packages/site-kit/src/lib/components/NavItem.svelte |  6 ++++--
 packages/site-kit/src/lib/components/Shell.svelte   |  6 ------
 packages/site-kit/src/lib/components/index.js       | 10 ++++++++++
 packages/site-kit/src/lib/search/index.js           | 12 ++++++++++++
 8 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/dry-brooms-call.md
 create mode 100644 .changeset/fifty-clouds-deliver.md
 create mode 100644 .changeset/wild-pots-kneel.md
 create mode 100644 packages/site-kit/src/lib/actions/index.js
 create mode 100644 packages/site-kit/src/lib/components/index.js
 create mode 100644 packages/site-kit/src/lib/search/index.js

diff --git a/.changeset/dry-brooms-call.md b/.changeset/dry-brooms-call.md
new file mode 100644
index 00000000..54ab7798
--- /dev/null
+++ b/.changeset/dry-brooms-call.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/site-kit': patch
+---
+
+fix: use default slot content as fallback for NavItem small view
diff --git a/.changeset/fifty-clouds-deliver.md b/.changeset/fifty-clouds-deliver.md
new file mode 100644
index 00000000..5c89ceea
--- /dev/null
+++ b/.changeset/fifty-clouds-deliver.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/site-kit': patch
+---
+
+chore: provide barrel exports for components, search and actions
diff --git a/.changeset/wild-pots-kneel.md b/.changeset/wild-pots-kneel.md
new file mode 100644
index 00000000..995cd900
--- /dev/null
+++ b/.changeset/wild-pots-kneel.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/site-kit': patch
+---
+
+fix: remove SearchBox from Shell for broader reuse
diff --git a/packages/site-kit/src/lib/actions/index.js b/packages/site-kit/src/lib/actions/index.js
new file mode 100644
index 00000000..b8b11b58
--- /dev/null
+++ b/packages/site-kit/src/lib/actions/index.js
@@ -0,0 +1 @@
+export { focusable_children, trap } from './focus.js';
diff --git a/packages/site-kit/src/lib/components/NavItem.svelte b/packages/site-kit/src/lib/components/NavItem.svelte
index 2a7b2c3f..c4ec4dd0 100644
--- a/packages/site-kit/src/lib/components/NavItem.svelte
+++ b/packages/site-kit/src/lib/components/NavItem.svelte
@@ -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}
diff --git a/packages/site-kit/src/lib/components/Shell.svelte b/packages/site-kit/src/lib/components/Shell.svelte
index a173fd85..b5232e06 100644
--- a/packages/site-kit/src/lib/components/Shell.svelte
+++ b/packages/site-kit/src/lib/components/Shell.svelte
@@ -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';
@@ -33,10 +31,6 @@
 	</div>
 {/if}
 
-{#if browser}
-	<SearchBox />
-{/if}
-
 <style>
 	main {
 		position: relative;
diff --git a/packages/site-kit/src/lib/components/index.js b/packages/site-kit/src/lib/components/index.js
new file mode 100644
index 00000000..81f93dc8
--- /dev/null
+++ b/packages/site-kit/src/lib/components/index.js
@@ -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';
diff --git a/packages/site-kit/src/lib/search/index.js b/packages/site-kit/src/lib/search/index.js
new file mode 100644
index 00000000..db8a46b8
--- /dev/null
+++ b/packages/site-kit/src/lib/search/index.js
@@ -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
+ */