opui-css 5.4.2 → 6.0.0-rc.1

package/components/TextField/types.ts

@@ -1,35 +1,21 @@
 export type Props = {
   autoFit?: boolean
-  error?: boolean
-  description?: string
   endText?: string
-  filled?: boolean
+  error?: boolean
+  hideLabel?: boolean
   label?: string
-  small?: boolean
+  size?: "x-small" | "small" | "medium" | "large"
   spread?: boolean
   startText?: string
+  variant?: "outlined" | "filled"
 }
 
 export type Slots<S> = {
-  description: string | S
-  endText: string | S
-  footer: string | S
-  header: string | S
-  label: string | S
-  prefix: string | S
-  startText: string | S
-  suffix: string | S
-  supportingText: string | S
+  bottom?: string | S
+  end?: string | S
+  endText?: string | S
+  label?: string | S
+  start?: string | S
+  startText?: string | S
+  top?: string | S
 }
-
-export type InputProps =
-  | "disabled"
-  | "list"
-  | "max"
-  | "min"
-  | "name"
-  | "placeholder"
-  | "required"
-  | "step"
-  | "type"
-  | "value"

package/components/TextField/types.vue-props.ts

@@ -0,0 +1,21 @@
+import type { HTMLAttributes, InputHTMLAttributes, Slot } from "vue"
+import type { Class } from "../vue"
+import type { Props as BaseProps } from "./types"
+
+export type Props = BaseProps &
+  Class & {
+    id?: HTMLAttributes["id"]
+    type?: InputHTMLAttributes["type"] | "numeric"
+    value?: string | number
+  }
+
+export type Slots = {
+  bottom?: Slot
+  default?: Slot
+  end?: Slot
+  "end-text"?: Slot
+  label?: Slot
+  start?: Slot
+  "start-text"?: Slot
+  top?: Slot
+}

package/components/Textarea/Textarea.astro

@@ -1,34 +1,29 @@
 ---
 import type { Props } from "./types.astro"
+import { fieldGroupContext } from "../FieldGroup/context.astro"
 
 export const title = "Textarea"
 
 const {
+  "aria-invalid": ariaInvalid,
   autoFit,
   class: className,
-  cols,
-  description,
-  disabled,
+  endText,
   error,
-  filled,
+  hideLabel,
   id,
   label,
-  maxlength,
-  minlength,
   name,
+  size,
   spread,
-  placeholder,
-  required,
-  rows,
-  small,
-  endText,
+  startText,
+  style,
   value,
+  variant,
   ...rest
 } = Astro.props
 
-const { $id, currentFieldName } = Astro.locals
-const fieldId = id || $id("textarea")
-const fieldName = name || currentFieldName
+const field = fieldGroupContext.get()
 ---
 
 <label
@@ -36,18 +31,17 @@ const fieldName = name || currentFieldName
     "ui-textarea",
     {
       "ui-auto-fit": autoFit,
-      "ui-filled": filled,
+      "ui-filled": variant === "filled",
       "ui-spread": spread,
-      "ui-small": small,
     },
+    size && size !== "medium" && `ui-${size}`,
     className,
   ]}
