@rojaostudio/ds 2.0.0-next.12 → 2.0.0-next.14

package/dist/components/image-crop-modal.js

@@ -1,240 +1,7 @@
 "use client";
 import "../chunk-ORMEWXMH.js";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useEffect, useRef, useState } from "react";
-import ReactCrop, { centerCrop } from "react-image-crop";
-import "react-image-crop/dist/ReactCrop.css";
-import { Alert } from "./alert.js";
-import { Button } from "./button.js";
-import { Dialog } from "./dialog.js";
-import { RectangleHorizontalIcon, RectangleVerticalIcon, SquareDashedIcon, SquareIcon } from "./internal/icons.js";
-import { Spinner } from "./spinner.js";
-import { ToggleGroup, ToggleGroupItem } from "./toggle-group.js";
-const DEFAULT_PRESETS = [
-  { id: "square", label: "1:1", aspect: 1, icon: /* @__PURE__ */ jsx(SquareIcon, {}) },
-  { id: "portrait", label: "4:5", aspect: 4 / 5, icon: /* @__PURE__ */ jsx(RectangleVerticalIcon, {}) },
-  { id: "landscape", label: "16:9", aspect: 16 / 9, icon: /* @__PURE__ */ jsx(RectangleHorizontalIcon, {}) },
-  { id: "free", label: "Livre", icon: /* @__PURE__ */ jsx(SquareDashedIcon, {}) }
-];
-const DEFAULT_MIN_ASPECT = 0.5;
-const DEFAULT_MAX_ASPECT = 2;
-function buildInitialCrop(width, height, aspect) {
-  if (!aspect) {
-    return { unit: "%", x: 0, y: 0, width: 100, height: 100 };
-  }
-  const imageAspect = width / height;
-  let cropW;
-  let cropH;
-  if (aspect >= imageAspect) {
-    cropW = 100;
-    cropH = imageAspect / aspect * 100;
-  } else {
-    cropH = 100;
-    cropW = aspect / imageAspect * 100;
-  }
-  return centerCrop({ unit: "%", x: 0, y: 0, width: cropW, height: cropH }, width, height);
-}
-const QUALITY_STEPS = [0.85, 0.75, 0.65, 0.55];
-const MAX_SIDE_STEPS = [1600, 1200];
-function canvasToBlob(canvas, mimeType, quality) {
-  return new Promise((resolve, reject) => {
-    canvas.toBlob((blob) => blob ? resolve(blob) : reject(new Error("toBlob failed")), mimeType, quality);
-  });
-}
-function drawCrop(image, crop, maxSide) {
-  const canvas = document.createElement("canvas");
-  const scaleX = image.naturalWidth / image.width;
-  const scaleY = image.naturalHeight / image.height;
-  let outW = Math.round(crop.width * scaleX);
-  let outH = Math.round(crop.height * scaleY);
-  if (maxSide && Math.max(outW, outH) > maxSide) {
-    const ratio = maxSide / Math.max(outW, outH);
-    outW = Math.round(outW * ratio);
-    outH = Math.round(outH * ratio);
-  }
-  canvas.width = outW;
-  canvas.height = outH;
-  const ctx = canvas.getContext("2d");
-  if (!ctx) throw new Error("Canvas not supported");
-  ctx.drawImage(
-    image,
-    crop.x * scaleX,
-    crop.y * scaleY,
-    crop.width * scaleX,
-    crop.height * scaleY,
-    0,
-    0,
-    outW,
-    outH
-  );
-  return canvas;
-}
-async function cropToBlob(image, crop, mimeType, maxSizeBytes) {
-  const baseCanvas = drawCrop(image, crop);
-  if (!maxSizeBytes) {
-    return canvasToBlob(baseCanvas, mimeType, 0.92);
-  }
-  const out = await canvasToBlob(baseCanvas, "image/jpeg", 0.92);
-  if (out.size <= maxSizeBytes) return out;
-  let best = out;
-  for (const q of QUALITY_STEPS) {
-    const candidate = await canvasToBlob(baseCanvas, "image/jpeg", q);
-    best = candidate;
-    if (candidate.size <= maxSizeBytes) return candidate;
-  }
-  for (const side of MAX_SIDE_STEPS) {
-    const scaledCanvas = drawCrop(image, crop, side);
-    for (const q of QUALITY_STEPS) {
-      const candidate = await canvasToBlob(scaledCanvas, "image/jpeg", q);
-      best = candidate;
-      if (candidate.size <= maxSizeBytes) return candidate;
-    }
-  }
-  return best;
-}
-function ImageCropModal({
-  open,
-  file,
-  position,
-  onCancel,
-  onConfirm,
-  presets = DEFAULT_PRESETS,
-  minAspect = DEFAULT_MIN_ASPECT,
-  maxAspect = DEFAULT_MAX_ASPECT,
-  title = "Ajustar foto",
-  confirmLabel = "Aplicar e enviar",
-  maxSizeBytes
-}) {
-  const [src, setSrc] = useState(null);
-  const [preset, setPreset] = useState(presets[0]);
-  const [crop, setCrop] = useState();
-  const [completedCrop, setCompletedCrop] = useState(null);
-  const [aspectError, setAspectError] = useState(null);
-  const [busy, setBusy] = useState(false);
-  const [imgLoaded, setImgLoaded] = useState(false);
-  const imgRef = useRef(null);
-  useEffect(() => {
-    if (!file) {
-      setSrc(null);
-      setImgLoaded(false);
-      return;
-    }
-    const url = URL.createObjectURL(file);
-    setSrc(url);
-    setPreset(presets[0]);
-    setCrop(void 0);
-    setCompletedCrop(null);
-    setAspectError(null);
-    setImgLoaded(false);
-    return () => URL.revokeObjectURL(url);
-  }, [file, presets]);
-  function handleImageLoad(e) {
-    var _a, _b, _c, _d;
-    const { width, height } = e.currentTarget;
-    const initial = buildInitialCrop(width, height, preset.aspect);
-    setCrop(initial);
-    const pixelInitial = {
-      unit: "px",
-      x: ((_a = initial.x) != null ? _a : 0) / 100 * width,
-      y: ((_b = initial.y) != null ? _b : 0) / 100 * height,
-      width: ((_c = initial.width) != null ? _c : 0) / 100 * width,
-      height: ((_d = initial.height) != null ? _d : 0) / 100 * height
-    };
-    setCompletedCrop(pixelInitial);
-    setImgLoaded(true);
-  }
-  function applyPreset(p) {
-    setPreset(p);
-    setAspectError(null);
-    if (imgRef.current) {
-      const { width, height } = imgRef.current;
-      setCrop(buildInitialCrop(width, height, p.aspect));
-    }
-  }
-  function validateFreeAspect(c) {
-    if (preset.aspect) return true;
-    if (!c.width || !c.height) return false;
-    const ratio = c.width / c.height;
-    if (ratio < minAspect) {
-      setAspectError(`Recorte muito alto. M\xEDnimo permitido: ${minAspect.toFixed(1)}.`);
-      return false;
-    }
-    if (ratio > maxAspect) {
-      setAspectError(`Recorte muito largo. M\xE1ximo permitido: ${maxAspect.toFixed(1)}.`);
-      return false;
-    }
-    setAspectError(null);
-    return true;
-  }
-  async function handleConfirm() {
-    if (busy) return;
-    if (!completedCrop || !imgRef.current || !file) return;
-    if (!validateFreeAspect(completedCrop)) return;
-    setBusy(true);
-    try {
-      const blob = await cropToBlob(imgRef.current, completedCrop, file.type || "image/jpeg", maxSizeBytes);
-      await onConfirm(blob);
-    } catch (err) {
-      console.error("cropToBlob error", err);
-    } finally {
-      setBusy(false);
-    }
-  }
-  return /* @__PURE__ */ jsx(
-    Dialog,
-    {
-      open,
-      onOpenChange: (next) => {
-        if (!next) onCancel();
-      },
-      size: "lg",
-      title: position ? `${title} \xB7 ${position}` : title,
-      footer: /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(Button, { tone: "neutral", variant: "ghost", onClick: onCancel, children: "Cancelar" }),
-        /* @__PURE__ */ jsx(Button, { onClick: handleConfirm, disabled: busy || !completedCrop || !!aspectError, loading: busy, children: busy ? "Aplicando\u2026" : confirmLabel })
-      ] }),
-      children: /* @__PURE__ */ jsxs("div", { className: "rds-image-crop", children: [
-        presets.length > 1 && /* @__PURE__ */ jsx(
-          ToggleGroup,
-          {
-            type: "single",
-            "aria-label": "Propor\xE7\xE3o",
-            value: preset.id,
-            onValueChange: (id) => {
-              const next = presets.find((p) => p.id === id);
-              if (next) applyPreset(next);
-            },
-            className: "rds-image-crop__presets",
-            children: presets.map((p) => /* @__PURE__ */ jsx(ToggleGroupItem, { value: p.id, icon: p.icon, children: p.label }, p.id))
-          }
-        ),
-        /* @__PURE__ */ jsxs("div", { className: "rds-image-crop__stage", children: [
-          src && /* @__PURE__ */ jsx(
-            ReactCrop,
-            {
-              crop,
-              onChange: (_, percentCrop) => setCrop(percentCrop),
-              onComplete: (c) => {
-                setCompletedCrop(c);
-                validateFreeAspect(c);
-              },
-              aspect: preset.aspect,
-              keepSelection: true,
-              minWidth: 50,
-              minHeight: 50,
-              className: "rds-image-crop__crop",
-              children: /* @__PURE__ */ jsx("img", { ref: imgRef, src, alt: "", onLoad: handleImageLoad, className: "rds-image-crop__image" })
-            }
-          ),
-          !imgLoaded && /* @__PURE__ */ jsx("div", { className: "rds-image-crop__layer", children: /* @__PURE__ */ jsx(Spinner, { size: "lg", label: "Carregando imagem\u2026" }) }),
-          busy && /* @__PURE__ */ jsx("div", { className: "rds-image-crop__layer rds-image-crop__layer--busy", children: /* @__PURE__ */ jsx(Spinner, { size: "lg", tone: "inverse", label: "Enviando\u2026" }) })
-        ] }),
-        aspectError && /* @__PURE__ */ jsx(Alert, { tone: "danger", title: aspectError, announce: "alert" }),
-        !aspectError && imgLoaded && !busy && /* @__PURE__ */ jsx("p", { className: "rds-image-crop__hint", children: preset.aspect ? "Arraste as al\xE7as para ajustar o recorte." : `Livre: propor\xE7\xE3o entre ${minAspect.toFixed(1)} (vertical) e ${maxAspect.toFixed(1)} (horizontal).` })
-      ] })
-    }
-  );
-}
+import { ImageCropDialog } from "./image-crop-dialog.js";
+const ImageCropModal = ImageCropDialog;
 export {
   ImageCropModal
 };

