fulldev-ui 0.4.33 → 0.5.0-beta-16

package/src/components/Select.astro

@@ -1,17 +1,15 @@
 ---
 import type { HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
 import Icon from 'fulldev-ui/components/Icon.astro'
 import Label from 'fulldev-ui/components/Label.astro'
-import Root from 'fulldev-ui/components/Root.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props = HTMLAttributes<'select'> & {
-  color?: 'base' | 'brand'
-  label?: string
-  placeholder?: string
-  options?: string[]
-  value?: string
-  radius?: 'none' | 'auto' | 'full'
-  variant?: 'outline'
+interface Props extends GlobalProps, HTMLAttributes<'select'> {
+  label?: string | undefined
+  placeholder?: string | undefined
+  options?: string[] | undefined
+  value?: string | undefined
 }
 
 const {
@@ -21,32 +19,30 @@ const {
   value,
   name,
   required,
-  radius = 'auto',
   disabled,
-  variant = 'outline',
+  onchange,
   ...rest
 } = Astro.props
 ---
 
-<Root
+<Element
   class:list="select"
-  {variant}
   {...rest}
 >
   <Label
     for={name}
-    html={label}
+    text={label}
   />
-  <Root
+  <Element
     as="select"
     if={name || options}
     id={name}
-    {radius}
     {name}
     {required}
     {disabled}
+    {onchange}
   >
-    <Root
+    <Element
       as="option"
       value={placeholder}
       set:html={placeholder}
@@ -55,7 +51,7 @@ const {
     />
     {
       options?.map((option: any) => (
-        <Root
+        <Element
           as="option"
           selected={value === option}
           set:html={option}
@@ -64,9 +60,9 @@ const {
       ))
     }
     <slot />
-  </Root>
+  </Element>
   <Icon name="chevron-down" />
-</Root>
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {
@@ -120,26 +116,12 @@ const {
           cursor: not-allowed;
           pointer-events: none;
         }
-
-        &.radius-none {
-          border-radius: 0;
-        }
-
-        &.radius-auto {
-          border-radius: var(--radius-1);
-        }
-
-        &.radius-full {
-          border-radius: 9999px;
-        }
       }
 
       option {
         color: var(--text);
-        font-weight: var(--font-weight);
         font-size: var(--text-2);
         line-height: 1;
-        font-family: var(--font-family);
       }
     }
   }

package/src/components/Sidebar.astro

@@ -1,73 +1,100 @@
 ---
-import { getCollection } from 'astro:content'
-import Column from 'fulldev-ui/components/Column.astro'
-import Heading from 'fulldev-ui/components/Heading.astro'
-import Link from 'fulldev-ui/components/Link.astro'
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
+import Logo from 'fulldev-ui/components/experimental/Logo.astro'
+import Menu from 'fulldev-ui/components/Menu.astro'
+import ThemeSelect from 'fulldev-ui/components/ThemeSelect.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
+import Heading from './Heading.astro'
+import Toc from './Toc.astro'
 
-const { sidebar } = Astro.props
-const slug = Astro.url.pathname.replace(/^\/|\/$/g, '')
-const url = Astro.url.href
+interface Props extends GlobalProps, HTMLAttributes<'aside'> {
+  menu?: ComponentProps<typeof Menu>['groups']
+  heading?: ComponentProps<typeof Heading>['text']
+  render?: ComponentProps<typeof Toc>['render']
+  logo?: ComponentProps<typeof Logo>
+  toc?: ComponentProps<typeof Toc>['heading']
+  company?: ComponentProps<typeof Logo>['company']
+  themeselect?: boolean | undefined
+}
+
+const {
+  size = 'sm',
+  logo,
+  company,
+  render,
+  themeselect,
+  menu,
+  toc,
+  heading,
+  ...rest
+} = Astro.props
 ---
 
-<Column
-  as="aside"
+<Element
   class:list="sidebar"
+  as="aside"
+  {size}
+  {...rest}
 >
-  {
-    sidebar?.length > 0 &&
-      sidebar.map((item: any) => (
-        <>
-          <Heading
-            level={6}
-            set:html={item.heading}
-          />
-          {item.links?.map((link: any) => (
-            <Link
-              {...link}
-              class="sidebar-link"
-              color={url.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}
-                  set:html={page.data.title}
-                />
-              ))
-            })()}
-        </>
-      ))
-  }
-</Column>
+  <Element
+    class:list="sidebar-header"
+    as="header"
+  >
+    <Logo
+      {company}
+      {...logo}
+    />
+    <Heading
+      level={4}
+      text={heading}
+    />
+    <slot name="header" />
+  </Element>
+  <Element class:list="sidebar-content">
+    <Menu groups={menu} />
+    <ThemeSelect if={themeselect} />
+    <slot />
+  </Element>
+</Element>
 
 <style lang="scss" is:global>
   @layer fulldev {
     .sidebar {
-      display: none !important;
-      box-sizing: border-box;
-      border-right: 1px solid var(--color-a6);
-      padding: var(--space-6) min(var(--space-5), var(--gutter)) var(--space-6)
-        0;
-      height: 100vh;
-      max-height: 100vh;
-      overflow-y: auto;
-
-      .sidebar-link {
-        font-size: var(--text-2);
-      }
+      display: none;
 
       @media (min-width: 1024px) {
-        display: flex !important;
+        display: flex;
+        position: sticky;
+        top: var(--header-height, 0px);
+        bottom: 0;
+        flex-shrink: 0;
+        flex-direction: column;
+        justify-content: flex-start;
+        z-index: 10;
+        border-right: 1px solid var(--color-a6);
+        width: calc(var(--space-7) * 4);
+        height: calc(100vh - var(--header-height, 0px));
+
+        .sidebar-header {
+          display: flex;
+          position: sticky;
+          align-items: center;
+          border-bottom: 1px solid var(--color-a6);
+          padding: 0 var(--gutter);
+          width: 100%;
+          height: 56px;
+        }
+
+        .sidebar-content {
+          display: flex;
+          top: 0;
+          flex: 1;
+          flex-direction: column;
+          padding: var(--space-md-6) var(--gutter);
+          width: 100%;
+          overflow-y: auto;
+        }
       }
     }
   }

