fulldev-ui 0.4.32 → 0.5.0-beta-16

package/src/components/Head.astro

@@ -1,12 +1,12 @@
 ---
 import { AstroSeo } from '@astrolib/seo'
-import type { CollectionEntry } from 'astro:content'
+import type { ComponentProps } from 'astro/types'
 import { ViewTransitions } from 'astro:transitions'
+import type Layout from 'fulldev-ui/layouts/Layout.astro'
 
-type Props = Partial<CollectionEntry<'pages'>>
+type Props = ComponentProps<typeof Layout>
 
-const { data, render } = Astro.props
-const { title, description, image, seo, code } = data || {}
+const { title, description, image, seo, code, render } = Astro.props
 
 const renderTitle = render && (await render()).headings[0]?.text
 const mergedTitle = seo?.title || title || renderTitle
@@ -25,10 +25,14 @@ const mergedImage =
     name="generator"
     content={Astro.generator}
   />
+  <link
+    rel="canonical"
+    href={Astro.url.href.endsWith('/') ? Astro.url.href : Astro.url.href + '/'}
+  />
   <ViewTransitions />
   <AstroSeo
-    title={mergedTitle}
-    description={mergedDescription}
+    title={mergedTitle ?? ''}
+    description={mergedDescription ?? ''}
     openGraph={{
       title: mergedTitle,
       description: mergedDescription,
@@ -40,45 +44,7 @@ const mergedImage =
             },
           ]
         : undefined,
-    }}
-  />
-  <link
-    rel="apple-touch-icon"
-    sizes="76x76"
-    href="/favicon/apple-touch-icon.png"
-  />
-  <link
-    rel="icon"
-    type="image/png"
-    sizes="32x32"
-    href="/favicon/favicon-32x32.png"
-  />
-  <link
-    rel="icon"
-    type="image/png"
-    sizes="16x16"
-    href="/favicon/favicon-16x16.png"
-  />
-  <link
-    rel="manifest"
-    href="/favicon/site.webmanifest"
-  />
-  <link
-    rel="mask-icon"
-    href="/favicon/safari-pinned-tab.svg"
-  />
-  <link
-    rel="shortcut icon"
-    href="/favicon/favicon.ico"
-  />
-  <meta
-    name="msapplication-config"
-    content="/favicon/browserconfig.xml"
-  />
-  <meta
-    name="theme-color"
-    content="#000000"
+    } as any}
   />
-  <slot name="head" />
   <Fragment set:html={code?.head} />
 </head>

package/src/components/Header.astro

@@ -1,212 +1,140 @@
 ---
-import type { HTMLTag, Polymorphic } from 'astro/types'
-import { getCollection } from 'astro:content'
-import Button from 'fulldev-ui/components/Button.astro'
-import Drawer from 'fulldev-ui/components/Drawer.astro'
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
+import Buttons from 'fulldev-ui/components/Buttons.astro'
+import Element from 'fulldev-ui/components/Element.astro'
 import Logo from 'fulldev-ui/components/experimental/Logo.astro'
