@endfield-ui/react 0.3.0 → 1.0.1

package/src/components/switch/Switch.tsx

@@ -22,6 +22,15 @@ const trackTransition =
   "transition-colors duration-(--duration-fast) ease-standard";
 const dualLabel =
   "pointer-events-none relative min-w-9 px-3 text-center transition-colors duration-(--duration-fast) ease-standard peer-disabled:text-ink-disabled";
+/*
+ * 高对比模式：旋钮是系统的"选中"色（禁用时是灰字色），压在它上面的那个值用配它的字色，
+ * 轨道上的另一个值用页面的字色。关的时候旋钮在"关"的值下面，开了换到"开"的值下面。
+ * 两个值的颜色都写明了，不让系统再改——不然它会在字后面垫一块页面色，把旋钮盖掉
+ */
+const dualOffForced =
+  "forced-colors:forced-color-adjust-none forced-colors:text-[HighlightText] forced-colors:peer-checked:text-[CanvasText] forced-colors:peer-disabled:text-[Canvas] forced-colors:peer-checked:peer-disabled:text-[GrayText]";
+const dualOnForced =
+  "forced-colors:forced-color-adjust-none forced-colors:text-[CanvasText] forced-colors:peer-checked:text-[HighlightText] forced-colors:peer-disabled:text-[GrayText] forced-colors:peer-checked:peer-disabled:text-[Canvas]";
 
 /**
  * 开关：胶囊轨道 + 圆形旋钮，立即生效的设置用它（需要"保存"才生效的用复选框）。
@@ -58,6 +67,8 @@ export function Switch({
         className={cn(
           // 两个值都是有效值，轨道不随开关变色：反转块的 80%，压在图像上时略微透出底下
           "peer absolute inset-0 size-full appearance-none rounded-full bg-surface-inverse/80 group-hover:bg-surface-inverse disabled:cursor-not-allowed disabled:bg-surface-muted",
+          // 高对比模式下底色都被系统换掉：轨道剩一圈边线，旋钮（下面那一块）用系统的"选中"色
+          "forced-colors:border forced-colors:border-[ButtonText] forced-colors:disabled:border-[GrayText]",
           trackTransition,
           focusRing,
         )}
@@ -68,20 +79,29 @@ export function Switch({
           "pointer-events-none absolute inset-y-1 left-1 w-[calc(50%-0.25rem)] rounded-full bg-surface-muted",
           "transition-[translate] duration-(--duration-fast) ease-standard",
           "peer-checked:translate-x-full peer-disabled:bg-surface-raised",
+          "forced-colors:bg-[Highlight] forced-colors:peer-disabled:bg-[GrayText]",
         )}
       />
       {/* 旋钮上的值用墨色，轨道上的另一个值降到 70% */}
       <span
         aria-hidden="true"
         data-value="off"
-        className={cn(dualLabel, "text-ink peer-checked:text-ink-inverse/70")}
+        className={cn(
+          dualLabel,
+          "text-ink peer-checked:text-ink-inverse/70",
+          dualOffForced,
+        )}
       >
         {offLabel}
       </span>
       <span
         aria-hidden="true"
         data-value="on"
-        className={cn(dualLabel, "text-ink-inverse/70 peer-checked:text-ink")}
+        className={cn(
+          dualLabel,
+          "text-ink-inverse/70 peer-checked:text-ink",
+          dualOnForced,
+        )}
       >
         {onLabel}
       </span>
