@sakura-ui/sakura-ui 0.2.0 → 0.4.1

package/packages/core/src/components/Heading.tsx

@@ -1,18 +1,18 @@
 import React from 'react'
-import { cx } from '../libs/cx'
+import { cx } from '@sakura-ui/helper'
 
-export interface HeadingProps extends React.ComponentPropsWithoutRef<'h1'> {}
+export namespace H1 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h1'> {}
+}
 
-export const H1 = (props: HeadingProps) => {
+export const H1 = (props: H1.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-lg-m
     sm:text-h-lg
-    mt-8
-    mb-3
-    sm:mt-16
-    sm:mb-6
+    pt-[2rem]
+    sm:pt-[6.5rem]
   `
 
   return (
@@ -22,16 +22,18 @@ export const H1 = (props: HeadingProps) => {
   )
 }
 
-export const H2 = (props: HeadingProps) => {
+export namespace H2 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h2'> {}
+}
+
+export const H2 = (props: H2.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-med-m
     sm:text-h-med
-    mt-8
-    mb-3
-    sm:mt-16
-    sm:mb-6
+    pt-[4rem]
+    sm:pt-[4.5rem]
   `
 
   return (
@@ -41,16 +43,18 @@ export const H2 = (props: HeadingProps) => {
   )
 }
 
-export const H3 = (props: HeadingProps) => {
+export namespace H3 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h3'> {}
+}
+
+export const H3 = (props: H3.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-sm-m
     sm:text-h-sm
-    mt-5
-    mb-3
-    sm:mt-10
-    sm:mb-6
+    pt-[4rem]
+    sm:pt-[4.5rem]
   `
 
   return (
@@ -60,16 +64,18 @@ export const H3 = (props: HeadingProps) => {
   )
 }
 
-export const H4 = (props: HeadingProps) => {
+export namespace H4 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h4'> {}
+}
+
+export const H4 = (props: H4.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-xs-m
     sm:text-h-xs
-    mt-5
-    mb-2
-    sm:mt-10
-    sm:mb-4
+    pt-[3.5rem]
+    sm:pt-[4.5rem]
   `
 
   return (
@@ -79,16 +85,18 @@ export const H4 = (props: HeadingProps) => {
   )
 }
 
-export const H5 = (props: HeadingProps) => {
+export namespace H5 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h5'> {}
+}
+
+export const H5 = (props: H5.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-xxs-m
     sm:text-h-xxs
-    mt-5
-    mb-2
-    sm:mt-10
-    sm:mb-4
+    pt-[3rem]
+    sm:pt-[4rem]
   `
 
   return (
@@ -98,16 +106,18 @@ export const H5 = (props: HeadingProps) => {
   )
 }
 
-export const H6 = (props: HeadingProps) => {
+export namespace H6 {
+  export interface Props extends React.ComponentPropsWithoutRef<'h6'> {}
+}
+
+export const H6 = (props: H6.Props) => {
   const { className, children, ...restProps } = props
 
   const style = `
     text-h-xxs-m
     sm:text-h-xxs
-    mt-3
-    mb-2
-    sm:mt-6
-    sm:mb-4
+    pt-[2.5rem]
+    sm:pt-[3.5rem]
   `
 
   return (

package/packages/core/src/components/Icon.tsx

@@ -1,32 +1,62 @@
 import React from 'react'
-import { cx } from '../libs/cx'
+import { cx } from '@sakura-ui/helper'
 
-export interface IconProps extends React.ComponentPropsWithRef<'span'> {
-  icon: string
-  srText?: string
+export namespace Icon {
+  export interface Props extends React.ComponentPropsWithRef<'span'> {
+    opticalSize?: 16 | 20 | 24 | 40 | 44 | 48
+    altText?: string
+  }
 }
 
-export const Icon = React.forwardRef<HTMLElement, IconProps>((props, ref) => {
-  const { className, icon, srText, ...restProps } = props
+export const Icon = React.forwardRef<HTMLElement, Icon.Props>((props, ref) => {
+  const { className, altText = '', opticalSize = 24, children, ...rest } = props
+
+  const size = {
+    16: '!text-[16px]',
+    20: '!text-[20px]',
+    24: '!text-[24px]',
+    40: '!text-[40px]',
+    44: '!text-[44px]',
+    48: '!text-[48px]'
+  }
+
+  const fontSize = size[opticalSize]
+
+  // @see: https://developers.google.com/fonts/docs/material_symbols
+  //.material-symbols-outlined {
+  //  font-family: 'Material Symbols Outlined';
+  //  font-weight: normal;
+  //  font-style: normal;
+  //  font-size: 24px;  /* Preferred icon size */
+  //  display: inline-block;
+  //  line-height: 1;
+  //  text-transform: none;
+  //  letter-spacing: normal;
+  //  word-wrap: normal;
+  //  white-space: nowrap;
+  //  direction: ltr;
+  //}
 
   const style = `
-    inline
-    align-middle
     font-icon
-    antialiased
+    font-light
+    inline-block
+    leading-none
+    align-middle
+    whitespace-nowrap
   `
 
   return (
     <>
       <span
         aria-hidden="true"
-        className={cx(style, className)}
-        {...restProps}
+        className={cx(className, fontSize, style)}
+        {...rest}
         ref={ref}
       >
-        {icon}
+        {children}
       </span>
-      <span className="sr-only">{srText}</span>
+      <span className="sr-only">{altText}</span>
     </>
   )
 })

package/packages/core/src/components/IconButton.tsx

@@ -1,33 +1,43 @@
-import { cx } from '../libs/cx'
-import type { ComponentWithAs } from '../types/component'
-import { forwardRef } from '../libs/forward-ref'
-import { base, getVariantStyle, getSizeStyle } from './buttonStyle'
+import React from 'react'
+import { cx } from '@sakura-ui/helper'
+import {
+  base,
+  getVariantStyle,
+  getSizeStyle,
+  type ButtonVariant,
+  type ButtonSize
+} from './buttonStyle'
 
-export interface IconButtonProps {
-  variant?: 'primary' | 'secondary'
-  size?: 'lg' | 'md' | 'sm' | 'xs'
-  iconLayout?: 'left' | 'right'
-  icon: string
-  rounded?: string
+export namespace IconButton {
+  export interface Props<T extends React.ElementType> {
+    as?: T
+    variant?: ButtonVariant
+    size?: ButtonSize
+    iconLayout?: 'left' | 'right'
+    icon: string
+    rounded?: string
+  }
 }
 
-export const IconButton: ComponentWithAs<'button', IconButtonProps> =
-  forwardRef((props, ref) => {
-    const {
-      as: Component = 'button',
-      variant = 'primary',
-      size = 'lg',
-      iconLayout = 'left',
-      icon,
-      rounded,
-      className,
-      children,
-      ...restProps
-    } = props
+export const IconButton = <T extends React.ElementType = 'button'>(
+  props: IconButton.Props<T> &
+    Omit<React.ComponentProps<T>, keyof IconButton.Props<T>>
+) => {
+  const {
+    as: Component = 'button',
+    variant = 'solid-fill',
+    size = 'lg',
+    iconLayout = 'left',
+    icon,
+    rounded,
+    className,
+    children,
+    ...restProps
+  } = props
 
-    const styleFontSize = `${size === 'xs' ? 'scale-105' : 'scale-125'}`
+  const styleFontSize = `${size === 'xs' ? 'scale-105' : 'scale-125'}`
 
-    const styleIcon = `
+  const styleIcon = `
       inline-block
       align-middle
       mb-1
@@ -37,23 +47,23 @@ export const IconButton: ComponentWithAs<'button', IconButtonProps> =
       antialiased
     `
 
-    const styleRounded = `${rounded ? 'aspect-square !rounded-full !py-0' : ''}`
+  const styleRounded = `${rounded ? 'aspect-square !rounded-full !py-0' : ''}`
 
-    // When text is specified on a button, set the 'aria-hidden' attribute of the icon to true.
-    const ariaHidden = !!children
+  // When text is specified on a button, set the 'aria-hidden' attribute of the icon to true.
+  const ariaHidden = !!children
 
-    return (
-      <Component
-        className={cx(
-          base,
-          getVariantStyle(variant),
-          getSizeStyle(size),
-          styleRounded,
-          className
-        )}
-        {...restProps}
-        ref={ref}
-      >
+  return (
+    <Component
+      className={cx(
+        base,
+        getVariantStyle(variant),
+        getSizeStyle(size),
+        styleRounded,
+        className
+      )}
+      {...restProps}
+    >
+      <span>
         {iconLayout === 'left' && (
           <span
             className={cx(styleIcon, styleFontSize)}
@@ -71,8 +81,9 @@ export const IconButton: ComponentWithAs<'button', IconButtonProps> =
             {icon}
           </span>
         )}
-      </Component>
-    )
-  })
+      </span>
+    </Component>
+  )
+}
 
 IconButton.displayName = 'IconButton'

package/packages/core/src/components/LangSelector.tsx

@@ -0,0 +1,135 @@
+import React from 'react'
+import { cx, mod, focusableSelector, Style } from '@sakura-ui/helper'
+import { Language, LanguageMobile, KeyboadArrowDown } from '@/icons'
+import { PopoverMenu, PopoverMenuItem } from './PopoverMenu'
+
+export namespace LangSelector {
+  interface Lang {
+    code: string
+    title: string
+    path: string
+  }
+  // Tailwind 3.4.5 or higher is required to use anchor-name.
+  // https://github.com/tailwindlabs/tailwindcss/issues/13818
+  export interface Props extends React.ComponentPropsWithRef<'button'> {
+    current: string
+    langs: Lang[]
+  }
+}
+
+export const LangSelector = ({
+  current,
+  langs,
+  className,
+  ...restProps
+}: LangSelector.Props) => {
+  const styleRoot = `
+    relative
+    group
+  `
+
+  const styleAnchorName = `
+    [anchor-name:--target]
+  `
+
+  // height: text-base(16px)*1.375 + p-3(12px)*2 + border(1px)*2  = 48px
+  const styleButton = `
+    w-fit
+    py-[1px]
+    sm:py-3
+    text-base
+    leading-snug
+    ${Style.clickable}
+    ${Style.focusRoundedWithBg}
+    ${Style.hoverUnderline}
+    ${styleAnchorName}
+    flex items-center
+  `
+
+  const stylePositionBottomRight = `
+    absolute
+    top-[anchor(--target_bottom)]
+    right-[anchor(--target_right)] 
+    position-try-options:flip-block]
+    inset-[unset]
+  `
+
+  const targetId = React.useId()
+
+  const menuRef = React.useRef<HTMLUListElement>(null)
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLElement>) => {
+    if (e.key === 'Tab') {
+      e.preventDefault()
+
+      const focusables: HTMLElement[] = Array.from(
+        menuRef.current?.querySelectorAll(focusableSelector) || []
+      )
+      if (focusables.length === 0) return
+
+      const tabIndex = focusables.indexOf(
+        document.activeElement as HTMLElement
+      )
+      // If there is no focused element, focus the first element
+      if (tabIndex === -1) {
+        focusables[0].focus()
+        return
+      }
+      const nextIndex = mod(tabIndex + (e.shiftKey ? -1 : 1), focusables.length)
+      focusables[nextIndex].focus()
+
+      return
+    }
+  }
+
+  React.useEffect(() => {
+    const handleToggle = () => {
+      const focusable: HTMLElement | null | undefined =
+        menuRef.current?.querySelector(focusableSelector)
+      if (!focusable) return
+      focusable.focus()
+    }
+
+    menuRef.current?.addEventListener('toggle', handleToggle)
+
+    return () => menuRef.current?.removeEventListener('toggle', handleToggle)
+  }, [])
+
+  return (
+    <div className={cx(className, styleRoot)}>
+      <button
+        popoverTarget={targetId}
+        type="button"
+        className={styleButton}
+        {...restProps}
+      >
+        <Language size={20} className="hidden sm:mt-0.5 sm:inline-block" />
+        <span className="hidden sm:mx-1 sm:inline">Language</span>
+        <LanguageMobile size={44} className="inline-block sm:hidden" />
+        <KeyboadArrowDown
+          size={16}
+          className="inline-block sm:mt-1 group-[:has(:popover-open)]:rotate-180"
+        />
+      </button>
+      <PopoverMenu
+        ref={menuRef}
+        id={targetId}
+        popover="auto"
+        onKeyDown={handleKeyDown}
+        className={stylePositionBottomRight}
+      >
+        {langs.map((lang) => (
+          <PopoverMenuItem
+            key={lang.code}
+            aria-current={current === lang.code}
+            href={lang.path}
+          >
+            {lang.title}
+          </PopoverMenuItem>
+        ))}
+      </PopoverMenu>
+    </div>
+  )
+}
+
+LangSelector.displayName = 'LangSelector'