package/src/components/Social.astro

@@ -0,0 +1,36 @@
+---
+import type { ComponentProps } from 'astro/types'
+import Button from 'fulldev-ui/components/Button.astro'
+
+interface Props extends ComponentProps<typeof Button> {}
+
+const { variant = 'secondary', icon, href } = Astro.props
+
+const platform = () => {
+  if (typeof href !== 'string') return
+  if (href.includes('x.com')) return 'brand-x'
+  if (href.includes('facebook')) return 'brand-facebook'
+  if (href.includes('instagram')) return 'brand-instagram'
+  if (href.includes('linkedin')) return 'brand-linkedin'
+  if (href.includes('youtube')) return 'brand-youtube'
+  if (href.includes('tiktok')) return 'brand-tiktok'
+  if (href.includes('twitch')) return 'brand-twitch'
+  if (href.includes('github')) return 'brand-github'
+  if (href.includes('discord')) return 'brand-discord'
+  return undefined
+}
+---
+
+<Button
+  class:list={'social'}
+  icon={icon ?? platform()}
+  {variant}
+  {href}
+/>
+
+<style is:global lang="scss">
+  .social {
+    padding: 0 var(--space-3);
+    height: calc(var(--text-2) + 2 * var(--space-3));
+  }
+</style>

package/src/components/Socials.astro

@@ -0,0 +1,37 @@
+---
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
+import Social from 'fulldev-ui/components/Social.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
+
+interface Props extends GlobalProps, HTMLAttributes<'div'> {
+  variant?: ComponentProps<typeof Social>['variant']
+  socials?: ComponentProps<typeof Social>['href'][] | undefined
+}
+
+const { socials, variant, ...rest } = Astro.props
+---
+
+<Element
+  class:list="socials"
+  {...rest}
+>
+  {
+    socials?.map((social) => (
+      <Social
+        {variant}
+        href={social}
+      />
+    ))
+  }
+</Element>
+
+<style is:global lang="scss">
+  @layer fulldev {
+    .socials {
+      display: flex;
+      flex-wrap: wrap;
+      gap: var(--space-2);
+    }
+  }
+</style>

