There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
refactor(component): refactor the implementation of Button and IconButton (#7716)
CatsJuice3d855647c7d9
diff --git a/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx b/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsxindex b42be3727c..6a81eefa0a 100644--- a/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx+++ b/packages/frontend/component/src/components/affine-banner/local-demo-tips.tsx@@ -1,6 +1,7 @@import { Button, IconButton } from '@affine/component/ui/button';import { useI18n } from '@affine/i18n';import { CloseIcon } from '@blocksuite/icons/rc';+import { cssVar } from '@toeverything/theme';import { useCallback } from 'react';import * as styles from './index.css';@@ -37,11 +38,12 @@ export const LocalDemoTips = ({</div><div className={styles.tipsRightItem}>- <div>- <Button onClick={handleClick}>{buttonLabel}</Button>- </div>+ <Button style={{ background: cssVar('white') }} onClick={handleClick}>+ {buttonLabel}+ </Button><IconButtononClick={onClose}+ size="20"data-testid="local-demo-tips-close-button"><CloseIcon />diff --git a/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx b/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsxindex c3d3d43aa7..d0a79ae482 100644--- a/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx+++ b/packages/frontend/component/src/components/affine-other-page-layout/mobile-navbar.tsx@@ -41,7 +41,7 @@ export const MobileNavbar = () => {onOpenChange: setOpenMenu,}}>- <IconButton type="plain" className={styles.iconButton}>+ <IconButton variant="plain" size="24" className={styles.iconButton}>{openMenu ? <CloseIcon /> : <PropertyIcon />}</IconButton></Menu>diff --git a/packages/frontend/component/src/components/auth-components/back-button.tsx b/packages/frontend/component/src/components/auth-components/back-button.tsxindex eade042a77..fa886dd8cb 100644--- a/packages/frontend/component/src/components/auth-components/back-button.tsx+++ b/packages/frontend/component/src/components/auth-components/back-button.tsx@@ -1,5 +1,6 @@import { useI18n } from '@affine/i18n';import { ArrowLeftSmallIcon } from '@blocksuite/icons/rc';+import { cssVar } from '@toeverything/theme';import type { FC } from 'react';import type { ButtonProps } from '../../ui/button';@@ -9,15 +10,15 @@ export const BackButton: FC<ButtonProps> = props => {const t = useI18n();return (<Button- type="plain"+ variant="plain"style={{marginTop: 12,marginLeft: -5,paddingLeft: 0,paddingRight: 5,- color: 'var(--affine-text-secondary-color)',+ color: cssVar('textSecondaryColor'),}}- icon={<ArrowLeftSmallIcon />}+ prefix={<ArrowLeftSmallIcon />}{...props}>{t['com.affine.backButton']()}diff --git a/packages/frontend/component/src/components/auth-components/change-email-page.tsx b/packages/frontend/component/src/components/auth-components/change-email-page.tsxindex d2dbaa75f1..3043a1deb5 100644--- a/packages/frontend/component/src/components/auth-components/change-email-page.tsx+++ b/packages/frontend/component/src/components/auth-components/change-email-page.tsx@@ -58,7 +58,7 @@ export const ChangeEmailPage = ({disabled={hasSetUp}/><Button- type="primary"+ variant="primary"size="large"onClick={onContinue}loading={loading}diff --git a/packages/frontend/component/src/components/auth-components/change-password-page.tsx b/packages/frontend/component/src/components/auth-components/change-password-page.tsxindex ca5582488e..94f7d402ea 100644--- a/packages/frontend/component/src/components/auth-components/change-password-page.tsx+++ b/packages/frontend/component/src/components/auth-components/change-password-page.tsx@@ -59,7 +59,7 @@ export const ChangePasswordPage: FC<{}>{hasSetUp ? (- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button>) : (diff --git a/packages/frontend/component/src/components/auth-components/confirm-change-email.tsx b/packages/frontend/component/src/components/auth-components/confirm-change-email.tsxindex 0d2fb8fcda..332a77ba48 100644--- a/packages/frontend/component/src/components/auth-components/confirm-change-email.tsx+++ b/packages/frontend/component/src/components/auth-components/confirm-change-email.tsx@@ -14,7 +14,7 @@ export const ConfirmChangeEmail: FC<{title={t['com.affine.auth.change.email.page.success.title']()}subtitle={t['com.affine.auth.change.email.page.success.subtitle']()}>- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button></AuthPageContainer>diff --git a/packages/frontend/component/src/components/auth-components/email-verified-email.tsx b/packages/frontend/component/src/components/auth-components/email-verified-email.tsxindex 0d2fb8fcda..332a77ba48 100644--- a/packages/frontend/component/src/components/auth-components/email-verified-email.tsx+++ b/packages/frontend/component/src/components/auth-components/email-verified-email.tsx@@ -14,7 +14,7 @@ export const ConfirmChangeEmail: FC<{title={t['com.affine.auth.change.email.page.success.title']()}subtitle={t['com.affine.auth.change.email.page.success.subtitle']()}>- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button></AuthPageContainer>diff --git a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx b/packages/frontend/component/src/components/auth-components/onboarding-page.tsxindex 1fa11ec63f..1ef7996bca 100644--- a/packages/frontend/component/src/components/auth-components/onboarding-page.tsx+++ b/packages/frontend/component/src/components/auth-components/onboarding-page.tsx@@ -219,7 +219,7 @@ export const OnboardingPage = ({</Button><ButtonclassName={styles.button}- type="primary"+ variant="primary"size="extraLarge"itemType="submit"onClick={() => {@@ -248,8 +248,7 @@ export const OnboardingPage = ({setQuestionIdx(questionIdx + 1);}}}- iconPosition="end"- icon={<ArrowRightSmallIcon />}+ suffix={<ArrowRightSmallIcon />}>{questionIdx === 0 ? 'start' : 'Next'}</Button>@@ -271,7 +270,7 @@ export const OnboardingPage = ({</p><ButtonclassName={clsx(styles.button, styles.openAFFiNEButton)}- type="primary"+ variant="primary"size="extraLarge"onClick={() => {if (callbackUrl) {@@ -280,8 +279,7 @@ export const OnboardingPage = ({onOpenAffine();}}}- iconPosition="end"- icon={<ArrowRightSmallIcon />}+ suffix={<ArrowRightSmallIcon />}>Get Started</Button>diff --git a/packages/frontend/component/src/components/auth-components/set-password-page.tsx b/packages/frontend/component/src/components/auth-components/set-password-page.tsxindex 8fb58c5e37..61536f4b27 100644--- a/packages/frontend/component/src/components/auth-components/set-password-page.tsx+++ b/packages/frontend/component/src/components/auth-components/set-password-page.tsx@@ -59,7 +59,7 @@ export const SetPasswordPage: FC<{}>{hasSetUp ? (- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button>) : (diff --git a/packages/frontend/component/src/components/auth-components/set-password.tsx b/packages/frontend/component/src/components/auth-components/set-password.tsxindex 5496436a10..0fee30104a 100644--- a/packages/frontend/component/src/components/auth-components/set-password.tsx+++ b/packages/frontend/component/src/components/auth-components/set-password.tsx@@ -33,7 +33,7 @@ export const SetPassword: FC<{/></Wrapper><Button- type="primary"+ variant="primary"size="large"disabled={!passwordPass}style={{ marginRight: 20 }}@@ -44,7 +44,7 @@ export const SetPassword: FC<{{t['com.affine.auth.set.password.save']()}</Button>{showLater ? (- <Button type="plain" size="large" onClick={onLater}>+ <Button variant="plain" size="large" onClick={onLater}>{t['com.affine.auth.later']()}</Button>) : null}diff --git a/packages/frontend/component/src/components/auth-components/sign-in-success-page.tsx b/packages/frontend/component/src/components/auth-components/sign-in-success-page.tsxindex cac2f4bd03..0784db569a 100644--- a/packages/frontend/component/src/components/auth-components/sign-in-success-page.tsx+++ b/packages/frontend/component/src/components/auth-components/sign-in-success-page.tsx@@ -13,7 +13,7 @@ export const SignInSuccessPage: FC<{title={t['com.affine.auth.signed.success.title']()}subtitle={t['com.affine.auth.signed.success.subtitle']()}>- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button></AuthPageContainer>diff --git a/packages/frontend/component/src/components/auth-components/sign-up-page.tsx b/packages/frontend/component/src/components/auth-components/sign-up-page.tsxindex b683ac6b32..d2c5aedf85 100644--- a/packages/frontend/component/src/components/auth-components/sign-up-page.tsx+++ b/packages/frontend/component/src/components/auth-components/sign-up-page.tsx@@ -63,7 +63,7 @@ export const SignUpPage: FC<{}>{hasSetUp ? (- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{openButtonText ?? t['com.affine.auth.open.affine']()}</Button>) : (diff --git a/packages/frontend/component/src/components/card/workspace-card/index.tsx b/packages/frontend/component/src/components/card/workspace-card/index.tsxindex b64d1593ad..69f4c8c9b8 100644--- a/packages/frontend/component/src/components/card/workspace-card/index.tsx+++ b/packages/frontend/component/src/components/card/workspace-card/index.tsx@@ -3,7 +3,6 @@ import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';import { WorkspaceFlavour } from '@affine/env/workspace';import { CollaborationIcon, SettingsIcon } from '@blocksuite/icons/rc';import type { WorkspaceMetadata } from '@toeverything/infra';-import clsx from 'clsx';import { type MouseEvent, useCallback } from 'react';import { Button } from '../../../ui/button';@@ -89,8 +88,7 @@ export const WorkspaceCard = ({<Buttonloading={!!openingId && openingId === meta.id}disabled={!!openingId}- type="default"- className={clsx(styles.enableCloudButton, styles.showOnCardHover)}+ className={styles.showOnCardHover}onClick={onEnableCloud}>{enableCloudText}diff --git a/packages/frontend/component/src/components/card/workspace-card/styles.css.ts b/packages/frontend/component/src/components/card/workspace-card/styles.css.tsindex 0665e715cb..0521152290 100644--- a/packages/frontend/component/src/components/card/workspace-card/styles.css.ts+++ b/packages/frontend/component/src/components/card/workspace-card/styles.css.ts@@ -79,21 +79,16 @@ export const settingButton = style({boxShadow: cssVar('shadow1'),background: cssVar('white80'),},- // [`.${card}:hover &:hover`]: {- // background: cssVar('hoverColor'),- // },},});-export const enableCloudButton = style({- background: 'transparent',-});-export const showOnCardHover = style({- display: 'none',+ visibility: 'hidden',+ opacity: 0,selectors: {[`.${card}:hover &`]: {- display: 'block',+ visibility: 'visible',+ opacity: 1,},},});diff --git a/packages/frontend/component/src/components/disable-public-link/index.tsx b/packages/frontend/component/src/components/disable-public-link/index.tsxindex a22f109396..08becbde58 100644--- a/packages/frontend/component/src/components/disable-public-link/index.tsx+++ b/packages/frontend/component/src/components/disable-public-link/index.tsx@@ -13,7 +13,7 @@ export const PublicLinkDisableModal = (props: ConfirmModalProps) => {cancelText={t['com.affine.publicLinkDisableModal.button.cancel']()}confirmText={t['com.affine.publicLinkDisableModal.button.disable']()}confirmButtonOptions={{- type: 'error',+ variant: 'error',['data-testid' as string]: 'confirm-enable-affine-cloud-button',}}{...props}diff --git a/packages/frontend/component/src/components/import-page/index.tsx b/packages/frontend/component/src/components/import-page/index.tsxindex 341201a610..068ba0bd3b 100644--- a/packages/frontend/component/src/components/import-page/index.tsx+++ b/packages/frontend/component/src/components/import-page/index.tsx@@ -16,6 +16,9 @@ import {importPageContainerStyle,} from './index.css';+/**+ * @deprecated Not used+ */export const ImportPage = ({importMarkdown,importHtml,@@ -37,8 +40,9 @@ export const ImportPage = ({onClick={() => {onClose();}}- icon={<CloseIcon />}- />+ >+ <CloseIcon />+ </IconButton><div className={importPageBodyStyle}><div className="title">Import</div><span>diff --git a/packages/frontend/component/src/components/member-components/accept-invite-page.tsx b/packages/frontend/component/src/components/member-components/accept-invite-page.tsxindex 1005ab44f1..d6d08bfecb 100644--- a/packages/frontend/component/src/components/member-components/accept-invite-page.tsx+++ b/packages/frontend/component/src/components/member-components/accept-invite-page.tsx@@ -37,7 +37,7 @@ export const AcceptInvitePage = ({</FlexWrapper>}>- <Button type="primary" size="large" onClick={onOpenWorkspace}>+ <Button variant="primary" size="large" onClick={onOpenWorkspace}>{t['Visit Workspace']()}</Button></AuthPageContainer>diff --git a/packages/frontend/component/src/components/member-components/invite-modal.tsx b/packages/frontend/component/src/components/member-components/invite-modal.tsxindex 2d4d950611..be4eb92a7e 100644--- a/packages/frontend/component/src/components/member-components/invite-modal.tsx+++ b/packages/frontend/component/src/components/member-components/invite-modal.tsx@@ -60,7 +60,7 @@ export const InviteModal = ({confirmText={t['Invite']()}confirmButtonOptions={{loading: isMutating,- type: 'primary',+ variant: 'primary',['data-testid' as string]: 'confirm-enable-affine-cloud-button',}}onConfirm={handleConfirm}diff --git a/packages/frontend/component/src/components/member-components/member-limit-modal.tsx b/packages/frontend/component/src/components/member-components/member-limit-modal.tsxindex f38a9e05e3..76f3470e5b 100644--- a/packages/frontend/component/src/components/member-components/member-limit-modal.tsx+++ b/packages/frontend/component/src/components/member-components/member-limit-modal.tsx@@ -44,7 +44,7 @@ export const MemberLimitModal = ({: 'com.affine.payment.member-limit.pro.confirm']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}onConfirm={handleConfirm}></ConfirmModal>diff --git a/packages/frontend/component/src/components/not-found-page/not-found-page.tsx b/packages/frontend/component/src/components/not-found-page/not-found-page.tsxindex 7c30372b46..63311da9b3 100644--- a/packages/frontend/component/src/components/not-found-page/not-found-page.tsx+++ b/packages/frontend/component/src/components/not-found-page/not-found-page.tsx@@ -3,7 +3,6 @@ import { SignOutIcon } from '@blocksuite/icons/rc';import { Avatar } from '../../ui/avatar';import { Button, IconButton } from '../../ui/button';-import { Tooltip } from '../../ui/tooltip';import { AffineOtherPageLayout } from '../affine-other-page-layout';import type { User } from '../auth-components';import { NotFoundPattern } from './not-found-pattern';@@ -38,7 +37,7 @@ export const NoPermissionOrNotFound = ({<p className={wrapper}>{t['404.hint']()}</p><div className={wrapper}><Button- type="primary"+ variant="primary"size="extraLarge"onClick={onBack}className={largeButtonEffect}@@ -49,11 +48,13 @@ export const NoPermissionOrNotFound = ({<div className={wrapper}><Avatar url={user.avatar ?? user.image} name={user.label} /><span style={{ margin: '0 12px' }}>{user.email}</span>- <Tooltip content={t['404.signOut']()}>- <IconButton onClick={onSignOut}>- <SignOutIcon />- </IconButton>- </Tooltip>+ <IconButton+ onClick={onSignOut}+ size="20"+ tooltip={t['404.signOut']()}+ >+ <SignOutIcon />+ </IconButton></div></>) : (@@ -80,7 +81,7 @@ export const NotFoundPage = ({<p className={wrapper}>{t['404.hint']()}</p><div className={wrapper}><Button- type="primary"+ variant="primary"size="extraLarge"onClick={onBack}className={largeButtonEffect}@@ -93,11 +94,13 @@ export const NotFoundPage = ({<div className={wrapper}><Avatar url={user.avatar ?? user.image} name={user.label} /><span style={{ margin: '0 12px' }}>{user.email}</span>- <Tooltip content={t['404.signOut']()}>- <IconButton onClick={onSignOut}>- <SignOutIcon />- </IconButton>- </Tooltip>+ <IconButton+ onClick={onSignOut}+ size="20"+ tooltip={t['404.signOut']()}+ >+ <SignOutIcon />+ </IconButton></div>) : null}</div>diff --git a/packages/frontend/component/src/ui/avatar/avatar.tsx b/packages/frontend/component/src/ui/avatar/avatar.tsxindex b5a9be8317..f59a044dc0 100644--- a/packages/frontend/component/src/ui/avatar/avatar.tsx+++ b/packages/frontend/component/src/ui/avatar/avatar.tsx@@ -199,21 +199,20 @@ export const Avatar = forwardRef<HTMLSpanElement, AvatarProps>(</Tooltip>{onRemove ? (- <Tooltip- portalOptions={{ container: removeButtonDom }}- {...removeTooltipOptions}+ <IconButton+ tooltipOptions={{+ portalOptions: { container: removeButtonDom },+ ...removeTooltipOptions,+ }}+ variant="solid"+ size="12"+ className={clsx(style.removeButton, removeButtonClassName)}+ onClick={onRemove}+ ref={setRemoveButtonDom}+ {...removeButtonProps}>- <IconButton- size="extraSmall"- type="default"- className={clsx(style.removeButton, removeButtonClassName)}- onClick={onRemove}- ref={setRemoveButtonDom}- {...removeButtonProps}- >- <CloseIcon />- </IconButton>- </Tooltip>+ <CloseIcon />+ </IconButton>) : null}</AvatarRoot>);diff --git a/packages/frontend/component/src/ui/avatar/style.css.ts b/packages/frontend/component/src/ui/avatar/style.css.tsindex a7def125e9..da67380c2b 100644--- a/packages/frontend/component/src/ui/avatar/style.css.ts+++ b/packages/frontend/component/src/ui/avatar/style.css.ts@@ -1,5 +1,5 @@import { cssVar } from '@toeverything/theme';-import { createVar, globalStyle, keyframes, style } from '@vanilla-extract/css';+import { createVar, keyframes, style } from '@vanilla-extract/css';export const sizeVar = createVar('sizeVar');export const blurVar = createVar('blurVar');const bottomAnimation = keyframes({@@ -172,7 +172,7 @@ export const hoverWrapper = style({alignItems: 'center',backgroundColor: 'rgba(60, 61, 63, 0.5)',zIndex: '1',- color: cssVar('white'),+ color: cssVar('pureWhite'),opacity: 0,transition: 'opacity .15s',cursor: 'pointer',@@ -189,14 +189,8 @@ export const removeButton = style({visibility: 'hidden',zIndex: '1',selectors: {- '&:hover': {- background: '#f6f6f6',+ [`${avatarRoot}:hover &`]: {+ visibility: 'visible',},},});-globalStyle(`${avatarRoot}:hover ${removeButton}`, {- visibility: 'visible',-});-globalStyle(`${avatarRoot} ${removeButton}:hover`, {- background: '#f6f6f6',-});diff --git a/packages/frontend/component/src/ui/button/button.css.ts b/packages/frontend/component/src/ui/button/button.css.tsindex 72c0a0859a..31126a7d55 100644--- a/packages/frontend/component/src/ui/button/button.css.ts+++ b/packages/frontend/component/src/ui/button/button.css.ts@@ -1,371 +1,259 @@import { cssVar } from '@toeverything/theme';-import { globalStyle, style } from '@vanilla-extract/css';+import { cssVarV2 } from '@toeverything/theme/v2';+import { createVar, globalStyle, style } from '@vanilla-extract/css';++// Using variables can override externally, without considering the priority of selectors.+// size vars+export const hVar = createVar('height');+export const wVar = createVar('width');+export const iconSizeVar = createVar('iconSize');+const gapVar = createVar('gap');+const paddingVar = createVar('padding');+const fontSizeVar = createVar('fontSize');+const fontWeightVar = createVar('fontWeight');+const lineHeightVar = createVar('lineHeight');+const shadowVar = createVar('shadow');++// style vars+const bgVar = createVar('bg');+const textVar = createVar('fg');+const iconColorVar = createVar('icon');+const borderColorVar = createVar('border');+const borderWidthVar = createVar('borderWidth');+export const button = style({+ vars: {+ // default vars+ [gapVar]: '4px',+ [wVar]: 'unset',+ [hVar]: 'unset',+ [borderWidthVar]: '1px',+ },++ flexShrink: 0,+ position: 'relative',display: 'inline-flex',- justifyContent: 'center',alignItems: 'center',+ justifyContent: 'center',userSelect: 'none',- touchAction: 'manipulation',- flexShrink: 0,- outline: '0',- border: '1px solid',- padding: '0 8px',- borderRadius: '8px',- fontSize: cssVar('fontXs'),- fontWeight: 500,+ outline: 0,+ borderRadius: 8,transition: 'all .3s',- ['WebkitAppRegion' as string]: 'no-drag',cursor: 'pointer',- // changeable- height: '28px',- background: cssVar('white'),- borderColor: cssVar('borderColor'),- color: cssVar('textPrimaryColor'),+ ['WebkitAppRegion' as string]: 'no-drag',++ // hover layer+ ':before': {+ content: '""',+ position: 'absolute',+ width: '100%',+ height: '100%',+ transition: 'inherit',+ borderRadius: 'inherit',+ opacity: 0,+ left: '50%',+ top: '50%',+ transform: 'translate(-50%, -50%)',+ backgroundColor: cssVarV2('layer/background/hoverOverlay'),+ borderColor: 'transparent',+ pointerEvents: 'none',+ borderWidth: 'inherit',+ borderStyle: 'inherit',+ },++ // style+ backgroundColor: bgVar,+ color: textVar,+ boxShadow: shadowVar,+ borderWidth: borderWidthVar,+ borderStyle: 'solid',+ borderColor: borderColorVar,++ // size+ width: wVar,+ height: hVar,+ gap: gapVar,+ padding: paddingVar,+ fontSize: fontSizeVar,+ fontWeight: fontWeightVar,+ lineHeight: lineHeightVar,+selectors: {- '&.text-bold': {- fontWeight: 600,- },- '&:not(.without-hover):hover': {- background: cssVar('hoverColor'),- },- '&.disabled': {- opacity: '.4',- cursor: 'default',- color: cssVar('textDisableColor'),- pointerEvents: 'none',- },- '&.loading': {- cursor: 'default',- color: cssVar('textDisableColor'),- pointerEvents: 'none',- },- '&.disabled:not(.without-hover):hover, &.loading:not(.without-hover):hover':- {- background: 'inherit',- },- '&.block': {- display: 'flex',- width: '100%',- },- '&.circle': {- borderRadius: '50%',- },- '&.round': {- borderRadius: '14px',- },+ '&:hover:before': { opacity: 1 },+ '&[data-block]': { display: 'flex' },+// size- '&.large': {- height: '32px',- fontSize: cssVar('fontBase'),- fontWeight: 600,- },- '&.round.large': {- borderRadius: '16px',- },- '&.extraLarge': {- height: '40px',- fontSize: cssVar('fontBase'),- fontWeight: 700,+ '&[data-size="default"]': {+ vars: {+ [hVar]: '28px', // line-height + paddingY * 2 (to ignore border width)+ [paddingVar]: '0px 8px',+ [iconSizeVar]: '16px',+ [paddingVar]: '4px 12px',+ [fontSizeVar]: cssVar('fontXs'),+ [fontWeightVar]: '500',+ [lineHeightVar]: '20px',+ },},- '&.extraLarge.primary': {- boxShadow: `${cssVar('largeButtonEffect')} !important`,+ '&[data-size="large"]': {+ vars: {+ [hVar]: '32px',+ [paddingVar]: '0px 8px',+ [iconSizeVar]: '20px',+ [paddingVar]: '4px 12px',+ [fontSizeVar]: '15px',+ [fontWeightVar]: '500',+ [lineHeightVar]: '24px',+ },},- '&.round.extraLarge': {- borderRadius: '20px',+ '&[data-size="extraLarge"]': {+ vars: {+ [hVar]: '40px',+ [paddingVar]: '0px 8px',+ [iconSizeVar]: '24px',+ [paddingVar]: '8px 18px',+ [fontSizeVar]: '15',+ [fontWeightVar]: '600',+ [lineHeightVar]: '24px',+ },},+// type- '&.plain': {- color: cssVar('textPrimaryColor'),- borderColor: 'transparent',- background: 'transparent',- },- '&.primary': {- color: cssVar('pureWhite'),- background: cssVar('primaryColor'),- borderColor: cssVar('black10'),- },- '&.primary:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'primaryColor'- )}`,- },- '&.primary.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.primary.disabled:not(.without-hover):hover': {- background: cssVar('primaryColor'),- },- '&.error': {- color: cssVar('pureWhite'),- background: cssVar('errorColor'),- borderColor: cssVar('black10'),- },- '&.error:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'errorColor'- )}`,- },- '&.error.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.error.disabled:not(.without-hover):hover': {- background: cssVar('errorColor'),- },- '&.warning': {- color: cssVar('pureWhite'),- background: cssVar('warningColor'),- borderColor: cssVar('black10'),- },- '&.warning:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'warningColor'- )}`,- },- '&.warning.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.warning.disabled:not(.without-hover):hover': {- background: cssVar('warningColor'),- },- '&.success': {- color: cssVar('pureWhite'),- background: cssVar('successColor'),- borderColor: cssVar('black10'),- },- '&.success:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'successColor'- )}`,- },- '&.success.disabled': {- opacity: '.4',- cursor: 'default',+ '&[data-variant="primary"]': {+ vars: {+ [bgVar]: cssVarV2('button/primary'),+ [textVar]: cssVarV2('button/pureWhiteText'),+ [iconColorVar]: cssVarV2('button/pureWhiteText'),+ [borderColorVar]: cssVarV2('button/innerBlackBorder'),+ },},- '&.success.disabled:not(.without-hover):hover': {- background: cssVar('successColor'),+ '&[data-variant="secondary"]': {+ vars: {+ [bgVar]: cssVarV2('button/secondary'),+ [textVar]: cssVarV2('text/primary'),+ [iconColorVar]: cssVarV2('icon/primary'),+ [borderColorVar]: cssVarV2('layer/border'),+ },},- '&.processing': {- color: cssVar('pureWhite'),- background: cssVar('processingColor'),- borderColor: cssVar('black10'),+ '&[data-variant="plain"]': {+ vars: {+ [bgVar]: 'transparent',+ [textVar]: cssVarV2('text/primary'),+ [iconColorVar]: cssVarV2('icon/primary'),+ [borderColorVar]: 'transparent',+ [borderWidthVar]: '0px',+ },},- '&.processing:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'processingColor'- )}`,+ '&[data-variant="error"]': {+ vars: {+ [bgVar]: cssVarV2('button/error'),+ [textVar]: cssVarV2('button/pureWhiteText'),+ [iconColorVar]: cssVarV2('button/pureWhiteText'),+ [borderColorVar]: cssVarV2('button/innerBlackBorder'),+ },},- '&.processing.disabled': {- opacity: '.4',- cursor: 'default',+ '&[data-variant="success"]': {+ vars: {+ [bgVar]: cssVarV2('button/success'),+ [textVar]: cssVarV2('button/pureWhiteText'),+ [iconColorVar]: cssVarV2('button/pureWhiteText'),+ [borderColorVar]: cssVarV2('button/innerBlackBorder'),+ },},- '&.processing.disabled:not(.without-hover):hover': {- background: cssVar('processingColor'),++ // disabled+ '&[data-disabled]': {+ cursor: 'not-allowed',+ opacity: 0.5,},- '&.danger:hover': {- color: cssVar('errorColor'),- background: cssVar('backgroundErrorColor'),++ // default keyboard focus style+ '&:focus-visible::after': {+ content: '""',+ width: '100%',+ height: '100%',+ position: 'absolute',+ top: 0,+ left: 0,+ borderRadius: 'inherit',+ boxShadow: `0 0 0 1px ${cssVarV2('layer/insideBorder/primary')}`,},},});-globalStyle(`${button} > span`, {- // flex: 1,- lineHeight: 1,- padding: '0 4px',+export const content = style({+ // in case that width is specified by parent and text is too long+ textOverflow: 'ellipsis',+ whiteSpace: 'nowrap',+ overflow: 'hidden',});-export const buttonIcon = style({++export const icon = style({flexShrink: 0,- display: 'inline-flex',- justifyContent: 'center',- alignItems: 'center',- color: cssVar('iconColor'),- fontSize: '16px',- width: '16px',- height: '16px',- selectors: {- '&.start': {- marginRight: '4px',- },- '&.end': {- marginLeft: '4px',- },- '&.large': {- fontSize: '20px',- width: '20px',- height: '20px',- },- '&.extraLarge': {- fontSize: '20px',- width: '20px',- height: '20px',- },- '&.color-white': {- color: cssVar('pureWhite'),- },- },+ // There are two kinds of icon size:+ // 1. control by props: width and height+ width: iconSizeVar,+ height: iconSizeVar,+ // 2. width/height is set to `1em`+ fontSize: iconSizeVar,+ color: iconColorVar,});+globalStyle(`${icon} > svg`, {+ width: '100%',+ height: '100%',+ display: 'block',+});+export const iconButton = style({- display: 'inline-flex',- justifyContent: 'center',- alignItems: 'center',- userSelect: 'none',- touchAction: 'manipulation',- outline: '0',- border: '1px solid',- borderRadius: '4px',- transition: 'all .3s',- ['WebkitAppRegion' as string]: 'no-drag',- cursor: 'pointer',- background: cssVar('white'),- // changeable- width: '24px',- height: '24px',- fontSize: '20px',- color: cssVar('textPrimaryColor'),- borderColor: cssVar('borderColor'),+ vars: {+ [paddingVar]: '2px',+ // TODO(@CatsJuice): Replace with theme variables when ready+ '--shadow':+ '0px 0px 1px 0px rgba(0, 0, 0, 0.12), 0px 1px 5px 0px rgba(0, 0, 0, 0.12)',+ },+ borderRadius: 4,selectors: {- '&.without-padding': {- margin: '-2px',- },- '&.active': {- color: cssVar('primaryColor'),- },- '&:not(.without-hover):hover': {- background: cssVar('hoverColor'),- },- '&.disabled': {- opacity: '.4',- cursor: 'default',- color: cssVar('textDisableColor'),- pointerEvents: 'none',- },- '&.loading': {- cursor: 'default',- color: cssVar('textDisableColor'),- pointerEvents: 'none',- },- '&.disabled:not(.without-hover):hover, &.loading:not(.without-hover):hover':- {- background: 'inherit',+ '[data-theme="dark"] &': {+ vars: {+ '--shadow':+ '0px 0px 1px 0px rgba(0, 0, 0, 0.66), 0px 1px 5px 0px rgba(0, 0, 0, 0.72)',},- // size- '&.large': {- width: '32px',- height: '32px',- fontSize: '24px',- },- '&.large.without-padding': {- margin: '-4px',- },- '&.small': {- width: '20px',- height: '20px',- fontSize: '16px',},- '&.extra-small': {- width: '16px',- height: '16px',- fontSize: '12px',- },- // type- '&.plain': {- color: cssVar('iconColor'),- borderColor: 'transparent',- background: 'transparent',- },- '&.plain.active': {- color: cssVar('primaryColor'),- },- '&.primary': {- color: cssVar('white'),- background: cssVar('primaryColor'),- borderColor: cssVar('black10'),- },- '&.primary:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'primaryColor'- )}`,- },- '&.primary.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.primary.disabled:not(.without-hover):hover': {- background: cssVar('primaryColor'),- },- '&.error': {- color: cssVar('white'),- background: cssVar('errorColor'),- borderColor: cssVar('black10'),- },- '&.error:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'errorColor'- )}`,- },- '&.error.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.error.disabled:not(.without-hover):hover': {- background: cssVar('errorColor'),- },- '&.warning': {- color: cssVar('white'),- background: cssVar('warningColor'),- borderColor: cssVar('black10'),- },- '&.warning:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'warningColor'- )}`,- },- '&.warning.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.warning.disabled:not(.without-hover):hover': {- background: cssVar('warningColor'),- },- '&.success': {- color: cssVar('white'),- background: cssVar('successColor'),- borderColor: cssVar('black10'),- },- '&.success:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'successColor'- )}`,- },- '&.success.disabled': {- opacity: '.4',- cursor: 'default',- },- '&.success.disabled:not(.without-hover):hover': {- background: cssVar('successColor'),+ '&[data-icon-variant="plain"]': {+ vars: {+ [bgVar]: 'transparent',+ [iconColorVar]: cssVarV2('icon/primary'),+ [borderColorVar]: 'transparent',+ [borderWidthVar]: '0px',+ },},- '&.processing': {- color: cssVar('white'),- background: cssVar('processingColor'),- borderColor: cssVar('black10'),+ '&[data-icon-variant="danger"]': {+ vars: {+ [bgVar]: 'transparent',+ [iconColorVar]: cssVarV2('icon/primary'),+ [borderColorVar]: 'transparent',+ [borderWidthVar]: '0px',+ },},- '&.processing:not(.without-hover):hover': {- background: `linear-gradient(0deg, rgba(0, 0, 0, 0.04) 0%, rgba(0, 0, 0, 0.04) 100%), ${cssVar(- 'processingColor'- )}`,+ '&[data-icon-variant="danger"]:hover': {+ vars: {+ [bgVar]: cssVar('backgroundErrorColor'),+ [iconColorVar]: cssVar('errorColor'),+ },},- '&.processing.disabled': {- opacity: '.4',- cursor: 'default',+ // disable hover layer for danger type+ '&[data-icon-variant="danger"]:hover:before': {+ opacity: 0,},- '&.processing.disabled:not(.without-hover):hover': {- background: cssVar('processingColor'),+ '&[data-icon-variant="solid"]': {+ vars: {+ [bgVar]: cssVarV2('button/iconButtonSolid'),+ [iconColorVar]: cssVarV2('icon/primary'),+ [borderColorVar]: 'transparent',+ [shadowVar]: 'var(--shadow)',+ },},- '&.danger:hover': {- color: cssVar('errorColor'),- background: cssVar('backgroundErrorColor'),++ '&[data-icon-size="24"]': {+ vars: { [paddingVar]: '4px' },},},});diff --git a/packages/frontend/component/src/ui/button/button.stories.css.ts b/packages/frontend/component/src/ui/button/button.stories.css.tsnew file mode 100644index 0000000000..c73cc52dc4--- /dev/null+++ b/packages/frontend/component/src/ui/button/button.stories.css.ts@@ -0,0 +1,61 @@+import { globalStyle, style } from '@vanilla-extract/css';++// table+export const table = style({+ vars: { '--border-color': '#974FFF' },+});+globalStyle(`${table} thead td, ${table} tbody tr td:nth-child(1)`, {+ backgroundColor: '#974FFF10',+ padding: '16px',+ fontWeight: 600,+ fontSize: 12,+ color: 'var(--border-color)',+});+globalStyle(`${table} td`, {+ textAlign: 'center',+ border: '0.5px dashed var(--border-color)',+ borderTopColor: 'transparent',+ borderBottomColor: 'transparent',+ padding: '16px 8px',+});+globalStyle(`${table} thead td`, {+ borderTopColor: 'var(--border-color)',+});+globalStyle(`${table} tbody tr:last-child td`, {+ borderBottomColor: 'var(--border-color)',+});++export const settings = style({+ display: 'flex',+ flexWrap: 'wrap',+ gap: '8px 100px',+ marginBottom: 40,+});+globalStyle(`${settings} > section`, {+ display: 'flex',+ alignItems: 'center',+});+globalStyle(`${settings} > section > span`, {+ display: 'inline-block',+ width: 200,+});++export const overrideBackground = style({+ background: 'cyan',+});+export const overrideTextColor = style({+ color: 'red',+});+export const overrideBorder = style({+ borderColor: 'green',+});+export const overrideFontSize = style({+ fontSize: 24,+});+export const overrideIconSize = style({+ width: 60,+ height: 60,+});+export const overrideIconColor = style({+ color: 'forestgreen',+});diff --git a/packages/frontend/component/src/ui/button/button.stories.tsx b/packages/frontend/component/src/ui/button/button.stories.tsxindex 44c218b8ba..933d90a411 100644--- a/packages/frontend/component/src/ui/button/button.stories.tsx+++ b/packages/frontend/component/src/ui/button/button.stories.tsx@@ -1,47 +1,183 @@-import { InformationIcon } from '@blocksuite/icons/rc';-import type { Meta, StoryFn } from '@storybook/react';+import {+ AfFiNeIcon,+ ArrowRightBigIcon,+ FolderIcon,+} from '@blocksuite/icons/rc';+import type { Meta } from '@storybook/react';+import clsx from 'clsx';+import { useCallback, useEffect, useState } from 'react';+import { Switch } from '../switch';import type { ButtonProps } from './button';import { Button } from './button';+import * as styles from './button.stories.css';export default {title: 'UI/Button',component: Button,- argTypes: {- onClick: () => console.log('Click button'),- },} satisfies Meta<ButtonProps>;-const Template: StoryFn<ButtonProps> = args => <Button {...args} />;+// const Template: StoryFn<ButtonProps> = args => <Button {...args} />;-export const Default: StoryFn<ButtonProps> = Template.bind(undefined);-Default.args = {- type: 'default',- children: 'This is a default button',- icon: <InformationIcon />,+const types: ButtonProps['variant'][] = [+ 'primary',+ 'secondary',+ 'plain',+ 'error',+ 'success',+];+const sizes: ButtonProps['size'][] = ['default', 'large', 'extraLarge'];++const Groups = ({+ children,+ ...props+}: Omit<ButtonProps, 'variant' | 'size'>) => {+ return (+ <table className={styles.table}>+ <thead>+ <tr>+ <td>Type/Size</td>+ {sizes.map(size => (+ <td key={size}>{size}</td>+ ))}+ </tr>+ </thead>+ <tbody>+ {types.map(type => (+ <tr key={type}>+ <td>{type}</td>+ {sizes.map(size => (+ <td key={size}>+ <Button variant={type} size={size} {...props}>+ {children ?? `${size} - ${type}`}+ </Button>+ </td>+ ))}+ </tr>+ ))}+ </tbody>+ </table>+ );+};++export const Default = () => <Groups />;++export const WithIcon = () => {+ return <Groups prefix={<FolderIcon />} suffix={<span>🚀</span>} />;};-export const Primary: StoryFn<ButtonProps> = Template.bind(undefined);-Primary.args = {- type: 'primary',- children: 'Content',- icon: <InformationIcon />,+export const Loading = () => {+ const [loading, setLoading] = useState(false);++ const toggleLoading = useCallback(() => setLoading(v => !v), []);++ useEffect(() => {+ setInterval(toggleLoading, 1000);+ }, [toggleLoading]);++ return <Groups loading={loading} prefix={<FolderIcon />} />;};-export const Disabled: StoryFn<ButtonProps> = Template.bind(undefined);-Disabled.args = {- disabled: true,- children: 'This is a disabled button',+export const OverrideViaClassName = () => {+ const [overrideBg, setOverrideBg] = useState(false);+ const [overrideTextColor, setOverrideTextColor] = useState(false);+ const [overrideBorder, setOverrideBorder] = useState(false);+ const [overrideFontSize, setOverrideFontSize] = useState(false);+ const [overridePrefixSize, setOverridePrefixSize] = useState(false);+ const [overrideSuffixSize, setOverrideSuffixSize] = useState(false);+ const [overridePrefixColor, setOverridePrefixColor] = useState(false);+ const [overrideSuffixColor, setOverrideSuffixColor] = useState(false);++ return (+ <div>+ <div className={styles.settings}>+ <section>+ <span>Override background color</span>+ <Switch checked={overrideBg} onChange={setOverrideBg} />+ </section>++ <section>+ <span>Override text color</span>+ <Switch checked={overrideTextColor} onChange={setOverrideTextColor} />+ </section>++ <section>+ <span>Override border color</span>+ <Switch checked={overrideBorder} onChange={setOverrideBorder} />+ </section>++ <section>+ <span>Override font size</span>+ <Switch checked={overrideFontSize} onChange={setOverrideFontSize} />+ </section>++ <section>+ <span>Override prefix size</span>+ <Switch+ checked={overridePrefixSize}+ onChange={setOverridePrefixSize}+ />+ </section>++ <section>+ <span>Override suffix size</span>+ <Switch+ checked={overrideSuffixSize}+ onChange={setOverrideSuffixSize}+ />+ </section>++ <section>+ <span>Override prefix color</span>+ <Switch+ checked={overridePrefixColor}+ onChange={setOverridePrefixColor}+ />+ </section>++ <section>+ <span>Override suffix color</span>+ <Switch+ checked={overrideSuffixColor}+ onChange={setOverrideSuffixColor}+ />+ </section>+ </div>++ <Groups+ prefix={<FolderIcon />}+ suffix={<ArrowRightBigIcon />}+ className={clsx({+ [styles.overrideBackground]: overrideBg,+ [styles.overrideTextColor]: overrideTextColor,+ [styles.overrideBorder]: overrideBorder,+ [styles.overrideFontSize]: overrideFontSize,+ })}+ prefixClassName={clsx({+ [styles.overrideIconSize]: overridePrefixSize,+ [styles.overrideIconColor]: overridePrefixColor,+ })}+ suffixClassName={clsx({+ [styles.overrideIconSize]: overrideSuffixSize,+ [styles.overrideIconColor]: overrideSuffixColor,+ })}+ />+ </div>+ );};-export const LargeSizeButton: StoryFn<ButtonProps> = Template.bind(undefined);-LargeSizeButton.args = {- size: 'large',- children: 'This is a large button',+export const FixedWidth = () => {+ const widths = [60, 100, 120, 160, 180];+ return (+ <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>+ {widths.map(width => (+ <Button prefix={<AfFiNeIcon />} key={width} style={{ width }}>+ This is a width fixed button+ </Button>+ ))}+ </div>+ );};-export const ExtraLargeSizeButton: StoryFn<ButtonProps> =- Template.bind(undefined);-ExtraLargeSizeButton.args = {- size: 'extraLarge',- children: 'This is a extra large button',+export const Disabled = () => {+ return <Groups disabled />;};diff --git a/packages/frontend/component/src/ui/button/button.tsx b/packages/frontend/component/src/ui/button/button.tsxindex 4a8ee87841..988405c22e 100644--- a/packages/frontend/component/src/ui/button/button.tsx+++ b/packages/frontend/component/src/ui/button/button.tsx@@ -1,172 +1,168 @@import clsx from 'clsx';import type {- FC,+ CSSProperties,HTMLAttributes,- PropsWithChildren,+ MouseEvent,ReactElement,} from 'react';-import { forwardRef, useMemo } from 'react';+import { cloneElement, forwardRef, useCallback } from 'react';import { Loading } from '../loading';-import { button, buttonIcon } from './button.css';+import { Tooltip, type TooltipProps } from '../tooltip';+import * as styles from './button.css';export type ButtonType =- | 'default'| 'primary'+ | 'secondary'| 'plain'| 'error'- | 'warning'| 'success'- | 'processing';-export type ButtonSize = 'default' | 'large' | 'extraLarge';-type BaseButtonProps = {- type?: ButtonType;+ | 'custom';+export type ButtonSize = 'default' | 'large' | 'extraLarge' | 'custom';++export interface ButtonProps+ extends Omit<HTMLAttributes<HTMLButtonElement>, 'type' | 'prefix'> {+ /**+ * Preset color scheme+ * @default 'secondary'+ */+ variant?: ButtonType;disabled?: boolean;- icon?: ReactElement;- iconPosition?: 'start' | 'end';- shape?: 'default' | 'round' | 'circle';+ /**+ * By default, the button is `inline-flex`, set to `true` to make it `flex`+ * @default false+ */block?: boolean;+ /**+ * Preset size, will be overridden by `style` or `className`+ * @default 'default'+ */size?: ButtonSize;+ /**+ * Will show a loading spinner at `prefix` position+ */loading?: boolean;- withoutHoverStyle?: boolean;-};-export type ButtonProps = PropsWithChildren<BaseButtonProps> &- Omit<HTMLAttributes<HTMLButtonElement>, 'type'> & {- componentProps?: {- startIcon?: Omit<IconButtonProps, 'icon' | 'iconPosition'>;- endIcon?: Omit<IconButtonProps, 'icon' | 'iconPosition'>;- };- };+ /**+ * By default, it is considered as an icon with preset size and color,+ * can be overridden by `prefixClassName` and `prefixStyle`.+ *+ * If `loading` is true, will be replaced by a spinner.(`prefixClassName` and `prefixStyle` still work)+ * */+ prefix?: ReactElement;+ prefixClassName?: string;+ prefixStyle?: CSSProperties;+ contentClassName?: string;+ contentStyle?: CSSProperties;-type IconButtonProps = PropsWithChildren<BaseButtonProps> &- Omit<HTMLAttributes<HTMLDivElement>, 'type'>;+ /**+ * By default, it is considered as an icon with preset size and color,+ * can be overridden by `suffixClassName` and `suffixStyle`.+ * */+ suffix?: ReactElement;+ suffixClassName?: string;+ suffixStyle?: CSSProperties;-const defaultProps = {- type: 'default',- disabled: false,- shape: 'default',- size: 'default',- iconPosition: 'start',- loading: false,- withoutHoverStyle: false,-} as const;+ tooltip?: TooltipProps['content'];+ tooltipOptions?: Partial<Omit<TooltipProps, 'content'>>;+}-const ButtonIcon: FC<IconButtonProps> = props => {- const {- size,- icon,- iconPosition = 'start',- children,- type,- loading,- withoutHoverStyle,- ...otherProps- } = {- ...defaultProps,- ...props,- };- const onlyIcon = icon && !children;- return (- <div- {...otherProps}- className={clsx(buttonIcon, {- 'color-white': type && type !== 'default' && type !== 'plain',- large: size === 'large',- extraLarge: size === 'extraLarge',- end: iconPosition === 'end' && !onlyIcon,- start: iconPosition === 'start' && !onlyIcon,- loading,- })}- data-without-hover={withoutHoverStyle}- >- {icon}+const IconSlot = ({+ icon,+ loading,+ className,+ ...attrs+}: {+ icon?: ReactElement;+ loading?: boolean;+} & HTMLAttributes<HTMLElement>) => {+ const showLoadingHere = loading !== undefined;+ const visible = icon || loading;+ return visible ? (+ <div className={clsx(styles.icon, className)} {...attrs}>+ {showLoadingHere && loading ? <Loading size="100%" /> : null}+ {icon && !loading+ ? cloneElement(icon, {+ width: '100%',+ height: '100%',+ ...icon.props,+ })+ : null}</div>- );+ ) : null;};+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(- (props, ref) => {- const {+ (+ {+ variant = 'secondary',+ size = 'default',children,- type,disabled,- shape,- size,- icon: propsIcon,- iconPosition,block,loading,- withoutHoverStyle,className,- ...otherProps- } = {- ...defaultProps,- ...props,- } satisfies ButtonProps;- const icon = useMemo(() => {- if (loading) {- return <Loading />;- }- return propsIcon;- }, [propsIcon, loading]);+ prefix,+ prefixClassName,+ prefixStyle,+ suffix,+ suffixClassName,+ suffixStyle,+ contentClassName,+ contentStyle,++ tooltip,+ tooltipOptions,+ onClick,- const baseIconButtonProps = useMemo(() => {- return {- size,- iconPosition,- icon,- type,- disabled,- loading,- } as const;- }, [disabled, icon, iconPosition, loading, size, type]);+ ...otherProps+ },+ ref+ ) => {+ const handleClick = useCallback(+ (e: MouseEvent<HTMLButtonElement>) => {+ if (loading || disabled) return;+ onClick?.(e);+ },+ [disabled, loading, onClick]+ );return (- <button- {...otherProps}- ref={ref}- className={clsx(- button,- {- primary: type === 'primary',- plain: type === 'plain',- error: type === 'error',- warning: type === 'warning',- success: type === 'success',- processing: type === 'processing',- large: size === 'large',- extraLarge: size === 'extraLarge',- disabled,- circle: shape === 'circle',- round: shape === 'round',- block,- loading,- 'without-hover': withoutHoverStyle,- },- className- )}- disabled={disabled}- data-disabled={disabled}- >- {icon && iconPosition === 'start' ? (- <ButtonIcon- {...baseIconButtonProps}- {...props.componentProps?.startIcon}- icon={icon}- iconPosition="start"+ <Tooltip content={tooltip} {...tooltipOptions}>+ <button+ {...otherProps}+ ref={ref}+ className={clsx(styles.button, className)}+ data-loading={loading || undefined}+ data-block={block || undefined}+ disabled={disabled}+ data-disabled={disabled || undefined}+ data-size={size}+ data-variant={variant}+ onClick={handleClick}+ >+ <IconSlot+ icon={prefix}+ loading={loading}+ className={prefixClassName}+ style={prefixStyle}/>- ) : null}- <span>{children}</span>- {icon && iconPosition === 'end' ? (- <ButtonIcon- {...baseIconButtonProps}- {...props.componentProps?.endIcon}- icon={icon}- iconPosition="end"+ {children ? (+ <span+ className={clsx(styles.content, contentClassName)}+ style={contentStyle}+ >+ {children}+ </span>+ ) : null}+ <IconSlot+ icon={suffix}+ className={suffixClassName}+ style={suffixStyle}/>- ) : null}- </button>+ </button>+ </Tooltip>);});diff --git a/packages/frontend/component/src/ui/button/icon-button.stories.tsx b/packages/frontend/component/src/ui/button/icon-button.stories.tsxindex 6509ea4052..943f1ef408 100644--- a/packages/frontend/component/src/ui/button/icon-button.stories.tsx+++ b/packages/frontend/component/src/ui/button/icon-button.stories.tsx@@ -1,49 +1,153 @@-import { InformationIcon } from '@blocksuite/icons/rc';-import type { Meta, StoryFn } from '@storybook/react';+import { AfFiNeIcon } from '@blocksuite/icons/rc';+import type { Meta } from '@storybook/react';+import clsx from 'clsx';+import { type ReactElement, useCallback, useEffect, useState } from 'react';+import { Switch } from '../switch';+import * as styles from './button.stories.css';import type { IconButtonProps } from './icon-button';import { IconButton } from './icon-button';+export default {title: 'UI/IconButton',component: IconButton,- argTypes: {- onClick: () => console.log('Click button'),- },} satisfies Meta<IconButtonProps>;-const Template: StoryFn<IconButtonProps> = args => <IconButton {...args} />;+const types: IconButtonProps['variant'][] = ['plain', 'solid', 'danger'];+const sizes: IconButtonProps['size'][] = ['12', '14', '16', '20', '24'];-export const Plain: StoryFn<IconButtonProps> = Template.bind(undefined);-Plain.args = {- children: <InformationIcon />,+const Groups = ({+ children,+ ...props+}: Omit<IconButtonProps, 'type' | 'size' | 'children'> & {+ children?: ReactElement;+}) => {+ return (+ <table className={styles.table}>+ <thead>+ <tr>+ <td>Type/Size</td>+ {sizes.map(size => (+ <td key={size}>{size}</td>+ ))}+ </tr>+ </thead>+ <tbody>+ {types.map(type => (+ <tr key={type}>+ <td>{type}</td>+ {sizes.map(size => (+ <td key={size}>+ <IconButton variant={type} size={size} {...props}>+ {children ?? <AfFiNeIcon />}+ </IconButton>+ </td>+ ))}+ </tr>+ ))}+ </tbody>+ </table>+ );};-export const Primary: StoryFn<IconButtonProps> = Template.bind(undefined);-Primary.args = {- type: 'primary',- icon: <InformationIcon />,-};+export const Default = () => <Groups />;-export const Disabled: StoryFn<IconButtonProps> = Template.bind(undefined);-Disabled.args = {- disabled: true,- icon: <InformationIcon />,-};-export const ExtraSmallSizeButton: StoryFn<IconButtonProps> =- Template.bind(undefined);-ExtraSmallSizeButton.args = {- size: 'extraSmall',- icon: <InformationIcon />,+export const Loading = () => {+ const [loading, setLoading] = useState(false);++ const toggleLoading = useCallback(() => setLoading(v => !v), []);++ useEffect(() => {+ setInterval(toggleLoading, 1000);+ }, [toggleLoading]);++ return <Groups loading={loading} />;};-export const SmallSizeButton: StoryFn<IconButtonProps> =- Template.bind(undefined);-SmallSizeButton.args = {- size: 'small',- icon: <InformationIcon />,++export const OverrideViaClassName = () => {+ const [overrideBg, setOverrideBg] = useState(false);+ const [overrideBorder, setOverrideBorder] = useState(false);+ const [overridePrefixColor, setOverridePrefixColor] = useState(false);++ return (+ <div>+ <div className={styles.settings}>+ <section>+ <span>Override background color</span>+ <Switch checked={overrideBg} onChange={setOverrideBg} />+ </section>++ <section>+ <span>Override border color</span>+ <Switch checked={overrideBorder} onChange={setOverrideBorder} />+ </section>++ <section>+ <span>Override icon color</span>+ <Switch+ checked={overridePrefixColor}+ onChange={setOverridePrefixColor}+ />+ </section>+ </div>++ <Groups+ className={clsx({+ [styles.overrideBackground]: overrideBg,+ [styles.overrideBorder]: overrideBorder,+ })}+ iconClassName={clsx({+ [styles.overrideIconColor]: overridePrefixColor,+ })}+ />+ </div>+ );};-export const LargeSizeButton: StoryFn<IconButtonProps> =- Template.bind(undefined);-LargeSizeButton.args = {- size: 'large',- icon: <InformationIcon />,++export const CustomSize = () => {+ const sizes = [+ [13, 2],+ [15, 2],+ [17, 2],+ [19, 2],+ [21, 3],+ [23, 3],+ [25, 3],+ [27, 3],+ [29, 4],+ [31, 4],+ [33, 4],+ [35, 4],+ ];+ return types.map(type => {+ return (+ <div key={type}>+ <div style={{ display: 'flex', gap: 4, alignItems: 'center' }}>+ {sizes.map(size => (+ <div+ key={size[0]}+ style={{+ fontSize: 10,+ textAlign: 'center',+ color: 'rgba(100, 100, 100, 0.5)',+ }}+ >+ <IconButton+ size={size[0]}+ style={{ padding: size[1] }}+ variant={type}+ >+ <AfFiNeIcon />+ </IconButton>++ <div style={{ marginTop: 8 }}>Size: {size[0]}px</div>+ <div style={{ marginTop: 2 }}>Padding: {size[1]}px</div>+ </div>+ ))}+ </div>+ </div>+ );+ });};++export const Disabled = () => <Groups disabled />;diff --git a/packages/frontend/component/src/ui/button/icon-button.tsx b/packages/frontend/component/src/ui/button/icon-button.tsxindex 5447905ae2..7524de5eb7 100644--- a/packages/frontend/component/src/ui/button/icon-button.tsx+++ b/packages/frontend/component/src/ui/button/icon-button.tsx@@ -1,85 +1,78 @@+import { assignInlineVars } from '@vanilla-extract/dynamic';import clsx from 'clsx';-import type { HTMLAttributes, PropsWithChildren, ReactElement } from 'react';-import { forwardRef } from 'react';+import { type CSSProperties, forwardRef, type ReactElement } from 'react';-import { Loading } from '../loading';-import type { ButtonType } from './button';-import { iconButton } from './button.css';+import { Button, type ButtonProps } from './button';+import { iconButton, iconSizeVar } from './button.css';-export type IconButtonSize = 'default' | 'large' | 'small' | 'extraSmall';-export type IconButtonProps = Omit<HTMLAttributes<HTMLButtonElement>, 'type'> &- PropsWithChildren<{- type?: ButtonType;- disabled?: boolean;- size?: IconButtonSize;- loading?: boolean;- withoutPadding?: boolean;- active?: boolean;- withoutHoverStyle?: boolean;- icon?: ReactElement;- }>;--const defaultProps = {- type: 'plain',- disabled: false,- size: 'default',- loading: false,- withoutPadding: false,- active: false,- withoutHoverStyle: false,-} as const;+export interface IconButtonProps+ extends Omit<+ ButtonProps,+ | 'variant'+ | 'size'+ | 'prefix'+ | 'suffix'+ | 'children'+ | 'prefixClassName'+ | 'prefixStyle'+ | 'suffix'+ | 'suffixClassName'+ | 'suffixStyle'+ > {+ /** Icon element */+ children?: ReactElement;+ /** Same as `children`, compatibility of the old API */+ icon?: ReactElement;+ variant?: 'plain' | 'solid' | 'danger' | 'custom';+ /**+ * Use preset size,+ * or use custom size(px) (default padding is `2px`, have to override yourself)+ *+ * > These presets size are referenced from the design system.+ * > The number is the size of the icon, the button size is calculated based on the icon size + padding.+ * > OR, you can define `width` and `height` in `style` or `className` directly.+ */+ size?: '12' | '14' | '16' | '20' | '24' | number;+ iconClassName?: string;+ iconStyle?: CSSProperties;+}export const IconButton = forwardRef<HTMLButtonElement, IconButtonProps>(- (props, ref) => {- const {- type,- size,- withoutPadding,- children,- disabled,- loading,- active,- withoutHoverStyle,- icon: propsIcon,+ (+ {+ variant = 'plain',+ size = '20',+ style,className,+ children,+ icon,+ iconClassName,+ iconStyle,...otherProps- } = {- ...defaultProps,- ...props,- };+ },+ ref+ ) => {+ const validatedSize = isNaN(parseInt(size as string, 10)) ? 16 : size;return (- <button+ <Buttonref={ref}- className={clsx(- iconButton,- {- 'without-padding': withoutPadding,-- primary: type === 'primary',- plain: type === 'plain',- error: type === 'error',- warning: type === 'warning',- success: type === 'success',- processing: type === 'processing',-- large: size === 'large',- small: size === 'small',- 'extra-small': size === 'extraSmall',-- disabled,- loading,- active,- 'without-hover': withoutHoverStyle,- },- className- )}- disabled={disabled}- data-disabled={disabled}+ style={{+ ...style,+ ...assignInlineVars({+ [iconSizeVar]: `${validatedSize}px`,+ }),+ }}+ data-icon-variant={variant}+ data-icon-size={validatedSize}+ className={clsx(iconButton, className)}+ size={'custom'}+ variant={'custom'}+ prefix={children ?? icon}+ prefixClassName={iconClassName}+ prefixStyle={iconStyle}{...otherProps}- >- {loading ? <Loading /> : children || propsIcon}- </button>+ />);});diff --git a/packages/frontend/component/src/ui/button/interface.ts b/packages/frontend/component/src/ui/button/interface.tsdeleted file mode 100644index 380f7872c1..0000000000--- a/packages/frontend/component/src/ui/button/interface.ts+++ /dev/null@@ -1,26 +0,0 @@-import type {- CSSProperties,- HTMLAttributes,- PropsWithChildren,- ReactElement,-} from 'react';--export const SIZE_SMALL = 'small' as const;-export const SIZE_MIDDLE = 'middle' as const;-export const SIZE_DEFAULT = 'default' as const;--export type ButtonProps = PropsWithChildren &- Omit<HTMLAttributes<HTMLButtonElement>, 'type'> & {- size?: typeof SIZE_SMALL | typeof SIZE_MIDDLE | typeof SIZE_DEFAULT;- disabled?: boolean;- hoverBackground?: CSSProperties['background'];- hoverColor?: CSSProperties['color'];- hoverStyle?: CSSProperties;- icon?: ReactElement;- iconPosition?: 'start' | 'end';- shape?: 'default' | 'round' | 'circle';- type?: 'primary' | 'light' | 'warning' | 'danger' | 'default';- bold?: boolean;- loading?: boolean;- noBorder?: boolean;- };diff --git a/packages/frontend/component/src/ui/button/utils.ts b/packages/frontend/component/src/ui/button/utils.tsdeleted file mode 100644index 09a3a6a0c7..0000000000--- a/packages/frontend/component/src/ui/button/utils.ts+++ /dev/null@@ -1,89 +0,0 @@-import type { ButtonProps } from './interface';--export const getButtonColors = (- type: ButtonProps['type'],- disabled: boolean,- extend?: {- hoverBackground: ButtonProps['hoverBackground'];- hoverColor: ButtonProps['hoverColor'];- hoverStyle: ButtonProps['hoverStyle'];- }-) => {- switch (type) {- case 'primary':- return {- background: 'var(--affine-primary-color)',- color: 'var(--affine-white)',- borderColor: 'var(--affine-primary-color)',- backgroundBlendMode: 'overlay',- opacity: disabled ? '.4' : '1',- '.affine-button-icon': {- color: 'var(--affine-white)',- },- ':hover': {- background:- 'linear-gradient(var(--affine-primary-color),var(--affine-primary-color)),var(--affine-hover-color)',- },- };- case 'light':- return {- background: 'var(--affine-tertiary-color)',- color: disabled- ? 'var(--affine-text-disable-color)'- : 'var(--affine-text-emphasis-color)',- borderColor: 'var(--affine-tertiary-color)',- '.affine-button-icon': {- borderColor: 'var(--affine-text-emphasis-color)',- },- ':hover': {- borderColor: disabled- ? 'var(--affine-disable-color)'- : 'var(--affine-text-emphasis-color)',- },- };- case 'warning':- return {- background: 'var(--affine-background-warning-color)',- color: 'var(--affine-warning-color)',- borderColor: 'var(--affine-background-warning-color)',- '.affine-button-icon': {- color: 'var(--affine-warning-color)',- },- ':hover': {- borderColor: 'var(--affine-warning-color)',- color: extend?.hoverColor,- background: extend?.hoverBackground,- ...extend?.hoverStyle,- },- };- case 'danger':- return {- background: 'var(--affine-background-error-color)',- color: 'var(--affine-error-color)',- borderColor: 'var(--affine-background-error-color)',- '.affine-button-icon': {- color: 'var(--affine-error-color)',- },- ':hover': {- borderColor: 'var(--affine-error-color)',- color: extend?.hoverColor,- background: extend?.hoverBackground,- ...extend?.hoverStyle,- },- };- default:- return {- color: 'var(--affine-text-primary-color)',- borderColor: 'var(--affine-border-color)',- ':hover': {- borderColor: 'var(--affine-primary-color)',- color: extend?.hoverColor ?? 'var(--affine-primary-color)',- '.affine-button-icon': {- color: extend?.hoverColor ?? 'var(--affine-primary-color)',- background: extend?.hoverBackground,- ...extend?.hoverStyle,- },- },- };- }-};diff --git a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx b/packages/frontend/component/src/ui/date-picker/calendar/items.tsxindex ec35aa4dc0..13182f589f 100644--- a/packages/frontend/component/src/ui/date-picker/calendar/items.tsx+++ b/packages/frontend/component/src/ui/date-picker/calendar/items.tsx@@ -134,8 +134,7 @@ export const NavButtons = memo(function NavButtons({<div className={styles.headerNavButtons} key="nav-btn-group"><IconButtonkey="nav-btn-prev"- size="small"- className={styles.focusInteractive}+ size="16"disabled={prevDisabled}data-testid="date-picker-nav-prev"onClick={onPrev}@@ -147,8 +146,7 @@ export const NavButtons = memo(function NavButtons({<IconButtonkey="nav-btn-next"- size="small"- className={styles.focusInteractive}+ size="16"disabled={nextDisabled}data-testid="date-picker-nav-next"onClick={onNext}diff --git a/packages/frontend/component/src/ui/loading/loading.tsx b/packages/frontend/component/src/ui/loading/loading.tsxindex 34195e5ec1..ceba9bd1e0 100644--- a/packages/frontend/component/src/ui/loading/loading.tsx+++ b/packages/frontend/component/src/ui/loading/loading.tsx@@ -1,9 +1,10 @@import { assignInlineVars } from '@vanilla-extract/dynamic';+import { withUnit } from '../../utils/with-unit';import { loading, speedVar } from './styles.css';export interface LoadingProps {- size?: number;+ size?: number | string;speed?: number;progress?: number;}@@ -13,11 +14,13 @@ export const Loading = ({speed = 1.2,progress = 0.2,}: LoadingProps) => {+ // allow `string` such as `16px` | `100%` | `1em`+ const sizeWithUnit = size ? withUnit(size, 'px') : '16px';return (<svgclassName={loading}- width={size ? `${size}px` : '16px'}- height={size ? `${size}px` : '16px'}+ width={sizeWithUnit}+ height={sizeWithUnit}viewBox="0 0 24 24"fill="none"xmlns="http://www.w3.org/2000/svg"diff --git a/packages/frontend/component/src/ui/modal/modal.stories.tsx b/packages/frontend/component/src/ui/modal/modal.stories.tsxindex 86738ca24d..4a6b44df5f 100644--- a/packages/frontend/component/src/ui/modal/modal.stories.tsx+++ b/packages/frontend/component/src/ui/modal/modal.stories.tsx@@ -61,7 +61,7 @@ const ConfirmModalTemplate: StoryFn<ConfirmModalProps> = () => {confirmText="Confirm"confirmButtonOptions={{loading: loading,- type: 'primary',+ variant: 'primary',}}><Input placeholder="input someting" status={inputStatus} />@@ -82,7 +82,7 @@ const OverlayModalTemplate: StoryFn<OverlayModalProps> = () => {title="Modal Title"description="Modal description"confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}topImage={<divdiff --git a/packages/frontend/component/src/ui/modal/modal.tsx b/packages/frontend/component/src/ui/modal/modal.tsxindex ee0b6b1985..19a5ef4a0f 100644--- a/packages/frontend/component/src/ui/modal/modal.tsx+++ b/packages/frontend/component/src/ui/modal/modal.tsx@@ -130,10 +130,12 @@ export const ModalInner = forwardRef<HTMLDivElement, ModalProps>(style: overlayStyle,...otherOverlayOptions} = {},- closeButtonOptions = {},+ closeButtonOptions,children,...otherProps} = props;+ const { className: closeButtonClassName, ...otherCloseButtonProps } =+ closeButtonOptions || {};const [container, setContainer] = useState<ModalTransitionContainer | null>(null@@ -204,11 +206,11 @@ export const ModalInner = forwardRef<HTMLDivElement, ModalProps>({withoutCloseButton ? null : (<Dialog.Close asChild><IconButton- className={styles.closeButton}+ size="20"+ className={clsx(styles.closeButton, closeButtonClassName)}aria-label="Close"- type="plain"data-testid="modal-close-button"- {...closeButtonOptions}+ {...otherCloseButtonProps}><CloseIcon /></IconButton>diff --git a/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx b/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsxindex 0c03b29de6..14b328816d 100644--- a/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx+++ b/packages/frontend/core/src/components/admin-panel/admin-panel-header.tsx@@ -32,7 +32,7 @@ export const AdminPanelHeader = ({</div><div><Button- type="primary"+ variant="primary"disabled={modifiedValues.length === 0}onClick={() => {openConfirmModal({@@ -41,7 +41,7 @@ export const AdminPanelHeader = ({'Are you sure you want to save the following changes?',confirmText: 'Save',confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},onConfirm: onConfirm,children:diff --git a/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx b/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsxindex b90c8634d1..b5ccc07852 100644--- a/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx+++ b/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx@@ -81,7 +81,7 @@ export const ErrorDetail: FC<ErrorDetailProps> = props => {))}<div className={styles.errorFooter}><Button- type="primary"+ variant="primary"onClick={onBtnClick}loading={isBtnLoading}size="extraLarge"diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.css.ts b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.css.tsindex 4f6f9170cc..99b33d8b98 100644--- a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.css.ts+++ b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.css.ts@@ -21,7 +21,6 @@ export const thumbContent = style({});export const actionButton = style({- fontWeight: 500,fontSize: cssVar('fontSm'),lineHeight: '22px',});diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsxindex b2a8c95fee..a33de6b297 100644--- a/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx+++ b/packages/frontend/core/src/components/affine/ai-onboarding/edgeless.dialog.tsx@@ -103,7 +103,7 @@ export const AIOnboardingEdgeless = () => {notify.dismiss(id);toggleEdgelessAIOnboarding(false);}}- type="plain"+ variant="plain"className={styles.actionButton}><span className={styles.getStartedButtonText}>@@ -113,7 +113,7 @@ export const AIOnboardingEdgeless = () => {{aiSubscription ? null : (<ButtonclassName={styles.actionButton}- type="plain"+ variant="plain"onClick={() => {goToPricingPlans();notify.dismiss(id);diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.css.ts b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.css.tsindex c9f2ce0841..c4845eb250 100644--- a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.css.ts+++ b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.css.ts@@ -114,17 +114,3 @@ export const subscribeActions = style({gap: 12,alignItems: 'center',});-export const baseActionButton = style({- fontSize: cssVar('fontBase'),- selectors: {- '&.large': {- fontWeight: 500,- },- },-});-export const transparentActionButton = style([- baseActionButton,- {- backgroundColor: 'transparent',- },-]);diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsxindex 67ee7d0655..85ca7ac6cf 100644--- a/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx+++ b/packages/frontend/core/src/components/affine/ai-onboarding/general.dialog.tsx@@ -243,36 +243,26 @@ export const AIOnboardingGeneral = () => {>{isLast ? (<>- <IconButton- size="default"- icon={<ArrowLeftSmallIcon width={20} height={20} />}- onClick={onPrev}- type="plain"- className={styles.baseActionButton}- />+ <IconButton size="20" onClick={onPrev}>+ <ArrowLeftSmallIcon />+ </IconButton>{aiSubscription ? (<Button- className={styles.baseActionButton}size="large"onClick={closeAndDismiss}- type="primary"+ variant="primary">{t['com.affine.ai-onboarding.general.get-started']()}</Button>) : (<div className={styles.subscribeActions}>- <Button- className={styles.baseActionButton}- size="large"- onClick={goToPricingPlans}- >+ <Button size="large" onClick={goToPricingPlans}>{t['com.affine.ai-onboarding.general.purchase']()}</Button><Button- className={styles.baseActionButton}size="large"onClick={closeAndDismiss}- type="primary"+ variant="primary">{t['com.affine.ai-onboarding.general.try-for-free']()}</Button>@@ -282,21 +272,15 @@ export const AIOnboardingGeneral = () => {) : (<>{isFirst ? (- <Button- className={styles.transparentActionButton}- onClick={remindLater}- size="large"- type="default"- >+ <Button onClick={remindLater} size="large">{t['com.affine.ai-onboarding.general.skip']()}</Button>) : (<Button- icon={<ArrowLeftSmallIcon />}- className={styles.baseActionButton}+ prefix={<ArrowLeftSmallIcon />}onClick={onPrev}- type="plain"size="large"+ variant="plain">{t['com.affine.ai-onboarding.general.prev']()}</Button>@@ -305,12 +289,7 @@ export const AIOnboardingGeneral = () => {<div>{index + 1} / {list.length}</div>- <Button- className={styles.baseActionButton}- size="large"- type="primary"- onClick={onNext}- >+ <Button size="large" variant="primary" onClick={onNext}>{t['com.affine.ai-onboarding.general.next']()}</Button></div>diff --git a/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx b/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsxindex 4dc757a96c..5c9245eb21 100644--- a/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx+++ b/packages/frontend/core/src/components/affine/ai-onboarding/local.dialog.tsx@@ -41,7 +41,7 @@ const FooterActions = ({ onDismiss }: { onDismiss: () => void }) => {<a href="https://ai.affine.pro" target="_blank" rel="noreferrer"><ButtonclassName={styles.actionButton}- type="plain"+ variant="plain"onClick={onDismiss}>{t['com.affine.ai-onboarding.local.action-learn-more']()}@@ -50,7 +50,7 @@ const FooterActions = ({ onDismiss }: { onDismiss: () => void }) => {{loggedIn ? null : (<ButtonclassName={styles.actionButton}- type="plain"+ variant="plain"onClick={() => {onDismiss();jumpToSignIn('', RouteLogic.REPLACE, {}, { initCloud: 'true' });diff --git a/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx b/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsxindex ed3a76d213..ef440c5c55 100644--- a/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx+++ b/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx@@ -99,7 +99,7 @@ export const AfterSignInSendEmail = ({<Buttonstyle={!verifyToken ? { cursor: 'not-allowed' } : {}}disabled={!verifyToken || isSending}- type="plain"+ variant="plain"size="large"onClick={onResendClick}>diff --git a/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx b/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsxindex 77a09e2620..3880d4d90b 100644--- a/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx+++ b/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx@@ -91,7 +91,7 @@ export const AfterSignUpSendEmail: FC<AuthPanelProps> = ({<Buttonstyle={!verifyToken ? { cursor: 'not-allowed' } : {}}disabled={!verifyToken || isSending}- type="plain"+ variant="plain"size="large"onClick={onResendClick}>diff --git a/packages/frontend/core/src/components/affine/auth/ai-login-required.tsx b/packages/frontend/core/src/components/affine/auth/ai-login-required.tsxindex a707d4cbbc..1811d6e741 100644--- a/packages/frontend/core/src/components/affine/auth/ai-login-required.tsx+++ b/packages/frontend/core/src/components/affine/auth/ai-login-required.tsx@@ -27,7 +27,7 @@ export const AiLoginRequiredModal = () => {},confirmText: t['com.affine.ai.login-required.dialog-confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText: t['com.affine.ai.login-required.dialog-cancel'](),onOpenChange: setOpen,diff --git a/packages/frontend/core/src/components/affine/auth/oauth.tsx b/packages/frontend/core/src/components/affine/auth/oauth.tsxindex 794e3c0dd8..af8babc2f5 100644--- a/packages/frontend/core/src/components/affine/auth/oauth.tsx+++ b/packages/frontend/core/src/components/affine/auth/oauth.tsx@@ -82,11 +82,11 @@ function OAuthProvider({return (<Buttonkey={provider}- type="primary"+ variant="primary"blocksize="extraLarge"- style={{ marginTop: 30 }}- icon={icon}+ style={{ marginTop: 30, width: '100%' }}+ prefix={icon}onClick={onClick}>Continue with {provider}diff --git a/packages/frontend/core/src/components/affine/auth/send-email.tsx b/packages/frontend/core/src/components/affine/auth/send-email.tsxindex 01cfb3d41e..9cd5803732 100644--- a/packages/frontend/core/src/components/affine/auth/send-email.tsx+++ b/packages/frontend/core/src/components/affine/auth/send-email.tsx@@ -203,7 +203,7 @@ export const SendEmail = ({</Wrapper><Button- type="primary"+ variant="primary"size="extraLarge"style={{ width: '100%' }}disabled={hasSentEmail}diff --git a/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx b/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsxindex a0877c6d6d..ff0d38d0a1 100644--- a/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx+++ b/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx@@ -129,7 +129,7 @@ export const SignInWithPassword: FC<AuthPanelProps> = ({</div><Buttondata-testid="sign-in-button"- type="primary"+ variant="primary"size="extraLarge"style={{ width: '100%' }}disabled={isLoading}diff --git a/packages/frontend/core/src/components/affine/auth/sign-in.tsx b/packages/frontend/core/src/components/affine/auth/sign-in.tsxindex b015393d41..31c245afc7 100644--- a/packages/frontend/core/src/components/affine/auth/sign-in.tsx+++ b/packages/frontend/core/src/components/affine/auth/sign-in.tsx@@ -5,8 +5,9 @@ import { authAtom } from '@affine/core/atoms';import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';import { mixpanel } from '@affine/core/mixpanel';import { Trans, useI18n } from '@affine/i18n';-import { ArrowDownBigIcon } from '@blocksuite/icons/rc';+import { ArrowRightBigIcon } from '@blocksuite/icons/rc';import { useLiveData, useService } from '@toeverything/infra';+import { cssVar } from '@toeverything/theme';import { useAtomValue } from 'jotai';import type { FC } from 'react';import { useCallback, useEffect, useState } from 'react';@@ -149,21 +150,13 @@ export const SignIn: FC<AuthPanelProps> = ({{verifyToken ? (<Button+ style={{ width: '100%' }}size="extraLarge"data-testid="continue-login-button"blockloading={isMutating}- icon={- <ArrowDownBigIcon- width={20}- height={20}- style={{- transform: 'rotate(-90deg)',- color: 'var(--affine-blue)',- }}- />- }- iconPosition="end"+ suffix={<ArrowRightBigIcon />}+ suffixStyle={{ width: 20, height: 20, color: cssVar('blue') }}onClick={onContinue}>{t['com.affine.auth.sign.email.continue']()}diff --git a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsxindex 65a09cd82a..89b2a6e947 100644--- a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx@@ -106,7 +106,7 @@ const NameWorkspaceContent = ({cancelText={t['com.affine.nameWorkspace.button.cancel']()}confirmText={t['com.affine.nameWorkspace.button.create']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',disabled: !workspaceName || loading,['data-testid' as string]: 'create-workspace-create-button',}}diff --git a/packages/frontend/core/src/components/affine/history-tips-modal/index.tsx b/packages/frontend/core/src/components/affine/history-tips-modal/index.tsxindex 163b3dc191..8b2d287cd9 100644--- a/packages/frontend/core/src/components/affine/history-tips-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/history-tips-modal/index.tsx@@ -28,7 +28,7 @@ export const HistoryTipsModal = () => {description={t['com.affine.history-vision.tips-modal.description']()}cancelText={t['com.affine.history-vision.tips-modal.cancel']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}onConfirm={handleConfirm}confirmText={t['com.affine.history-vision.tips-modal.confirm']()}diff --git a/packages/frontend/core/src/components/affine/issue-feedback-modal/index.tsx b/packages/frontend/core/src/components/affine/issue-feedback-modal/index.tsxindex 1438b80671..a3e6ef095c 100644--- a/packages/frontend/core/src/components/affine/issue-feedback-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/issue-feedback-modal/index.tsx@@ -27,7 +27,7 @@ export const IssueFeedbackModal = () => {to={`${runtimeConfig.githubUrl}/issues/new/choose`}confirmText={t['com.affine.issue-feedback.confirm']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}external/>diff --git a/packages/frontend/core/src/components/affine/onboarding/animate-in-tooltip.tsx b/packages/frontend/core/src/components/affine/onboarding/animate-in-tooltip.tsxindex 8cfe73f02f..99315b2553 100644--- a/packages/frontend/core/src/components/affine/onboarding/animate-in-tooltip.tsx+++ b/packages/frontend/core/src/components/affine/onboarding/animate-in-tooltip.tsx@@ -19,7 +19,7 @@ export const AnimateInTooltip = ({</div><div className={styles.next}>{visible ? (- <Button type="primary" size="extraLarge" onClick={onNext}>+ <Button variant="primary" size="extraLarge" onClick={onNext}>Next</Button>) : null}diff --git a/packages/frontend/core/src/components/affine/onboarding/steps/edgeless-switch.tsx b/packages/frontend/core/src/components/affine/onboarding/steps/edgeless-switch.tsxindex 1d8acd36b1..aa72a81b10 100644--- a/packages/frontend/core/src/components/affine/onboarding/steps/edgeless-switch.tsx+++ b/packages/frontend/core/src/components/affine/onboarding/steps/edgeless-switch.tsx@@ -235,7 +235,7 @@ export const EdgelessSwitch = ({onSwitchToPageMode={onSwitchToPageMode}onSwitchToEdgelessMode={onSwitchToEdgelessMode}/>- <Button size="extraLarge" type="primary" onClick={onNextClick}>+ <Button size="extraLarge" variant="primary" onClick={onNextClick}>Next</Button></header>@@ -263,7 +263,7 @@ export const EdgelessSwitch = ({<ButtonclassName={styles.wellDoneEnterAnim}onClick={onNextClick}- type="primary"+ variant="primary"size="extraLarge"style={{ marginTop: 40 }}>diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsxindex f2a32185ab..baaa5be84f 100644--- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx+++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx@@ -251,11 +251,9 @@ const PlanPrompt = () => {: '' /* TODO(@catsjuice): loading UI */}- <IconButton- size="small"- icon={<CloseIcon />}- onClick={closeFreePlanPrompt}- />+ <IconButton onClick={closeFreePlanPrompt}>+ <CloseIcon />+ </IconButton></div>);}, [closeFreePlanPrompt, isProWorkspace, t]);@@ -393,7 +391,7 @@ const PageHistoryList = ({})}{onLoadMore ? (<Button- type="plain"+ variant="plain"loading={loadingMore}disabled={loadingMore}className={styles.historyItemLoadMore}@@ -480,7 +478,7 @@ const PageHistoryManager = ({},confirmText: t['com.affine.history.confirm-restore-modal.restore'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',['data-testid' as string]: 'confirm-restore-history-button',},onConfirm: handleRestore,@@ -520,12 +518,12 @@ const PageHistoryManager = ({) : null}<div className={styles.historyFooter}>- <Button type="plain" onClick={onClose}>+ <Button onClick={onClose}>{t['com.affine.history.back-to-page']()}</Button><div className={styles.spacer} /><Button- type="primary"+ variant="primary"onClick={onConfirmRestore}disabled={isMutating || !activeVersion}>diff --git a/packages/frontend/core/src/components/affine/page-properties/confirm-delete-property-modal.tsx b/packages/frontend/core/src/components/affine/page-properties/confirm-delete-property-modal.tsxindex 8806feb314..1df7bd7428 100644--- a/packages/frontend/core/src/components/affine/page-properties/confirm-delete-property-modal.tsx+++ b/packages/frontend/core/src/components/affine/page-properties/confirm-delete-property-modal.tsx@@ -50,7 +50,7 @@ export const ConfirmDeletePropertyModal = ({onClick: onCancel,}}confirmButtonOptions={{- type: 'error',+ variant: 'error',}}/>);diff --git a/packages/frontend/core/src/components/affine/page-properties/styles.css.ts b/packages/frontend/core/src/components/affine/page-properties/styles.css.tsindex cf12e239ec..a00d387210 100644--- a/packages/frontend/core/src/components/affine/page-properties/styles.css.ts+++ b/packages/frontend/core/src/components/affine/page-properties/styles.css.ts@@ -117,22 +117,14 @@ export const tableBodySortable = style({});export const addPropertyButton = style({- display: 'flex',- alignItems: 'center',alignSelf: 'flex-start',fontSize: cssVar('fontSm'),- color: `${cssVar('textSecondaryColor')} !important`,+ color: `${cssVar('textSecondaryColor')}`,padding: '0 4px',height: 36,- cursor: 'pointer',- ':hover': {- color: cssVar('textPrimaryColor'),- backgroundColor: cssVar('hoverColor'),- },- gap: 2,fontWeight: 400,+ gap: 6,});-globalStyle(`${addPropertyButton} svg`, {fontSize: 16,color: cssVar('iconSecondary'),diff --git a/packages/frontend/core/src/components/affine/page-properties/table.tsx b/packages/frontend/core/src/components/affine/page-properties/table.tsxindex aa946abd24..ae25835621 100644--- a/packages/frontend/core/src/components/affine/page-properties/table.tsx+++ b/packages/frontend/core/src/components/affine/page-properties/table.tsx@@ -703,11 +703,9 @@ export const PagePropertiesTableHeader = ({</div>{properties.length === 0 || manager.readonly ? null : (<PagePropertiesSettingsPopup>- <IconButton- data-testid="page-info-show-more"- type="plain"- icon={<MoreHorizontalIcon />}- />+ <IconButton data-testid="page-info-show-more" size="20">+ <MoreHorizontalIcon />+ </IconButton></PagePropertiesSettingsPopup>)}<Collapsible.Trigger asChild role="button" onClick={handleCollapse}>@@ -715,15 +713,12 @@ export const PagePropertiesTableHeader = ({className={styles.tableHeaderCollapseButtonWrapper}data-testid="page-info-collapse">- <IconButton- type="plain"- icon={- <ToggleExpandIcon- className={styles.collapsedIcon}- data-collapsed={!open}- />- }- />+ <IconButton size="20">+ <ToggleExpandIcon+ className={styles.collapsedIcon}+ data-collapsed={!open}+ />+ </IconButton></div></Collapsible.Trigger></div>@@ -1056,8 +1051,8 @@ export const PagePropertiesAddProperty = () => {return (<Menu {...menuOptions}><Button- type="plain"- icon={<PlusIcon />}+ variant="plain"+ prefix={<PlusIcon />}className={styles.addPropertyButton}>{t['com.affine.page-properties.add-property']()}diff --git a/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx b/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsxindex b41b58d46e..af9a7f8171 100644--- a/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx+++ b/packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx@@ -405,11 +405,9 @@ export const TagsEditor = ({ pageId, readonly }: TagsEditorProps) => {<TagItem maxWidth="100%" tag={tag} mode="inline" /><div className={styles.spacer} /><EditTagMenu tagId={tag.id} onTagDelete={onTagDelete}>- <IconButton- className={styles.tagEditIcon}- type="plain"- icon={<MoreHorizontalIcon />}- />+ <IconButton className={styles.tagEditIcon}>+ <MoreHorizontalIcon />+ </IconButton></EditTagMenu></div>);diff --git a/packages/frontend/core/src/components/affine/quota-reached-modal/cloud-quota-modal.tsx b/packages/frontend/core/src/components/affine/quota-reached-modal/cloud-quota-modal.tsxindex 662bf00808..470be57062 100644--- a/packages/frontend/core/src/components/affine/quota-reached-modal/cloud-quota-modal.tsx+++ b/packages/frontend/core/src/components/affine/quota-reached-modal/cloud-quota-modal.tsx@@ -112,7 +112,7 @@ export const CloudQuotaModal = () => {isFreePlanOwner ? t['com.affine.payment.upgrade']() : t['Got it']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}/>);diff --git a/packages/frontend/core/src/components/affine/quota-reached-modal/local-quota-modal.tsx b/packages/frontend/core/src/components/affine/quota-reached-modal/local-quota-modal.tsxindex 1348eacaea..4ef94c9180 100644--- a/packages/frontend/core/src/components/affine/quota-reached-modal/local-quota-modal.tsx+++ b/packages/frontend/core/src/components/affine/quota-reached-modal/local-quota-modal.tsx@@ -37,7 +37,7 @@ export const LocalQuotaModal = () => {onConfirm={onConfirm}confirmText={t['Got it']()}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}/>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/ai-usage-panel.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/ai-usage-panel.tsxindex 16c1dc1bcc..97c3e04fee 100644--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/ai-usage-panel.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/ai-usage-panel.tsx@@ -132,7 +132,7 @@ export const AIUsagePanel = () => {</div>{hasPaymentFeature && (- <AISubscribe type="primary" className={styles.storageButton}>+ <AISubscribe variant="primary">{t['com.affine.payment.ai.usage.purchase-button-label']()}</AISubscribe>)}diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsxindex f63aa3c057..876eb35624 100644--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx@@ -142,7 +142,6 @@ export const AvatarAndName = () => {<Buttondata-testid="save-user-name"onClick={handleUpdateUserName}- className={styles.button}style={{marginLeft: '12px',}}@@ -234,7 +233,7 @@ export const AccountSetting: FC = () => {/><AvatarAndName /><SettingRow name={t['com.affine.settings.email']()} desc={account.email}>- <Button onClick={onChangeEmail} className={styles.button}>+ <Button onClick={onChangeEmail}>{account.info?.emailVerified? t['com.affine.settings.email.action.change'](): t['com.affine.settings.email.action.verify']()}@@ -244,7 +243,7 @@ export const AccountSetting: FC = () => {name={t['com.affine.settings.password']()}desc={t['com.affine.settings.password.message']()}>- <Button onClick={onPasswordButtonClick} className={styles.button}>+ <Button onClick={onPasswordButtonClick}>{account.info?.hasPassword? t['com.affine.settings.password.action.change'](): t['com.affine.settings.password.action.set']()}diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.css.ts b/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.css.tsindex a6eb95b317..086caf4ea8 100644--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.css.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.css.ts@@ -28,6 +28,3 @@ globalStyle(`${storageProgressWrapper} .storage-progress-bar-wrapper`, {export const storageProgressBar = style({height: '100%',});-export const storageButton = style({- padding: '4px 12px',-});diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.tsxindex c365dd6b8f..2e1032c172 100644--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/storage-progress.tsx@@ -18,7 +18,7 @@ export interface StorageProgressProgress {enum ButtonType {Primary = 'primary',- Default = 'default',+ Default = 'secondary',}export const StorageProgress = ({ onUpgrade }: StorageProgressProgress) => {@@ -101,11 +101,7 @@ export const StorageProgress = ({ onUpgrade }: StorageProgressProgress) => {}><span tabIndex={0}>- <Button- type={buttonType}- onClick={onUpgrade}- className={styles.storageButton}- >+ <Button variant={buttonType} onClick={onUpgrade}>{isFreeUser? t['com.affine.storage.upgrade'](): t['com.affine.storage.change-plan']()}diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/account-setting/style.css.tsindex f559a1c797..f4a17038d7 100644--- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/style.css.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/style.css.ts@@ -39,6 +39,3 @@ globalStyle(`${avatarWrapper} .camera-icon-wrapper`, {color: cssVar('white'),fontSize: cssVar('fontH4'),});-export const button = style({- padding: '4px 12px',-});diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsxindex 8aded7e9a7..c85faf8cc6 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx@@ -299,9 +299,7 @@ const TypeFormLink = () => {desc={t['com.affine.payment.billing-type-form.description']()}><a target="_blank" href={link} rel="noreferrer">- <Button style={{ padding: '4px 12px' }}>- {t['com.affine.payment.billing-type-form.go']()}- </Button>+ <Button>{t['com.affine.payment.billing-type-form.go']()}</Button></a></SettingRow>);@@ -435,7 +433,7 @@ const PlanAction = ({return (<ButtonclassName={styles.planAction}- type="primary"+ variant="primary"onClick={gotoPlansSetting}>{plan === SubscriptionPlan.Pro@@ -460,12 +458,7 @@ const PaymentMethodUpdater = () => {}, [trigger]);return (- <Button- className={styles.button}- onClick={update}- loading={isMutating}- disabled={isMutating}- >+ <Button onClick={update} loading={isMutating} disabled={isMutating}>{t['com.affine.payment.billing-setting.update']()}</Button>);@@ -492,7 +485,7 @@ const ResumeSubscription = () => {return (<ResumeAction open={open} onOpenChange={setOpen}>- <Button className={styles.button} onClick={handleClick}>+ <Button onClick={handleClick}>{t['com.affine.payment.billing-setting.resume-subscription']()}</Button></ResumeAction>@@ -503,10 +496,11 @@ const CancelSubscription = ({ loading }: { loading?: boolean }) => {return (<IconButtonstyle={{ pointerEvents: 'none' }}- icon={<ArrowRightSmallIcon />}disabled={loading}loading={loading}- />+ >+ <ArrowRightSmallIcon />+ </IconButton>);};@@ -583,7 +577,7 @@ const InvoiceLine = ({: ''} $${invoice.amount / 100} - ${planText}`}>- <Button className={styles.button} onClick={open}>+ <Button onClick={open}>{t['com.affine.payment.billing-setting.view-invoice']()}</Button></SettingRow>diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/style.css.tsindex a63548659b..17a91656df 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/style.css.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/style.css.ts@@ -46,9 +46,6 @@ export const currentPlanName = style({color: cssVar('textEmphasisColor'),cursor: 'pointer',});-export const button = style({- padding: '4px 12px',-});export const subscriptionSettingSkeleton = style({display: 'flex',flexDirection: 'column',diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsxindex f130872063..fbd1df6d94 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx@@ -63,7 +63,7 @@ const ExperimentalFeaturesPrompt = ({<Buttondisabled={!checked}onClick={onConfirm}- type="primary"+ variant="primary"data-testid="experimental-confirm-button">{t[diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/cancel.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/cancel.tsxindex 118191bf95..50c9ffb80d 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/cancel.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/cancel.tsx@@ -43,12 +43,12 @@ export const AICancel = ({ module, ...btnProps }: AICancelProps) => {confirmText:t['com.affine.payment.ai.action.cancel.confirm.confirm-text'](),confirmButtonOptions: {- type: 'default',+ variant: 'secondary',},cancelText:t['com.affine.payment.ai.action.cancel.confirm.cancel-text'](),cancelButtonOptions: {- type: 'primary',+ variant: 'primary',},onConfirm: async () => {try {@@ -92,7 +92,12 @@ export const AICancel = ({ module, ...btnProps }: AICancelProps) => {]);return (- <Button onClick={cancel} loading={isMutating} type="primary" {...btnProps}>+ <Button+ onClick={cancel}+ loading={isMutating}+ variant="primary"+ {...btnProps}+ >{t['com.affine.payment.ai.action.cancel.button-label']()}</Button>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/login.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/login.tsxindex edf69f1acf..98585a7b08 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/login.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/login.tsx@@ -16,7 +16,7 @@ export const AILogin = (btnProps: ButtonProps) => {}, [setOpen]);return (- <Button onClick={onClickSignIn} type="primary" {...btnProps}>+ <Button onClick={onClickSignIn} variant="primary" {...btnProps}>{t['com.affine.payment.ai.action.login.button-label']()}</Button>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsxindex 12e9292037..b5813bd18f 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/resume.tsx@@ -48,7 +48,7 @@ export const AIResume = ({ module, ...btnProps }: AIResumeProps) => {confirmText:t['com.affine.payment.ai.action.resume.confirm.confirm-text'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText:t['com.affine.payment.ai.action.resume.confirm.cancel-text'](),@@ -79,7 +79,12 @@ export const AIResume = ({ module, ...btnProps }: AIResumeProps) => {}, [subscription, openConfirmModal, t, module, idempotencyKey]);return (- <Button loading={isMutating} onClick={resume} type="primary" {...btnProps}>+ <Button+ loading={isMutating}+ onClick={resume}+ variant="primary"+ {...btnProps}+ >{t['com.affine.payment.ai.action.resume.button-label']()}</Button>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/subscribe.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/subscribe.tsxindex e00eb3eceb..f706741929 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/subscribe.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/ai/actions/subscribe.tsx@@ -102,7 +102,7 @@ export const AISubscribe = ({<Buttonloading={isMutating}onClick={subscribe}- type="primary"+ variant="primary"{...btnProps}>{btnProps.children ?? `${priceReadable} / ${priceFrequency}`}diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.tsindex c2f471a526..4a7f3796d0 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.css.ts@@ -46,6 +46,7 @@ export const allPlansLink = style({export const collapsibleHeader = style({display: 'flex',+ alignItems: 'start',marginBottom: 8,});export const collapsibleHeaderContent = style({diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsxindex 2041b0c74a..e247704250 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx@@ -58,7 +58,7 @@ export const PricingCollapsible = ({<div className={styles.collapsibleHeaderTitle}>{title}</div><div className={styles.collapsibleHeaderCaption}>{caption}</div></div>- <IconButton onClick={toggle}>+ <IconButton onClick={toggle} size="20"><ArrowUpSmallIconstyle={{transform: open ? 'rotate(0deg)' : 'rotate(180deg)',@@ -163,7 +163,7 @@ export const PlanLayout = ({ cloud, ai, cloudTip }: PlanLayoutProps) => {</div><ButtononClick={() => scrollToAnchor('cloudPricingPlan')}- type="primary"+ variant="primary">{t['com.affine.ai-scroll-tip.view']()}</Button>diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsxindex 1c3e72b50c..8aac457a35 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx@@ -48,7 +48,7 @@ export const ConfirmLoadingModal = ({cancelText={cancelText}confirmText={confirmText}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',loading,}}open={open}@@ -120,7 +120,7 @@ export const DowngradeModal = ({<Buttondisabled={loading}onClick={() => onOpenChange?.(false)}- type="primary"+ variant="primary">{t['com.affine.payment.modal.downgrade.confirm']()}</Button>diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsxindex 3d166b0507..15378ddd7e 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx@@ -1,4 +1,4 @@-import { Button } from '@affine/component/ui/button';+import { Button, type ButtonProps } from '@affine/component/ui/button';import { Tooltip } from '@affine/component/ui/tooltip';import { generateSubscriptionCallbackLink } from '@affine/core/hooks/affine/use-subscription-notify';import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';@@ -10,10 +10,11 @@ import { SubscriptionPlan, SubscriptionStatus } from '@affine/graphql';import { Trans, useI18n } from '@affine/i18n';import { DoneIcon } from '@blocksuite/icons/rc';import { useLiveData, useService } from '@toeverything/infra';+import { assignInlineVars } from '@vanilla-extract/dynamic';import clsx from 'clsx';import { useSetAtom } from 'jotai';import { nanoid } from 'nanoid';-import type { HTMLAttributes, PropsWithChildren } from 'react';+import type { PropsWithChildren } from 'react';import { useCallback, useEffect, useMemo, useState } from 'react';import { authAtom } from '../../../../../atoms/index';@@ -194,7 +195,7 @@ const Downgrade = ({ disabled }: { disabled?: boolean }) => {<div className={styles.planAction}><ButtonclassName={styles.planAction}- type="primary"+ variant="primary"onClick={handleClick}disabled={disabled}>@@ -232,7 +233,7 @@ const BookDemo = ({ plan }: { plan: SubscriptionPlan }) => {});}}>- <Button className={styles.planAction} type="primary">+ <Button className={styles.planAction} variant="primary">{t['com.affine.payment.tell-us-use-case']()}</Button></a>@@ -243,8 +244,8 @@ export const Upgrade = ({className,recurring,children,- ...attrs-}: HTMLAttributes<HTMLButtonElement> & {+ ...btnProps+}: ButtonProps & {recurring: SubscriptionRecurring;}) => {const [isMutating, setMutating] = useState(false);@@ -307,11 +308,11 @@ export const Upgrade = ({return (<ButtonclassName={clsx(styles.planAction, className)}- type="primary"+ variant="primary"onClick={upgrade}disabled={isMutating}loading={isMutating}- {...attrs}+ {...btnProps}>{children ?? t['com.affine.payment.upgrade']()}</Button>@@ -371,7 +372,7 @@ const ChangeRecurring = ({<><ButtonclassName={styles.planAction}- type="primary"+ variant="primary"onClick={onStartChange}disabled={disabled || isMutating}loading={isMutating}@@ -405,7 +406,7 @@ const SignUpAction = ({ children }: PropsWithChildren) => {<ButtononClick={onClickSignIn}className={styles.planAction}- type="primary"+ variant="primary">{children}</Button>@@ -415,7 +416,6 @@ const SignUpAction = ({ children }: PropsWithChildren) => {const ResumeButton = () => {const t = useI18n();const [open, setOpen] = useState(false);- const [hovered, setHovered] = useState(false);const subscription = useService(SubscriptionService).subscription;const handleClick = useCallback(() => {@@ -435,14 +435,14 @@ const ResumeButton = () => {return (<ResumeAction open={open} onOpenChange={setOpen}><Button- className={styles.planAction}- onMouseEnter={() => setHovered(true)}- onMouseLeave={() => setHovered(false)}+ className={styles.resumeAction}onClick={handleClick}+ style={assignInlineVars({+ '--default-content': t['com.affine.payment.current-plan'](),+ '--hover-content': t['com.affine.payment.resume-renewal'](),+ })}>- {hovered- ? t['com.affine.payment.resume-renewal']()- : t['com.affine.payment.current-plan']()}+ <span className={styles.resumeActionContent} /></Button></ResumeAction>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/style.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/style.css.tsindex c62bd833ef..e6967100bd 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/style.css.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/style.css.ts@@ -177,7 +177,17 @@ export const planPriceDesc = style({});export const planAction = style({width: '100%',- fontWeight: 500,+});+export const resumeAction = style([planAction, {}]);+export const resumeActionContent = style({+ ':after': {+ content: 'var(--default-content)',+ },+ selectors: {+ [`${resumeAction}:hover &:after`]: {+ content: 'var(--hover-content)',+ },+ },});export const planBenefits = style({fontSize: cssVar('fontXs'),diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsxindex 6bd7bc96d9..7ff68f7f58 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx@@ -38,7 +38,7 @@ export const WorkspaceDeleteModal = ({cancelText={t['com.affine.workspaceDelete.button.cancel']()}confirmText={t['com.affine.workspaceDelete.button.delete']()}confirmButtonOptions={{- type: 'error',+ variant: 'error',disabled: !allowDelete,['data-testid' as string]: 'delete-workspace-confirm-button',}}diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsxindex 90915ff9ea..b6384c681b 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx@@ -136,7 +136,7 @@ export const DeleteLeaveWorkspace = () => {description={t['com.affine.deleteLeaveWorkspace.leaveDescription']()}confirmText={t['Leave']()}confirmButtonOptions={{- type: 'warning',+ variant: 'error',}}/>)}diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsxindex a2ae3e92e6..268d1f6e58 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx@@ -56,7 +56,7 @@ export const EnableCloudPanel = () => {><Buttondata-testid="publish-enable-affine-cloud-button"- type="primary"+ variant="primary"onClick={confirmEnableCloudAndClose}style={{ marginTop: '12px' }}>diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsxindex 80abe08f03..8a42d80455 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/members.tsx@@ -63,7 +63,7 @@ const MembersPanelLocal = () => {<Tooltip content={t['com.affine.settings.member-tooltip']()}><div className={style.fakeWrapper}><SettingRow name={`${t['Members']()} (0)`} desc={t['Members hint']()}>- <Button size="large">{t['Invite Members']()}</Button>+ <Button>{t['Invite Members']()}</Button></SettingRow></div></Tooltip>@@ -393,7 +393,6 @@ const MemberItem = ({><IconButtondisabled={!operationButtonInfo.show}- type="plain"style={{visibility: operationButtonInfo.show ? 'visible' : 'hidden',flexShrink: 0,diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsxindex 8e2aa106e6..30bc06e094 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/properties/index.tsx@@ -173,11 +173,9 @@ const EditPropertyButton = ({}}items={editing ? editMenuItems : defaultMenuItems}>- <IconButton- onClick={() => setOpen(true)}- type="plain"- icon={<MoreHorizontalIcon />}- />+ <IconButton onClick={() => setOpen(true)} size="20">+ <MoreHorizontalIcon />+ </IconButton></Menu><ConfirmDeletePropertyModalonConfirm={() => {@@ -350,7 +348,7 @@ const WorkspaceSettingPropertiesMain = () => {<div className={styles.listHeader}>{properties.length > 0 ? (<Menu items={filterMenuItems}>- <Button type="default" icon={<FilterIcon />}>+ <Button prefix={<FilterIcon />}>{filterMode === 'all'? t['com.affine.filter'](): t[`com.affine.settings.workspace.properties.${filterMode}`]()}@@ -365,7 +363,7 @@ const WorkspaceSettingPropertiesMain = () => {/>}>- <Button type="primary">+ <Button variant="primary">{t['com.affine.settings.workspace.properties.add_property']()}</Button></Menu>diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsxindex 9d2ef3daab..9576ebf10c 100644--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx@@ -55,7 +55,7 @@ const DefaultShareButton = forwardRef(function DefaultShareButton(}, [shareService]);return (- <Button ref={ref} className={styles.shareButton} type="primary">+ <Button ref={ref} className={styles.shareButton} variant="primary">{shared? t['com.affine.share-menu.sharedButton'](): t['com.affine.share-menu.shareButton']()}diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsxindex 44fca95086..5e7b228a0c 100644--- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx+++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx@@ -40,7 +40,7 @@ export const LocalSharePage = (props: ShareMenuProps) => {<div><ButtononClick={props.onEnableAffineCloud}- type="primary"+ variant="primary"data-testid="share-menu-enable-affine-cloud-button">{t['Enable AFFiNE Cloud']()}@@ -256,7 +256,7 @@ export const AffineSharePage = (props: ShareMenuProps) => {) : (<ButtononClick={onClickCreateLink}- type="primary"+ variant="primary"data-testid="share-menu-create-link-button"style={{ padding: '4px 12px', whiteSpace: 'nowrap' }}>diff --git a/packages/frontend/core/src/components/affine/sign-out-modal/index.tsx b/packages/frontend/core/src/components/affine/sign-out-modal/index.tsxindex 5e927d9151..9275b0876e 100644--- a/packages/frontend/core/src/components/affine/sign-out-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/sign-out-modal/index.tsx@@ -32,7 +32,7 @@ export const SignOutModal = ({ ...props }: ConfirmModalProps) => {cancelText={cancelText ?? defaultTexts.cancelText}confirmText={confirmText ?? defaultTexts.children}confirmButtonOptions={{- type: 'error',+ variant: 'error',['data-testid' as string]: 'confirm-sign-out-button',}}contentOptions={{diff --git a/packages/frontend/core/src/components/affine/star-affine-modal/index.tsx b/packages/frontend/core/src/components/affine/star-affine-modal/index.tsxindex f0185537eb..41bd5c1851 100644--- a/packages/frontend/core/src/components/affine/star-affine-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/star-affine-modal/index.tsx@@ -26,7 +26,7 @@ export const StarAFFiNEModal = () => {cancelText={t['com.affine.star-affine.cancel']()}to={runtimeConfig.githubUrl}confirmButtonOptions={{- type: 'primary',+ variant: 'primary',}}confirmText={t['com.affine.star-affine.confirm']()}externaldiff --git a/packages/frontend/core/src/components/affine/subscription-landing/index.tsx b/packages/frontend/core/src/components/affine/subscription-landing/index.tsxindex cc2ddfa8d0..a091e2390c 100644--- a/packages/frontend/core/src/components/affine/subscription-landing/index.tsx+++ b/packages/frontend/core/src/components/affine/subscription-landing/index.tsx@@ -48,7 +48,7 @@ const UpgradeSuccessLayout = ({return (<AuthPageContainer title={title} subtitle={subtitle}>- <Button type="primary" size="extraLarge" onClick={openAffine}>+ <Button variant="primary" size="extraLarge" onClick={openAffine}>{t['com.affine.other-page.nav.open-affine']()}</Button></AuthPageContainer>diff --git a/packages/frontend/core/src/components/affine/subscription-landing/notify.tsx b/packages/frontend/core/src/components/affine/subscription-landing/notify.tsxindex 307d883cde..350c9fce83 100644--- a/packages/frontend/core/src/components/affine/subscription-landing/notify.tsx+++ b/packages/frontend/core/src/components/affine/subscription-landing/notify.tsx@@ -32,7 +32,7 @@ const SubscriptionChangedNotifyFooter = ({className={clsx(actionButton, cancelButton)}size={'default'}onClick={onCancel}- type="plain"+ variant="plain">{cancelText}</Button>@@ -40,7 +40,7 @@ const SubscriptionChangedNotifyFooter = ({<ButtononClick={onConfirm}className={clsx(actionButton, confirmButton)}- type="plain"+ variant="plain">{okText}</Button>diff --git a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.css.ts b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.css.tsindex ddba6bbd53..2881d65bb9 100644--- a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.css.ts+++ b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.css.ts@@ -6,11 +6,7 @@ export const root = style({height: 32,borderRadius: 8,boxShadow: '0px 1px 2px 0px rgba(0, 0, 0, 0.15)',- border: `1px solid ${cssVarV2('layer/border')}`,+ borderWidth: 1,+ borderColor: cssVarV2('layer/border'),background: cssVarV2('button/siderbarPrimary/background'),});-export const icon = style({- color: cssVarV2('icon/primary'),- fontSize: 20,- display: 'block',-});diff --git a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsxindex 3eaca72a85..c8da78a66b 100644--- a/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx+++ b/packages/frontend/core/src/components/app-sidebar/add-page-button/index.tsx@@ -1,4 +1,4 @@-import { Button, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { useI18n } from '@affine/i18n';import { PlusIcon } from '@blocksuite/icons/rc';import clsx from 'clsx';@@ -12,6 +12,7 @@ interface AddPageButtonProps {style?: React.CSSProperties;}+const sideBottom = { side: 'bottom' as const };export function AddPageButton({onClick,className,@@ -20,15 +21,15 @@ export function AddPageButton({const t = useI18n();return (- <Tooltip content={t['New Page']()} side="bottom">- <Button- data-testid="sidebar-new-page-button"- style={style}- className={clsx([styles.root, className])}- onClick={onClick}- >- <PlusIcon className={styles.icon} />- </Button>- </Tooltip>+ <IconButton+ tooltip={t['New Page']()}+ tooltipOptions={sideBottom}+ data-testid="sidebar-new-page-button"+ style={style}+ className={clsx([styles.root, className])}+ onClick={onClick}+ >+ <PlusIcon />+ </IconButton>);}diff --git a/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts b/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.tsindex 5380eca67d..e1daac0703 100644--- a/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts+++ b/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts@@ -34,25 +34,20 @@ export const label = style({lineHeight: '20px',flexGrow: '0',display: 'flex',+ gap: 2,alignItems: 'center',justifyContent: 'start',cursor: 'pointer',});-export const collapseButton = style({- selectors: {- [`${label} > &`]: {- color: cssVarV2('icon/tertiary'),- transform: 'translateY(1px)',- },- },-});export const collapseIcon = style({- transform: 'rotate(90deg)',+ vars: { '--y': '1px', '--r': '90deg' },+ color: cssVarV2('icon/tertiary'),+ transform: 'translateY(var(--y)) rotate(var(--r))',transition: 'transform 0.2s',selectors: {[`${root}[data-collapsed="true"] &`]: {- transform: 'rotate(0deg)',+ vars: { '--r': '0deg' },},},});diff --git a/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx b/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsxindex 55b0d1bf5e..3407939d0f 100644--- a/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx+++ b/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx@@ -1,4 +1,3 @@-import { IconButton } from '@affine/component';import { ToggleCollapseIcon } from '@blocksuite/icons/rc';import clsx from 'clsx';import { type ForwardedRef, forwardRef, type PropsWithChildren } from 'react';@@ -42,14 +41,12 @@ export const CategoryDivider = forwardRef(<div className={styles.label}>{label}{collapsible ? (- <IconButton- withoutHoverStyle- className={styles.collapseButton}- size="small"+ <ToggleCollapseIcon+ width={16}+ height={16}data-testid="category-divider-collapse-button"- >- <ToggleCollapseIcon className={styles.collapseIcon} />- </IconButton>+ className={styles.collapseIcon}+ />) : null}</div><div className={styles.actions} onClick={e => e.stopPropagation()}>diff --git a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.css.ts b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.css.tsindex 45c075d008..4b78a0e657 100644--- a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.css.ts+++ b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.css.ts@@ -1,23 +1,18 @@import { style } from '@vanilla-extract/css';-export const sidebarSwitch = style({- opacity: 0,- display: 'inline-flex',+export const sidebarSwitchClip = style({+ flexShrink: 0,overflow: 'hidden',- pointerEvents: 'none',- transition: 'max-width 0.2s ease-in-out, margin 0.3s ease-in-out',+ transition:+ 'max-width 0.2s ease-in-out, margin 0.3s ease-in-out, opacity 0.3s ease',selectors: {'&[data-show=true]': {- maxWidth: '32px',opacity: 1,- width: '32px',- flexShrink: 0,- fontSize: '24px',- pointerEvents: 'auto',+ maxWidth: '60px',},'&[data-show=false]': {+ opacity: 0,maxWidth: 0,- margin: '0 !important',},},});diff --git a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsxindex 26fe1046b7..6424dad245 100644--- a/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx+++ b/packages/frontend/core/src/components/app-sidebar/sidebar-header/sidebar-switch.tsx@@ -1,7 +1,6 @@-import { IconButton, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { useI18n } from '@affine/i18n';import { SidebarIcon } from '@blocksuite/icons/rc';-import clsx from 'clsx';import { useAtom } from 'jotai';import { appSidebarOpenAtom } from '../index.jotai';@@ -19,19 +18,21 @@ export const SidebarSwitch = ({const tooltipContent = open? t['com.affine.sidebarSwitch.collapse'](): t['com.affine.sidebarSwitch.expand']();+ // TODO(@CatsJuice): Tooltip shortcut styleconst collapseKeyboardShortcuts =environment.isBrowser && environment.isMacOs ? ' ⌘+/' : ' Ctrl+/';return (- <Tooltip- content={tooltipContent + ' ' + collapseKeyboardShortcuts}- side={open ? 'bottom' : 'right'}+ <div+ data-show={show}+ className={styles.sidebarSwitchClip}+ data-testid={`app-sidebar-arrow-button-${open ? 'collapse' : 'expand'}`}><IconButton- className={clsx(styles.sidebarSwitch, className)}- data-show={show}- size="large"- data-testid={`app-sidebar-arrow-button-${open ? 'collapse' : 'expand'}`}+ tooltip={tooltipContent + ' ' + collapseKeyboardShortcuts}+ tooltipOptions={{ side: open ? 'bottom' : 'right' }}+ className={className}+ size="24"style={{zIndex: 1,}}@@ -39,6 +40,6 @@ export const SidebarSwitch = ({><SidebarIcon /></IconButton>- </Tooltip>+ </div>);};diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsxindex 1b96c99988..b8dadca991 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx@@ -134,7 +134,7 @@ export function patchNotificationService(description: toReactNode(message),confirmText,confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText,onConfirm: () => {@@ -177,7 +177,7 @@ export function patchNotificationService(description: description,confirmText: confirmText ?? 'Confirm',confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText: cancelText ?? 'Cancel',onConfirm: () => {diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/info/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/info/index.tsxindex 52b6263652..557c1958a2 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/info/index.tsx+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/info/index.tsx@@ -1,4 +1,4 @@-import { IconButton, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { openInfoModalAtom } from '@affine/core/atoms';import { useI18n } from '@affine/i18n';import { InformationIcon } from '@blocksuite/icons/rc';@@ -11,12 +11,13 @@ export const InfoButton = () => {setOpenInfoModal(true);};return (- <Tooltip content={t['com.affine.page-properties.page-info.view']()}>- <IconButton- data-testid="header-info-button"- onClick={onOpenInfoModal}- icon={<InformationIcon />}- />- </Tooltip>+ <IconButton+ size="20"+ tooltip={t['com.affine.page-properties.page-info.view']()}+ data-testid="header-info-button"+ onClick={onOpenInfoModal}+ >+ <InformationIcon />+ </IconButton>);};diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header/present/detail-header-present-button.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header/present/detail-header-present-button.tsxindex 2f5ea27852..55fd0e1a3b 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-header/present/detail-header-present-button.tsx+++ b/packages/frontend/core/src/components/blocksuite/block-suite-header/present/detail-header-present-button.tsx@@ -9,9 +9,10 @@ export const DetailPageHeaderPresentButton = () => {return (<IconButtonstyle={{ flexShrink: 0 }}- size={'large'}- icon={<PresentationIcon />}+ size="24"onClick={() => handlePresent(!isPresent)}- ></IconButton>+ >+ <PresentationIcon />+ </IconButton>);};diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsxindex 0444951f87..6c8c75a265 100644--- a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx+++ b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx@@ -11,11 +11,10 @@ export const PresentButton = () => {return (<Button- icon={<PresentationIcon />}+ prefix={<PresentationIcon />}className={styles.presentButton}onClick={() => handlePresent()}disabled={isPresent}- withoutHoverStyle>{t['com.affine.share-page.header.present']()}</Button>diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/styles.css.ts b/packages/frontend/core/src/components/cloud/share-header-right-item/styles.css.tsindex bd55261111..9fa3f7f015 100644--- a/packages/frontend/core/src/components/cloud/share-header-right-item/styles.css.ts+++ b/packages/frontend/core/src/components/cloud/share-header-right-item/styles.css.ts@@ -46,7 +46,6 @@ export const headerDivider = style({});export const presentButton = style({- gap: '4px',background: cssVar('black'),color: cssVar('white'),borderColor: cssVar('pureBlack10'),diff --git a/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx b/packages/frontend/core/src/components/page-list/components/favorite-tag.tsxindex b62706a4cd..6e9336d389 100644--- a/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx+++ b/packages/frontend/core/src/components/page-list/components/favorite-tag.tsx@@ -1,7 +1,8 @@import type { IconButtonProps } from '@affine/component';-import { IconButton, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { useI18n } from '@affine/i18n';import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons/rc';+import { cssVar } from '@toeverything/theme';import Lottie from 'lottie-react';import { forwardRef, useCallback, useState } from 'react';@@ -25,24 +26,32 @@ export const FavoriteTag = forwardRef<[active, onClick]);return (- <Tooltip content={active ? t['Favorited']() : t['Favorite']()} side="top">- <IconButton ref={ref} active={active} onClick={handleClick} {...props}>- {active ? (- playAnimation ? (- <Lottie- loop={false}- animationData={favoritedAnimation}- onComplete={() => setPlayAnimation(false)}- style={{ width: '20px', height: '20px' }}- />- ) : (- <FavoritedIcon data-testid="favorited-icon" />- )+ <IconButton+ tooltip={active ? t['Favorited']() : t['Favorite']()}+ tooltipOptions={{ side: 'top' }}+ ref={ref}+ onClick={handleClick}+ size="20"+ {...props}+ >+ {active ? (+ playAnimation ? (+ <Lottie+ loop={false}+ animationData={favoritedAnimation}+ onComplete={() => setPlayAnimation(false)}+ style={{ width: '20px', height: '20px' }}+ />) : (- <FavoriteIcon />- )}- </IconButton>- </Tooltip>+ <FavoritedIcon+ color={cssVar('primaryColor')}+ data-testid="favorited-icon"+ />+ )+ ) : (+ <FavoriteIcon />+ )}+ </IconButton>);});FavoriteTag.displayName = 'FavoriteTag';diff --git a/packages/frontend/core/src/components/page-list/components/page-display-menu.css.ts b/packages/frontend/core/src/components/page-list/components/page-display-menu.css.tsindex 183b3bbefc..6e2a772dc6 100644--- a/packages/frontend/core/src/components/page-list/components/page-display-menu.css.ts+++ b/packages/frontend/core/src/components/page-list/components/page-display-menu.css.ts@@ -5,12 +5,6 @@ export const menu = style({minWidth: '220px',});-export const arrowDownSmallIcon = style({- width: '16px',- height: '16px',- color: cssVar('iconColor'),-});-export const headerDisplayButton = style({marginLeft: '16px',['WebkitAppRegion' as string]: 'no-drag',diff --git a/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx b/packages/frontend/core/src/components/page-list/components/page-display-menu.tsxindex de271740ad..3e2ed603e8 100644--- a/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx+++ b/packages/frontend/core/src/components/page-list/components/page-display-menu.tsx@@ -167,8 +167,7 @@ export const PageDisplayMenu = () => {}}><Button- iconPosition="end"- icon={<ArrowDownSmallIcon className={styles.arrowDownSmallIcon} />}+ suffix={<ArrowDownSmallIcon />}className={styles.headerDisplayButton}data-testid="page-display-menu-button">diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-header.css.ts b/packages/frontend/core/src/components/page-list/docs/page-list-header.css.tsindex ff4c349574..23981bf084 100644--- a/packages/frontend/core/src/components/page-list/docs/page-list-header.css.ts+++ b/packages/frontend/core/src/components/page-list/docs/page-list-header.css.ts@@ -27,14 +27,6 @@ export const titleIcon = style({export const titleCollectionName = style({color: cssVar('textPrimaryColor'),});-export const addPageButton = style({- padding: '6px 10px',- borderRadius: '8px',- background: cssVar('backgroundPrimaryColor'),- fontSize: cssVar('fontXs'),- fontWeight: 500,- height: '28px',-});export const tagSticky = style({display: 'flex',alignItems: 'center',diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsxindex d1d83cf0f3..8cd3dd901f 100644--- a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx+++ b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx@@ -125,7 +125,7 @@ export const CollectionPageListHeader = ({cancelText: t['Cancel'](),confirmText: t['Confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},onConfirm: () => createAndAddDocument(createDocumentFn),});@@ -156,9 +156,7 @@ export const CollectionPageListHeader = ({<div className={styles.titleCollectionName}>{collection.name}</div></div><div className={styles.rightButtonGroup}>- <Button className={styles.addPageButton} onClick={handleEdit}>- {t['Edit']()}- </Button>+ <Button onClick={handleEdit}>{t['Edit']()}</Button><PageListNewPageButtonsize="small"testId="new-page-button-trigger"@@ -253,7 +251,7 @@ export const TagPageListHeader = ({</div></Menu></div>- <Button className={styles.addPageButton} onClick={handleClick}>+ <Button onClick={handleClick}>{t['com.affine.editCollection.saveCollection']()}</Button></div>diff --git a/packages/frontend/core/src/components/page-list/filter/filter-list.tsx b/packages/frontend/core/src/components/page-list/filter/filter-list.tsxindex 3d0d17e1c2..3cfe459822 100644--- a/packages/frontend/core/src/components/page-list/filter/filter-list.tsx+++ b/packages/frontend/core/src/components/page-list/filter/filter-list.tsx@@ -59,15 +59,11 @@ export const FilterList = ({}>{value.length === 0 ? (- <Button- icon={<PlusIcon style={{ color: 'var(--affine-icon-color)' }} />}- iconPosition="end"- style={{ fontSize: 'var(--affine-font-xs)', padding: '0 8px' }}- >+ <Button suffix={<PlusIcon />}>{t['com.affine.filterList.button.add']()}</Button>) : (- <IconButton size="small">+ <IconButton size="16"><PlusIcon /></IconButton>)}diff --git a/packages/frontend/core/src/components/page-list/list.css.ts b/packages/frontend/core/src/components/page-list/list.css.tsindex 3bfbfd4569..72963f66c6 100644--- a/packages/frontend/core/src/components/page-list/list.css.ts+++ b/packages/frontend/core/src/components/page-list/list.css.ts@@ -84,12 +84,16 @@ export const editTagWrapper = style({},});-export const deleteIcon = style({+export const deleteButton = style({color: cssVar('iconColor'),+ ':hover': {+ background: cssVar('backgroundErrorColor'),+ },+});+export const deleteIcon = style({selectors: {- '&:not(.without-hover):hover': {+ [`${deleteButton}:hover &`]: {color: cssVar('errorColor'),- background: cssVar('backgroundErrorColor'),},},});diff --git a/packages/frontend/core/src/components/page-list/operation-cell.tsx b/packages/frontend/core/src/components/page-list/operation-cell.tsxindex 7286c95db0..003a16dc30 100644--- a/packages/frontend/core/src/components/page-list/operation-cell.tsx+++ b/packages/frontend/core/src/components/page-list/operation-cell.tsx@@ -4,7 +4,6 @@ import {MenuIcon,MenuItem,toast,- Tooltip,useConfirmModal,} from '@affine/component';import { useAppSettingHelper } from '@affine/core/hooks/affine/use-app-setting-helper';@@ -53,6 +52,9 @@ import type { TagMeta } from './types';import { ColWrapper, stopPropagationWithoutPrevent } from './utils';import { useEditCollection, useEditCollectionName } from './view';+const tooltipSideTop = { side: 'top' as const };+const tooltipSideTopAlignEnd = { side: 'top' as const, align: 'end' as const };+export interface PageOperationCellProps {page: DocMeta;isInAllowList?: boolean;@@ -238,7 +240,7 @@ export const PageOperationCell = ({align: 'end',}}>- <IconButton type="plain" data-testid="page-list-operation-button">+ <IconButton data-testid="page-list-operation-button" size="20"><MoreVerticalIcon /></IconButton></Menu>@@ -278,7 +280,7 @@ export const TrashOperationCell = ({cancelText: t['Cancel'](),confirmText: t['com.affine.trashOperation.delete'](),confirmButtonOptions: {- type: 'error',+ variant: 'error',},onConfirm: onPermanentlyDeletePage,});@@ -286,30 +288,29 @@ export const TrashOperationCell = ({return (<ColWrapper flex={1}>- <Tooltip content={t['com.affine.trashOperation.restoreIt']()} side="top">- <IconButton- data-testid="restore-page-button"- style={{ marginRight: '12px' }}- onClick={() => {- onRestorePage();- }}- >- <ResetIcon />- </IconButton>- </Tooltip>- <Tooltip- content={t['com.affine.trashOperation.deletePermanently']()}- side="top"- align="end"+ <IconButton+ tooltip={t['com.affine.trashOperation.restoreIt']()}+ tooltipOptions={tooltipSideTop}+ data-testid="restore-page-button"+ style={{ marginRight: '12px' }}+ onClick={() => {+ onRestorePage();+ }}+ size="20">- <IconButton- data-testid="delete-page-button"- onClick={onConfirmPermanentlyDelete}- className={styles.deleteIcon}- >- <DeletePermanentlyIcon />- </IconButton>- </Tooltip>+ <ResetIcon />+ </IconButton>+ <IconButton+ tooltip={t['com.affine.trashOperation.deletePermanently']()}+ tooltipOptions={tooltipSideTopAlignEnd}+ data-testid="delete-page-button"+ onClick={onConfirmPermanentlyDelete}+ className={styles.deleteButton}+ iconClassName={styles.deleteIcon}+ size="20"+ >+ <DeletePermanentlyIcon />+ </IconButton></ColWrapper>);};@@ -393,7 +394,7 @@ export const CollectionOperationCell = ({cancelText: t['Cancel'](),confirmText: t['Confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},onConfirm: createAndAddDocument,});@@ -411,16 +412,20 @@ export const CollectionOperationCell = ({><FavoriteTag onClick={onToggleFavoriteCollection} active={favourite} /></ColWrapper>- <Tooltip content={t['com.affine.collection.menu.rename']()} side="top">- <IconButton onClick={handleEditName}>- <EditIcon />- </IconButton>- </Tooltip>- <Tooltip content={t['com.affine.collection.menu.edit']()} side="top">- <IconButton onClick={handleEdit}>- <FilterIcon />- </IconButton>- </Tooltip>+ <IconButton+ onClick={handleEditName}+ tooltip={t['com.affine.collection.menu.rename']()}+ tooltipOptions={tooltipSideTop}+ >+ <EditIcon />+ </IconButton>+ <IconButton+ onClick={handleEdit}+ tooltip={t['com.affine.collection.menu.edit']()}+ tooltipOptions={tooltipSideTop}+ >+ <FilterIcon />+ </IconButton><ColWrapper alignment="start"><Menuitems={@@ -470,7 +475,7 @@ export const CollectionOperationCell = ({align: 'end',}}>- <IconButton type="plain">+ <IconButton><MoreVerticalIcon /></IconButton></Menu>@@ -521,11 +526,13 @@ export const TagOperationCell = ({</div></div>- <Tooltip content={t['Rename']()} side="top">- <IconButton onClick={() => setOpen(true)}>- <EditIcon />- </IconButton>- </Tooltip>+ <IconButton+ tooltip={t['Rename']()}+ tooltipOptions={tooltipSideTop}+ onClick={() => setOpen(true)}+ >+ <EditIcon />+ </IconButton><ColWrapper alignment="start"><Menu@@ -546,7 +553,7 @@ export const TagOperationCell = ({align: 'end',}}>- <IconButton type="plain">+ <IconButton><MoreVerticalIcon /></IconButton></Menu>diff --git a/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx b/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsxindex 3280f9bd85..fed80a90e1 100644--- a/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx+++ b/packages/frontend/core/src/components/page-list/operation-menu-items/move-to-trash.tsx@@ -49,7 +49,7 @@ const MoveToTrashConfirm = ({confirmText={t.Delete()}confirmButtonOptions={{['data-testid' as string]: 'confirm-delete-page',- type: 'error',+ variant: 'error',}}{...confirmModalProps}/>diff --git a/packages/frontend/core/src/components/page-list/selector/selector-layout.tsx b/packages/frontend/core/src/components/page-list/selector/selector-layout.tsxindex e676543e66..dbf812d6d5 100644--- a/packages/frontend/core/src/components/page-list/selector/selector-layout.tsx+++ b/packages/frontend/core/src/components/page-list/selector/selector-layout.tsx@@ -61,7 +61,11 @@ export const SelectorLayout = ({<span>{t['com.affine.selectPage.selected']()}</span><span className={styles.selectedNum}>{selectedCount ?? 0}</span></div>- <Button type="plain" className={styles.clearButton} onClick={onClear}>+ <Button+ variant="plain"+ className={styles.clearButton}+ onClick={onClear}+ >{t['com.affine.editCollection.pages.clear']()}</Button></div>@@ -75,7 +79,7 @@ export const SelectorLayout = ({<ButtononClick={onConfirm}className={styles.actionButton}- type="primary"+ variant="primary">{t['Confirm']()}</Button>diff --git a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx b/packages/frontend/core/src/components/page-list/tags/create-tag.tsxindex 0e02a32b69..be58c36222 100644--- a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx+++ b/packages/frontend/core/src/components/page-list/tags/create-tag.tsx@@ -158,7 +158,7 @@ export const CreateOrEditTag = ({<Button className={styles.cancelBtn} onClick={onClose}>{t['Cancel']()}</Button>- <Button type="primary" onClick={onConfirm} disabled={!tagName}>+ <Button variant="primary" onClick={onConfirm} disabled={!tagName}>{tagMeta ? t['Save']() : t['Create']()}</Button></div>diff --git a/packages/frontend/core/src/components/page-list/view/collection-list.css.ts b/packages/frontend/core/src/components/page-list/view/collection-list.css.tsindex 8d09656ccc..93197bd14a 100644--- a/packages/frontend/core/src/components/page-list/view/collection-list.css.ts+++ b/packages/frontend/core/src/components/page-list/view/collection-list.css.ts@@ -35,9 +35,6 @@ export const viewOption = style({});export const filterMenuTrigger = style({padding: '6px 8px',- ':hover': {- backgroundColor: cssVar('hoverColor'),- },selectors: {[`&[data-is-hidden="true"]`]: {display: 'none',diff --git a/packages/frontend/core/src/components/page-list/view/collection-list.tsx b/packages/frontend/core/src/components/page-list/view/collection-list.tsxindex 8f7916b15a..2686bee9e4 100644--- a/packages/frontend/core/src/components/page-list/view/collection-list.tsx+++ b/packages/frontend/core/src/components/page-list/view/collection-list.tsx@@ -30,8 +30,7 @@ export const AllPageListOperationsMenu = ({><ButtonclassName={styles.filterMenuTrigger}- type="default"- icon={<FilterIcon />}+ prefix={<FilterIcon />}data-testid="create-first-filter">{t['com.affine.filter']()}diff --git a/packages/frontend/core/src/components/page-list/view/create-collection.tsx b/packages/frontend/core/src/components/page-list/view/create-collection.tsxindex 1f8f92f3cf..f45aa7f597 100644--- a/packages/frontend/core/src/components/page-list/view/create-collection.tsx+++ b/packages/frontend/core/src/components/page-list/view/create-collection.tsx@@ -115,7 +115,7 @@ export const CreateCollection = ({<Buttonsize="large"data-testid="save-collection"- type="primary"+ variant="primary"disabled={isNameEmpty}onClick={save}>diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.css.ts b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.css.tsindex 341135b390..21b658252e 100644--- a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.css.ts+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.css.ts@@ -146,21 +146,13 @@ export const rulesTitleHighlight = style({fontStyle: 'italic',fontWeight: 800,});-export const icon = style({- color: cssVar('iconColor'),-});-export const button = style({- userSelect: 'none',- borderRadius: 4,- cursor: 'pointer',- ':hover': {- backgroundColor: cssVar('hoverColor'),- },-});export const bottomButton = style({padding: '4px 12px',borderRadius: 8,});+export const actionButton = style({+ minWidth: 80,+});export const previewActive = style({backgroundColor: cssVar('hoverColorFilled'),});diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsxindex cdafb74e1b..e341e15147 100644--- a/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/edit-collection.tsx@@ -119,13 +119,13 @@ export const EditCollection = ({const buttons = useMemo(() => (<>- <Button size="large" onClick={onCancel}>+ <Button onClick={onCancel} className={styles.actionButton}>{t['com.affine.editCollection.button.cancel']()}</Button><Button- size="large"+ className={styles.actionButton}data-testid="save-collection"- type="primary"+ variant="primary"disabled={isNameEmpty}onClick={onSaveCollection}>@@ -183,7 +183,7 @@ export const EditCollection = ({reset={reset}updateCollection={onChange}buttons={buttons}- ></RulesMode>+ />)}</div>);diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsxindex 3b0198f828..3c3c2710e4 100644--- a/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/rules-mode.tsx@@ -1,4 +1,4 @@-import { Tooltip } from '@affine/component';+import { Button, IconButton, Tooltip } from '@affine/component';import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties';import type { Collection } from '@affine/env/filter';import { Trans, useI18n } from '@affine/i18n';@@ -125,14 +125,12 @@ export const RulesMode = ({<div className={styles.rulesContainerLeftContentInclude}>{collection.allowList.length > 0 ? (<div className={styles.includeTitle}>- <ToggleCollapseIcon+ <IconButtononClick={() => setExpandInclude(!expandInclude)}- className={styles.button}- width={24}- height={24}- style={{+ iconStyle={{transform: expandInclude ? 'rotate(90deg)' : undefined,}}+ icon={<ToggleCollapseIcon />}/><div style={{ color: cssVar('textSecondaryColor') }}>{t['com.affine.editCollection.rules.include.title']()}@@ -181,8 +179,9 @@ export const RulesMode = ({{page?.title || t['Untitled']()}</div></div>- <CloseIcon- className={styles.button}+ <IconButton+ size="14"+ icon={<CloseIcon />}onClick={() => {updateCollection({...collection,@@ -191,7 +190,7 @@ export const RulesMode = ({),});}}- ></CloseIcon>+ /></div>);})}@@ -240,24 +239,16 @@ export const RulesMode = ({</div><div className={styles.rulesBottom}><div className={styles.bottomLeft}>- <div- className={clsx(- styles.button,- styles.bottomButton,- showPreview && styles.previewActive- )}+ <ButtononClick={() => {setShowPreview(!showPreview);}}>{t['com.affine.editCollection.rules.preview']()}- </div>- <div- className={clsx(styles.button, styles.bottomButton)}- onClick={reset}- >+ </Button>+ <Button variant="plain" onClick={reset}>{t['com.affine.editCollection.rules.reset']()}- </div>+ </Button><div className={styles.previewCountTips}><Transi18nKey="com.affine.editCollection.rules.countTips"@@ -273,7 +264,9 @@ export const RulesMode = ({</Trans></div></div>- <div style={{ display: 'flex', alignItems: 'center' }}>{buttons}</div>+ <div style={{ display: 'flex', alignItems: 'center', gap: 20 }}>+ {buttons}+ </div></div></>);diff --git a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsxindex 62a9d9a68c..c8a7b8cbb5 100644--- a/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx+++ b/packages/frontend/core/src/components/page-list/view/edit-collection/select-page.tsx@@ -1,4 +1,4 @@-import { Menu, toast } from '@affine/component';+import { IconButton, Menu, toast } from '@affine/component';import { useBlockSuiteDocMeta } from '@affine/core/hooks/use-block-suite-page-meta';import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties';import { ShareDocsService } from '@affine/core/modules/share-doc';@@ -12,7 +12,6 @@ import {useServices,WorkspaceService,} from '@toeverything/infra';-import clsx from 'clsx';import { type ReactNode, useCallback, useEffect, useState } from 'react';import { FavoriteTag } from '../../components/favorite-tag';@@ -185,22 +184,10 @@ export const SelectPage = ({/>}>- <div>- <FilterIcon- className={clsx(styles.icon, styles.button)}- onClick={clickFilter}- width={24}- height={24}- ></FilterIcon>- </div>+ <IconButton icon={<FilterIcon />} onClick={clickFilter} /></Menu>) : (- <FilterIcon- className={clsx(styles.icon, styles.button)}- onClick={clickFilter}- width={24}- height={24}- ></FilterIcon>+ <IconButton icon={<FilterIcon />} onClick={clickFilter} />)}</div>{showFilter ? (diff --git a/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx b/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsxindex 9525df05e0..1c5fb163e9 100644--- a/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx+++ b/packages/frontend/core/src/components/page-list/view/save-as-collection-button.tsx@@ -35,7 +35,7 @@ export const SaveAsCollectionButton = ({<ButtononClick={handleClick}data-testid="save-as-collection"- icon={<SaveIcon />}+ prefix={<SaveIcon />}className={styles.button}>{t['com.affine.editCollection.saveCollection']()}diff --git a/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx b/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsxindex 667eb0eba9..0713e9db5f 100644--- a/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx+++ b/packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx@@ -75,7 +75,7 @@ export const VirtualizedTrashList = () => {cancelText: t['Cancel'](),confirmText: t['com.affine.trashOperation.delete'](),confirmButtonOptions: {- type: 'error',+ variant: 'error',},onConfirm: handleMultiDelete,});diff --git a/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx b/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsxindex 10b1aef4eb..d77c081a08 100644--- a/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx+++ b/packages/frontend/core/src/components/pure/header-drop-down-button/index.tsx@@ -15,8 +15,6 @@ export const HeaderDropDownButton = forwardRef<{...props}data-testid="header-dropDownButton"className={headerMenuTrigger}- withoutHoverStyle={true}- type="plain"><MoreHorizontalIcon /></IconButton>diff --git a/packages/frontend/core/src/components/pure/header-drop-down-button/styles.css.ts b/packages/frontend/core/src/components/pure/header-drop-down-button/styles.css.tsindex 5feb36501e..a7563277e0 100644--- a/packages/frontend/core/src/components/pure/header-drop-down-button/styles.css.ts+++ b/packages/frontend/core/src/components/pure/header-drop-down-button/styles.css.ts@@ -2,7 +2,7 @@ import { cssVar } from '@toeverything/theme';import { style } from '@vanilla-extract/css';export const headerMenuTrigger = style({selectors: {- '&[data-state=open], &:hover': {+ '&[data-state=open]': {backgroundColor: cssVar('hoverColor'),},},diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsxindex 55707166ee..55d20f742f 100644--- a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx+++ b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx@@ -1,6 +1,5 @@import { Button } from '@affine/component/ui/button';import { ConfirmModal } from '@affine/component/ui/modal';-import { Tooltip } from '@affine/component/ui/tooltip';import { useI18n } from '@affine/i18n';import { DeleteIcon, ResetIcon } from '@blocksuite/icons/rc';import { DocService, useService, WorkspaceService } from '@toeverything/infra';@@ -50,30 +49,23 @@ export const TrashPageFooter = () => {><div className={styles.deleteHintText}>{hintText}</div><div className={styles.group}>- <Tooltip content={t['com.affine.trashOperation.restoreIt']()}>- <Button- data-testid="page-restore-button"- type="primary"- onClick={onRestore}- className={styles.buttonContainer}- >- <div className={styles.icon}>- <ResetIcon />- </div>- </Button>- </Tooltip>- <Tooltip content={t['com.affine.trashOperation.deletePermanently']()}>- <Button- type="error"- onClick={onDelete}- style={{ color: 'var(--affine-pure-white)' }}- className={styles.buttonContainer}- >- <div className={styles.icon}>- <DeleteIcon />- </div>- </Button>- </Tooltip>+ <Button+ tooltip={t['com.affine.trashOperation.restoreIt']()}+ data-testid="page-restore-button"+ variant="primary"+ onClick={onRestore}+ className={styles.buttonContainer}+ prefix={<ResetIcon />}+ prefixClassName={styles.icon}+ />+ <Button+ tooltip={t['com.affine.trashOperation.deletePermanently']()}+ variant="error"+ onClick={onDelete}+ className={styles.buttonContainer}+ prefix={<DeleteIcon />}+ prefixClassName={styles.icon}+ /></div><ConfirmModaltitle={t['com.affine.trashOperation.delete.title']()}@@ -81,7 +73,7 @@ export const TrashPageFooter = () => {description={t['com.affine.trashOperation.delete.description']()}confirmText={t['com.affine.trashOperation.delete']()}confirmButtonOptions={{- type: 'error',+ variant: 'error',}}open={open}onConfirm={onConfirmDelete}diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/styles.css.ts b/packages/frontend/core/src/components/pure/trash-page-footer/styles.css.tsindex 1e7179c752..1937ba329d 100644--- a/packages/frontend/core/src/components/pure/trash-page-footer/styles.css.ts+++ b/packages/frontend/core/src/components/pure/trash-page-footer/styles.css.ts@@ -28,12 +28,10 @@ export const deleteHintText = style({overflow: 'hidden',});export const buttonContainer = style({- color: cssVar('pureWhite'),padding: '8px 18px',- fontSize: '20px',height: '36px',});export const icon = style({- display: 'flex',- alignContent: 'center',+ width: 20,+ height: 20,});diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.css.ts b/packages/frontend/core/src/components/root-app-sidebar/index.css.tsindex 80ab3e32f4..88e267fe42 100644--- a/packages/frontend/core/src/components/root-app-sidebar/index.css.ts+++ b/packages/frontend/core/src/components/root-app-sidebar/index.css.ts@@ -24,18 +24,6 @@ export const workspaceWrapper = style({flex: 1,});-export const userInfoWrapper = style({- flexShrink: 0,- width: 'auto',- height: 'auto',- padding: '4px 0',-});--// TODO(@catsjuice):-globalStyle(`button.${userInfoWrapper} > span`, {- lineHeight: 0,-});-export const operationMenu = style({display: 'flex',flexDirection: 'column',diff --git a/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsxindex 2d51c27ab5..9d5e70f1cd 100644--- a/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx+++ b/packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx@@ -44,7 +44,7 @@ export const TrashButton = () => {),confirmText: t.Delete(),confirmButtonOptions: {- type: 'error',+ variant: 'error',},onConfirm() {docRecord.moveToTrash();diff --git a/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx b/packages/frontend/core/src/components/root-app-sidebar/user-info.tsxindex 6b3e95b71c..fdf20e6d1c 100644--- a/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx+++ b/packages/frontend/core/src/components/root-app-sidebar/user-info.tsx@@ -1,8 +1,8 @@import {Avatar,- Button,Divider,ErrorMessage,+ IconButton,Menu,MenuIcon,MenuItem,@@ -52,13 +52,9 @@ const menuContentOptions: MenuProps['contentOptions'] = {const AuthorizedUserInfo = ({ account }: { account: AuthAccountInfo }) => {return (<Menu items={<OperationMenu />} contentOptions={menuContentOptions}>- <Button- data-testid="sidebar-user-avatar"- type="plain"- className={styles.userInfoWrapper}- >+ <IconButton data-testid="sidebar-user-avatar" variant="plain" size="24"><Avatar size={24} name={account.label} url={account.avatar} />- </Button>+ </IconButton></Menu>);};@@ -71,14 +67,14 @@ const UnauthorizedUserInfo = () => {}, [setOpen]);return (- <Button+ <IconButtononClick={openSignInModal}data-testid="sidebar-user-avatar"- type="plain"- className={styles.userInfoWrapper}+ variant="plain"+ size="24">- <UnknownUserIcon width={24} height={24} />- </Button>+ <UnknownUserIcon />+ </IconButton>);};diff --git a/packages/frontend/core/src/components/workspace-upgrade/upgrade.css.ts b/packages/frontend/core/src/components/workspace-upgrade/upgrade.css.tsindex 5deb8329c2..d5f7a31381 100644--- a/packages/frontend/core/src/components/workspace-upgrade/upgrade.css.ts+++ b/packages/frontend/core/src/components/workspace-upgrade/upgrade.css.ts@@ -1,5 +1,5 @@import { cssVar } from '@toeverything/theme';-import { keyframes, style } from '@vanilla-extract/css';+import { style } from '@vanilla-extract/css';export const layout = style({margin: '80px auto',maxWidth: '536px',@@ -19,17 +19,3 @@ export const upgradeTips = style({lineHeight: '20px',textAlign: 'center',});-const rotate = keyframes({- '0%': {- transform: 'rotate(0deg)',- },- '50%': {- transform: 'rotate(180deg)',- },- '100%': {- transform: 'rotate(360deg)',- },-});-export const loadingIcon = style({- animation: `${rotate} 1.2s infinite linear`,-});diff --git a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsxindex c77075d244..24c36ced7a 100644--- a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx+++ b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx@@ -54,16 +54,9 @@ export const WorkspaceUpgrade = function WorkspaceUpgrade() {data-testid="upgrade-workspace-button"onClick={onButtonClick}size="extraLarge"- icon={- error ? (- <HeartBreakIcon />- ) : (- <ArrowCircleIcon- className={upgrading ? styles.loadingIcon : undefined}- />- )- }- type={error ? 'error' : 'default'}+ loading={upgrading}+ prefix={error ? <HeartBreakIcon /> : <ArrowCircleIcon />}+ variant={error ? 'error' : 'secondary'}>{error? t['com.affine.upgrade.button-text.error']()diff --git a/packages/frontend/core/src/hooks/affine/use-enable-cloud.tsx b/packages/frontend/core/src/hooks/affine/use-enable-cloud.tsxindex e01f160383..70ea74ca4a 100644--- a/packages/frontend/core/src/hooks/affine/use-enable-cloud.tsx+++ b/packages/frontend/core/src/hooks/affine/use-enable-cloud.tsx@@ -89,7 +89,7 @@ export const useEnableCloud = () => {? t['Enable'](): t['Sign in and Enable'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',['data-testid' as string]: 'confirm-enable-affine-cloud-button',},onConfirm: async () =>diff --git a/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsxindex f2477b2f1c..cdbd0f1194 100644--- a/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx+++ b/packages/frontend/core/src/modules/app-tabs-header/views/app-tabs-header.tsx@@ -362,11 +362,15 @@ export const AppTabsHeader = ({ref={spacerDropTargetRef}data-dragged-over={draggedOver}>- <IconButton onClick={onAddTab} data-testid="add-tab-view-button">- <PlusIcon />- </IconButton>+ <IconButton+ size={22.86}+ onClick={onAddTab}+ data-testid="add-tab-view-button"+ style={{ width: 32, height: 32 }}+ icon={<PlusIcon />}+ /></div>- <IconButton size="large" onClick={onToggleRightSidebar}>+ <IconButton size="24" onClick={onToggleRightSidebar}><RightSidebarIcon /></IconButton>{environment.isDesktop && environment.isWindows ? (diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsxindex b422eeb55d..9fba8ee0e1 100644--- a/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx+++ b/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx@@ -95,7 +95,7 @@ export const useExplorerCollectionNodeOperations = (cancelText: t['Cancel'](),confirmText: t['Confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},onConfirm: createAndAddDocument,});@@ -129,11 +129,7 @@ export const useExplorerCollectionNodeOperations = (index: 0,inline: true,view: (- <IconButton- size="small"- type="plain"- onClick={handleAddDocToCollection}- >+ <IconButton size="16" onClick={handleAddDocToCollection}><PlusIcon /></IconButton>),diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsxindex fc749611e4..ab51c555f6 100644--- a/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx+++ b/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx@@ -61,7 +61,7 @@ export const useExplorerDocNodeOperations = (confirmText: t['com.affine.moveToTrash.confirmModal.confirm'](),cancelText: t['com.affine.moveToTrash.confirmModal.cancel'](),confirmButtonOptions: {- type: 'error',+ variant: 'error',},onConfirm() {docRecord.moveToTrash();diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsxindex 6c0c783f79..4d50b09ddf 100644--- a/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx@@ -633,7 +633,7 @@ export const ExplorerFolderNodeFolder = ({index: 0,inline: true,view: (- <IconButton size="small" type="plain" onClick={handleNewDoc}>+ <IconButton size="16" onClick={handleNewDoc}><PlusIcon /></IconButton>),diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsxindex ed93507df6..8f36c8b484 100644--- a/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx+++ b/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx@@ -103,7 +103,7 @@ export const useExplorerTagNodeOperations = (index: 0,inline: true,view: (- <IconButton size="small" type="plain" onClick={handleNewDoc}>+ <IconButton size="16" onClick={handleNewDoc}><PlusIcon /></IconButton>),diff --git a/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsxindex 4cf71a38e8..6ddde6c8bb 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx@@ -63,7 +63,7 @@ export const ExplorerCollections = () => {<IconButtondata-testid="explorer-bar-add-collection-button"onClick={handleCreateCollection}- size="small"+ size="16"><PlusIcon /></IconButton>diff --git a/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsxindex 27c0404f9b..26618293fc 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx@@ -239,7 +239,7 @@ export const ExplorerFavorites = () => {<IconButtondata-testid="explorer-bar-add-favorite-button"onClick={handleCreateNewFavoriteDoc}- size="small"+ size="16"><PlusIcon /></IconButton>diff --git a/packages/frontend/core/src/modules/explorer/views/sections/migration-favorites/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/migration-favorites/index.tsxindex 4033bd6c31..8cee8a9eb6 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/migration-favorites/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/migration-favorites/index.tsx@@ -52,7 +52,7 @@ export const ExplorerMigrationFavorites = () => {confirmText:t['com.affine.rootAppSidebar.migration-data.clean-all.confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText:t['com.affine.rootAppSidebar.migration-data.clean-all.cancel'](),@@ -79,13 +79,12 @@ export const ExplorerMigrationFavorites = () => {t['com.affine.rootAppSidebar.migration-data.help.description'](),confirmText: t['com.affine.rootAppSidebar.migration-data.help.confirm'](),confirmButtonOptions: {- type: 'primary',+ variant: 'primary',},cancelText:t['com.affine.rootAppSidebar.migration-data.help.clean-all'](),cancelButtonOptions: {- icon: <BroomIcon />,- type: 'default',+ prefix: <BroomIcon />,onClick: () => {requestAnimationFrame(() => {handleClickClear();@@ -114,13 +113,13 @@ export const ExplorerMigrationFavorites = () => {<IconButtondata-testid="explorer-bar-favorite-migration-clear-button"onClick={handleClickClear}- size="small"+ size="16"><BroomIcon /></IconButton><IconButtondata-testid="explorer-bar-favorite-migration-help-button"- size="small"+ size="16"onClick={handleClickHelp}><HelpIcon />diff --git a/packages/frontend/core/src/modules/explorer/views/sections/old-favorites/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/old-favorites/index.tsxindex fe92122246..5b3796b3dc 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/old-favorites/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/old-favorites/index.tsx@@ -184,7 +184,7 @@ export const ExplorerOldFavorites = () => {<IconButtondata-testid="explorer-bar-add-old-favorite-button"onClick={handleCreateNewFavoriteDoc}- size="small"+ size="16"><PlusIcon /></IconButton>diff --git a/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsxindex 5faf2d9031..aa5fa614c7 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx@@ -122,7 +122,7 @@ export const ExplorerOrganize = () => {<IconButtondata-testid="explorer-bar-add-organize-button"onClick={handleCreateFolder}- size="small"+ size="16"><PlusIcon /></IconButton>diff --git a/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsxindex b6ae827c8d..afa972ede0 100644--- a/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx+++ b/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx@@ -53,7 +53,7 @@ export const ExplorerTags = () => {<IconButtondata-testid="explorer-bar-add-favorite-button"onClick={handleCreateNewFavoriteDoc}- size="small"+ size="16"><PlusIcon /></IconButton>diff --git a/packages/frontend/core/src/modules/explorer/views/tree/node.tsx b/packages/frontend/core/src/modules/explorer/views/tree/node.tsxindex 1995eb7b48..7102be1456 100644--- a/packages/frontend/core/src/modules/explorer/views/tree/node.tsx+++ b/packages/frontend/core/src/modules/explorer/views/tree/node.tsx@@ -344,8 +344,7 @@ export const ExplorerTreeNode = ({))}><IconButton- size="small"- type="plain"+ size="16"data-testid="explorer-tree-node-operation-button"style={{ marginLeft: 4 }}>diff --git a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.css.ts b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.css.tsindex 842a11f5a7..24f7466c5e 100644--- a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.css.ts+++ b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.css.ts@@ -1,4 +1,5 @@import { cssVar } from '@toeverything/theme';+import { cssVarV2 } from '@toeverything/theme/v2';import { createVar, keyframes, style } from '@vanilla-extract/css';export const animationTimeout = createVar();@@ -52,6 +53,7 @@ export const modalContent = style({// :focus-visible will set outlineoutline: 'none',display: 'flex',+ gap: 8,alignItems: 'center',justifyContent: 'space-between',border: `0.5px solid ${cssVar('borderColor')}`,@@ -133,22 +135,13 @@ export const count = style({});export const arrowButton = style({- padding: '4px',- fontSize: '24px',- width: '32px',- height: '32px',+ width: 32,+ height: 32,flexShrink: 0,border: '1px solid',- borderColor: cssVar('borderColor'),- color: cssVar('iconSecondary'),- alignItems: 'baseline',- background: 'transparent',+ borderColor: cssVarV2('layer/border'),selectors: {- '&:hover': {- color: cssVar('iconColor'),- },'&.backward': {- marginLeft: '8px',borderRadius: '4px 0 0 4px',},'&.forward': {@@ -157,12 +150,3 @@ export const arrowButton = style({},},});-export const closeButton = style({- padding: '4px',- fontSize: '20px',- width: '24px',- height: '24px',- flexShrink: 0,- color: cssVar('iconColor'),- marginLeft: '8px',-});diff --git a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsxindex 96aa2663b9..4f97a2dcf4 100644--- a/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx+++ b/packages/frontend/core/src/modules/find-in-page/view/find-in-page-modal.tsx@@ -1,4 +1,4 @@-import { Button, IconButton, observeResize } from '@affine/component';+import { IconButton, observeResize } from '@affine/component';import {ArrowDownSmallIcon,ArrowUpSmallIcon,@@ -182,63 +182,58 @@ export const FindInPageModal = () => {className={styles.modalContent}data-state={status}>- <div className={styles.leftContent}>- <div- className={clsx(styles.inputContainer, {- active: active,- })}- >- <SearchIcon className={styles.searchIcon} />- <div className={styles.inputMain}>- <input- type="text"- autoFocus- value={value}- ref={inputRef}- style={{- visibility: isSearching ? 'hidden' : 'visible',- }}- onBlur={handleBlur}- onFocus={handleFocus}- className={styles.input}- onKeyDown={handleKeydown}- onChange={e => handleValueChange(e.target.value)}- />- <CanvasText className={styles.inputHack} text={value} />- </div>- <div className={styles.count}>- {value.length > 0 && result && result.matches !== 0 ? (- <>- <span>{result?.activeMatchOrdinal || 0}</span>- <span>/</span>- <span>{result?.matches || 0}</span>- </>- ) : value.length ? (- <span>No matches</span>- ) : null}- </div>+ <div+ className={clsx(styles.inputContainer, {+ active: active,+ })}+ >+ <SearchIcon className={styles.searchIcon} />+ <div className={styles.inputMain}>+ <input+ type="text"+ autoFocus+ value={value}+ ref={inputRef}+ style={{+ visibility: isSearching ? 'hidden' : 'visible',+ }}+ onBlur={handleBlur}+ onFocus={handleFocus}+ className={styles.input}+ onKeyDown={handleKeydown}+ onChange={e => handleValueChange(e.target.value)}+ />+ <CanvasText className={styles.inputHack} text={value} />+ </div>+ <div className={styles.count}>+ {value.length > 0 && result && result.matches !== 0 ? (+ <>+ <span>{result?.activeMatchOrdinal || 0}</span>+ <span>/</span>+ <span>{result?.matches || 0}</span>+ </>+ ) : value.length ? (+ <span>No matches</span>+ ) : null}</div>+ </div>- <Button+ <div>+ <IconButton+ size="24"className={clsx(styles.arrowButton, 'backward')}onClick={handleBackWard}- >- <ArrowUpSmallIcon />- </Button>- <Button+ icon={<ArrowUpSmallIcon />}+ />+ <IconButton+ size="24"className={clsx(styles.arrowButton, 'forward')}onClick={handleForward}- >- <ArrowDownSmallIcon />- </Button>+ icon={<ArrowDownSmallIcon />}+ /></div>- <IconButton- className={styles.closeButton}- type="plain"- onClick={handleDone}- >- <CloseIcon />- </IconButton>++ <IconButton onClick={handleDone} icon={<CloseIcon />} /></Dialog.Content></div></Dialog.Portal>diff --git a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsxindex 1c79c2c962..fe7f8f598a 100644--- a/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx+++ b/packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx@@ -1,4 +1,4 @@-import { IconButton, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { useI18n } from '@affine/i18n';import { ArrowLeftSmallIcon, ArrowRightSmallIcon } from '@blocksuite/icons/rc';import { useLiveData, useService } from '@toeverything/infra';@@ -8,6 +8,8 @@ import { useGeneralShortcuts } from '../../../hooks/affine/use-shortcuts';import { NavigatorService } from '../services/navigator';import * as styles from './navigation-buttons.css';+const tooltipSideBottom = { side: 'bottom' as const };+export const NavigationButtons = () => {const t = useI18n();@@ -63,34 +65,29 @@ export const NavigationButtons = () => {return null;}+ // TODO(@CatsJuice): tooltip with shortcutreturn (<div className={styles.container}>- <Tooltip- content={`${shortcutsObject.goBack} ${shortcutsObject.goBackShortcut}`}- side="bottom"+ <IconButton+ tooltip={`${shortcutsObject.goBack} ${shortcutsObject.goBackShortcut}`}+ tooltipOptions={tooltipSideBottom}+ className={styles.button}+ data-testid="app-navigation-button-back"+ disabled={!backable}+ onClick={handleBack}>- <IconButton- className={styles.button}- data-testid="app-navigation-button-back"- disabled={!backable}- onClick={handleBack}- >- <ArrowLeftSmallIcon />- </IconButton>- </Tooltip>- <Tooltip- content={`${shortcutsObject.goForward} ${shortcutsObject.goForwardShortcut}`}- side="bottom"+ <ArrowLeftSmallIcon />+ </IconButton>+ <IconButton+ tooltip={`${shortcutsObject.goForward} ${shortcutsObject.goForwardShortcut}`}+ tooltipOptions={tooltipSideBottom}+ className={styles.button}+ data-testid="app-navigation-button-forward"+ disabled={!forwardable}+ onClick={handleForward}>- <IconButton- className={styles.button}- data-testid="app-navigation-button-forward"- disabled={!forwardable}- onClick={handleForward}- >- <ArrowRightSmallIcon />- </IconButton>- </Tooltip>+ <ArrowRightSmallIcon />+ </IconButton></div>);};diff --git a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsxindex 5b87cea48b..72e99a0889 100644--- a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx+++ b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx@@ -1,6 +1,5 @@import { toast } from '@affine/component';import { Button, IconButton } from '@affine/component/ui/button';-import { Tooltip } from '@affine/component/ui/tooltip';import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';import type { ImageBlockModel } from '@blocksuite/blocks';import { assertExists } from '@blocksuite/global/utils';@@ -100,30 +99,6 @@ export type ImagePreviewModalProps = {blockId: string;};-const ButtonWithTooltip = ({- icon,- tooltip,- disabled,- ...props-}: PropsWithChildren<{- disabled?: boolean;- icon?: ReactElement;- tooltip: string;- onClick: () => void;- className?: string;-}>) => {- const element = icon ? (- <IconButton icon={icon} type="plain" disabled={disabled} {...props} />- ) : (- <Button disabled={disabled} type="plain" {...props} />- );- if (disabled) {- return element;- } else {- return <Tooltip content={tooltip}>{element}</Tooltip>;- }-};-const ImagePreviewModalImpl = ({docId,blockId,@@ -362,7 +337,7 @@ const ImagePreviewModalImpl = ({</p>) : null}<div className={styles.imagePreviewActionBarStyle}>- <ButtonWithTooltip+ <IconButtondata-testid="previous-image-button"tooltip="Previous"icon={<ArrowLeftSmallIcon />}@@ -372,7 +347,7 @@ const ImagePreviewModalImpl = ({<div className={styles.cursorStyle}>{`${blocks.length ? cursor + 1 : 0}/${blocks.length}`}</div>- <ButtonWithTooltip+ <IconButtondata-testid="next-image-button"tooltip="Next"icon={<ArrowRightSmallIcon />}@@ -380,40 +355,41 @@ const ImagePreviewModalImpl = ({onClick={() => goto(cursor + 1)}/><div className={styles.dividerStyle}></div>- <ButtonWithTooltip+ <IconButtondata-testid="fit-to-screen-button"tooltip="Fit to screen"icon={<ViewBarIcon />}onClick={() => resetZoom()}/>- <ButtonWithTooltip+ <IconButtondata-testid="zoom-out-button"tooltip="Zoom out"icon={<MinusIcon />}onClick={zoomOut}/>- <ButtonWithTooltip+ <Buttondata-testid="reset-scale-button"tooltip="Reset scale"onClick={resetScale}+ variant="plain">{`${(currentScale * 100).toFixed(0)}%`}- </ButtonWithTooltip>+ </Button>- <ButtonWithTooltip+ <IconButtondata-testid="zoom-in-button"tooltip="Zoom in"icon={<PlusIcon />}onClick={zoomIn}/><div className={styles.dividerStyle}></div>- <ButtonWithTooltip+ <IconButtondata-testid="download-button"tooltip="Download"icon={<DownloadIcon />}onClick={downloadHandler}/>- <ButtonWithTooltip+ <IconButtondata-testid="copy-to-clipboard-button"tooltip="Copy to clipboard"icon={<CopyIcon />}@@ -422,13 +398,13 @@ const ImagePreviewModalImpl = ({{blockModel && !blockModel.doc.readonly && (<><div className={styles.dividerStyle}></div>- <ButtonWithTooltip- className="danger"+ <IconButtondata-testid="delete-button"tooltip="Delete"icon={<DeleteIcon />}disabled={blocks.length === 0}onClick={() => deleteHandler(cursor)}+ variant="danger"/></>)}diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.css.ts b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.css.tsindex 38334d2c36..1bc13e69cb 100644--- a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.css.ts+++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.css.ts@@ -1,4 +1,3 @@-import { cssVar } from '@toeverything/theme';import { style } from '@vanilla-extract/css';export const root = style({@@ -9,12 +8,7 @@ export const root = style({});export const button = style({- color: cssVar('iconColor'),- boxShadow: cssVar('shadow2'),borderRadius: 8,- fontSize: '20px !important',- ':hover': {- background: cssVar('hoverColorFilled'),- },- pointerEvents: 'auto',+ width: 32,+ height: 32,});diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsxindex da62eb2fef..b06d8585bf 100644--- a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx+++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx@@ -1,4 +1,4 @@-import { IconButton, Tooltip } from '@affine/component';+import { IconButton } from '@affine/component';import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper';import { useI18n } from '@affine/i18n';import {@@ -45,18 +45,16 @@ export const ControlButton = ({);return (- <Tooltip content={name}>- <IconButton- data-testid="peek-view-control"- data-action-name={nameKey}- size="large"- type="default"- onClick={handleClick}- icon={icon}- className={styles.button}- withoutHoverStyle- />- </Tooltip>+ <IconButton+ variant="solid"+ tooltip={name}+ data-testid="peek-view-control"+ data-action-name={nameKey}+ size="20"+ onClick={handleClick}+ icon={icon}+ className={styles.button}+ />);};diff --git a/packages/frontend/core/src/modules/tag/view/delete-tag-modal.tsx b/packages/frontend/core/src/modules/tag/view/delete-tag-modal.tsxindex 2fed54a989..c607a30c8b 100644--- a/packages/frontend/core/src/modules/tag/view/delete-tag-modal.tsx+++ b/packages/frontend/core/src/modules/tag/view/delete-tag-modal.tsx@@ -56,7 +56,7 @@ export const DeleteTagConfirmModal = ({}confirmText={t['Delete']()}confirmButtonOptions={{- type: 'warning',+ variant: 'error',}}onConfirm={handleDelete}/>diff --git a/packages/frontend/core/src/modules/workbench/view/route-container.tsx b/packages/frontend/core/src/modules/workbench/view/route-container.tsxindex 717b342513..dc230badc1 100644--- a/packages/frontend/core/src/modules/workbench/view/route-container.tsx+++ b/packages/frontend/core/src/modules/workbench/view/route-container.tsx@@ -30,7 +30,7 @@ const ToggleButton = ({}) => {return (<IconButton- size="large"+ size="24"onClick={onToggle}className={className}data-show={show}diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header-switcher.tsx b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header-switcher.tsxindex 4612964548..34040ff978 100644--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header-switcher.tsx+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header-switcher.tsx@@ -33,7 +33,7 @@ export const SidebarHeaderSwitcher = () => {[view]);- return (+ return tabItems.length ? (<RadioGroupborderRadius={8}itemHeight={24}@@ -44,5 +44,5 @@ export const SidebarHeaderSwitcher = () => {onChange={handleActiveTabChange}activeItemStyle={{ color: cssVar('primaryColor') }}/>- );+ ) : null;};diff --git a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsxindex a053249336..76cadb00a6 100644--- a/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx+++ b/packages/frontend/core/src/modules/workbench/view/sidebar/sidebar-header.tsx@@ -34,7 +34,7 @@ function Container({const ToggleButton = ({ onToggle }: { onToggle?: () => void }) => {return (- <IconButton size="large" onClick={onToggle}>+ <IconButton size="24" onClick={onToggle}><RightSidebarIcon /></IconButton>);diff --git a/packages/frontend/core/src/pages/expired.tsx b/packages/frontend/core/src/pages/expired.tsxindex 2aa98427f9..36211e1e35 100644--- a/packages/frontend/core/src/pages/expired.tsx+++ b/packages/frontend/core/src/pages/expired.tsx@@ -17,7 +17,7 @@ export const Component = () => {title={t['com.affine.expired.page.title']()}subtitle={t['com.affine.expired.page.subtitle']()}>- <Button type="primary" size="large" onClick={onOpenAffine}>+ <Button variant="primary" size="large" onClick={onOpenAffine}>{t['com.affine.auth.open.affine']()}</Button></AuthPageContainer>diff --git a/packages/frontend/core/src/pages/subscribe.tsx b/packages/frontend/core/src/pages/subscribe.tsxindex 41dd662056..f3684bbd6d 100644--- a/packages/frontend/core/src/pages/subscribe.tsx+++ b/packages/frontend/core/src/pages/subscribe.tsx@@ -154,7 +154,7 @@ export const Component = () => {<>{error}<br />- <Button type="primary" onClick={() => setRetryKey(i => i + 1)}>+ <Button variant="primary" onClick={() => setRetryKey(i => i + 1)}>Retry</Button></>diff --git a/packages/frontend/core/src/pages/workspace/all-collection/header.css.ts b/packages/frontend/core/src/pages/workspace/all-collection/header.css.tsindex 9b1b795a32..75bb3b1ced 100644--- a/packages/frontend/core/src/pages/workspace/all-collection/header.css.ts+++ b/packages/frontend/core/src/pages/workspace/all-collection/header.css.ts@@ -1,12 +1,10 @@import { style } from '@vanilla-extract/css';export const headerCreateNewCollectionIconButton = style({- padding: '4px 8px',- fontSize: '16px',width: '32px',- height: '28px',- borderRadius: '8px',- transition: 'opacity 0.1s ease-in-out',+ height: '32px',+ borderRadius: 8,+ transition: 'all 0.1s ease-in-out',});export const headerCreateNewButtonHidden = style({opacity: 0,diff --git a/packages/frontend/core/src/pages/workspace/all-collection/header.tsx b/packages/frontend/core/src/pages/workspace/all-collection/header.tsxindex bb90a65999..82dc49b7a2 100644--- a/packages/frontend/core/src/pages/workspace/all-collection/header.tsx+++ b/packages/frontend/core/src/pages/workspace/all-collection/header.tsx@@ -17,8 +17,8 @@ export const AllCollectionHeader = ({<Headerright={<IconButton- type="default"- icon={<PlusIcon fontSize={16} />}+ size="16"+ icon={<PlusIcon />}onClick={onCreateCollection}className={clsx(styles.headerCreateNewCollectionIconButton,diff --git a/packages/frontend/core/src/pages/workspace/collection/collection.css.ts b/packages/frontend/core/src/pages/workspace/collection/collection.css.tsindex 8daf9aa86a..dc64c14939 100644--- a/packages/frontend/core/src/pages/workspace/collection/collection.css.ts+++ b/packages/frontend/core/src/pages/workspace/collection/collection.css.ts@@ -27,10 +27,8 @@ export const headerCreateNewButton = style({transition: 'opacity 0.1s ease-in-out',});export const headerCreateNewCollectionIconButton = style({- padding: '4px 8px',- fontSize: '16px',- width: '32px',- height: '28px',+ width: '30px',+ height: '30px',borderRadius: '8px',});export const headerCreateNewButtonHidden = style({diff --git a/packages/frontend/core/src/pages/workspace/collection/header.tsx b/packages/frontend/core/src/pages/workspace/collection/header.tsxindex 2249c1337c..41580d9acb 100644--- a/packages/frontend/core/src/pages/workspace/collection/header.tsx+++ b/packages/frontend/core/src/pages/workspace/collection/header.tsx@@ -19,8 +19,8 @@ export const CollectionDetailHeader = ({right={<><IconButton- type="default"- icon={<PlusIcon fontSize={16} />}+ size="16"+ icon={<PlusIcon />}onClick={onCreate}className={clsx(styles.headerCreateNewButton,diff --git a/packages/frontend/core/src/pages/workspace/detail-page/tabs/journal.tsx b/packages/frontend/core/src/pages/workspace/detail-page/tabs/journal.tsxindex b4664d1e01..c0ad2ca3bd 100644--- a/packages/frontend/core/src/pages/workspace/detail-page/tabs/journal.tsx+++ b/packages/frontend/core/src/pages/workspace/detail-page/tabs/journal.tsx@@ -330,7 +330,7 @@ const ConflictList = ({/>}>- <IconButton type="plain">+ <IconButton><MoreHorizontalIcon /></IconButton></Menu>diff --git a/tests/affine-local/e2e/quick-search.spec.ts b/tests/affine-local/e2e/quick-search.spec.tsindex 89e67d4d26..3ecf556430 100644--- a/tests/affine-local/e2e/quick-search.spec.ts+++ b/tests/affine-local/e2e/quick-search.spec.ts@@ -556,8 +556,10 @@ test('can use slash menu to insert a newly created doc card', async ({page,}) => {await openHomePage(page);- await clickNewPageButton(page);+ // title '1' is a workaround to make sure Keyboard enter works correctly+ await clickNewPageButton(page, '1');+ // flaky: still focus on the title input// goto main contentawait page.keyboard.press('Enter');