refactor(platform): 统一控件 - 统一输入按钮与图标控件样式表现
This commit is contained in:
@@ -259,6 +259,7 @@ function DockCommandButton({ command, mouseX, metrics, motionEnabled, compact, s
|
||||
type="button"
|
||||
aria-label={command.label}
|
||||
title={nativeTitle}
|
||||
data-icon-only
|
||||
aria-expanded={command.expands ? command.active || undefined : undefined}
|
||||
aria-pressed={command.expands ? undefined : command.active || undefined}
|
||||
disabled={command.disabled}
|
||||
|
||||
@@ -19,7 +19,12 @@ import { cn } from "@/lib/utils";
|
||||
* 明暗:全部颜色走 token;active 按压底用 bg-surface-active,明暗自动适配。
|
||||
*/
|
||||
export const iconButtonVariants = cva(
|
||||
["inline-flex shrink-0 items-center justify-center rounded-md", "outline-none focus-visible:outline-none data-[input-modality=keyboard]:focus-visible:ring-2 data-[input-modality=keyboard]:focus-visible:ring-ring", "disabled:pointer-events-none disabled:opacity-45", "motion-safe:active:scale-[0.96]"],
|
||||
[
|
||||
"inline-flex shrink-0 items-center justify-center rounded-md",
|
||||
"outline-none focus-visible:outline-none data-[input-modality=keyboard]:focus-visible:ring-2 data-[input-modality=keyboard]:focus-visible:ring-ring",
|
||||
"disabled:pointer-events-none disabled:opacity-45",
|
||||
"motion-safe:active:scale-[0.96]",
|
||||
],
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
|
||||
@@ -21,7 +21,12 @@ import { cn } from "@/lib/utils";
|
||||
* 明暗:全部颜色走 token;active 用按压底语义 token,明暗自动适配。
|
||||
*/
|
||||
export const toolButtonVariants = cva(
|
||||
["inline-flex select-none items-center justify-center gap-1.5 rounded-md px-3", "font-medium transition-colors", "outline-none focus-visible:outline-none data-[input-modality=keyboard]:focus-visible:ring-2 data-[input-modality=keyboard]:focus-visible:ring-ring", "disabled:pointer-events-none disabled:opacity-45"],
|
||||
[
|
||||
"inline-flex select-none items-center justify-center gap-1.5 rounded-md px-3",
|
||||
"font-medium transition-colors",
|
||||
"outline-none focus-visible:outline-none data-[input-modality=keyboard]:focus-visible:ring-2 data-[input-modality=keyboard]:focus-visible:ring-ring",
|
||||
"disabled:pointer-events-none disabled:opacity-45",
|
||||
],
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
|
||||
@@ -56,7 +56,7 @@ export const Select = forwardRef<RefSelectProps, SelectProps>(function Select({
|
||||
onKeyDown?.(event);
|
||||
}}
|
||||
onFocus={(event) => {
|
||||
setInputModality((current) => current === "unknown" ? "keyboard" : current);
|
||||
setInputModality((current) => (current === "unknown" ? "keyboard" : current));
|
||||
onFocus?.(event);
|
||||
}}
|
||||
onBlur={(event) => {
|
||||
|
||||
Reference in New Issue
Block a user