@rimelight/ui 0.0.24 → 0.0.26

package/src/components/astro/RLAPlaceholder.astro

@@ -1,52 +1,28 @@
 ---
-import { scv, cx } from "css-variants"
-import { twMerge } from "tailwind-merge"
-import defu from "defu"
-import { placeholderTheme } from "../../themes/placeholder.theme.ts"
-import { getUIConfig } from "virtual:rimelight-ui"
+import { scv } from "css-variants"
+import { useUi, resolveClasses } from "../../utils"
+import type { ComponentSlots } from "../../types"
+import placeholderTheme from "../../themes/placeholder.theme"
 
-const placeholder = scv({
-  slots: [...placeholderTheme.slots],
-  base: placeholderTheme.base,
-  variants: placeholderTheme.variants,
-  compoundVariants: [...placeholderTheme.compoundVariants],
-  defaultVariants: placeholderTheme.defaultVariants,
-  classNameResolver: (...args) => twMerge(cx(...args))
-})
+const placeholder = scv(placeholderTheme)
 
 export interface RLAPlaceholderProps {
-  /**
-   * UI overrides for individual slots, derived from the placeholder theme.
-   */
-  ui?: Partial<Record<keyof typeof placeholderTheme.base, string>>
-  /**
-   * External class — applied to the root element.
-   */
-  class?: string
-  /**
-   * Standard HTML attributes.
-   */
+  ui?: ComponentSlots<typeof placeholderTheme>
+  class?: any
   [key: string]: unknown
 }
 
 const {
-  class: className,
   ui: uiProp,
+  class: className,
   ...rest
 } = Astro.props as RLAPlaceholderProps
 
-const globalConfig = getUIConfig()
-
-const mergedUI = defu(
-  uiProp ?? {},
-  (globalConfig.placeholder as Record<string, unknown>) ?? {}
-) as Record<keyof typeof placeholderTheme.base, string | undefined>
-
-const { base, svg } = placeholder()
+const classes = resolveClasses(placeholder, {}, useUi("placeholder", uiProp), className)
 ---
 
-<div class={twMerge(base, mergedUI.base, className)} {...rest}>
-  <svg class={twMerge(svg, mergedUI.svg)}>
+<div class={classes.base} {...rest}>
+  <svg class={classes.svg}>
     <defs>
       <pattern
         id="pattern-5c1e4f0e-62d5-498b-8ff0-cf77bb448c8e"

package/src/components/astro/RLAQuote.astro

@@ -0,0 +1,15 @@
+---
+
+---
+
+<figure class="relative my-8 border-y-[3px] border-astro-gray-500 py-4">
+    <span class="i-lucide-quote mb-2 s-10 md:absolute md:right-[calc(100%+1rem)] md:top-6" />
+    <blockquote
+            class="font-heading heading-3 text-xl font-medium text-white md:text-[32px] md:leading-[40px]"
+    >
+        <slot name="quote" />
+    </blockquote>
+    <figcaption class="font-mono mt-4 text-right text-astro-pink-light">
+        <slot name="caption" />
+    </figcaption>
+</figure>

package/src/components/astro/RLAScrollToTop.astro

