Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(ui): improve the style of Ribbon (#4448)

白熱4be0fb997446
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 2add8f30a3..ccffc1221f 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -154,8 +154,8 @@ export function Ribbon(props: IRibbonProps) {
<header className="univer-relative univer-select-none">
<div
className={clsx(`
- univer-animate-in univer-flex univer-gap-2 univer-justify-center univer-items-center univer-h-0
- univer-transition-all univer-overflow-hidden
+ univer-animate-in univer-flex univer-h-0 univer-items-center univer-justify-center univer-gap-2
+ univer-overflow-hidden univer-transition-all
`, {
'univer-h-8 univer-slide-in-from-top-full': ribbon.length > 1 || (headerMenuComponents && headerMenuComponents.size > 0),
})}
@@ -164,8 +164,8 @@ export function Ribbon(props: IRibbonProps) {
<a
key={group.key}
className={clsx(`
- univer-text-gray-700 univer-text-sm univer-rounded univer-px-2 univer-py-0.5
- univer-cursor-pointer univer-transition-colors univer-box-border
+ univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-0.5
+ univer-text-sm univer-text-gray-700 univer-transition-colors
hover:univer-bg-gray-300
`, {
'univer-bg-primary-500 univer-text-white hover:!univer-bg-primary-500': group.key === activatedTab,
@@ -180,10 +180,10 @@ export function Ribbon(props: IRibbonProps) {
{(headerMenuComponents && headerMenuComponents.size > 0) && (
<div
className={`
- univer-absolute univer-top-0 univer-right-2 univer-h-full univer-flex univer-gap-2
- univer-items-center
- [&>*]:univer-inline-flex [&>*]:univer-items-center [&>*]:univer-rounded
- [&>*]:univer-transition-colors [&>*]:univer-px-1 [&>*]:univer-h-6
+ univer-absolute univer-right-2 univer-top-0 univer-flex univer-h-full univer-items-center
+ univer-gap-2
+ [&>*]:univer-inline-flex [&>*]:univer-h-6 [&>*]:univer-items-center [&>*]:univer-rounded
+ [&>*]:univer-px-1 [&>*]:univer-transition-colors
hover:[&>*]:univer-bg-gray-300
`}
>
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 014710aea3..a3431e75bc 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -108,10 +108,10 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
return (
<div
className={clsx(styles.toolbarItemSelectButton, `
- univer-pr-5 univer-h-6 univer-group univer-transition-colors
+ univer-group univer-h-6 univer-pr-5 univer-transition-colors
hover:univer-bg-gray-100
`, {
- 'univer-cursor-not-allowed univer-text-gray-200 univer-pointer-events-none': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-200': disabled,
})}
data-disabled={disabled}
>
@@ -121,6 +121,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
hover:univer-bg-gray-200
`, {
'univer-bg-gray-200': activated,
+ 'univer-bg-gray-50': activated && disabled,
})}
onClick={handleClick}
>
@@ -148,13 +149,13 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
>
<div
className={clsx(`
- univer-absolute univer-top-0 univer-right-0 univer-box-border text-gray-400
- univer-transition-colors univer-w-5 univer-flex univer-justify-center univer-items-center
- univer-h-6
+ univer-absolute univer-right-0 univer-top-0 univer-box-border text-gray-400 univer-flex
+ univer-h-6 univer-w-5 univer-items-center univer-justify-center univer-transition-colors
hover:univer-bg-gray-200
`, {
- 'univer-cursor-not-allowed univer-text-gray-400 univer-pointer-events-none': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-400': disabled,
'univer-bg-gray-200': activated,
+ 'univer-bg-gray-50': activated && disabled,
})}
data-disabled={disabled}
>
@@ -179,7 +180,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
>
<div
className={clsx(styles.toolbarItemSelect, {
- 'univer-cursor-not-allowed univer-text-gray-200 univer-pointer-events-none': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-200': disabled,
[styles.toolbarItemSelectActivated]: activated,
})}
>
@@ -192,7 +193,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
/>
<div
className={clsx(styles.toolbarItemSelectArrow, {
- 'univer-cursor-not-allowed univer-text-gray-200 univer-pointer-events-none': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-200': disabled,
})}
>
<MoreDownSingle className="univer-text-gray-400" />