@happydesigns/ui 0.17.1 → 0.17.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,6 @@
1
1
  <script setup lang="ts" generic="C extends keyof PageCollections = 'article'">
2
2
  import type { PageCollections } from '@nuxt/content'
3
3
  import type { BreadcrumbItem } from '@nuxt/ui'
4
- import { getPageLayoutUi } from '../internal/pageLayout'
5
4
 
6
5
  const props = defineProps<{
7
6
  path?: string
@@ -27,7 +26,6 @@ const tocEnabled = computed(() => !page.value || !('toc' in page.value) || page.
27
26
  const renderToc = computed(() => hasToc.value
28
27
  && tocEnabled.value
29
28
  && Boolean(page.value?.body?.toc?.links?.length))
30
- const pageUi = computed(() => getPageLayoutUi(renderToc.value))
31
29
 
32
30
  if (!page.value) {
33
31
  throw createError({
@@ -93,7 +91,7 @@ const backLink = computed(() => {
93
91
  </HArticleHeaderBody>
94
92
  </UPageHeader>
95
93
 
96
- <UPage :ui="pageUi">
94
+ <UPage>
97
95
  <UPageBody>
98
96
  <slot />
99
97
 
@@ -1,6 +1,5 @@
1
1
  <script setup lang="ts" generic="C extends 'page' = 'page'">
2
2
  import type { Collections } from '@nuxt/content'
3
- import { getPageLayoutUi } from '../internal/pageLayout'
4
3
 
5
4
  const {
6
5
  path,
@@ -35,13 +34,12 @@ usePageSeo(page)
35
34
  const renderToc = computed(() => hasToc.value
36
35
  && page.value?.toc !== false
37
36
  && Boolean(page.value?.body?.toc?.links?.length))
38
- const pageUi = computed(() => getPageLayoutUi(renderToc.value))
39
37
  const header = computed(() => resolvePageHeader(page.value))
40
38
  </script>
41
39
 
42
40
  <template>
43
41
  <UContainer v-if="page">
44
- <UPage :ui="pageUi">
42
+ <UPage>
45
43
  <UPageHeader
46
44
  v-if="hasHeader && header"
47
45
  v-bind="header"
@@ -0,0 +1,48 @@
1
+ <script setup lang="ts" generic="C extends 'page' = 'page'">
2
+ import type { Collections } from '@nuxt/content'
3
+
4
+ const {
5
+ path,
6
+ collection = 'page' as C,
7
+ } = defineProps<{
8
+ path?: string
9
+ collection?: C
10
+ }>()
11
+
12
+ const route = useRoute()
13
+
14
+ const { data: page } = await usePageContent<C, Collections['page']>({
15
+ path: () => path,
16
+ collection: () => collection,
17
+ })
18
+
19
+ const { has } = useVariant(collection)
20
+ const hasHeader = has('header')
21
+
22
+ if (!page.value) {
23
+ throw createError({
24
+ statusCode: 404,
25
+ statusMessage: `${collection} ${path || route.path} not found`,
26
+ fatal: true,
27
+ })
28
+ }
29
+
30
+ usePageSeo(page)
31
+
32
+ const header = computed(() => resolvePageHeader(page.value))
33
+ </script>
34
+
35
+ <template>
36
+ <UContainer v-if="page">
37
+ <UPage>
38
+ <UPageHeader
39
+ v-if="hasHeader && header"
40
+ v-bind="header"
41
+ />
42
+
43
+ <UPageBody>
44
+ <slot />
45
+ </UPageBody>
46
+ </UPage>
47
+ </UContainer>
48
+ </template>
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@happydesigns/ui",
3
3
  "type": "module",
4
- "version": "0.17.1",
4
+ "version": "0.17.3",
5
5
  "private": false,
6
6
  "packageManager": "pnpm@11.11.0",
7
7
  "description": "A reusable Nuxt foundation for content-driven happydesigns websites and applications.",
package/schemas/traits.ts CHANGED
@@ -57,7 +57,7 @@ export const locationTrait = {
57
57
 
58
58
  export const layoutTrait = {
59
59
  schema: z.object({
60
- layout: z.enum(['default', 'content']).optional(),
60
+ layout: z.enum(['default', 'page', 'content']).optional(),
61
61
  }),
62
62
  }
63
63
 
@@ -1,7 +0,0 @@
1
- export function getPageLayoutUi(hasToc: boolean) {
2
- return {
3
- root: 'lg:grid-cols-12',
4
- center: hasToc ? 'lg:col-span-9' : 'lg:col-span-12',
5
- right: 'lg:col-span-3',
6
- }
7
- }