-import Heading from 'fulldev-ui/components/Heading.astro'
-import Link from 'fulldev-ui/components/Link.astro'
-import Root from 'fulldev-ui/components/Root.astro'
-import Row from 'fulldev-ui/components/Row.astro'
-import Search from 'fulldev-ui/components/Search.astro'
-
-type Props<As extends HTMLTag = 'header'> = Polymorphic<{ as: As }> & {
-  structure?: 'spread' | 'row' | 'column'
-  position?: 'relative' | 'sticky' | 'fixed' | 'absolute'
-  variant?: 'ghost' | 'base' | 'subtle' | 'soft' | 'surface' | 'outline'
-  size?: 'sm' | 'md' | 'lg'
-  frame?: 'fill' | 'panel'
-  align?: 'start' | 'center' | 'end'
-  space?: 'none' | 'auto'
-  logo?: string
-  heading?: string
-  links?: any[]
-  buttons?: any[]
-  drawer?: any[]
-  search?: any
+import ThemeSelect from 'fulldev-ui/components/ThemeSelect.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
+import Cart from './Cart.astro'
+import Drawer from './Drawer.astro'
+import type Menu from './Menu.astro'
+import Socials from './Socials.astro'
+
+interface Props extends GlobalProps, HTMLAttributes<'header'> {
+  logo?: ComponentProps<typeof Logo>
+  company?: ComponentProps<typeof Logo>['company']
+  buttons?: ComponentProps<typeof Buttons>['buttons']
+  menu?: ComponentProps<typeof Menu>['groups']
+  panel?: boolean | undefined
+  search?: boolean | undefined
+  open?: boolean | undefined
+  themeselect?: boolean | undefined
+  cart?: string | undefined
+  socials?: ComponentProps<typeof Socials>['socials']
 }
 
 const {
-  as = 'header',
-  align = 'center',
-  structure = 'spread',
-  space = 'auto',
   size = 'sm',
-  frame = 'none',
+  open,
   logo,
-  heading,
-  links,
+  company,
   buttons,
-  drawer,
   search,
+  panel,
+  socials,
+  menu,
+  themeselect,
+  cart,
   ...rest
 } = Astro.props
-
-const slug = Astro.url.pathname.replace(/^\/|\/$/g, '')
-const url = Astro.url.href
 ---
 
-<Root
-  class:list={'header'}
-  {as}
-  {frame}
-  {structure}
-  {space}
+<Element
+  class:list={['header']}
+  as="header"
+  {panel}
   {size}
+  {open}
   {...rest}
 >
-  <Row
-    style={{ textDecoration: 'none', height: '100%' }}
-    as="a"
-    href="/"
-  >
-    <Logo src={logo} />
-    <Heading
-      as="p"
-      level={3}
-      html={heading}
-    />
-  </Row>
-  <Row>
-    {
-      links?.map((link) => (
-        <Link
-          class={'header-link'}
-          {...link}
-        />
-      ))
-    }
-    {
-      buttons?.map((button) => (
-        <Button
-          variant="secondary"
-          {...button}
-        />
-      ))
-    }
-    {search && <Search {...search} />}
-    {
-      drawer && (
-        <Drawer
-          icon="menu-2"
-          id="navigation-drawer"
-        >
-          {drawer &&
-            drawer.length > 0 &&
-            drawer.map((item: any) => (
-              <>
-                <Heading
-                  level={6}
-                  html={item.heading}
-                />
-                {item.links?.map((link: any) => (
-                  <Link
-                    {...link}
-                    class="sidebar-link"
-                    color={
-                      url.replace(/\/$/, '').endsWith(link.href)
-                        ? 'brand'
-                        : undefined
-                    }
-                  />
-                ))}
-                {item.folder &&
-                  (async () => {
-                    const pages = await getCollection(
-                      'pages',
-                      (entry: any) =>
-                        entry.slug.startsWith(item.folder) &&
-                        !entry.slug.endsWith(item.folder)
-                    )
-                    return pages.map((page: any) => (
-                      <Link
-                        href={`/${page.slug}`}
-                        class="sidebar-link"
-                        color={slug === page.slug ? 'brand' : undefined}
-                        html={page.data.title}
-                      />
-                    ))
-                  })()}
-              </>
-            ))}
-        </Drawer>
-      )
-    }
-  </Row>
-</Root>
+  <Logo
+    {company}
+    {...typeof logo === 'string' ? { src: logo } : logo}
+  />
+  <Buttons
+    {buttons}
+    variant="link"
+  />
+  {themeselect && <ThemeSelect />}
+  <Socials {socials} />
+  <Cart
+    if={cart}
+    heading={cart}
+  />
+  <Drawer
+    class:list={['header-button']}
+    icon="menu-2"
+    id="menu"
+    {logo}
+    {company}
+    {buttons}
+    {menu}
+  />
+</Element>
 
 <style lang="scss" is:global>
-  :root {
-    --header-height: calc(
-      var(--text-2) + 2 * var(--space-4) + 2 * var(--space-3)
-    );
-  }
-
   @layer fulldev {
     .header {
-      --screen: 1536px;
-      --gutter: max(4vw, calc(100vw - var(--screen)) / 2);
-
       display: flex;
-      position: relative;
+      position: sticky;
       top: 0;
-      right: 0;
       left: 0;
+      justify-content: flex-end;
       align-items: center;
-      z-index: 10;
-      border-bottom: 1px solid var(--color-a6);
+      gap: var(--space-4);
+      z-index: 20;
+      border-bottom-width: 1px;
+      border-style: solid;
+      border-color: var(--base-a6);
+      background-color: var(--base-2);
+      padding: 0 var(--gutter);
       width: 100%;
-      // TODO: fix this
-      max-width: calc(100% - (2 * var(--outer-x)));
       height: var(--header-height);
+      overflow: hidden;
 
-      &.frame-none {
-        padding: 0 var(--gutter);
+      &,
+      & ~ * {
+        --header-height: 56px;
       }
 
-      &.frame-fill {
-        background-color: var(--color-2);
-        padding: 0 var(--gutter);
-      }
-
-      &.frame-panel {
-        margin: var(--space-3) var(--gutter);
-        border: 1px solid var(--color-a6);
+      &.panel {
+        margin: var(--space-4) var(--gutter);
+        border-width: 1px solid;
         border-radius: var(--radius-2);
-        padding: var(--space-4) min(var(--gutter), var(--space-4));
+        padding: var(--sapce-4) min(var(--gutter), var(--space-4));
         width: auto;
-        overflow: hidden;
       }
 
-      &.position-fixed {
-        position: fixed;
+      .logo {
+        margin-right: auto;
       }
 
-      &.position-absolute {
-        position: absolute;
-      }
+      @media (min-width: 1024px) {
+        &:not(.open) {
+          display: none;
 
-      &.position-sticky {
-        position: sticky;
-        top: -1px;
+          & ~ * {
+            --header-height: 0px;
+          }
+        }
       }
 
-      .header-link {
+      .buttons {
         display: none;
-        font-size: var(--text-2);
 
         @media (min-width: 1024px) {
           display: flex;
-        }
-      }
+          gap: var(--space-2);
 
-      .drawer-link {
-        font-size: var(--text-2);
+          .button.variant-link + .button {
+            margin-left: var(--space-3);
+          }
+        }
       }
 
-      .drawer-button {
+      .menu-button {
         @media (min-width: 1024px) {
-          display: none !important;
+          display: none;
         }
       }
     }

package/src/components/Heading.astro

@@ -1,43 +1,35 @@
 ---
-import type { Polymorphic } from 'astro/types'
-import Root from 'fulldev-ui/components/Root.astro'
+import type { HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props<As extends 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'p' | 'span'> =
-  Polymorphic<{
-    as: As
-  }> & {
-    level?: 1 | 2 | 3 | 4 | 5 | 6
-    size?: 'sm' | 'md' | 'lg'
-    color?: 'base' | 'brand'
-    contrast?: boolean
-    html?: string
-    text?: string
-  }
+interface Props
+  extends GlobalProps,
+    HTMLAttributes<'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'> {
+  level?: 1 | 2 | 3 | 4 | 5 | 6 | undefined
+  text?: string | undefined
+}
 
 const {
-  level = 2,
-  as = `h${level}`,
-  color = 'base',
   contrast = true,
-  html,
+  color = 'base',
+  level = 2,
   text,
   ...rest
 } = Astro.props
 ---
 
-<Root
+<Element
   class:list="heading"
-  {as}
+  as=`h${level}`
   {contrast}
   {color}
   {level}
   {...rest}
 >
-  <slot>
-    <Fragment set:html={html} />
-    <Fragment set:text={text} />
-  </slot>
-</Root>
+  <slot />
+  <Fragment set:html={text} />
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {
@@ -46,15 +38,15 @@ const {
       max-width: calc(var(--space-4) * 44);
       scroll-margin: var(--space-5);
       color: var(--color-11);
-      font-weight: var(--heading-font-weight);
       font-weight: 700;
       line-height: 1.1;
-      font-family: var(--heading-font-family);
       letter-spacing: -0.025em;
+      text-align: inherit;
       text-decoration: none;
 
       &.level-1 {
         font-size: var(--text-8);
+        text-wrap: balance;
       }
 
       &.level-2 {

package/src/components/Icon.astro

@@ -1,14 +1,14 @@
 ---
 import tablerIcons from '@iconify-json/tabler/icons.json'
-import type { HTMLTag, Polymorphic } from 'astro/types'
-import Root from 'fulldev-ui/components/Root.astro'
+import type { HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props<As extends HTMLTag = 'i'> = Polymorphic<{ as: As }> & {
-  name?: string
-  color?: 'base' | 'brand'
+interface Props extends GlobalProps, HTMLAttributes<'i'> {
+  name?: string | undefined
 }
 
-const { as = 'i', name, ...rest } = Astro.props
+const { name, ...rest } = Astro.props
 
 const trimmedName = name?.trim() as string | undefined
 const icon = trimmedName
@@ -16,10 +16,10 @@ const icon = trimmedName
   : undefined
 ---
 
-<Root
+<Element
   class:list="icon"
   if={icon}
-  {as}
+  as="i"
   {...rest}
 >
   {
@@ -31,7 +31,7 @@ const icon = trimmedName
       />
     )
   }
-</Root>
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {