opui-css 5.4.3 → 6.0.0-rc.1

package/components/TextField/TextField.astro

@@ -1,124 +1,108 @@
----
-import type { Props } from "./types.astro"
-
-export const title = "Text Field"
-
-const {
-  autoFit,
-  class: className,
-  error,
-  description,
-  disabled,
-  endText,
-  filled,
-  id,
-  label,
-  list,
-  max,
-  min,
-  name,
-  placeholder,
-  required,
-  small,
-  spread,
-  startText,
-  step,
-  type = "text",
-  value,
-  ...rest
-} = Astro.props
-
-const startTextValue = description || startText
-const { $id, currentFieldName } = Astro.locals
-const fieldId = id || $id("text-field")
-const fieldName = name || currentFieldName
----
-
-<label
-  class:list={[
-    "ui-text-field",
-    {
-      "ui-auto-fit": autoFit,
-      "ui-filled": filled,
-      "ui-spread": spread,
-      "ui-small": small,
-    },
-    className,
-  ]}
-  data-invalid={error || undefined}
-  {...rest}
->
-  {
-    (label || Astro.slots.has("label")) && (
-      <span class="ui-label">
-        {label}
-        <slot name="label" />
-      </span>
-    )
-  }
-  {
-    (startTextValue || Astro.slots.has("description")) && (
-      <span class="ui-start-text">
-        {startTextValue}
-        <slot name="description" />
-      </span>
-    )
-  }
-  <span class="ui-field">
-    <input
-      disabled={disabled}
-      id={fieldId}
-      inputmode={type === "numeric" ? "numeric" : undefined}
-      list={list}
-      max={max}
-      min={min}
-      name={fieldName}
-      pattern={type === "numeric" ? "[0-9]*" : undefined}
-      placeholder={placeholder}
-      required={required}
-      step={step}
-      type={type === "numeric" ? "text" : type}
-      value={value}
-    />
-    {
-      Astro.slots.has("prefix") && (
-        <span class="ui-prefix">
-          <slot name="prefix" />
-        </span>
-      )
-    }
-    {
-      Astro.slots.has("suffix") && (
-        <span class="ui-suffix">
-          <slot name="suffix" />
-        </span>
-      )
-    }
-    {
-      Astro.slots.has("header") && (
-        <span class="ui-header">
-          <slot name="header" />
-        </span>
-      )
-    }
-    {
-      Astro.slots.has("footer") && (
-        <span class="ui-footer">
-          <slot name="footer" />
-        </span>
-      )
-    }
-  </span>
-  {
-    (endText ||
-      Astro.slots.has("end-text") ||
-      Astro.slots.has("supporting-text")) && (
-      <span class="ui-end-text">
-        {endText}
-        <slot name="end-text" />
-        <slot name="supporting-text" />
-      </span>
-    )
-  }
-  <slot />
-</label>
+---
+import type { Props } from "./types.astro"
+import { fieldGroupContext } from "../FieldGroup/context.astro"
+
+export const title = "Text Field"
+
+const {
+  "aria-invalid": ariaInvalid,
+  autoFit,
+  class: className,
+  endText,
+  error,
+  hideLabel,
+  id,
+  inputmode,
+  label,
+  name,
+  pattern,
+  size,
+  spread,
+  startText,
+  style,
+  type = "text",
+  variant,
+  ...rest
+} = Astro.props
+
+const field = fieldGroupContext.get()
+---
+
+<label
+  class:list={[
+    "ui-text-field",
+    {
+      "ui-auto-fit": autoFit,
+      "ui-filled": variant === "filled",
+      "ui-spread": spread,
+    },
+    size && size !== "medium" && `ui-${size}`,
+    className,
+  ]}
+  style={style}
+>
+  {
+    (label || Astro.slots.has("label")) && (
+      <span class:list={[hideLabel ? "ui-sr-only" : "ui-label"]}>
+        {label}
+        <slot name="label" />
+      </span>
+    )
+  }
+  {
+    (startText || Astro.slots.has("start-text")) && (
+      <span class="ui-start-text">
+        {startText}
+        <slot name="start-text" />
+      </span>
+    )
+  }
+  <span class="ui-field">
+    <input
+      {...rest}
+      aria-invalid={error ? "true" : ariaInvalid}
+      id={id}
+      inputmode={inputmode ?? (type === "numeric" ? "numeric" : undefined)}
+      name={name ?? field?.name}
+      pattern={pattern ?? (type === "numeric" ? "[0-9]*" : undefined)}
+      type={type === "numeric" ? "text" : type}
+    />
+    {
+      Astro.slots.has("start") && (
+        <span class="ui-start">
+          <slot name="start" />
+        </span>
+      )
+    }
+    {
+      Astro.slots.has("end") && (
+        <span class="ui-end">
+          <slot name="end" />
+        </span>
+      )
+    }
+    {
+      Astro.slots.has("top") && (
+        <span class="ui-top">
+          <slot name="top" />
+        </span>
+      )
+    }
+    {
+      Astro.slots.has("bottom") && (
+        <span class="ui-bottom">
+          <slot name="bottom" />
+        </span>
+      )
+    }
+  </span>
+  {
+    (endText || Astro.slots.has("end-text")) && (
+      <span class="ui-end-text">
+        {endText}
+        <slot name="end-text" />
+      </span>
+    )
+  }
+  <slot />
+</label>