-  data-invalid={error || undefined}
-  {...rest}
+  style={style}
 >
   {
     (label || Astro.slots.has("label")) && (
-      <span class="ui-label">
+      <span class:list={[hideLabel ? "ui-sr-only" : "ui-label"]}>
         {label}
         <slot name="label" />
       </span>
@@ -55,62 +49,54 @@ const fieldName = name || currentFieldName
   }
 
   {
-    (description || Astro.slots.has("description")) && (
+    (startText || Astro.slots.has("start-text")) && (
       <span class="ui-start-text">
-        {description}
-        <slot name="description" />
+        {startText}
+        <slot name="start-text" />
       </span>
     )
   }
   <span class="ui-field">
     <textarea
-      cols={cols}
-      disabled={disabled}
-      id={fieldId}
-      maxlength={maxlength}
-      minlength={minlength}
-      name={fieldName}
-      placeholder={placeholder}
-      required={required}
-      rows={rows}
-      value={value}></textarea>
+      {...rest}
+      aria-invalid={error ? "true" : ariaInvalid}
+      id={id}
+      name={name ?? field?.name}>{value}</textarea
+    >
     {
-      Astro.slots.has("prefix") && (
-        <span class="ui-prefix">
-          <slot name="prefix" />
+      Astro.slots.has("start") && (
+        <span class="ui-start">
+          <slot name="start" />
         </span>
       )
     }
     {
-      Astro.slots.has("suffix") && (
-        <span class="ui-suffix">
-          <slot name="suffix" />
+      Astro.slots.has("end") && (
+        <span class="ui-end">
+          <slot name="end" />
         </span>
       )
     }
     {
-      Astro.slots.has("header") && (
-        <span class="ui-header">
-          <slot name="header" />
+      Astro.slots.has("top") && (
+        <span class="ui-top">
+          <slot name="top" />
         </span>
       )
     }
     {
-      Astro.slots.has("footer") && (
-        <span class="ui-footer">
-          <slot name="footer" />
+      Astro.slots.has("bottom") && (
+        <span class="ui-bottom">
+          <slot name="bottom" />
         </span>
       )
     }
   </span>
   {
-    (endText ||
-      Astro.slots.has("end-text") ||
-      Astro.slots.has("supporting-text")) && (
+    (endText || Astro.slots.has("end-text")) && (
       <span class="ui-end-text">
         {endText}
         <slot name="end-text" />
-        <slot name="supporting-text" />
       </span>
     )
   }

package/components/Textarea/Textarea.react.tsx

@@ -0,0 +1,64 @@
+"use client"
+
+import { cx } from "../cx"
+import { useFieldGroupContext } from "../FieldGroup/context.react"
+import type { Props } from "./types.react"
+
+export default function Textarea({
+  autoFit,
+  className,
+  error,
+  hideLabel,
+  id,
+  name,
+  size,
+  spread,
+  style,
+  variant,
+  children,
+  bottom,
+  end,
+  endText,
+  label,
+  start,
+  startText,
+  top,
+  ...rest
+}: Props) {
+  const field = useFieldGroupContext()
+
+  return (
+    <label
+      className={cx([
+        "ui-textarea",
+        {
+          "ui-auto-fit": autoFit,
+          "ui-filled": variant === "filled",
+          "ui-spread": spread,
+        },
+        size && size !== "medium" && `ui-${size}`,
+        className,
+      ])}
+      style={style}
+    >
+      {label && (
+        <span className={hideLabel ? "ui-sr-only" : "ui-label"}>{label}</span>
+      )}
+      {startText && <span className="ui-start-text">{startText}</span>}
+      <span className="ui-field">
+        <textarea
+          {...rest}
+          aria-invalid={error ? "true" : rest["aria-invalid"]}
+          id={id}
+          name={name ?? field?.name}
+        />
+        {start && <span className="ui-start">{start}</span>}
+        {end && <span className="ui-end">{end}</span>}
+        {top && <span className="ui-top">{top}</span>}
+        {bottom && <span className="ui-bottom">{bottom}</span>}
+      </span>
+      {endText && <span className="ui-end-text">{endText}</span>}
+      {children}
+    </label>
+  )
+}

package/components/Textarea/Textarea.svelte

@@ -0,0 +1,80 @@
+<script lang="ts">
+  import { content } from "../content.svelte"
+  import { getFieldGroupContext } from "../FieldGroup/context.svelte"
+  import type { Props } from "./types.svelte"
+
+  let {
+    autoFit,
+    class: className,
+    error,
+    hideLabel,
+    id,
+    name,
+    size,
+    spread,
+    style,
+    value = $bindable(),
+    variant,
+
+    // Snippets
+    children,
+    bottom,
+    end,
+    endText,
+    label,
+    start,
+    startText,
+    top,
+    ...rest
+  }: Props = $props()
+
+  const field = getFieldGroupContext()
+</script>
+
+<label
+  class={[
+    "ui-textarea",
+    {
+      "ui-auto-fit": autoFit,
+      "ui-filled": variant === "filled",
+      "ui-spread": spread,
+    },
+    size && size !== "medium" && `ui-${size}`,
+    className,
+  ]}
+  {style}
+>
+  {#if label}
+    <span class={[hideLabel ? "ui-sr-only" : "ui-label"]}
+      >{@render content(label)}</span
+    >
+  {/if}
+  {#if startText}
+    <span class="ui-start-text">{@render content(startText)}</span>
+  {/if}
+  <span class="ui-field">
+    <textarea
+      {...rest}
+      aria-invalid={error ? "true" : rest["aria-invalid"]}
+      bind:value
+      {id}
+      name={name ?? field?.name}
+    ></textarea>
+    {#if start}
+      <span class="ui-start">{@render content(start)}</span>
+    {/if}
+    {#if end}
+      <span class="ui-end">{@render content(end)}</span>
+    {/if}
+    {#if top}
+      <span class="ui-top">{@render content(top)}</span>
+    {/if}
+    {#if bottom}
+      <span class="ui-bottom">{@render content(bottom)}</span>
+    {/if}
+  </span>
+  {#if endText}
+    <span class="ui-end-text">{@render content(endText)}</span>
+  {/if}
+  {@render children?.()}
+</label>

package/components/Textarea/Textarea.vue

@@ -1,16 +1,39 @@
 <script setup lang="ts">
-import { useId } from "vue"
-import type { Props, Slots } from "./types.d.vue"
+import { computed, inject, type TextareaHTMLAttributes, useAttrs } from "vue"
+import { useInputAttrs } from "../vue"
+import type { Props, Slots } from "./types.vue-props"
+import { FieldGroupKey } from "../FieldGroup/context.vue"
 
 defineOptions({
   inheritAttrs: false,
 })
 
-const props = defineProps<Props>()
+const {
+  autoFit,
+  endText,
+  error,
+  hideLabel,
+  id,
+  label,
+  size,
+  spread,
+  startText,
+  value,
+  variant,
+} = defineProps<Props>()
 defineSlots<Slots>()
+const attrs = useAttrs() as TextareaHTMLAttributes
+const inputAttrs = useInputAttrs()
 const modelValue = defineModel<string>()
 
-const fieldId = props.id || useId()
+const model = computed({
+  get: () => modelValue.value ?? value,
+  set: (value) => {
+    modelValue.value = value
+  },
+})
+
+const field = inject(FieldGroupKey, undefined)
 </script>
 
 <template>
@@ -18,45 +41,46 @@ const fieldId = props.id || useId()
     :class="[
       'ui-textarea',
       {
-        'ui-auto-fit': props.autoFit,
-        'ui-filled': props.filled,
-        'ui-spread': props.spread,
-        'ui-small': props.small,
+        'ui-auto-fit': autoFit,
+        'ui-filled': variant === 'filled',
+        'ui-spread': spread,
       },
-      props.class,
+      size && size !== 'medium' && `ui-${size}`,
+      $props.class,
     ]"
-    :data-invalid="props.error || undefined"
+    :style="$attrs.style"
   >
-    <span v-if="props.label || $slots.label" class="ui-label">
-      <slot name="label">{{ props.label }}</slot>
+    <span
+      v-if="label || $slots.label"
+      :class="[hideLabel ? 'ui-sr-only' : 'ui-label']"
+    >
+      {{ label }}<slot name="label"></slot>
     </span>
 
-    <span v-if="props.description || $slots.description" class="ui-start-text">
-      <slot name="description">{{ props.description }}</slot>
+    <span v-if="startText || $slots['start-text']" class="ui-start-text">
+      {{ startText }}<slot name="start-text"></slot>
     </span>
 
     <span class="ui-field">
-      <textarea :id="fieldId" v-bind="$attrs" v-model="modelValue"></textarea>
-      <span class="ui-prefix" v-if="$slots.prefix"
-        ><slot name="prefix"></slot
+      <textarea
+        v-bind="inputAttrs"
+        v-model="model"
+        :aria-invalid="error ? 'true' : attrs['aria-invalid']"
+        :id="id"
+        :name="attrs.name ?? field?.name"
+      ></textarea>
+      <span class="ui-start" v-if="$slots.start"
+        ><slot name="start"></slot
       ></span>
-      <span class="ui-suffix" v-if="$slots.suffix"
-        ><slot name="suffix"></slot
-      ></span>
-      <span class="ui-header" v-if="$slots.header"
-        ><slot name="header"></slot
-      ></span>
-      <span class="ui-footer" v-if="$slots.footer"
-        ><slot name="footer"></slot
+      <span class="ui-end" v-if="$slots.end"><slot name="end"></slot></span>
+      <span class="ui-top" v-if="$slots.top"><slot name="top"></slot></span>
+      <span class="ui-bottom" v-if="$slots.bottom"
+        ><slot name="bottom"></slot
       ></span>
     </span>
 
-    <span
-      v-if="props.endText || $slots['end-text'] || $slots['supporting-text']"
-      class="ui-end-text"
-    >
-      <slot name="end-text">{{ props.endText }}</slot
-      ><slot name="supporting-text"></slot>
+    <span v-if="endText || $slots['end-text']" class="ui-end-text">
+      {{ endText }}<slot name="end-text"></slot>
     </span>
 
     <slot></slot>

package/components/Textarea/types.astro.ts

@@ -4,7 +4,5 @@ import type { HTMLAttributes } from "astro/types"
 export type Props =
   // Unique component props
   Base.Props &
-    // All html label attributes
-    HTMLAttributes<"label"> &
     // Some input attributes for spreading
-    Pick<HTMLAttributes<"textarea">, Base.TextareaProps>
+    HTMLAttributes<"textarea">

package/components/Textarea/types.react.ts

@@ -0,0 +1,8 @@
+import type * as Base from "./types"
+import type { ComponentProps, ReactNode } from "react"
+
+type Slots = Base.Slots<ReactNode>
+
+export type Props = Omit<Base.Props, keyof Slots> &
+  Omit<ComponentProps<"textarea">, keyof Slots> &
+  Slots

package/components/Textarea/types.svelte.ts

@@ -2,20 +2,12 @@ import type * as Base from "./types"
 import type { SvelteHTMLElements } from "svelte/elements"
 import type { Snippet } from "svelte"
 
-type InputProps = {
-  type?: SvelteHTMLElements["input"]["type"] | "numeric"
-}
-
 type Snippets = Base.Slots<Snippet>
 
 export type Props =
   // Unique component props, except snippets
   Omit<Base.Props, keyof Snippets> &
-    // All html label attributes, (except prefix)
-    Omit<SvelteHTMLElements["label"], "prefix"> &
     // Some input attributes for spreading
-    Pick<SvelteHTMLElements["textarea"], Base.TextareaProps> &
-    // Special input type attribute with 'numeric'
-    InputProps &
+    Omit<SvelteHTMLElements["textarea"], keyof Snippets> &
     // Snippets
     Snippets

package/components/Textarea/types.ts

@@ -1,33 +1,21 @@
 export type Props = {
   autoFit?: boolean
-  description?: string
+  endText?: string
   error?: boolean
-  filled?: boolean
+  hideLabel?: boolean
   label?: string
+  size?: "x-small" | "small" | "medium" | "large"
   spread?: boolean
-  small?: boolean
-  endText?: string
+  startText?: string
+  variant?: "outlined" | "filled"
 }
 
 export type Slots<S> = {
-  description?: string | S
-  footer?: string | S
-  header?: string | S
+  bottom?: string | S
+  end?: string | S
+  endText?: string | S
   label?: string | S
-  prefix?: string | S
+  start?: string | S
   startText?: string | S
-  suffix?: string | S
-  endText?: string | S
-  supportingText?: string | S
+  top?: string | S
 }
-
-export type TextareaProps =
-  | "cols"
-  | "disabled"
-  | "maxlength"
-  | "minlength"
-  | "name"
-  | "placeholder"
-  | "required"
-  | "rows"
-  | "value"

package/components/Textarea/types.vue-props.ts

@@ -0,0 +1,20 @@
+import type { HTMLAttributes, Slot } from "vue"
+import type { Class } from "../vue"
+import type { Props as BaseProps } from "./types"
+
+export type Props = BaseProps &
+  Class & {
+    id?: HTMLAttributes["id"]
+    value?: string
+  }
+
+export type Slots = {
+  bottom?: Slot
+  default?: Slot
+  end?: Slot
+  "end-text"?: Slot
+  label?: Slot
+  start?: Slot
+  "start-text"?: Slot
+  top?: Slot
+}

package/components/ToggleButton/ToggleButton.astro

@@ -1,43 +1,43 @@
 ---
 import type { Props } from "./types.astro"
+import { fieldGroupContext } from "../FieldGroup/context.astro"
+import { toggleGroupContext } from "../ToggleGroup/context.astro"
 
 export const title = "Toggle Button"
 
 const {
+  checked,
   class: className,
-  disabled,
   label,
   name,
-  pressed,
   size,
+  style,
   type,
   value,
   ...rest
 } = Astro.props
 
-const { $id, currentToggleGroupName, currentToggleGroupType } = Astro.locals
-const finalName = name || currentToggleGroupName
-const finalType = type || currentToggleGroupType || "checkbox"
-const id = rest.id || $id("toggle")
+const field = fieldGroupContext.get()
+const group = toggleGroupContext.get()
+
+const finalName = name || group?.groupName || field?.name
+const finalType = group?.inputType === "radio" ? "radio" : (type ?? "checkbox")
 ---
 
 <label
   class:list={[
     "ui-toggle-button",
-    { "ui-disabled": disabled },
-    size && `ui-${size}`,
+    size && size !== "medium" && `ui-${size}`,
     className,
   ]}
+  style={style}
 >
   <input
-    aria-pressed={finalType === "checkbox" ? pressed : undefined}
-    checked={pressed}
-    disabled={disabled}
-    id={id}
+    checked={checked}
     name={finalName}
     type={finalType}
-    value={value || label}
+    value={value}
     {...rest}
   />
-  <slot />
+  <slot>{label}</slot>
 </label>