package/src/components/Switch.astro

@@ -1,32 +1,23 @@
 ---
-import type { Polymorphic } from 'astro/types'
+import type { HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
 import Label from 'fulldev-ui/components/Label.astro'
-import Root from 'fulldev-ui/components/Root.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props<As extends 'div'> = Polymorphic<{ as: As }> & {
-  color?: 'base' | 'brand'
-  true?: string
-  false?: string
-  trueLabel?: string
-  falseLabel?: string
+interface Props extends GlobalProps, HTMLAttributes<'div'> {
+  true?: string | undefined
+  false?: string | undefined
+  trueLabel?: string | undefined
+  falseLabel?: string | undefined
   name: string
   checked: boolean
 }
 
-const {
-  as = 'div',
-  name,
-  checked,
-  trueLabel,
-  falseLabel,
-  ...rest
-} = Astro.props
+const { name, checked, trueLabel, falseLabel, ...rest } = Astro.props
 ---
 
-<Root
-  structure="row"
+<Element
   class:list="switch"
-  {as}
   {...rest}
 >
   <Label
@@ -49,11 +40,12 @@ const {
     for={name}
     set:html={trueLabel}
   />
-</Root>
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {
     .switch {
+      display: flex;
       position: relative;
       align-items: center;
       gap: var(--space-1);
@@ -62,7 +54,7 @@ const {
       .switch-element {
         display: block;
         position: relative;
-        transition: var(--transition);
+        transition: all;
         cursor: pointer;
         box-sizing: border-box;
         border: 1px solid var(--border);
@@ -84,7 +76,7 @@ const {
 
         .checkmark {
           transform: 0%;
-          transition: var(--transition);
+          transition: all;
           border-radius: 999px;
           background-color: var(--base-1);
           width: 50%;

package/src/components/Table.astro

@@ -1,50 +1,45 @@
 ---
 import type { HTMLAttributes } from 'astro/types'
-import Root from 'fulldev-ui/components/Root.astro'
+import Element from 'fulldev-ui/components/Element.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props = HTMLAttributes<'table'> & {
-  color?: 'base' | 'brand'
-  size?: 'sm' | 'md' | 'lg'
-  header?: string[]
-  body?: string[][]
-  footer?: string[]
-  radius?: 'none' | 'auto'
+interface Props extends GlobalProps, HTMLAttributes<'table'> {
+  header?: string[] | undefined
+  body?: string[][] | undefined
+  footer?: string[] | undefined
 }
 
-const { header, body, footer, radius = 'auto', ...rest } = Astro.props
+const { header, body, footer, ...rest } = Astro.props
 ---
 
-<Root
+<Element
   class:list="table"
   {...rest}
 >
-  <Root
-    as="table"
-    {radius}
-  >
-    <Root as="thead">
-      <Root as="tr">
+  <Element as="table">
+    <Element as="thead">
+      <Element as="tr">
         {header?.map((cell) => <th>{cell}</th>)}
-      </Root>
-    </Root>
-    <Root as="tbody">
+      </Element>
+    </Element>
+    <Element as="tbody">
       {
         body?.map((row: string[]) => (
-          <Root as="tr">
+          <Element as="tr">
             {row?.map((cell) => (
               <td>{cell}</td>
             ))}
-          </Root>
+          </Element>
         ))
       }
-    </Root>
-    <Root as="tfoot">
-      <Root as="tr">
+    </Element>
+    <Element as="tfoot">
+      <Element as="tr">
         {footer?.map((cell) => <td>{cell}</td>)}
-      </Root>
-    </Root>
-  </Root>
-</Root>
+      </Element>
+    </Element>
+  </Element>
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {
@@ -61,14 +56,6 @@ const { header, body, footer, radius = 'auto', ...rest } = Astro.props
         caption-side: bottom;
         white-space: nowrap;
 
-        &.radius-none {
-          border-radius: 0;
-        }
-
-        &.radius-auto {
-          border-radius: var(--radius-1);
-        }
-
         thead {
           background-color: var(--color-3);
 

package/src/components/Tagline.astro

@@ -1,28 +1,23 @@
 ---
-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 = 'span'> = Polymorphic<{ as: As }> & {
-  size?: 'sm' | 'md' | 'lg'
-  color?: 'base' | 'brand'
-  contrast?: boolean
-  html?: string
-  text?: string
+interface Props extends GlobalProps, HTMLAttributes<'span'> {
+  text?: string | undefined
 }
 
-const { as = 'span', html, text, ...rest } = Astro.props
+const { text, ...rest } = Astro.props
 ---
 
-<Root
+<Element
   class:list="tagline"
-  {as}
+  as="span"
   {...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 {

package/src/components/Text.astro

@@ -1,31 +1,29 @@
 ---
-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 = 'p'> = Polymorphic<{ as: As }> & {
-  size?: 'sm' | 'md' | 'lg'
-  color?: 'base' | 'brand'
-  contrast?: boolean
-  lead?: boolean
-  html?: string
-  text?: string
+interface Props extends GlobalProps, HTMLAttributes<'p'> {
+  size?: 'sm' | 'md' | 'lg' | undefined
+  color?: 'base' | 'brand' | undefined
+  theme?: 'light' | 'dark' | undefined
+  contrast?: boolean | undefined
+  lead?: boolean | undefined
+  text?: string | undefined
 }
 
-const { as = 'p', color = 'base', html, text, ...rest } = Astro.props
+const { color = 'base', text, ...rest } = Astro.props
 ---
 
-<Root
+<Element
   class:list="text"
-  {as}
-  {html}
+  as="p"
   {color}
   {...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 {
@@ -33,12 +31,12 @@ const { as = 'p', color = 'base', html, text, ...rest } = Astro.props
       margin: 0;
       max-width: calc(var(--space-4) * 44);
       color: var(--color-11);
-      font-weight: var(--font-weight);
       font-size: var(--text-3);
       line-height: 1.625;
 
       &.lead {
         font-size: var(--text-4);
+        text-wrap: balance;
       }
     }
   }

package/src/components/Textarea.astro

@@ -1,20 +1,16 @@
 ---
-import type { HTMLAttributes } from 'astro/types'
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
+import Element from 'fulldev-ui/components/Element.astro'
 import Label from 'fulldev-ui/components/Label.astro'
-import Root from 'fulldev-ui/components/Root.astro'
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
 
-type Props = HTMLAttributes<'textarea'> & {
-  radius?: 'none' | 'auto'
-  color?: 'base' | 'brand'
-  variant?: 'outline'
-  label?: string
+interface Props extends GlobalProps, HTMLAttributes<'textarea'> {
+  label?: ComponentProps<typeof Label>['text']
 }
 
 const {
   placeholder,
   name = placeholder,
-  variant = 'outline',
-  radius = 'auto',
   label,
   rows,
   value,
@@ -24,7 +20,7 @@ const {
 } = Astro.props
 ---
 
-<Root
+<Element
   class:list="textarea"
   {...rest}
 >
@@ -32,20 +28,18 @@ const {
     for={name}
     set:html={label}
   />
-  <Root
+  <Element
     as="textarea"
     if={name}
     id={name}
     {name}
-    {variant}
     {placeholder}
     {value}
     {disabled}
     {required}
     {rows}
-    {radius}
   />
-</Root>
+</Element>
 
 <style is:global lang="scss">
   @layer fulldev {
@@ -74,14 +68,6 @@ const {
         font-size: var(--text-2);
         line-height: 1.25;
 
-        &.radius-none {
-          border-radius: 0;
-        }
-
-        &.radius-auto {
-          border-radius: var(--radius-1);
-        }
-
         &::placeholder {
           color: var(--color-11);
         }