package/packages/core/src/components/Link.tsx

@@ -1,79 +1,50 @@
-import { cx } from '../libs/cx'
-import type { ComponentWithAs } from '../types/component'
-import { forwardRef } from '../libs/forward-ref'
+import React from 'react'
+import { cx, Style } from '@sakura-ui/helper'
+import { Icon } from './Icon'
 
-// biome-ignore lint/suspicious/noEmptyInterface:
-export interface LinkProps {}
-
-export const Link: ComponentWithAs<'a', LinkProps> = forwardRef(
-  (props, ref) => {
-    const {
-      as: Component = 'a',
-      href,
-      className,
-      children,
-      ...restProps
-    } = props
-
-    const styleUnderLine = `
-      underline
-      underline-offset-[0.125em]
-    `
+export namespace Link {
+  export interface Props<T extends React.ElementType> {
+    as?: T
+  }
+}
 
-    // Make lines break at each word
-    const style = `
-      rounded-sm
-      cursor-pointer
-      text-sea-600
-      hover:text-sea-800
-      active:text-sea-800
-      visited:text-sea-900
-      focus:outline
-      focus:outline-2
-      focus:outline-wood-500
-      disabled:border-sumi-500
-      [overflow-wrap:anywhere]
-    `
+export const Link = <T extends React.ElementType = 'a'>(
+  props: Link.Props<T> & Omit<React.ComponentProps<T>, keyof Link.Props<T>>
+) => {
+  const { as: Component = 'a', className, children, ...restProps } = props
 
-    const styleIcon = `
-      align-middle
-      ml-0.5
-      text-sumi-700
-      font-icon
-      font-light
-      leading-4
-      antialiased
-    `
+  // Make lines break at each word
+  const style = `
+    cursor-pointer
+    text-blue-1000
+    active:text-orange-700
+    visited:text-magenta-900
+    ${Style.focusRoundedWithBg}
+    ${Style.underline}
+    disabled:border-solid-gray-500
+    [overflow-wrap:anywhere]
+  `
 
-    if (href?.startsWith('http')) {
-      return (
-        <Component
-          className={cx(style, className)}
-          href={href}
-          target="_blank"
-          rel="noopener noreferrer"
-          {...restProps}
-          ref={ref}
-        >
-          <span className={styleUnderLine}>{children}</span>
-          <span className={cx(styleIcon)} aria-hidden="true">
-            open_in_new
-          </span>
-          <span className="sr-only">Opens in new tab</span>
-        </Component>
-      )
-    }
+  if (restProps.href?.startsWith('http') || restProps.target === '_blank') {
     return (
       <Component
-        className={cx(style, styleUnderLine, className)}
-        href={href}
+        className={cx(style, className)}
+        target="_blank"
         {...restProps}
-        ref={ref}
       >
-        {children}
+        <span>{children}</span>
+        <Icon opticalSize={16} altText="Opens in new tab" className="ml-0.5">
+          open_in_new
+        </Icon>
       </Component>
     )
   }
-)
+
+  return (
+    <Component className={cx(style, className)} {...restProps}>
+      {children}
+    </Component>
+  )
+}
 
 Link.displayName = 'Link'