package/dist/components/image-upload.d.ts

@@ -1,5 +1,5 @@
 import * as react from 'react';
-import { CropPreset } from './image-crop-modal.js';
+import { CropPreset } from './image-crop-dialog.js';
 
 /**
  * @deprecated Use `<FileInput variant="tile">` (Figma [RDS] Forms/FileInput): the image's square with the preview
@@ -25,7 +25,7 @@ interface ImageUploadLabels {
     /** The error message when the upload fails without one. */
     error: string;
 }
-/** When given, the chosen image goes through the ImageCropModal before the upload. */
+/** When given, the chosen image goes through the ImageCropDialog before the upload. */
 interface ImageUploadCrop {
     presets?: CropPreset[];
     minAspect?: number;

package/dist/components/image-upload.js

@@ -5,7 +5,7 @@ import {
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useRef, useState } from "react";
 import { FileInput } from "./file-input.js";
-import { ImageCropModal } from "./image-crop-modal.js";
+import { ImageCropDialog } from "./image-crop-dialog.js";
 const DEFAULT_LABELS = {
   select: "Selecionar imagem",
   change: "Trocar imagem",
@@ -81,7 +81,7 @@ function ImageUpload({
     ),
     /* @__PURE__ */ jsx("input", { type: "hidden", name, value }),
     crop && /* @__PURE__ */ jsx(
-      ImageCropModal,
+      ImageCropDialog,
       {
         open: !!pendingFile,
         file: pendingFile,

package/dist/components/index.d.ts

@@ -38,6 +38,7 @@ export { Empty, EmptyProps } from './empty.js';
 export { InsightCard, InsightCardProps, InsightCardType } from './insight-card.js';
 export { SectionCard, SectionCardProps } from './section-card.js';
 export { SectionHeader, SectionHeaderProps } from './section-header.js';
+export { Stepper, StepperProps, StepperStep } from './stepper.js';
 export { FloatingStepper, FloatingStepperProps, FloatingStepperStep } from './floating-stepper.js';
 export { Stat, StatProps, StatTone } from './stat.js';
 export { SummaryBar, SummaryBarItem, SummaryBarLayout, SummaryBarProps, SummaryBarTone } from './summary-bar.js';

package/dist/components/index.js

@@ -45,6 +45,7 @@ import { Empty } from "./empty.js";
 import { InsightCard } from "./insight-card.js";
 import { SectionCard } from "./section-card.js";
 import { SectionHeader } from "./section-header.js";
+import { Stepper } from "./stepper.js";
 import { FloatingStepper } from "./floating-stepper.js";
 import { Stat } from "./stat.js";
 import { SummaryBar } from "./summary-bar.js";
@@ -273,6 +274,7 @@ export {
   Stat,
   Status,
   StepProgress,
+  Stepper,
   SummaryBar,
   Switch,
   Table,

package/dist/components/number-input.d.ts

@@ -53,7 +53,7 @@ interface NumberInputProps extends Omit<FieldTextProps, 'labelPosition'> {
  * booking, instalments). The number in the middle is typed; the field is a spinbutton, so the arrows move it (Page
  * Up/Down by ten steps, Home/End to the limits) and − and + stay out of the Tab order. At a limit its button turns
  * off. A price, a CPF or a CEP is the Input; a continuous range, the Slider; the steps of a flow, the
- * FloatingStepper. Styles: number-input.css and internal/field.css.
+ * Stepper. Styles: number-input.css and internal/field.css.
  */
 declare function NumberInput({ label, hint, error, errorMessage, required, value, defaultValue, onChange, min, max, step, unit, steps, stepsLabel, debounce, decrementLabel, incrementLabel, name, placeholder, disabled, id, className, style, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledBy, }: NumberInputProps): react.JSX.Element;
 

package/dist/components/stepper.d.ts

@@ -0,0 +1,33 @@
+import * as react from 'react';
+import { ReactNode } from 'react';
+
+/**
+ * Stepper — a composition of the Card (as a pill) and Buttons (Figma [RDS] Actions/Button, neutral): the
+ * floating steps of a flow (point of sale, checkout). The current step is the filled Button (aria-current="step");
+ * earlier steps go back, later ones are disabled; `canNavigate` changes the rule. `action` is a last Button after
+ * a vertical Separator (Reset). Where it floats is the caller's (className or a wrapper). Styles: stepper.css.
+ */
+type StepperStep = {
+    key: string;
+    label: string;
+};
+interface StepperProps {
+    steps: StepperStep[];
+    /** key da etapa atual */
+    current: string;
+    onNavigate?: (key: string) => void;
+    /** Regra de navegação por etapa. Default: só etapas anteriores à atual. */
+    canNavigate?: (key: string, index: number, currentIndex: number) => boolean;
+    /** Ação à direita, separada por divisor (ex.: Reset). */
+    action?: {
+        label: string;
+        icon?: ReactNode;
+        onClick: () => void;
+    };
+    className?: string;
+    /** The navigation's name. Default "Etapas". */
+    'aria-label'?: string;
+}
+declare function Stepper({ steps, current, onNavigate, canNavigate, action, className, 'aria-label': ariaLabel }: StepperProps): react.JSX.Element;
+
+export { Stepper, type StepperProps, type StepperStep };

package/dist/components/stepper.js

@@ -0,0 +1,36 @@
+"use client";
+import "../chunk-ORMEWXMH.js";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Button } from "./button.js";
+import { Card } from "./card.js";
+import { Separator } from "./separator.js";
+function Stepper({ steps, current, onNavigate, canNavigate, action, className, "aria-label": ariaLabel = "Etapas" }) {
+  const currentIdx = steps.findIndex((s) => s.key === current);
+  return /* @__PURE__ */ jsxs(Card, { as: "div", size: "sm", role: "navigation", "aria-label": ariaLabel, className: ["rds-stepper", className].filter(Boolean).join(" "), children: [
+    steps.map((s, idx) => {
+      const isCurrent = idx === currentIdx;
+      const canGo = canNavigate ? canNavigate(s.key, idx, currentIdx) : idx < currentIdx;
+      return /* @__PURE__ */ jsx(
+        Button,
+        {
+          tone: "neutral",
+          variant: isCurrent ? "fill" : "ghost",
+          disabled: !canGo && !isCurrent,
+          "aria-current": isCurrent ? "step" : void 0,
+          onClick: () => {
+            if (canGo && !isCurrent) onNavigate == null ? void 0 : onNavigate(s.key);
+          },
+          children: s.label
+        },
+        s.key
+      );
+    }),
+    action && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Separator, { orientation: "vertical", className: "rds-stepper__divider" }),
+      /* @__PURE__ */ jsx(Button, { tone: "neutral", variant: "ghost", icon: action.icon, onClick: action.onClick, children: action.label })
+    ] })
+  ] });
+}
+export {
+  Stepper
+};

package/dist/components/toast.d.ts

@@ -14,12 +14,18 @@ interface ToastOptions {
     variant?: ToastVariant;
     /** The tone's icon (Figma: `showIcon`). Decorative. */
     showIcon?: boolean;
-    /** One action (Figma: `showAction`): "Desfazer", "Ver". With an action it stays at least 6 s. */
+    /**
+     * One action (Figma: `showAction`): "Desfazer", "Ver". A toast with an action does not close by itself (WCAG 2.2.1,
+     * Timing Adjustable): it stays until the person uses the action or the ×. Choosing the action also closes it.
+     */
     action?: {
         label: string;
         onClick: () => void;
     };
-    /** ms on screen. Default 5 s, 6 s with an action. It pauses while the mouse or the focus is on it. */
+    /**
+     * ms on screen. Default 5 s; `Infinity` (until closed) with an action. It pauses while the mouse or the focus is on
+     * it. A number given here wins, also with an action: give one only when the action can be reached some other way.
+     */
     duration?: number;
     /** Give the same id to replace a toast that is on screen instead of stacking another one. */
     id?: string;
@@ -50,14 +56,19 @@ declare function useToast(): ToastFn;
 interface ToasterProps {
     /** The region's name, said with the F8 shortcut that takes the focus to it. */
     label?: string;
+    /** The ×'s accessible name (and its Tooltip), on every toast. Default "Fechar". */
+    closeLabel?: string;
     /** The app, when the Toaster wraps it. It can also be mounted alone, once, anywhere on the page. */
     children?: ReactNode;
 }
+/** @internal How long a toast stays: 5 s, or until closed when it has an action (WCAG 2.2.1). */
+declare const toastDuration: (duration: number | undefined, hasAction: boolean) => number;
 /**
  * Toaster — the region where the toasts of the Figma [RDS] Feedback/Toast appear (Radix Toast): the bottom-right
  * corner, up to three at a time (a fourth pushes the oldest out), each one announced in a live region (danger
- * assertively, the others politely). F8 takes the focus to the region; swiping right dismisses. Styles: toast.css.
+ * assertively, the others politely). F8 takes the focus to the region; swiping right dismisses. A toast closes by
+ * itself after 5 s; one with an action stays until the action or the × (WCAG 2.2.1). Styles: toast.css.
  */
-declare function Toaster({ label, children }: ToasterProps): react.JSX.Element;
+declare function Toaster({ label, closeLabel, children }: ToasterProps): react.JSX.Element;
 
-export { type ToastFn, type ToastOptions, type ToastTone, type ToastVariant, ToastView, type ToastViewProps, Toaster, type ToasterProps, toast, toastClassName, useToast };
+export { type ToastFn, type ToastOptions, type ToastTone, type ToastVariant, ToastView, type ToastViewProps, Toaster, type ToasterProps, toast, toastClassName, toastDuration, useToast };

package/dist/components/toast.js

@@ -66,7 +66,8 @@ function useToast() {
   return toast;
 }
 const MAX_VISIBLE = 3;
-function Toaster({ label = "Notifica\xE7\xF5es", children }) {
+const toastDuration = (duration, hasAction) => duration != null ? duration : hasAction ? Infinity : 5e3;
+function Toaster({ label = "Notifica\xE7\xF5es", closeLabel = "Fechar", children }) {
   const [items, setItems] = useState([]);
   useEffect(() => {
     const listener = (event) => {
@@ -102,7 +103,7 @@ function Toaster({ label = "Notifica\xE7\xF5es", children }) {
           if (!next) close(key);
         },
         type: tone === "danger" ? "foreground" : "background",
-        duration: duration != null ? duration : action ? 6e3 : 5e3,
+        duration: toastDuration(duration, Boolean(action)),
         className: toastClassName(tone, variant),
         children: [
           /* @__PURE__ */ jsx(
@@ -115,7 +116,7 @@ function Toaster({ label = "Notifica\xE7\xF5es", children }) {
             }
           ),
           action && /* @__PURE__ */ jsx(ToastPrimitive.Action, { altText: action.label, asChild: true, children: /* @__PURE__ */ jsx(Button, { tone: "neutral", variant: "ghost", className: "rds-toast__action", onClick: action.onClick, children: action.label }) }),
-          /* @__PURE__ */ jsx(Tooltip, { text: "Fechar", children: /* @__PURE__ */ jsx(ToastPrimitive.Close, { asChild: true, children: /* @__PURE__ */ jsx(IconButton, { icon: /* @__PURE__ */ jsx(CloseIcon, {}), label: "Fechar", tone: "neutral", variant: "ghost", className: "rds-toast__close" }) }) })
+          /* @__PURE__ */ jsx(Tooltip, { text: closeLabel, children: /* @__PURE__ */ jsx(ToastPrimitive.Close, { asChild: true, children: /* @__PURE__ */ jsx(IconButton, { icon: /* @__PURE__ */ jsx(CloseIcon, {}), label: closeLabel, tone: "neutral", variant: "ghost", className: "rds-toast__close" }) }) })
         ]
       },
       key
@@ -128,5 +129,6 @@ export {
   Toaster,
   toast,
   toastClassName,
+  toastDuration,
   useToast
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rojaostudio/ds",
-  "version": "2.0.0-next.12",
+  "version": "2.0.0-next.14",
   "type": "module",
   "description": "Rojão Design System — componentes React, estilos e alvo React Native. O motor vive em @rojaostudio/ds-core.",
   "license": "MIT",
@@ -168,7 +168,6 @@
     "playwright": "^1.63.0",
     "react-image-crop": "^11.0.10",
     "react-international-phone": "^4.8.0",
-    "ts-morph": "^28.0.0",
     "tsup": "^8.5.1",
     "tsx": "^4.21.0",
     "typescript": "^5",
@@ -191,7 +190,7 @@
     "@radix-ui/react-toggle": "^1.1.18",
     "@radix-ui/react-toggle-group": "^1.1.19",
     "@radix-ui/react-tooltip": "^1.2.16",
-    "@rojaostudio/ds-core": "1.1.0-next.6"
+    "@rojaostudio/ds-core": "1.1.0-next.7"
   },
   "scripts": {
     "build": "pnpm run build:tokens && pnpm run build:themes && pnpm run build:rds && pnpm run build:native && tsup",
@@ -208,6 +207,6 @@
     "lint": "eslint .",
     "build:brands": "tsx scripts/build-brands.ts",
     "build:rds": "tsx scripts/build-rds-tokens.ts",
-    "migrate:consumer": "tsx scripts/migrate-consumer.ts"
+    "migrate:consumer": "tsx ../codemod/src/cli.ts"
   }
 }

package/styles/base.css

@@ -26,9 +26,17 @@
    Run `pnpm build:tokens` in the DS to regenerate.
    ───────────────────────────────────────────────────────────── */
 
+/* Cascade layers, lowest first: the same order rds.css declares, whichever of the two is imported first.
+   Everything of this file except Tailwind's @utility and @theme blocks (which Tailwind wants at the top level)
+   lives in rds.legacy, below rds.theme: with rds.css also imported, the 2.0 variables win wherever the names
+   collide (--surface-page, --text-muted, --border-default, --radius-card, --z-modal, --space-*, --toast-text…)
+   and the h1–h6 rule loses to the 2.0 components. */
+@layer rds.legacy, rds.theme, rds.tokens, rds.components;
+
 /* Primitives — auto-generated from tokens/index.ts */
-@import "./_primitives.generated.css";
+@import "./_primitives.generated.css" layer(rds.legacy);
 
+@layer rds.legacy {
 /* ── CSS Custom Properties — light (default, neutral theme) ── */
 /* .ds-scope: qualquer wrapper que precise recalcular tokens de COMPONENTE (ex.
    --option-tile-bg) sob um override local de token SEMÂNTICO (ex. --surface-default)
@@ -724,6 +732,7 @@ h1, h2, h3, h4, h5, h6 {
   .rojao-toast--enter-top, .rojao-toast--enter-bottom,
   .rojao-toast--exit-top,  .rojao-toast--exit-bottom { animation: none; }
 }
+} /* @layer rds.legacy */
 
 /* ── Control size utilities — h-control-sm/md/lg, size-control-sm/md/lg ── */
 @utility h-control-sm   { height: var(--space-control-height-sm); }
@@ -925,6 +934,9 @@ h1, h2, h3, h4, h5, h6 {
  * sem ele, num botão com borda da mesma família de cor, o anel some dentro da
  * borda. E ele é desenhado com a cor da superfície, então funciona igual sobre
  * fundo claro e sobre o escuro do chrome.
+ *
+ * Stays in Tailwind's `base` layer, not in rds.legacy: it sets no variable, and in `base` Tailwind's utilities
+ * (`outline-none`) still win over it, as they did in 1.x. Both layers sit below the rds.* ones.
  */
 @layer base {
   :where(a, button, input, select, textarea, summary, [tabindex]):focus-visible {

package/styles/rds/components-styles.css

@@ -4399,35 +4399,6 @@ input:focus-visible + .rds-checkbox__box {
   }
 }
 
-/* components/floating-stepper.css */
-/* @tokens floating-stepper */
-/*
- * FloatingStepper: no tokens of its own; the Card and the Buttons bring theirs. A pill (radius/full) of 44 Buttons,
- * 4 inside and 4 apart, raised by elevation/overlay because it floats over the page. A vertical Separator, 24
- * tall, before the action.
- */
-.rds-floating-stepper {
-  flex-direction: row;
-  align-items: center;
-  gap: var(--space-4);
-  width: max-content;
-  max-width: 100%;
-  padding: var(--space-4);
-  border-radius: var(--radius-full);
-  box-shadow: var(--elevation-overlay);
-  overflow-x: auto;
-}
-
-.rds-floating-stepper > .rds-button {
-  flex: none;
-  border-radius: var(--radius-full);
-}
-
-.rds-floating-stepper > .rds-floating-stepper__divider {
-  align-self: center;
-  height: var(--size-24);
-}
-
 /* components/footer.css */
 /* @tokens footer */
 /*
@@ -4892,12 +4863,12 @@ input:focus-visible + .rds-checkbox__box {
   }
 }
 
-/* components/image-crop-modal.css */
-/* @tokens image-crop-modal */
+/* components/image-crop-dialog.css */
+/* @tokens image-crop-dialog */
 /*
- * ImageCropModal (Figma [RDS] Overlays/ImageCropModal): the Dialog, the ToggleGroup, the Alert and the Spinner bring
- * their tokens; the crop brings its own (Overlays, image-crop-modal/*). 12 apart: the presets (they share the
- * width), the stage (320 tall, on image-crop-modal/stage/background, the image letterboxed inside 16 of padding, a
+ * ImageCropDialog (Figma [RDS] Overlays/ImageCropDialog): the Dialog, the ToggleGroup, the Alert and the Spinner bring
+ * their tokens; the crop brings its own (Overlays, image-crop-dialog/*). 12 apart: the presets (they share the
+ * width), the stage (320 tall, on image-crop-dialog/stage/background, the image letterboxed inside 16 of padding, a
  * line in the dialog's border colour), the error or the hint. Over the image, outside the crop, the shade; the crop's
  * line and its handles in their own colours. While sending, the dialog's scrim covers the stage.
  */
@@ -4927,7 +4898,7 @@ input:focus-visible + .rds-checkbox__box {
   max-height: 60vh;
   padding: var(--space-16);
   overflow: hidden;
-  background: var(--image-crop-modal-stage-background);
+  background: var(--image-crop-dialog-stage-background);
   border: var(--border-width) solid var(--dialog-border);
   border-radius: var(--radius-control);
 }
@@ -4941,18 +4912,18 @@ input:focus-visible + .rds-checkbox__box {
 .rds-image-crop__crop {
   max-width: 100%;
   max-height: calc(min(320px, 60vh) - var(--space-32));
-  --rc-drag-handle-bg-colour: var(--image-crop-modal-handle);
-  --rc-border-color: var(--image-crop-modal-handle);
+  --rc-drag-handle-bg-colour: var(--image-crop-dialog-handle);
+  --rc-border-color: var(--image-crop-dialog-handle);
 }
 
 .rds-image-crop__crop .ReactCrop__crop-mask > rect {
-  fill: var(--image-crop-modal-shade);
+  fill: var(--image-crop-dialog-shade);
   fill-opacity: 1;
 }
 
 .rds-image-crop__crop .ReactCrop__crop-selection {
   background-image: none !important;
-  border: var(--border-width) solid var(--image-crop-modal-selection);
+  border: var(--border-width) solid var(--image-crop-dialog-selection);
   animation: none !important;
 }
 
@@ -9721,6 +9692,35 @@ input:focus-visible + .rds-radio__circle {
   }
 }
 
+/* components/stepper.css */
+/* @tokens stepper */
+/*
+ * Stepper: no tokens of its own; the Card and the Buttons bring theirs. A pill (radius/full) of 44 Buttons,
+ * 4 inside and 4 apart, raised by elevation/overlay because it floats over the page. A vertical Separator, 24
+ * tall, before the action.
+ */
+.rds-stepper {
+  flex-direction: row;
+  align-items: center;
+  gap: var(--space-4);
+  width: max-content;
+  max-width: 100%;
+  padding: var(--space-4);
+  border-radius: var(--radius-full);
+  box-shadow: var(--elevation-overlay);
+  overflow-x: auto;
+}
+
+.rds-stepper > .rds-button {
+  flex: none;
+  border-radius: var(--radius-full);
+}
+
+.rds-stepper > .rds-stepper__divider {
+  align-self: center;
+  height: var(--size-24);
+}
+
 /* components/summary-bar.css */
 /* @tokens summary-bar */
 /*