@@ -1,221 +1,171 @@
----
-import { scv, cx } from "css-variants"
-import { twMerge } from "tailwind-merge"
-import defu from "defu"
-import { scrollToTopTheme } from "../../themes/scroll-to-top.theme.ts"
-import { getUIConfig } from "virtual:rimelight-ui"
-
-export interface RLAScrollToTopProps {
-  /**
-   * Button color.
-   *
-   * @default "primary"
-   */
-  color?: keyof typeof scrollToTopTheme.variants.color
-  /**
-   * Transition duration for the progress circle (in seconds).
-   *
-   * @default 0.1
-   */
-  duration?: number
-  /**
-   * Scroll threshold (in pixels) before the button becomes visible.
-   *
-   * @default 200
-   */
-  threshold?: number
-  /**
-   * Whether to show the scroll progress indicator.
-   *
-   * @default false
-   */
-  showProgress?: boolean
-  /**
-   * Stroke width of the progress circle.
-   *
-   * @default 6
-   */
-  progressWidth?: number
-  /**
-   * UI overrides for individual slots, derived from the scroll-to-top theme.
-   */
-  ui?: Partial<Record<keyof typeof scrollToTopTheme.base, string>>
-  /**
-   * External class — applied to the root element.
-   */
-  class?: string
-  /**
-   * Standard HTML attributes.
-   */
-  [key: string]: unknown
-}
-
-const scrollToTop = scv({
-  slots: [...scrollToTopTheme.slots],
-  base: scrollToTopTheme.base,
-  variants: scrollToTopTheme.variants,
-  compoundVariants: [...scrollToTopTheme.compoundVariants],
-  defaultVariants: scrollToTopTheme.defaultVariants,
-  classNameResolver: (...args) => twMerge(cx(...args))
-})
-
-const {
-  color = "primary",
-  progressWidth = 6,
-  duration = 0.1,
-  threshold = 200,
-  showProgress = false,
-  ui: uiProp,
-  class: className,
-  ...rest
-} = Astro.props as RLAScrollToTopProps
-
-const globalConfig = getUIConfig()
-
-const mergedUI = defu(
-  uiProp ?? {},
-  (globalConfig["scroll-to-top"] as Record<string, unknown>) ?? {}
-) as Record<keyof typeof scrollToTopTheme.base, string | undefined>
-
-const { root, button, progressBase, svg: svgClass, iconContainer, icon } = scrollToTop({
-  color
-})
-
-const circumference = 2 * Math.PI * 45
-const percentPx = circumference / 100
----
-
-<div
-  class:list={["rla-scroll-to-top", "fixed bottom-6 right-6 z-50", twMerge(root, mergedUI.root, className)]}
-  data-threshold={threshold}
-  data-duration={duration}
-  data-circle-stroke-width={progressWidth}
-  {...rest}
->
-  <button
-    type="button"
-    class={twMerge(button, mergedUI.button)}
-    aria-label="Scroll to top"
-    data-scroll-to-top-button
-  >
-    <div class={twMerge(progressBase, mergedUI.progressBase)}>
-      <svg class={twMerge(svgClass, mergedUI.svg)} viewBox="0 0 100 100" shape-rendering="geometricPrecision">
-        <circle
-          cx="50"
-          cy="50"
-          r="45"
-          fill="var(--color-primary-950)"
-          stroke-width={progressWidth}
-          stroke-dashoffset="0"
-          stroke-linecap="round"
-          class="gauge-secondary-stroke opacity-100"
-        />
-        {showProgress && (
-        <circle
-          cx="50"
-          cy="50"
-          r="45"
-          fill="transparent"
-          stroke-width={progressWidth}
-          stroke-dashoffset="0"
-          stroke-linecap="round"
-          class="gauge-primary-stroke opacity-100"
-          data-progress-circle
-          style={`--stroke-percent: 0; --percent-to-px: ${percentPx}px; --circumference: ${circumference}; --duration: ${duration}s`}
-        />
-        )}
-      </svg>
-      <div class={twMerge(iconContainer, mergedUI.iconContainer)}>
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="24"
-          height="24"
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          class={twMerge(icon, mergedUI.icon)}
-        >
-          <path d="m5 12 7-7 7 7" />
-          <path d="M12 19V5" />
-        </svg>
-      </div>
-    </div>
-  </button>
-</div>
-
-<script>
-  document.querySelectorAll('.rla-scroll-to-top').forEach((el) => {
-    const element = el as HTMLElement
-    const button = element.querySelector('[data-scroll-to-top-button]') as HTMLButtonElement | null
-    const progressCircle = element.querySelector('[data-progress-circle]') as SVGCircleElement | null
-
-    if (!button) return
-
-    const threshold = Number(element.dataset.threshold) || 200
-
-    function updateScrollState() {
-      const scrollTop = window.scrollY || document.documentElement.scrollTop
-      const scrollHeight = document.documentElement.scrollHeight - window.innerHeight
-      const scrollPercentage = scrollHeight > 0 ? (scrollTop / scrollHeight) * 100 : 0
-
-      if (scrollTop > threshold) {
-        element.classList.add('visible')
-      } else {
-        element.classList.remove('visible')
-      }
-
-      if (progressCircle) {
-        const circumference = 2 * Math.PI * 45
-        const percentPx = circumference / 100
-        const duration = element.dataset.duration || '0.1'
-        progressCircle.style.setProperty('--stroke-percent', scrollPercentage.toString())
-        progressCircle.style.setProperty('--percent-to-px', `${percentPx}px`)
-        progressCircle.style.setProperty('--circumference', circumference.toString())
-        progressCircle.style.setProperty('--duration', `${duration}s`)
-      }
-    }
-
-    button.addEventListener('click', () => {
-      window.scrollTo({ top: 0, behavior: 'smooth' })
-    })
-
-    window.addEventListener('scroll', updateScrollState, { passive: true })
-    updateScrollState()
-  })
-</script>
-
-<style>
-  .rla-scroll-to-top {
-    opacity: 0;
-    pointer-events: none;
-    transition: opacity 0.3s ease-in-out;
-  }
-
-  .rla-scroll-to-top.visible {
-    opacity: 1;
-    pointer-events: auto;
-  }
-
-  .progress-circle-base {
-    transform: translateZ(0);
-  }
-
-  .gauge-primary-stroke {
-    stroke: var(--color-primary-500);
-    stroke-dasharray: calc(var(--stroke-percent, 0) * var(--percent-to-px, 2.826px)) var(--circumference, 282.6);
-    transition: stroke-dasharray var(--duration, 0.1s) ease, stroke var(--duration, 0.1s) ease;
-    transform: rotate(-90deg);
-    transform-origin: center;
-    shape-rendering: geometricPrecision;
-  }
-
-  .gauge-secondary-stroke {
-    stroke: var(--color-primary-900);
-    stroke-dasharray: 282.6;
-    transform: rotate(-90deg);
-    transform-origin: center;
-  }
-</style>
+---
+import { scv } from "css-variants"
+import { useUi, resolveClasses } from "../../utils"
+import type { ComponentVariants, ComponentSlots } from "../../types"
+import scrollToTopTheme from "../../themes/scroll-to-top.theme"
+
+const scrollToTop = scv(scrollToTopTheme)
+type ScrollToTopVariants = ComponentVariants<typeof scrollToTopTheme>
+
+export interface RLAScrollToTopProps {
+  color?: ScrollToTopVariants['color'];
+  progressWidth?: number;
+  duration?: number;
+  threshold?: number;
+  showProgress?: boolean;
+  ui?: ComponentSlots<typeof scrollToTopTheme>;
+  class?: any;
+  [key: string]: unknown;
+}
+
+const {
+  color = "primary",
+  progressWidth = 6,
+  duration = 0.1,
+  threshold = 200,
+  showProgress = false,
+  ui: uiProp,
+  class: className,
+  ...rest
+} = Astro.props as RLAScrollToTopProps
+
+const classes = resolveClasses(scrollToTop, { color }, useUi("scrollToTop", uiProp), className)
+
+const circumference = 2 * Math.PI * 45
+const percentPx = circumference / 100
+---
+
+<div
+  class:list={["rla-scroll-to-top", "fixed bottom-6 right-6 z-50", classes.root]}
+  data-threshold={threshold}
+  data-duration={duration}
+  data-circle-stroke-width={progressWidth}
+  {...rest}
+>
+  <button
+    type="button"
+    class={classes.button}
+    aria-label="Scroll to top"
+    data-scroll-to-top-button
+  >
+    <div class={classes.progressBase}>
+      <svg class={classes.svg} viewBox="0 0 100 100" shape-rendering="geometricPrecision">
+        <circle
+          cx="50"
+          cy="50"
+          r="45"
+          fill="var(--color-primary-950)"
+          stroke-width={progressWidth}
+          stroke-dashoffset="0"
+          stroke-linecap="round"
+          class="gauge-secondary-stroke opacity-100"
+        />
+        {showProgress && (
+        <circle
+          cx="50"
+          cy="50"
+          r="45"
+          fill="transparent"
+          stroke-width={progressWidth}
+          stroke-dashoffset="0"
+          stroke-linecap="round"
+          class="gauge-primary-stroke opacity-100"
+          data-progress-circle
+          style={`--stroke-percent: 0; --percent-to-px: ${percentPx}px; --circumference: ${circumference}; --duration: ${duration}s`}
+        />
+        )}
+      </svg>
+      <div class={classes.iconContainer}>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="24"
+          height="24"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          class={classes.icon}
+        >
+          <path d="m5 12 7-7 7 7" />
+          <path d="M12 19V5" />
+        </svg>
+      </div>
+    </div>
+  </button>
+</div>
+
+<script>
+  document.querySelectorAll('.rla-scroll-to-top').forEach((el) => {
+    const element = el as HTMLElement
+    const button = element.querySelector('[data-scroll-to-top-button]') as HTMLButtonElement | null
+    const progressCircle = element.querySelector('[data-progress-circle]') as SVGCircleElement | null
+
+    if (!button) return
+
+    const threshold = Number(element.dataset.threshold) || 200
+
+    function updateScrollState() {
+      const scrollTop = window.scrollY || document.documentElement.scrollTop
+      const scrollHeight = document.documentElement.scrollHeight - window.innerHeight
+      const scrollPercentage = scrollHeight > 0 ? (scrollTop / scrollHeight) * 100 : 0
+
+      if (scrollTop > threshold) {
+        element.classList.add('visible')
+      } else {
+        element.classList.remove('visible')
+      }
+
+      if (progressCircle) {
+        const circumference = 2 * Math.PI * 45
+        const percentPx = circumference / 100
+        const duration = element.dataset.duration || '0.1'
+        progressCircle.style.setProperty('--stroke-percent', scrollPercentage.toString())
+        progressCircle.style.setProperty('--percent-to-px', `${percentPx}px`)
+        progressCircle.style.setProperty('--circumference', circumference.toString())
+        progressCircle.style.setProperty('--duration', `${duration}s`)
+      }
+    }
+
+    button.addEventListener('click', () => {
+      window.scrollTo({ top: 0, behavior: 'smooth' })
+    })
+
+    window.addEventListener('scroll', updateScrollState, { passive: true })
+    updateScrollState()
+  })
+</script>
+
+<style>
+  .rla-scroll-to-top {
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  .rla-scroll-to-top.visible {
+    opacity: 1;
+    pointer-events: auto;
+  }
+
+  .progress-circle-base {
+    transform: translateZ(0);
+  }
+
+  .gauge-primary-stroke {
+    stroke: var(--color-primary-500);
+    stroke-dasharray: calc(var(--stroke-percent, 0) * var(--percent-to-px, 2.826px)) var(--circumference, 282.6);
+    transition: stroke-dasharray var(--duration, 0.1s) ease, stroke var(--duration, 0.1s) ease;
+    transform: rotate(-90deg);
+    transform-origin: center;
+    shape-rendering: geometricPrecision;
+  }
+
+  .gauge-secondary-stroke {
+    stroke: var(--color-primary-900);
+    stroke-dasharray: 282.6;
+    transform: rotate(-90deg);
+    transform-origin: center;
+  }
+</style>