@@ -96,6 +116,9 @@ export function Switch({
         className={cn(
           // 开：反转块作轨道。颜色只点在旋钮上，不是整条黄色轨道
           "peer h-7 w-13 appearance-none rounded-full bg-line-strong group-hover:bg-ink-tertiary checked:bg-surface-inverse disabled:cursor-not-allowed disabled:bg-surface-muted",
+          // 高对比模式下底色都被系统换掉，整个开关就没了：关是一圈边线，开是系统"选中"色的实心轨道
+          "forced-colors:border-2 forced-colors:border-[ButtonText] forced-colors:checked:border-[Highlight] forced-colors:checked:bg-[Highlight]",
+          "forced-colors:disabled:border-[GrayText] forced-colors:checked:disabled:bg-[GrayText]",
           trackTransition,
           focusRing,
         )}
@@ -106,6 +129,7 @@ export function Switch({
           "pointer-events-none absolute top-1 left-1 size-5 rounded-full bg-surface-raised",
           "transition-[translate,background-color] duration-(--duration-fast) ease-standard",
           "peer-checked:translate-x-6 peer-checked:bg-accent-ink-inverse peer-disabled:bg-ink-disabled",
+          "forced-colors:bg-[ButtonText] forced-colors:peer-checked:bg-[HighlightText] forced-colors:peer-disabled:bg-[GrayText] forced-colors:peer-checked:peer-disabled:bg-[Canvas]",
         )}
       />
     </span>

package/src/components/table/Table.tsx

@@ -16,10 +16,12 @@ import {
 } from "react";
 import { useControllableState } from "../../hooks/useControllableState";
 import { useOverflowing } from "../../hooks/useOverflowing";
+import { usePresence, type Presence } from "../../hooks/usePresence";
 import { TriangleRight } from "../../icons/TriangleRight";
 import { cn } from "../../lib/cn";
 import { focusRing, focusRingInset } from "../../lib/focus-ring";
 import { mergeRefs } from "../../lib/merge-refs";
+import { collapse, collapseEnter, collapseInner } from "../../lib/motion";
 
 export type TableHeaderVariant = "band" | "muted";
 export type TableSize = "sm" | "md";
@@ -173,10 +175,11 @@ export type TableBodyProps = ComponentProps<"tbody">;
 
 /*
  * 每隔五行加重一条线。只数主行：展开的明细也是一个 <tr>，不能让它把数数错。
- * 第五行自己展开着的时候，它的下边线没有了，加重的那条画在它的明细下面
+ * 第五行后面跟着明细的时候（展开着，或者正在收起），它的下边线没有了，
+ * 加重的那条画在它的明细下面
  */
 const ruledLines = [
-  "[&>tr:nth-child(5n_of_:not([data-detail])):not([data-expanded])>*]:border-line-strong",
+  "[&>tr:nth-child(5n_of_:not([data-detail])):not(:has(+tr[data-detail]))>*]:border-line-strong",
   "[&>tr:nth-child(5n_of_:not([data-detail]))+tr[data-detail]>*]:border-line-strong",
 ].join(" ");
 
@@ -241,6 +244,8 @@ export function TableRow({
   const expandable =
     detail !== undefined && detail !== null && detail !== false;
   const open = expandable && expanded;
+  // 收起：明细先按高度收回去，收完再卸载
+  const detailPresence = usePresence<HTMLDivElement>(open);
 
   const context = useMemo(
     () =>
@@ -269,18 +274,19 @@ export function TableRow({
         className={cn(
           "group/row transition-colors duration-(--duration-fast) ease-standard",
           selected ? rowSelected : rowIdle,
-          // 展开着：它和下面的明细是一块，中间不画线
-          "[&[data-expanded]>*]:border-b-transparent",
+          // 后面跟着明细（展开着，或者正在收起）：它们是一块，中间不画线
+          "[&:has(+tr[data-detail])>*]:border-b-transparent",
           className,
         )}
       >
         <RowContext value={context}>{children}</RowContext>
       </tr>
-      {open && (
+      {detailPresence.mounted && (
         <DetailRow
           id={detailId}
           rowRef={rowRef}
           estimate={countCells(children)}
+          presence={detailPresence}
         >
           {detail}
         </DetailRow>
@@ -303,11 +309,13 @@ function DetailRow({
   id,
   rowRef,
   estimate,
+  presence,
   children,
 }: {
   id: string;
   rowRef: RefObject<HTMLTableRowElement | null>;
   estimate: number;
+  presence: Presence<HTMLDivElement>;
   children: ReactNode;
 }) {
   const [measured, setMeasured] = useState<number | null>(null);
@@ -323,14 +331,30 @@ function DetailRow({
   });
 
   return (
-    <tr id={id} data-detail="">
+    // 正在收起的明细点不到、Tab 不进去
+    <tr id={id} data-detail="" inert={presence.leaving}>
       <td
         colSpan={measured ?? estimate}
         className="border-b border-line bg-surface-sunken p-0 [tr:last-child>&]:border-b-0"
       >
-        {/* 表格横向滚动时明细不跟着滚走：钉在容器的左缘，宽度是容器看得见的那一段 */}
-        <div className="sticky left-0 w-[var(--table-viewport,100%)] px-4 py-3 text-sm whitespace-normal">
-          {children}
+        {/*
+         * 表格横向滚动时明细不跟着滚走：钉在容器的左缘，宽度是容器看得见的那一段。
+         * 收放也在这一层上——表格行的高度过渡不了，过渡的是单元格里的它
+         */}
+        <div
+          ref={presence.ref}
+          data-leaving={presence.leaving ? "" : undefined}
+          className={cn(
+            "sticky left-0 w-[var(--table-viewport,100%)]",
+            collapse,
+            presence.entered && collapseEnter,
+          )}
+        >
+          <div className={collapseInner}>
+            <div className="px-4 py-3 text-sm whitespace-normal">
+              {children}
+            </div>
+          </div>
         </div>
       </td>
     </tr>

package/src/components/tabs/Tabs.tsx

@@ -3,14 +3,18 @@ import {
   useContext,
   useId,
   useMemo,
+  useState,
   type ComponentProps,
   type KeyboardEvent,
   type MouseEvent,
 } from "react";
 import { useControllableState } from "../../hooks/useControllableState";
+import { useIndicator } from "../../hooks/useIndicator";
 import { TriangleRight } from "../../icons/TriangleRight";
 import { cn } from "../../lib/cn";
 import { focusRing, focusRingInset } from "../../lib/focus-ring";
+import { mergeRefs } from "../../lib/merge-refs";
+import { fadeInFast, indicator, indicatorBox } from "../../lib/motion";
 import { capsuleBase, capsuleSize, capsuleState } from "../chip/capsule-style";
 
 export type TabsVariant = "block" | "capsule" | "wedge";
@@ -22,6 +26,8 @@ type TabsContextValue = {
   baseId: string;
   variant: TabsVariant;
   size: TabsSize;
+  /** 切换过没有：一开始选中的那一块面板是静止的，切过来的才淡入 */
+  switched: boolean;
 };
 
 const TabsContext = createContext<TabsContextValue | null>(null);
@@ -71,9 +77,13 @@ export function Tabs({
     onChange: onValueChange,
   });
 
+  const [initial] = useState(current);
+  const [switched, setSwitched] = useState(false);
+  if (!switched && current !== initial) setSwitched(true);
+
   const context = useMemo(
-    () => ({ value: current, select, baseId, variant, size }),
-    [current, select, baseId, variant, size],
+    () => ({ value: current, select, baseId, variant, size, switched }),
+    [current, select, baseId, variant, size, switched],
   );
 
   return (
@@ -85,8 +95,12 @@ export function Tabs({
 
 export type TabListProps = ComponentProps<"div">;
 
-export function TabList({ className, onKeyDown, ...props }: TabListProps) {
+export function TabList({ className, onKeyDown, ref, ...props }: TabListProps) {
   const { variant } = useTabsContext("TabList");
+  // 胶囊：选中的底画在这一栏上，换一个时是同一块滑过去。另外两种的"让位"是实测的，不动
+  const listRef = useIndicator<HTMLDivElement>(
+    variant === "capsule" ? '[role="tab"][aria-selected="true"]' : null,
+  );
 
   // 漫游 tabindex：方向键在页签之间移动焦点并直接切换
   const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
@@ -128,13 +142,24 @@ export function TabList({ className, onKeyDown, ...props }: TabListProps) {
   return (
     <div
       {...props}
+      ref={mergeRefs(listRef, ref)}
       role="tablist"
       aria-orientation="horizontal"
       onKeyDown={handleKeyDown}
       className={cn(
         // 页签很多时横向滚动，不换行
         "flex overflow-x-auto [scrollbar-width:thin]",
-        variant === "capsule" && "gap-2 p-1",
+        variant === "capsule" && [
+          "gap-2 p-1",
+          // 胶囊各有各的宽：底滑过去的时候宽度跟着变。它在滚动的内容里，跟着内容走
+          indicator,
+          indicatorBox,
+          // 墨底提到各个胶囊的轮廓线之上：滑过去的时候是一块干净的实心胶囊，
+          // 不被相邻胶囊的轮廓切开。胶囊里的字另提一层，留在它上面
+          "after:z-0 after:rounded-full after:bg-surface-inverse",
+          // 高对比模式下底色被系统换掉，这一块成了盖住选中胶囊轮廓的一片页面色：改用系统的"选中"色
+          "forced-colors:after:bg-[Highlight]",
+        ],
         // 楔形坐在一条墨线上：亮色页面上黄色对白底的明度差很小，靠这条线托住
         variant === "wedge" && "border-b-2 border-ink",
         className,
@@ -205,14 +230,21 @@ export function Tab({
           focusRing,
           capsuleSize[size],
           selected
-            ? capsuleState.selected
+            ? // 这一栏量到了位置，底就由栏上滑动的那一块来画
+              [
+                capsuleState.selected,
+                "in-data-indicator:bg-transparent forced-colors:in-data-indicator:bg-transparent",
+              ]
             : disabled
               ? capsuleState.disabled
               : capsuleState.rest,
           className,
         )}
       >
-        {children}
+        {/* 字在滑动的墨底之上；间距跟按钮自己的走，里面照旧是一行居中的弹性排布 */}
+        <span className="relative z-1 inline-flex items-center gap-[inherit]">
+          {children}
+        </span>
       </button>
     );
   }
@@ -229,7 +261,13 @@ export function Tab({
           focusRingInset,
           wedgeSize[size],
           selected
-            ? "text-on-action before:bg-action"
+            ? // 焦点环画在里面、压在黄楔上：普通的焦点色在暗色主题下也是黄的，看不见，
+              // 换成压得住黄底的颜色。再往里收 2px：这个颜色贴着边的话，在暗色页面上
+              // 和页面分不开，看上去只是黄楔小了一圈。
+              // 高对比模式下黄底被系统换掉：楔形改用系统的"选中"色，字用配它的字色；
+              // 这一个的颜色不让系统再改，不然它会在字后面垫一块页面色。
+              // 画在里面的焦点环也用那个字色，再往里收 2px：贴着边的话它和页面一个颜色
+              "text-on-action before:bg-action focus-visible:-outline-offset-4 focus-visible:outline-on-action forced-colors:forced-color-adjust-none forced-colors:text-[HighlightText] forced-colors:before:bg-[Highlight] forced-colors:focus-visible:-outline-offset-4 forced-colors:focus-visible:outline-[HighlightText]"
             : disabled
               ? "cursor-not-allowed text-ink-disabled"
               : "text-ink hover:before:bg-ink/5",
@@ -287,7 +325,10 @@ export type TabPanelProps = ComponentProps<"div"> & {
   value: string;
 };
 
-/** 未选中的面板保留一个隐藏的空容器，让页签的 `aria-controls` 始终有所指。 */
+/**
+ * 未选中的面板保留一个隐藏的空容器，让页签的 `aria-controls` 始终有所指。
+ * 切过来的面板淡入；一开始就选中的那一块不动。
+ */
 export function TabPanel({
   value,
   className,
@@ -305,7 +346,12 @@ export function TabPanel({
       aria-labelledby={toId(context.baseId, "tab", value)}
       hidden={!selected}
       tabIndex={0}
-      className={cn(focusRing, className)}
+      className={cn(
+        focusRing,
+        // 只淡入、不位移：页签本身已经有"让位"的动作
+        selected && context.switched && fadeInFast,
+        className,
+      )}
     >
       {selected ? children : null}
     </div>

package/src/components/tag-input/TagInput.tsx

@@ -10,14 +10,19 @@ import {
   type KeyboardEvent,
   type MouseEvent,
 } from "react";
+import { useAddedKeys } from "../../hooks/useAddedKeys";
 import { useControllableState } from "../../hooks/useControllableState";
+import { FLIP_LIMIT, useFlip } from "../../hooks/useFlip";
+import { useLingering } from "../../hooks/useLingering";
 import { Close } from "../../icons/Close";
 import { StatusDanger } from "../../icons/StatusDanger";
 import { cn } from "../../lib/cn";
 import { mergeRefs } from "../../lib/merge-refs";
+import { fadeInFast, flipBox, flipLeaving } from "../../lib/motion";
 import { useFieldControl } from "../field/Field";
 import {
   controlBox,
+  controlDisabledText,
   controlElement,
   controlIconSize,
   type ControlSize,
@@ -182,6 +187,15 @@ export function TagInput({
   const [flash, setFlash] = useState<string | null>(null);
   const [message, setMessage] = useState("");
   const full = max !== undefined && tags.length >= max;
+  // 后来加的那几个淡入；一开始就有的是静止的
+  const added = useAddedKeys(tags);
+  // 删掉的那一块先留着把淡出走完，其余的小块和输入框同时补位。
+  // 补位的钩子排在前面：它钉不住的（小块太多、量不到位置）当场藏掉，后面那个就不等了
+  const rowRef = useFlip<HTMLDivElement>();
+  const lingering = useLingering<HTMLDivElement>(
+    tags,
+    tags.length < FLIP_LIMIT,
+  );
 
   useEffect(() => {
     if (flash === null) return;
@@ -367,48 +381,71 @@ export function TagInput({
         className,
       )}
     >
-      <div className="flex min-w-0 flex-1 flex-wrap items-center gap-1 py-1 pl-2">
-        {tags.map((tag, index) => (
-          <span
-            key={tag}
-            data-tag=""
-            data-flash={flash === tag ? "" : undefined}
-            className={cn(
-              valueChip,
-              valueChipSize[size],
-              "transition-colors duration-(--duration-fast) ease-standard",
-              // 重复时闪一下：填充反转。不用黄色——这不是"选中"
-              "data-flash:bg-surface-inverse data-flash:text-ink-inverse",
-              disabled && "text-ink-disabled",
-              !editable && "pr-2",
-            )}
-          >
-            <span className="min-w-0 truncate">{tag}</span>
-            {editable && (
-              <button
-                type="button"
-                // 整个控件只占一个 Tab 停靠点：小块用方向键走
-                tabIndex={-1}
-                aria-label={removeLabel(tag)}
-                onClick={(event) =>
-                  // 键盘触发的（回车、空格）焦点留在小块这一排；鼠标点的回到输入框
-                  remove(
-                    index,
-                    event.detail === 0 && tags.length > 1 ? index : "input",
-                  )
-                }
-                onKeyDown={(event) => handleChipKeyDown(event, index)}
-                className={cn(
-                  valueChipRemove,
-                  "focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-focus",
-                  flash === tag && "text-ink-inverse",
-                )}
-              >
-                <Close size={12} />
-              </button>
-            )}
-          </span>
-        ))}
+      <div
+        ref={mergeRefs(rowRef, lingering.ref)}
+        className={cn(
+          "flex min-w-0 flex-1 flex-wrap items-center gap-1 py-1 pl-2",
+          flipBox,
+        )}
+      >
+        {lingering.entries.map(({ key: tag, leaving }) => {
+          // 正在走的那一块已经不在 tags 里了，下面按位置算的事它都用不上
+          const index = tags.indexOf(tag);
+          return (
+            <span
+              key={tag}
+              // 正在走的不算数：删掉之后焦点落到哪、整排怎么用方向键走，看到的只有还在的
+              data-tag={leaving ? undefined : ""}
+              data-leaving={leaving ? "" : undefined}
+              data-flash={flash === tag && !leaving ? "" : undefined}
+              // 它点不到、Tab 不进去，读屏也读不到：状态在删的那一刻就变了，画面后到
+              inert={leaving}
+              aria-hidden={leaving || undefined}
+              className={cn(
+                valueChip,
+                valueChipSize[size],
+                // 换色、补位时滑回原位、走的时候淡出，都是 200ms
+                "transition-[color,background-color,translate,opacity] duration-(--duration-fast) ease-standard",
+                // 重复时闪一下：填充反转。不用黄色——这不是"选中"
+                "data-flash:bg-surface-inverse data-flash:text-ink-inverse",
+                // 高对比模式下底色被系统换掉，反转闪不出来：闪的时候套一圈系统"选中"色的环，
+                // 画在那一圈线的外面（小块之间有 4px，放得下）
+                "forced-colors:data-flash:outline-2 forced-colors:data-flash:outline-[Highlight]",
+                flipLeaving,
+                added.has(tag) && fadeInFast,
+                // 高对比模式：这是个 <span>，系统不知道它禁用了，字和那一圈线都写明灰字色
+                disabled &&
+                  "text-ink-disabled forced-colors:border-[GrayText] forced-colors:text-[GrayText]",
+                !editable && "pr-2",
+              )}
+            >
+              <span className="min-w-0 truncate">{tag}</span>
+              {editable && (
+                <button
+                  type="button"
+                  // 整个控件只占一个 Tab 停靠点：小块用方向键走
+                  tabIndex={-1}
+                  aria-label={removeLabel(tag)}
+                  onClick={(event) =>
+                    // 键盘触发的（回车、空格）焦点留在小块这一排；鼠标点的回到输入框
+                    remove(
+                      index,
+                      event.detail === 0 && tags.length > 1 ? index : "input",
+                    )
+                  }
+                  onKeyDown={(event) => handleChipKeyDown(event, index)}
+                  className={cn(
+                    valueChipRemove,
+                    "focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-focus",
+                    flash === tag && "text-ink-inverse",
+                  )}
+                >
+                  <Close size={12} />
+                </button>
+              )}
+            </span>
+          );
+        })}
         <input
           {...props}
           ref={mergeRefs(inputRef, ref)}
@@ -446,6 +483,8 @@ export function TagInput({
             controlElement,
             "min-w-12 px-1",
             valueInputHeight[size],
+            // 删了一个小块：和后面的小块一起滑到新位置
+            "transition-[translate] duration-(--duration-fast) ease-standard",
           )}
         />
       </div>
@@ -469,7 +508,7 @@ export function TagInput({
               className={cn(
                 "font-tech text-xs tabular-nums",
                 disabled
-                  ? "text-ink-disabled"
+                  ? controlDisabledText
                   : full
                     ? "text-ink"
                     : "text-ink-secondary",

package/src/components/textarea/Textarea.tsx

@@ -3,6 +3,7 @@ import { cn } from "../../lib/cn";
 import { useFieldControl } from "../field/Field";
 import {
   controlBox,
+  controlDisabledText,
   controlElement,
   type ControlVariant,
 } from "../input/control-box";
@@ -88,7 +89,7 @@ export function Textarea({
           data-count=""
           className={cn(
             "pointer-events-none self-end px-3 pb-1.5 font-tech text-xs tabular-nums",
-            disabled ? "text-ink-disabled" : "text-ink-secondary",
+            disabled ? controlDisabledText : "text-ink-secondary",
           )}
         >
           {maxLength !== undefined ? `${length} / ${maxLength}` : length}

package/src/components/timeline/Timeline.tsx

@@ -25,9 +25,10 @@ export type TimelineItemProps = Omit<ComponentProps<"li">, "title"> & {
 };
 
 const nodeClass: Record<TimelineStatus, string> = {
-  past: "bg-ink",
+  // 高对比模式下底色都被系统换掉，实心的菱形就没了：换成页面的字色
+  past: "bg-ink forced-colors:bg-[CanvasText]",
   // 描一圈最细的线（1px），颜色跟着文字走：亮色下是墨色，暗色下是近白
-  current: "border border-ink bg-action",
+  current: "border border-ink bg-action forced-colors:bg-[Highlight]",
   upcoming: "border-2 border-ink-tertiary",
 };
 
@@ -66,7 +67,7 @@ export function TimelineItem({
           <span className={cn("size-[11px] rotate-45", nodeClass[status])} />
         </span>
         {/* 轴只画在节点之间，不从节点后面穿过，空心菱形才是空的 */}
-        <span className="w-0.5 flex-1 bg-line-strong group-last/item:hidden" />
+        <span className="w-0.5 flex-1 bg-line-strong group-last/item:hidden forced-colors:bg-[CanvasText]" />
       </span>
       <div className="min-w-0 flex-1 pb-6 group-last/item:pb-0">
         {hasDate && (