@womp/kookie-ui 0.16.0 → 0.18.0

package/src/components/tabs.tsx

@@ -4,6 +4,7 @@ import { Tabs as TabsPrimitive } from 'radix-ui';
 
 import { tabsListPropDefs } from './tabs.props.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { marginPropDefs } from '../props/margin.props.js';
 
 import type { tabsContentPropDefs, tabsRootPropDefs } from './tabs.props.js';
@@ -35,17 +36,16 @@ interface TabsListProps
   extends ComponentPropsWithout<typeof TabsPrimitive.List, RemovedProps>,
     MarginProps,
     TabsListOwnProps {}
-const TabsList = React.forwardRef<TabsListElement, TabsListProps>((props, forwardedRef) => {
-  const { className, color, material: materialProp, ...listProps } = extractProps(
+const TabsList = React.forwardRef<TabsListElement, TabsListProps>((ownProps, forwardedRef) => {
+  const props = useThemeSizeProps(ownProps, tabsListPropDefs.size);
+  const { className, color, ...listProps } = extractProps(
     props,
     tabsListPropDefs,
     marginPropDefs,
   );
-  const material = materialProp;
   return (
     <TabsPrimitive.List
       data-accent-color={color}
-      data-material={material}
       {...listProps}
       asChild={false}
       ref={forwardedRef}

package/src/components/text-area.css

@@ -1,13 +1,13 @@
 /**
  * TextArea Component Styles
- * 
+ *
  * ARCHITECTURE (following base-button pattern):
- * - Base styles: Layout, accessibility, material system
+ * - Base styles: Layout, accessibility
  * - Sizes: Responsive sizing and typography
  * - Variant palettes: Each variant defines its color scale as CSS variables
  * - Shared state logic: Single set of hover/focus/disabled selectors
  * - Special variants: raised (unique behavior, kept separate)
- * - Error states: Override colors for error styling
+ * - Invalid state: border and focus ring only, keyed on aria-invalid
  */
 
 /***************************************************************************************************
@@ -17,20 +17,6 @@
  ***************************************************************************************************/
 
 .rt-TextAreaRoot {
-  /*
-   * Component-level material override
-   * When component has explicit material prop, override the inherited theme values.
-   */
-  &:where([data-material='solid']) {
-    --material-blend: 100%;
-    --material-alpha: 0;
-  }
-
-  &:where([data-material='translucent']) {
-    --material-blend: 60%;
-    --material-alpha: 1;
-  }
-
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
@@ -43,26 +29,8 @@
   /* Allows the `resize` property to work on the div */
   overflow: hidden;
 
-  /* Theme-level translucent override */
-  :where([data-material='translucent']) & {
-    backdrop-filter: var(--backdrop-filter-components);
-    --backdrop-filter-components: var(--backdrop-filter-components-enabled);
-  }
-
-  /* Prevent backdrop-filter stacking with parents */
   isolation: isolate;
 
-  /* Component-level overrides */
-  &:where([data-material='solid']) {
-    backdrop-filter: none;
-    --backdrop-filter-components: none;
-  }
-  
-  &:where([data-material='translucent']) {
-    backdrop-filter: var(--backdrop-filter-components);
-    --backdrop-filter-components: var(--backdrop-filter-components-enabled);
-  }
-
   &:where(:focus-within) {
     outline: 2px solid var(--v-focus-color, var(--focus-8));
     outline-offset: -1px;
@@ -94,14 +62,14 @@
     cursor: auto;
   }
   &::-webkit-scrollbar {
-    width: var(--space-3);
-    height: var(--space-3);
+    width: var(--space-4);
+    height: var(--space-4);
   }
   &::-webkit-scrollbar-track,
   &::-webkit-scrollbar-thumb {
     background-clip: content-box;
-    border: var(--space-1) solid transparent;
-    border-radius: var(--space-3);
+    border: var(--space-2) solid transparent;
+    border-radius: var(--space-4);
   }
   &::-webkit-scrollbar-track {
     background-color: var(--gray-a3);
@@ -135,59 +103,52 @@
   box-sizing: border-box;
   padding: var(--text-area-border-width);
 }
+/* One inset on all four sides, the control padding of the size; the control height is the floor. */
 .rt-TextAreaInput {
-  padding: var(--text-area-padding-y) var(--text-area-padding-x);
+  padding: calc(var(--text-area-padding) - var(--text-area-border-width));
 }
 
 @breakpoints {
   .rt-TextAreaRoot {
     &:where(.rt-r-size-1) {
-      min-height: var(--space-8);
+      --text-area-padding: var(--control-px-1);
+      min-height: var(--control-height-1);
       border-radius: var(--radius-1);
 
       & :where(.rt-TextAreaInput) {
-        /* Clip text to border */
-        --text-area-padding-y: calc(var(--space-2) - var(--text-area-border-width));
-        --text-area-padding-x: calc(var(--space-2) - var(--text-area-border-width));
         font-size: var(--font-size-1);
         line-height: var(--line-height-1);
         letter-spacing: var(--letter-spacing-1);
       }
     }
     &:where(.rt-r-size-2) {
-      min-height: var(--space-9);
+      --text-area-padding: var(--control-px-2);
+      min-height: var(--control-height-2);
       border-radius: var(--radius-2);
 
       & :where(.rt-TextAreaInput) {
-        /* Clip text to border */
-        --text-area-padding-y: calc(var(--space-2) - var(--text-area-border-width));
-        --text-area-padding-x: calc(var(--space-2) - var(--text-area-border-width));
         font-size: var(--font-size-2);
         line-height: var(--line-height-2);
         letter-spacing: var(--letter-spacing-2);
       }
     }
     &:where(.rt-r-size-3) {
-      min-height: 80px;
+      --text-area-padding: var(--control-px-3);
+      min-height: var(--control-height-3);
       border-radius: var(--radius-3);
 
       & :where(.rt-TextAreaInput) {
-        /* Clip text to border */
-        --text-area-padding-y: calc(var(--space-3) - var(--text-area-border-width));
-        --text-area-padding-x: calc(var(--space-3) - var(--text-area-border-width));
         font-size: var(--font-size-3);
         line-height: var(--line-height-3);
         letter-spacing: var(--letter-spacing-3);
       }
     }
     &:where(.rt-r-size-4) {
-      min-height: var(--space-10);
+      --text-area-padding: var(--control-px-4);
+      min-height: var(--control-height-4);
       border-radius: var(--radius-4);
 
       & :where(.rt-TextAreaInput) {
-        /* Clip text to border */
-        --text-area-padding-y: calc(var(--space-3) - var(--text-area-border-width));
-        --text-area-padding-x: calc(var(--space-4) - var(--text-area-border-width));
         font-size: var(--font-size-4);
         line-height: var(--line-height-4);
         letter-spacing: var(--letter-spacing-4);
@@ -280,11 +241,7 @@
 
 .rt-TextAreaRoot:where(.rt-variant-soft, .rt-variant-ghost, .rt-variant-outline, .rt-variant-surface) {
   /* Rest state */
-  background-color: color-mix(
-    in srgb,
-    var(--v-bg-a) calc(var(--material-alpha) * 100%),
-    var(--v-bg) var(--material-blend)
-  );
+  background-color: var(--v-bg);
 
   /* Placeholder styling */
   & :where(.rt-TextAreaInput) {
@@ -296,12 +253,8 @@
 
   /* Hover state */
   @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--v-bg-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-bg-hover) var(--material-blend)
-      );
+    &:where(:hover:not(:has(.rt-TextAreaInput:where(:focus, :disabled)))) {
+      background-color: var(--v-bg-hover);
     }
   }
 
@@ -322,20 +275,12 @@
 /* Border variants: outline and surface */
 .rt-TextAreaRoot:where(.rt-variant-outline, .rt-variant-surface) {
   /* Rest state border */
-  box-shadow: inset 0 0 0 1px color-mix(
-    in srgb,
-    var(--v-border-a) calc(var(--material-alpha) * 100%),
-    var(--v-border) var(--material-blend)
-  );
+  box-shadow: inset 0 0 0 1px var(--v-border);
 
   /* Hover state border */
   @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      box-shadow: inset 0 0 0 1px color-mix(
-        in srgb,
-        var(--v-border-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-border-hover) var(--material-blend)
-      );
+    &:where(:hover:not(:has(.rt-TextAreaInput:where(:focus, :disabled)))) {
+      box-shadow: inset 0 0 0 1px var(--v-border-hover);
     }
   }
 
@@ -348,27 +293,15 @@
 /* Ghost focus state - needs background on focus */
 .rt-TextAreaRoot:where(.rt-variant-ghost) {
   &:where(:focus-within) {
-    background-color: color-mix(
-      in srgb,
-      var(--v-bg-focus-a, var(--v-bg-a)) calc(var(--material-alpha) * 100%),
-      var(--v-bg-focus, var(--v-bg)) var(--material-blend)
-    );
+    background-color: var(--v-bg-focus, var(--v-bg));
   }
 }
 
 /* Surface focus state - border changes on focus */
 .rt-TextAreaRoot:where(.rt-variant-surface) {
   &:where(:focus-within) {
-    background-color: color-mix(
-      in srgb,
-      var(--v-bg-focus-a, var(--v-bg-a)) calc(var(--material-alpha) * 100%),
-      var(--v-bg-focus, var(--v-bg)) var(--material-blend)
-    );
-    box-shadow: inset 0 0 0 var(--text-area-border-width) color-mix(
-      in srgb,
-      var(--v-border-focus-a) calc(var(--material-alpha) * 100%),
-      var(--v-border-focus) var(--material-blend)
-    );
+    background-color: var(--v-bg-focus, var(--v-bg));
+    box-shadow: inset 0 0 0 var(--text-area-border-width) var(--v-border-focus);
   }
 }
 
@@ -429,11 +362,6 @@
   background-color: var(--color-surface-solid);
   box-shadow: var(--shadow-2);
 
-  /* Translucent theme override */
-  &:where([data-material='translucent']) {
-    background-color: var(--color-surface-translucent);
-  }
-
   & :where(.rt-TextAreaInput) {
     &::placeholder {
       color: var(--gray-a10);
@@ -442,12 +370,8 @@
 
   /* Hover effects */
   @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--accent-a2) calc(var(--material-alpha) * 100%),
-        var(--accent-2) var(--material-blend)
-      );
+    &:where(:hover:not(:has(.rt-TextAreaInput:where(:focus, :disabled)))) {
+      background-color: var(--accent-2);
       box-shadow: var(--shadow-2);
     }
   }
@@ -474,167 +398,78 @@
  *                                                                                                 *
  ***************************************************************************************************/
 
-/* All disabled and read-only text areas */
+/* Read-only text areas: the value stays selectable, so the caret cursor stays. */
 .rt-TextAreaInput {
-  &:where(:disabled, :read-only) {
-    cursor: text;
+  &:where(:read-only:not(:disabled)) {
     color: var(--gray-a11);
     /* Safari */
     -webkit-text-fill-color: var(--gray-a11);
 
-    &::placeholder {
-      opacity: 0.5;
+    .rt-TextAreaRoot:where(:has(&)) {
+      --v-selection-color: var(--gray-a5);
+      --v-focus-color: var(--gray-8);
     }
-    &:where(:placeholder-shown) {
-      cursor: var(--cursor-disabled);
+  }
+}
+
+/* Disabled is a colour remap, never opacity, and the cursor goes back to the arrow. */
+.rt-TextAreaInput {
+  &:where(:disabled) {
+    cursor: default;
+    color: var(--gray-a8);
+    /* Safari */
+    -webkit-text-fill-color: var(--gray-a8);
+
+    &::placeholder {
+      color: var(--gray-a8);
+      -webkit-text-fill-color: var(--gray-a8);
+      opacity: 1;
     }
 
     .rt-TextAreaRoot:where(:has(&)) {
       --v-selection-color: var(--gray-a5);
       --v-focus-color: var(--gray-8);
+      cursor: default;
     }
   }
 }
 
 /***************************************************************************************************
  *                                                                                                 *
- * ERROR STATES                                                                                    *
+ * INVALID                                                                                         *
+ *                                                                                                 *
+ * Keyed on the textarea's `aria-invalid`, which the `error` prop also sets. Only the border and   *
+ * the focus ring move; the fill stays the variant's.                                              *
  *                                                                                                 *
  ***************************************************************************************************/
 
-.rt-TextAreaRoot:where(.rt-error) {
-  --v-selection-color: var(--red-a5);
+.rt-TextAreaRoot:where(:has(> .rt-TextAreaInput[aria-invalid='true'])) {
   --v-focus-color: var(--red-8);
-}
 
-/* Error outline variant */
-.rt-TextAreaRoot:where(.rt-error.rt-variant-outline) {
-  --v-bg-hover: var(--red-2);
-  --v-bg-hover-a: var(--red-a2);
-  --v-border: var(--red-6);
-  --v-border-a: var(--red-a6);
-  --v-border-hover: var(--red-7);
-  --v-border-hover-a: var(--red-a7);
-
-  box-shadow: inset 0 0 0 1px color-mix(
-    in srgb,
-    var(--v-border-a) calc(var(--material-alpha) * 100%),
-    var(--v-border) var(--material-blend)
-  );
+  &:where(.rt-variant-outline, .rt-variant-surface, .rt-variant-soft, .rt-variant-ghost) {
+    box-shadow: inset 0 0 0 1px var(--red-6);
 
-  @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--v-bg-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-bg-hover) var(--material-blend)
-      );
-      box-shadow: inset 0 0 0 1px color-mix(
-        in srgb,
-        var(--v-border-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-border-hover) var(--material-blend)
-      );
+    @media (hover: hover) {
+      &:where(:hover:not(:has(.rt-TextAreaInput:where(:focus, :disabled)))) {
+        box-shadow: inset 0 0 0 1px var(--red-7);
+      }
     }
   }
-}
-
-/* Error surface variant */
-.rt-TextAreaRoot:where(.rt-error.rt-variant-surface) {
-  --v-bg: var(--red-2);
-  --v-bg-a: var(--red-a2);
-  --v-bg-hover: var(--red-3);
-  --v-bg-hover-a: var(--red-a3);
-  --v-border: var(--red-6);
-  --v-border-a: var(--red-a6);
-  --v-border-hover: var(--red-7);
-  --v-border-hover-a: var(--red-a7);
-
-  background-color: color-mix(
-    in srgb,
-    var(--v-bg-a) calc(var(--material-alpha) * 100%),
-    var(--v-bg) var(--material-blend)
-  );
-  box-shadow: inset 0 0 0 1px color-mix(
-    in srgb,
-    var(--v-border-a) calc(var(--material-alpha) * 100%),
-    var(--v-border) var(--material-blend)
-  );
 
-  @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--v-bg-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-bg-hover) var(--material-blend)
-      );
-      box-shadow: inset 0 0 0 1px color-mix(
-        in srgb,
-        var(--v-border-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-border-hover) var(--material-blend)
-      );
-    }
-  }
-}
+  &:where(.rt-variant-raised) {
+    box-shadow: var(--shadow-2), inset 0 0 0 1px var(--red-6);
 
-/* Error raised variant */
-.rt-TextAreaRoot:where(.rt-error.rt-variant-raised) {
-  box-shadow: var(--shadow-2), inset 0 0 0 1px var(--red-6);
-  
-  @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      box-shadow: var(--shadow-3), inset 0 0 0 1px var(--red-7);
-    }
-  }
-}
-
-/* Error soft variant */
-.rt-TextAreaRoot:where(.rt-error.rt-variant-soft) {
-  --v-bg: var(--red-2);
-  --v-bg-a: var(--red-a2);
-  --v-bg-hover: var(--red-4);
-  --v-bg-hover-a: var(--red-a4);
-  
-  background-color: color-mix(
-    in srgb,
-    var(--v-bg-a) calc(var(--material-alpha) * 100%),
-    var(--v-bg) var(--material-blend)
-  );
-  
-  @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--v-bg-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-bg-hover) var(--material-blend)
-      );
+    @media (hover: hover) {
+      &:where(:hover:not(:has(.rt-TextAreaInput:where(:focus, :disabled)))) {
+        box-shadow: var(--shadow-2), inset 0 0 0 1px var(--red-7);
+      }
     }
-  }
-}
-
-/* Error ghost variant */
-.rt-TextAreaRoot:where(.rt-error.rt-variant-ghost) {
-  --v-bg-hover: var(--red-3);
-  --v-bg-hover-a: var(--red-a3);
-  --v-bg-focus: var(--red-2);
-  --v-bg-focus-a: var(--red-a2);
 
-  @media (hover: hover) {
-    &:where(:hover:not(:has(.rt-TextAreaInput:focus))) {
-      background-color: color-mix(
-        in srgb,
-        var(--v-bg-hover-a) calc(var(--material-alpha) * 100%),
-        var(--v-bg-hover) var(--material-blend)
-      );
+    /* The raised focus ring is a box-shadow, not the outline */
+    &:where(:has(.rt-TextAreaInput:focus)) {
+      box-shadow: var(--shadow-2), inset 0 0 0 1px var(--red-6), 0 0 0 2px var(--red-8);
     }
   }
-  
-  &:where(:focus-within) {
-    background-color: color-mix(
-      in srgb,
-      var(--v-bg-focus-a) calc(var(--material-alpha) * 100%),
-      var(--v-bg-focus) var(--material-blend)
-    );
-  }
 }
 
 /***************************************************************************************************
@@ -647,10 +482,10 @@
   color: var(--red-11);
   font-size: var(--font-size-1);
   line-height: var(--line-height-1);
-  margin-top: var(--space-1);
+  margin-top: var(--space-2);
   display: flex;
   align-items: center;
-  gap: var(--space-1);
+  gap: var(--space-2);
 }
 
 .rt-TextAreaErrorMessage::before {

package/src/components/text-area.props.tsx

@@ -6,14 +6,12 @@ import type { PropDef } from '../props/prop-def.js';
 const sizes = ['1', '2', '3', '4'] as const;
 const variants = ['raised', 'surface', 'soft', 'outline', 'ghost'] as const;
 const resizeValues = ['none', 'vertical', 'horizontal', 'both'] as const;
-const materials = ['solid', 'translucent'] as const;
 
 // prettier-ignore
 const textAreaPropDefs = {
   size: { type: 'enum', className: 'rt-r-size', values: sizes, default: '2', responsive: true },
   variant: { type: 'enum', className: 'rt-variant', values: variants, default: 'raised' },
   resize: { type: 'enum', className: 'rt-r-resize', values: resizeValues,  responsive: true },
-  material: { type: 'enum', values: materials, default: undefined },
   // Error and validation props
   error: { type: 'boolean', default: false },
   errorMessage: { type: 'string', default: undefined },
@@ -27,7 +25,6 @@ const textAreaPropDefs = {
   size: PropDef<(typeof sizes)[number]>;
   variant: PropDef<(typeof variants)[number]>;
   resize: PropDef<(typeof resizeValues)[number]>;
-  material: PropDef<(typeof materials)[number] | undefined>;
   error: PropDef<boolean>;
   errorMessage: PropDef<string | undefined>;
   required: PropDef<boolean>;

package/src/components/text-area.tsx

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 
 import { textAreaPropDefs } from './text-area.props.js';
 import { extractProps } from '../helpers/extract-props.js';
+import { useThemeSizeProps } from '../helpers/theme-size.js';
 import { marginPropDefs } from '../props/margin.props.js';
 
 import type { MarginProps } from '../props/margin.props.js';
@@ -19,18 +20,18 @@ interface TextAreaProps
     MarginProps,
     TextAreaOwnProps {}
 
-const TextArea = React.forwardRef<TextAreaElement, TextAreaProps>((props, forwardedRef) => {
-  const { className, color, radius, material, style, ...textAreaProps } =
+const TextArea = React.forwardRef<TextAreaElement, TextAreaProps>((ownProps, forwardedRef) => {
+  const props = useThemeSizeProps(ownProps, textAreaPropDefs.size);
+  const { className, color, radius, style, ...textAreaProps } =
     extractProps(props, textAreaPropDefs, marginPropDefs);
-  const effectiveMaterial = material;
 
   // Generate unique IDs for accessibility
   const errorId = React.useId();
 
-  const { 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby } = textAreaProps;
+  const { 'aria-describedby': ariaDescribedby, 'aria-labelledby': ariaLabelledby, 'aria-invalid': ariaInvalid } = textAreaProps;
 
-  // Determine invalid state
-  const isInvalid = textAreaProps.error;
+  // Invalid when `error` is set or the caller passes aria-invalid; the CSS keys on aria-invalid only.
+  const isInvalid = Boolean(textAreaProps.error) || ariaInvalid === true || ariaInvalid === 'true';
 
   // Build aria-describedby string
   const describedBy = React.useMemo(() => {
@@ -43,11 +44,11 @@ const TextArea = React.forwardRef<TextAreaElement, TextAreaProps>((props, forwar
   // Build aria attributes
   const ariaProps = React.useMemo(
     () => ({
-      'aria-invalid': isInvalid,
+      'aria-invalid': isInvalid ? true : ariaInvalid,
       'aria-describedby': describedBy,
       'aria-labelledby': ariaLabelledby,
     }),
-    [isInvalid, describedBy, ariaLabelledby],
+    [isInvalid, ariaInvalid, describedBy, ariaLabelledby],
   );
 
   // Filter out our custom props to avoid DOM warnings
@@ -65,7 +66,6 @@ const TextArea = React.forwardRef<TextAreaElement, TextAreaProps>((props, forwar
     <div
       data-accent-color={color}
       data-radius={radius}
-      data-material={effectiveMaterial}
       className={classNames('rt-TextAreaRoot', className, {
         'rt-error': isInvalid,
       })}