package/components/TextField/TextField.react.tsx

@@ -0,0 +1,70 @@
+"use client"
+
+import { cx } from "../cx"
+import { useFieldGroupContext } from "../FieldGroup/context.react"
+import type { Props } from "./types.react"
+
+export default function TextField({
+  autoFit,
+  className,
+  error,
+  hideLabel,
+  id,
+  name,
+  size,
+  spread,
+  style,
+  type = "text",
+  variant,
+  children,
+  bottom,
+  end,
+  endText,
+  label,
+  start,
+  startText,
+  top,
+  ...rest
+}: Props) {
+  const field = useFieldGroupContext()
+
+  return (
+    <label
+      className={cx([
+        "ui-text-field",
+        {
+          "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">
+        <input
+          {...rest}
+          aria-invalid={error ? "true" : rest["aria-invalid"]}
+          id={id}
+          inputMode={
+            rest.inputMode ?? (type === "numeric" ? "numeric" : undefined)
+          }
+          name={name ?? field?.name}
+          pattern={rest.pattern ?? (type === "numeric" ? "[0-9]*" : undefined)}
+          type={type === "numeric" ? "text" : type}
+        />
+        {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/TextField/TextField.svelte

@@ -0,0 +1,84 @@
+<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,
+    type = "text",
+    value = $bindable(),
+    variant,
+
+    // Snippets
+    children,
+    bottom,
+    end,
+    endText,
+    label,
+    start,
+    startText,
+    top,
+    ...rest
+  }: Props = $props()
+
+  const field = getFieldGroupContext()
+</script>
+
+<label
+  class={[
+    "ui-text-field",
+    {
+      "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">
+    <input
+      {...rest}
+      aria-invalid={error ? "true" : rest["aria-invalid"]}
+      bind:value
+      {id}
+      inputmode={rest.inputmode ?? (type === "numeric" ? "numeric" : undefined)}
+      name={name ?? field?.name}
+      pattern={rest.pattern ?? (type === "numeric" ? "[0-9]*" : undefined)}
+      type={type === "numeric" ? "text" : type}
+    />
+    {#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/TextField/TextField.vue

@@ -1,74 +1,94 @@
-<script setup lang="ts">
-import { useId, computed } from "vue"
-import type { Props, Slots } from "./types.d.vue"
-
-defineOptions({
-  inheritAttrs: false,
-})
-
-const props = withDefaults(defineProps<Props>(), {
-  type: "text",
-})
-defineSlots<Slots>()
-const modelValue = defineModel<string | number>()
-
-const fieldId = props.id || useId()
-const startTextValue = computed(() => props.description || props.startText)
-</script>
-
-<template>
-  <label
-    :class="[
-      'ui-text-field',
-      {
-        'ui-auto-fit': props.autoFit,
-        'ui-filled': props.filled,
-        'ui-spread': props.spread,
-        'ui-small': props.small,
-      },
-      props.class,
-    ]"
-    :data-invalid="props.error || undefined"
-  >
-    <span v-if="props.label || $slots.label" class="ui-label">
-      <slot name="label">{{ props.label }}</slot>
-    </span>
-
-    <span v-if="startTextValue || $slots.description" class="ui-start-text">
-      <slot name="description">{{ startTextValue }}</slot>
-    </span>
-
-    <span class="ui-field">
-      <input
-        :id="fieldId"
-        :inputmode="props.type === 'numeric' ? 'numeric' : undefined"
-        :pattern="props.type === 'numeric' ? '[0-9]*' : undefined"
-        :type="props.type === 'numeric' ? 'text' : props.type"
-        v-bind="$attrs"
-        v-model="modelValue"
-      />
-      <span class="ui-prefix" v-if="$slots.prefix"
-        ><slot name="prefix"></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>
-    </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>
-
-    <slot></slot>
-  </label>
-</template>
+<script setup lang="ts">
+import { computed, inject, type InputHTMLAttributes, 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 {
+  autoFit,
+  endText,
+  error,
+  hideLabel,
+  id,
+  label,
+  size,
+  spread,
+  startText,
+  type = "text",
+  value,
+  variant,
+} = defineProps<Props>()
+defineSlots<Slots>()
+const attrs = useAttrs() as InputHTMLAttributes
+const inputAttrs = useInputAttrs()
+const modelValue = defineModel<string | number>()
+
+const model = computed({
+  get: () => modelValue.value ?? value,
+  set: (value) => {
+    modelValue.value = value
+  },
+})
+
+const field = inject(FieldGroupKey, undefined)
+</script>
+
+<template>
+  <label
+    :class="[
+      'ui-text-field',
+      {
+        'ui-auto-fit': autoFit,
+        'ui-filled': variant === 'filled',
+        'ui-spread': spread,
+      },
+      size && size !== 'medium' && `ui-${size}`,
+      $props.class,
+    ]"
+    :style="$attrs.style"
+  >
+    <span
+      v-if="label || $slots.label"
+      :class="[hideLabel ? 'ui-sr-only' : 'ui-label']"
+    >
+      {{ label }}<slot name="label"></slot>
+    </span>
+
+    <span v-if="startText || $slots['start-text']" class="ui-start-text">
+      {{ startText }}<slot name="start-text"></slot>
+    </span>
+
+    <span class="ui-field">
+      <input
+        v-bind="inputAttrs"
+        v-model="model"
+        :aria-invalid="error ? 'true' : attrs['aria-invalid']"
+        :id="id"
+        :inputmode="
+          attrs.inputmode ?? (type === 'numeric' ? 'numeric' : undefined)
+        "
+        :name="attrs.name ?? field?.name"
+        :pattern="attrs.pattern ?? (type === 'numeric' ? '[0-9]*' : undefined)"
+        :type="type === 'numeric' ? 'text' : type"
+      />
+      <span class="ui-start" v-if="$slots.start"
+        ><slot name="start"></slot
+      ></span>
+      <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="endText || $slots['end-text']" class="ui-end-text">
+      {{ endText }}<slot name="end-text"></slot>
+    </span>
+
+    <slot></slot>
+  </label>
+</template>

package/components/TextField/types.astro.ts

@@ -1,17 +1,15 @@
-import type * as Base from "./types"
-import type { HTMLAttributes } from "astro/types"
-
-type InputProps = {
-  // Add 'numeric' as valid input type
-  type?: HTMLAttributes<"input">["type"] | "numeric"
-} &
-  // include the rest
-  Pick<HTMLAttributes<"input">, Exclude<Base.InputProps, "type">>
-
-export type Props =
-  // Unique component props
-  Base.Props &
-    // All html label attributes
-    HTMLAttributes<"label"> &
-    // Input attributes
-    InputProps
+import type * as Base from "./types"
+import type { HTMLAttributes } from "astro/types"
+
+type InputProps = {
+  // Add 'numeric' as valid input type
+  type?: HTMLAttributes<"input">["type"] | "numeric"
+} &
+  // include the rest
+  Omit<HTMLAttributes<"input">, "size" | "type">
+
+export type Props =
+  // Unique component props
+  Base.Props &
+    // Input attributes
+    InputProps

package/components/TextField/types.react.ts

@@ -0,0 +1,12 @@
+import type * as Base from "./types"
+import type { ComponentProps, ReactNode } from "react"
+
+type InputProps = {
+  type?: ComponentProps<"input">["type"] | "numeric"
+} & Omit<ComponentProps<"input">, "size" | "type">
+
+type Slots = Base.Slots<ReactNode>
+
+export type Props = Omit<Base.Props, keyof Slots> &
+  Omit<InputProps, keyof Slots> &
+  Slots

package/components/TextField/types.svelte.ts

@@ -7,16 +7,14 @@ type InputProps = {
   type?: SvelteHTMLElements["input"]["type"] | "numeric"
 } &
   // include the rest
-  Pick<SvelteHTMLElements["input"], Exclude<Base.InputProps, "type">>
+  Omit<SvelteHTMLElements["input"], "size" | "type">
 
 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"> &
     // Input attributes
-    InputProps &
+    Omit<InputProps, keyof Snippets> &
     // Snippets
     Snippets

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"