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.

feat(*): support dark mode (#5176)

白熱ceebb5220282
diff --git a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
index 050893d894..516098446a 100644
--- a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
+++ b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
@@ -151,6 +151,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
`
univer-relative univer-box-border univer-cursor-pointer univer-py-1 univer-pl-9
univer-text-gray-900
+ dark:univer-text-white
`,
`
univer-rounded univer-no-underline univer-transition-colors univer-duration-200
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
index 7962b5f8bb..10ed2a0ce0 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
@@ -123,6 +123,7 @@ export function UnitName({ unitId }: { unitId: string }) {
className={`
univer-flex univer-h-6 univer-items-center univer-gap-1 univer-rounded-md univer-bg-white univer-px-1
univer-py-0 univer-text-sm univer-text-gray-900
+ dark:univer-text-white
`}
>
{name}
diff --git a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
index b9b564506f..5f462d769e 100644
--- a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
+++ b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
@@ -319,7 +319,12 @@ function UnitNode({ data }: IUnitNodeProps) {
<MenuSingle />
</div>
- <div className="univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{title}
</div>
<ComponentContainer key="unit" components={unitComponents} sharedProps={{ unitId }} />
diff --git a/packages/design/src/components/cascader-list/CascaderList.tsx b/packages/design/src/components/cascader-list/CascaderList.tsx
index 8921d8d809..e1d0f0b6eb 100644
--- a/packages/design/src/components/cascader-list/CascaderList.tsx
+++ b/packages/design/src/components/cascader-list/CascaderList.tsx
@@ -57,7 +57,12 @@ export interface ICascaderListProps {
function Empty({ emptyText }: { emptyText?: string }) {
return (
- <section className="univer-h-8 univer-px-2 univer-pr-32 univer-text-sm/8 univer-text-gray-600">
+ <section
+ className={`
+ univer-h-8 univer-px-2 univer-pr-32 univer-text-sm/8 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{emptyText}
</section>
);
@@ -102,11 +107,13 @@ export function CascaderList(props: ICascaderListProps) {
return (
<section
+ data-u-comp="cascader-list"
className={clsx(`
univer-grid univer-h-full univer-max-h-80 univer-grid-flow-col univer-overflow-auto-y univer-rounded
univer-py-2 univer-text-gray-900
[&>ul:not(:last-child)]:univer-border-0 [&>ul:not(:last-child)]:univer-border-r
[&>ul:not(:last-child)]:univer-border-solid [&>ul:not(:last-child)]:univer-border-r-gray-200
+ dark:univer-text-white
`, borderClassName, scrollbarClassName, wrapperClassName)}
>
{activeOptions.map((options, index) =>
@@ -128,7 +135,7 @@ export function CascaderList(props: ICascaderListProps) {
`, {
'univer-px-7': index > 0,
'univer-px-1.5': index === 0,
- 'univer-bg-gray-200': option.value === value[index],
+ 'univer-bg-gray-200 dark:univer-bg-gray-600': option.value === value[index],
})}
onClick={() => handleChange(index, option.value)}
>
diff --git a/packages/design/src/components/date-picker/index.css b/packages/design/src/components/date-picker/index.css
index 475e0ec701..6951a8afe2 100644
--- a/packages/design/src/components/date-picker/index.css
+++ b/packages/design/src/components/date-picker/index.css
@@ -9,7 +9,7 @@
@apply univer-text-gray-900;
}
.univer-dark .univer-date-picker {
- @apply univer-text-white;
+ @apply univer-text-white univer-bg-gray-900;
}
.univer-date-picker-rtl {
@@ -45,6 +45,9 @@
cursor: pointer;
@apply univer-text-gray-600;
}
+.univer-dark .univer-date-picker-suffix-icon {
+ @apply univer-text-gray-200;
+}
.univer-date-picker-decade-panel,
.univer-date-picker-year-panel,
@@ -115,7 +118,7 @@
.univer-dark .univer-date-picker-header-super-next-btn,
.univer-dark .univer-date-picker-header-prev-btn,
.univer-dark .univer-date-picker-header-next-btn {
- @apply univer-text-gray-400;
+ @apply univer-text-gray-200;
}
/* Content */
@@ -123,7 +126,7 @@
@apply univer-text-gray-600;
}
.univer-dark .univer-date-picker-cell {
- @apply univer-text-gray-400;
+ @apply univer-text-gray-200;
}
.univer-date-picker-cell-disabled {
@@ -323,6 +326,7 @@
border: none;
border-radius: 4px;
box-sizing: border-box;
+ @apply univer-bg-transparent;
}
.univer-date-picker-input > input:focus {
diff --git a/packages/design/src/components/date-range-picker/index.css b/packages/design/src/components/date-range-picker/index.css
index 5361ab5a7d..b352e49eb7 100644
--- a/packages/design/src/components/date-range-picker/index.css
+++ b/packages/design/src/components/date-range-picker/index.css
@@ -9,7 +9,7 @@
@apply univer-text-gray-900;
}
.univer-dark .univer-date-range-picker {
- @apply univer-text-white;
+ @apply univer-text-white univer-bg-gray-900;
}
.univer-date-range-picker-rtl {
@@ -284,6 +284,7 @@
border: none;
border-radius: 4px;
box-sizing: border-box;
+ @apply univer-bg-transparent;
}
.univer-date-range-picker-input > input:focus {
diff --git a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
index 7c3cf7687a..0453ae75f3 100644
--- a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
+++ b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
@@ -200,7 +200,7 @@ function DropdownMenuItem({
className={clsx(
`
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center univer-gap-2
- univer-rounded univer-px-2 univer-py-1.5 univer-text-smver-outline-none univer-transition-colors
+ univer-rounded univer-px-2 univer-py-1.5 univer-text-sm univer-outline-none univer-transition-colors
[&>svg]:univer-size-4 [&>svg]:univer-shrink-0
dark:focus:univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
@@ -226,7 +226,7 @@ function DropdownMenuCheckboxItem({
className={clsx(
`
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center
- univer-rounded univer-py-1.5 univer-pr-2 univer-text-smver-outline-none univer-transition-colors
+ univer-rounded univer-py-1.5 univer-pr-2 univer-text-sm univer-outline-none univer-transition-colors
dark:focus:univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
focus:univer-bg-gray-100
@@ -271,7 +271,7 @@ function DropdownMenuRadioItem({
className={clsx(
`
univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center
- univer-rounded univer-py-1.5 univer-pr-2 univer-text-smver-outline-none univer-transition-colors
+ univer-rounded univer-py-1.5 univer-pr-2 univer-text-sm univer-outline-none univer-transition-colors
dark:focus:univer-bg-gray-600
data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50
focus:univer-bg-gray-100
diff --git a/packages/design/src/components/dropdown/PopoverPrimitive.tsx b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
index 82fcd9dd48..ff469799a0 100644
--- a/packages/design/src/components/dropdown/PopoverPrimitive.tsx
+++ b/packages/design/src/components/dropdown/PopoverPrimitive.tsx
@@ -47,7 +47,7 @@ function PopoverContent({
`
univer-z-[1080] univer-max-h-[var(--radix-popper-available-height)] univer-overflow-y-auto
univer-rounded-md univer-bg-white univer-text-gray-900 univer-shadow-md univer-outline-hidden
- dark:univer-bg-gray-900
+ dark:univer-bg-gray-900 dark:univer-text-white
data-[side=bottom]:univer-slide-in-from-top-2
data-[side=left]:univer-slide-in-from-right-2
data-[side=right]:univer-slide-in-from-left-2
diff --git a/packages/design/src/components/form-layout/FormLayout.tsx b/packages/design/src/components/form-layout/FormLayout.tsx
index d7580dce3d..102f9a1903 100644
--- a/packages/design/src/components/form-layout/FormLayout.tsx
+++ b/packages/design/src/components/form-layout/FormLayout.tsx
@@ -46,6 +46,7 @@ export const FormLayout = (props: IFormLayoutProps) => {
className={clsx(`
univer-mb-2 univer-flex univer-min-h-3.5 univer-items-center univer-text-sm
univer-text-gray-900
+ dark:univer-text-white
`, {
'univer-cursor-pointer': collapsable,
})}
@@ -67,7 +68,16 @@ export const FormLayout = (props: IFormLayoutProps) => {
? null
: (
<>
- {desc && <div className="univer-mt-1 univer-text-sm univer-text-gray-600">{desc}</div>}
+ {desc && (
+ <div
+ className={`
+ univer-mt-1 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
+ {desc}
+ </div>
+ )}
{children
? (
<div
diff --git a/packages/design/src/components/message/Message.tsx b/packages/design/src/components/message/Message.tsx
index 3b3b37c65c..049ca07029 100644
--- a/packages/design/src/components/message/Message.tsx
+++ b/packages/design/src/components/message/Message.tsx
@@ -65,7 +65,7 @@ const Message = ({ content, type = MessageType.Info }: IMessageProps) => {
`
)}
>
- <div className="univer-flex univer-items-start univer-gap-2">
+ <div className="univer-flex univer-gap-2">
<span className="[&>svg]:univer-relative [&>svg]:univer-top-0.5 [&>svg]:univer-block">
{icon}
</span>
diff --git a/packages/design/src/components/separator/Separator.tsx b/packages/design/src/components/separator/Separator.tsx
index d0d679eade..b9beac539a 100644
--- a/packages/design/src/components/separator/Separator.tsx
+++ b/packages/design/src/components/separator/Separator.tsx
@@ -32,6 +32,7 @@ function Separator({
className={clsx(
`
univer-shrink-0 univer-bg-gray-200
+ dark:univer-bg-gray-600
data-[orientation=horizontal]:univer-h-px data-[orientation=horizontal]:univer-w-full
data-[orientation=vertical]:univer-h-full data-[orientation=vertical]:univer-w-px
`,
diff --git a/packages/design/src/components/toaster/Toaster.tsx b/packages/design/src/components/toaster/Toaster.tsx
index e0f6f42476..5a29f04a84 100644
--- a/packages/design/src/components/toaster/Toaster.tsx
+++ b/packages/design/src/components/toaster/Toaster.tsx
@@ -28,6 +28,7 @@ const Toaster = ({ visibleToasts, ...props }: IToasterProps) => {
[&_[data-icon]>svg]:univer-relative [&_[data-icon]>svg]:univer-top-1
[&_[data-sonner-toast]]:univer-shadow-md
[&_[data-title]]:univer-text-sm [&_[data-title]]:univer-text-gray-900
+ dark:[&_[data-description]]:univer-text-gray-200
`}
toastOptions={{
classNames: {
diff --git a/packages/design/src/components/tree/index.css b/packages/design/src/components/tree/index.css
index ce41376ec8..32fff2f48e 100644
--- a/packages/design/src/components/tree/index.css
+++ b/packages/design/src/components/tree/index.css
@@ -3,6 +3,9 @@
position: relative;
@apply univer-text-gray-900;
}
+.univer-dark .univer-tree {
+ @apply univer-text-white;
+}
.univer-tree-icon {
position: absolute;
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
index 206a93613d..cc7acedec2 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingPosition.tsx
@@ -360,50 +360,42 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
return (
<div
- className={clsx('univer-relative univer-mt-5 univer-w-full', borderTopClassName)}
- style={{ display: showPanel ? 'block' : 'none' }}
+ className={clsx('univer-relative univer-mt-5 univer-w-full', borderTopClassName, {
+ 'univer-hidden': !showPanel,
+ })}
>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1 univer-text-gray-400">
<div>{localeService.t('image-position.title')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className="univer-flex univer-items-center univer-gap-1 univer-text-gray-900">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-position.horizontal')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1 univer-text-gray-400">
<label>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-position.absolutePosition')}
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
@@ -425,21 +417,13 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
</div>
<div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-position.toTheRightOf')}
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<Select
@@ -454,38 +438,27 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className="univer-flex univer-items-center univer-gap-1 univer-text-gray-900">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-position.vertical')}</div>
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-position.absolutePosition')}
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
@@ -507,21 +480,13 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
</div>
<div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-position.bellow')}
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<Select
@@ -536,21 +501,19 @@ export const DocDrawingPosition = (props: IDocDrawingPositionProps) => {
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className="univer-flex univer-items-center univer-gap-1 univer-text-gray-900">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-position.options')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- style={{ marginBottom: '50px' }}
+ className="univer-relative univer-mb-12 univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<Checkbox disabled={disabled} checked={followTextMove} onChange={handleFollowTextMoveCheck}>{localeService.t('image-position.moveObjectWithText')}</Checkbox>
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
index 1e57c3e9d2..addd64d89e 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/DocDrawingTextWrap.tsx
@@ -267,30 +267,28 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
'univer-hidden': !showPanel,
})}
>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className={clsx('univer-flex univer-items-center univer-gap-1 univer-text-gray-600')}>
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
<div>{localeService.t('image-text-wrap.title')}</div>
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className={clsx('univer-flex univer-items-center univer-gap-1 univer-text-gray-900')}>
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-text-wrap.wrappingStyle')}</div>
</div>
</div>
- <div
- className={clsx(`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `)}
- >
- <div className={clsx('univer-flex univer-items-center univer-gap-1')}>
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div className="univer-flex univer-items-center univer-gap-1">
<RadioGroup value={wrappingStyle} onChange={handleWrappingStyleChange} direction="vertical">
<Radio value={TextWrappingStyle.INLINE}>{localeService.t('image-text-wrap.inline')}</Radio>
<Radio value={TextWrappingStyle.WRAP_SQUARE}>{localeService.t('image-text-wrap.square')}</Radio>
@@ -301,21 +299,20 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className={clsx('univer-flex univer-items-center univer-gap-1 univer-text-gray-900')}>
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-text-wrap.wrapText')}</div>
</div>
</div>
<div
- className={clsx(`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `)}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className={clsx('univer-flex univer-items-center univer-gap-1')}>
+ <div className="univer-flex univer-items-center univer-gap-1">
<RadioGroup disabled={disableWrapText} value={wrapText} onChange={handleWrapTextChange} direction="horizontal">
<Radio value={WrapTextType.BOTH_SIDES}>{localeService.t('image-text-wrap.bothSide')}</Radio>
<Radio value={WrapTextType.LEFT}>{localeService.t('image-text-wrap.leftOnly')}</Radio>
@@ -324,39 +321,28 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
- >
- <div className={clsx('univer-flex univer-items-center univer-gap-1 univer-text-gray-900')}>
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-flex univer-items-center univer-gap-1 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-text-wrap.distanceFromText')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className={clsx('univer-flex univer-items-center univer-gap-1')}>
+ <div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-text-wrap.top')}
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
min={MIN_MARGIN}
@@ -373,21 +359,13 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
<div className={clsx('univer-flex univer-items-center univer-gap-1')}>
<label>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-text-wrap.left')}
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
min={MIN_MARGIN}
@@ -403,28 +381,16 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className={clsx('univer-flex univer-items-center univer-gap-1')}>
+ <div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-text-wrap.bottom')}
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
min={MIN_MARGIN}
@@ -438,24 +404,14 @@ export const DocDrawingTextWrap = (props: IDocDrawingTextWrapProps) => {
</div>
</label>
</div>
- <div className={clsx('univer-flex univer-items-center univer-gap-1')}>
+ <div className="univer-flex univer-items-center univer-gap-1">
<label>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
{localeService.t('image-text-wrap.right')}
</div>
</div>
- <div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start
- univer-justify-start
- `}
- >
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-flex univer-items-center univer-gap-1">
<InputNumber
min={MIN_MARGIN}
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
index fefbe6264e..48181aaf6f 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
@@ -67,6 +67,7 @@ export const DocLinkPopup = () => {
className={`
univer-mr-2 univer-flex univer-size-5 univer-flex-[0_0_auto] univer-items-center
univer-justify-center univer-text-base univer-text-gray-900
+ dark:univer-text-white
`}
>
<LinkSingle />
diff --git a/packages/docs-ui/src/components/paragraph-menu/index.tsx b/packages/docs-ui/src/components/paragraph-menu/index.tsx
index d768000ea4..6fbc400773 100644
--- a/packages/docs-ui/src/components/paragraph-menu/index.tsx
+++ b/packages/docs-ui/src/components/paragraph-menu/index.tsx
@@ -89,8 +89,18 @@ export const ParagraphMenu = ({ popup }: { popup: IPopup }) => {
docParagraphMenuService?.setParagraphMenuActive(true);
}}
>
- <icon.component className="univer-h-4 univer-w-4 univer-text-gray-900" />
- <DownSingle className="univer-h-3 univer-w-3 univer-text-gray-600" />
+ <icon.component
+ className={`
+ univer-size-4 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ />
+ <DownSingle
+ className={`
+ univer-size-3 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ />
</div>
{visible && (
<RectPopup
diff --git a/packages/docs-ui/src/views/page-settings/index.tsx b/packages/docs-ui/src/views/page-settings/index.tsx
index 07b4e79fca..35cfc87c9b 100644
--- a/packages/docs-ui/src/views/page-settings/index.tsx
+++ b/packages/docs-ui/src/views/page-settings/index.tsx
@@ -100,7 +100,12 @@ export function PageSettings(props: IConfirmChildrenProps) {
return (
<div className="univer-flex univer-flex-col univer-gap-4">
<div className="univer-flex univer-flex-col univer-gap-2">
- <label className="univer-text-sm univer-font-medium univer-text-gray-900">
+ <label
+ className={`
+ univer-text-sm univer-font-medium univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
{localeService.t('page-settings.paper-size')}
</label>
<Select
@@ -113,28 +118,13 @@ export function PageSettings(props: IConfirmChildrenProps) {
/>
</div>
- {/* <div className="univer-flex univer-flex-col univer-gap-2">
- <label className="univer-text-sm univer-font-medium univer-text-gray-900">
- {localeService.t('page-settings.orientation')}
- </label>
- <div className="univer-flex univer-gap-3">
- <Radio
- checked={settings.orientation === PageOrientType.PORTRAIT}
- onChange={() => handleOrientationChange(PageOrientType.PORTRAIT)}
- >
- {localeService.t('page-settings.portrait')}
- </Radio>
- <Radio
- checked={settings.orientation === PageOrientType.LANDSCAPE}
- onChange={() => handleOrientationChange(PageOrientType.LANDSCAPE)}
- >
- {localeService.t('page-settings.landscape')}
- </Radio>
- </div>
- </div> */}
-
<div className="univer-flex univer-flex-col univer-gap-2">
- <label className="univer-text-sm univer-font-medium univer-text-gray-900">
+ <label
+ className={`
+ univer-text-sm univer-font-medium univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
{localeService.t('page-settings.custom-paper-size')}
</label>
<div className="univer-flex univer-flex-col univer-gap-2.5">
diff --git a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
index 4816eeff4f..dfbb4d436c 100644
--- a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
@@ -104,7 +104,7 @@ export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopu
dark:univer-text-white
`}
/>
- {showMore && <MoreDownSingle />}
+ {showMore && <MoreDownSingle className="dark:univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingAlign.tsx b/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
index 956515cafd..a7e0e3bcdf 100644
--- a/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingAlign.tsx
@@ -98,20 +98,26 @@ export const DrawingAlign = (props: IDrawingAlignProps) => {
})}
>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className="univer-w-full univer-text-gray-900">
+ <div
+ className={`
+ univer-w-full univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<div>{localeService.t('image-panel.align.title')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
- <div className="univer-w-full univer-text-gray-900">
+ <div
+ className={`
+ univer-w-full univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
<Select value={alignValue} options={alignOptions} onChange={handleAlignChange} />
</div>
</div>
diff --git a/packages/drawing-ui/src/views/utils/classnames.ts b/packages/drawing-ui/src/views/utils/classnames.ts
index 314f5f3e55..ae373268aa 100644
--- a/packages/drawing-ui/src/views/utils/classnames.ts
+++ b/packages/drawing-ui/src/views/utils/classnames.ts
@@ -17,6 +17,6 @@
// TODO@siam-ese: these styles are widely used in drawing's components. They should be deprecated once the
// Form component is completed.
-export const rowClassName = 'univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-between univer-gap-2 univer-flex-no-wrap';
+export const rowClassName = 'univer-relative univer-mt-2.5 univer-flex univer-h-full univer-justify-between univer-gap-2 univer-flex-no-wrap';
export const columnTitleClassName = 'univer-w-full univer-text-left univer-text-gray-400';
export const inlineClassName = 'univer-flex univer-items-center univer-gap-1';
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
index 2fb8e65c32..385060bbd7 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
@@ -224,13 +224,23 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
};
return (
<div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className={previewClassName}>
<Preview rule={getResult({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor, maxColor }) as IConditionalFormattingRuleConfig} />
</div>
- <div className="univer-mt-3 univer-text-xs univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3 univer-text-xs univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.valueType.min')}
</div>
<div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
@@ -242,7 +252,17 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
setMinType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 10);
setMinValue(value);
- handleChange({ minType: v as CFValueType, medianType, maxType, minValue: value, medianValue, maxValue, minColor, medianColor, maxColor });
+ handleChange({
+ minType: v as CFValueType,
+ medianType,
+ maxType,
+ minValue: value,
+ medianValue,
+ maxValue,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
<TextInput
@@ -252,7 +272,17 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
type={minType}
onChange={(v) => {
setMinValue(v);
- handleChange({ minType, medianType, maxType, minValue: v, medianValue, maxValue, minColor, medianColor, maxColor });
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue: v,
+ medianValue,
+ maxValue,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
<ColorPicker
@@ -260,11 +290,28 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
color={minColor}
onChange={(v) => {
setMinColor(v);
- handleChange({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor: v, medianColor, maxColor });
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue,
+ medianValue,
+ maxValue,
+ minColor: v,
+ medianColor,
+ maxColor,
+ });
}}
/>
</div>
- <div className="univer-mt-3 univer-text-xs univer-text-gray-600">{localeService.t('sheet.cf.panel.medianValue')}</div>
+ <div
+ className={`
+ univer-mt-3 univer-text-xs
+ univer-text-gray-600dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t('sheet.cf.panel.medianValue')}
+ </div>
<div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
<Select
className="univer-flex-shrink-0"
@@ -330,7 +377,14 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
)}
</div>
- <div className="univer-mt-3 univer-text-xs univer-text-gray-600">{localeService.t('sheet.cf.valueType.max')}</div>
+ <div
+ className={`
+ univer-mt-3 univer-text-xs univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t('sheet.cf.valueType.max')}
+ </div>
<div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
<Select
className="univer-flex-shrink-0"
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
index 7bc151d01d..9bcaf6f14c 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
@@ -219,11 +219,29 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
const handlePositiveColorChange = (color: string) => {
positiveColorSet(color);
- _handleChange({ isGradient, minValue, minValueType, maxValue, maxValueType, positiveColor: color, nativeColor, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor: color,
+ nativeColor,
+ isShowValue,
+ });
};
const handleNativeColorChange = (color: string) => {
nativeColorSet(color);
- _handleChange({ isGradient, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor: color, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor: color,
+ isShowValue,
+ });
};
const isShowInput = (type: string) => {
@@ -232,7 +250,12 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
return (
<div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className={previewClassName}>
@@ -250,7 +273,12 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
/>
</div>
<div>
- <div className="univer-mt-3 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.fillType')}
</div>
@@ -259,7 +287,16 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
value={isGradient}
onChange={(v) => {
isGradientSet(v as string);
- _handleChange({ isGradient: v as string, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor, isShowValue });
+ _handleChange({
+ isGradient: v as string,
+ minValue,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ });
}}
>
<Radio value="0">
@@ -291,7 +328,14 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
</div>
</div>
<div>
- <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.panel.colorSet')}</div>
+ <div
+ className={`
+ univer-mt-3 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t('sheet.cf.panel.colorSet')}
+ </div>
<div className="univer-ml-1 univer-mt-3 univer-flex univer-items-center">
<div className="univer-flex univer-items-center">
<div className="univer-text-xs">
@@ -315,7 +359,14 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
</div>
<div>
- <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.valueType.min')}</div>
+ <div
+ className={`
+ univer-mt-3 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t('sheet.cf.valueType.min')}
+ </div>
<div className="univer-mt-3 univer-flex univer-items-center">
<Select
className="univer-w-1/2 univer-flex-shrink-0"
@@ -359,7 +410,14 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
}}
/>
</div>
- <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.valueType.max')}</div>
+ <div
+ className={`
+ univer-mt-3 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t('sheet.cf.valueType.max')}
+ </div>
<div className="univer-mt-3 univer-flex univer-items-center">
<Select
className="univer-w-1/2 univer-flex-shrink-0"
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
index c1e400c709..b42c91436e 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
@@ -96,7 +96,12 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
return (
<div ref={divEleRef}>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className="univer-mt-3">
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
index 147d012db1..97d328d8a5 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
@@ -367,7 +367,12 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
return (
<div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className="univer-flex univer-justify-between univer-gap-4">
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
index 2b52cd1dc6..bc1ebebf8f 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
@@ -262,6 +262,7 @@ const IconSetRuleEdit = (props: {
className={`
univer-mt-3 univer-flex univer-items-center univer-justify-between univer-text-sm
univer-text-gray-600
+ dark:univer-text-gray-200
`}
>
<div
@@ -275,7 +276,12 @@ const IconSetRuleEdit = (props: {
<>
{!isFirst && !isEnd && localeService.t('sheet.cf.iconSet.rule')}
{!isFirst && !isEnd && (
- <span className="univer-font-medium univer-text-gray-600">
+ <span
+ className={`
+ univer-font-medium univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
(
{localeService.t('sheet.cf.iconSet.when')}
{localeService.t(`sheet.cf.symbol.${getOppositeOperator(preItem.operator)}`)}
@@ -302,6 +308,7 @@ const IconSetRuleEdit = (props: {
univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center
univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2
univer-text-xs univer-text-gray-600 univer-transition-all
+ dark:univer-text-gray-200
hover:univer-border-primary-600
`, borderClassName)}
>
@@ -325,9 +332,14 @@ const IconSetRuleEdit = (props: {
/>
)
: (
- <div className="univer-mt-0 univer-w-[45%] univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-0 univer-w-[45%] univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.iconSet.rule')}
- <span className="univer-font-medium univer-text-gray-600">
+ <span className="univer-font-medium">
{localeService.t('sheet.cf.iconSet.when')}
{localeService.t(`sheet.cf.symbol.${getOppositeOperator(preItem.operator)}`)}
{lessThanText}
@@ -343,6 +355,7 @@ const IconSetRuleEdit = (props: {
className={`
univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4
univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
`}
>
<div>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
index e14ad65c99..f9bb7b0fd5 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
@@ -141,7 +141,12 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
};
return (
<div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<Select
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
index 661324a743..baed53b370 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
@@ -230,7 +230,12 @@ export const RuleEdit = (props: IRuleEditProps) => {
};
return (
<div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.range')}
</div>
<div className="univer-mt-4">
@@ -243,7 +248,12 @@ export const RuleEdit = (props: IRuleEditProps) => {
/>
{errorText && <div className="univer-mt-1 univer-text-xs univer-text-red-500">{errorText}</div>}
</div>
- <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-4 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.cf.panel.styleType')}
</div>
<Select
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
index 7ec528fbfb..1b0d5f76d2 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
@@ -409,7 +409,12 @@ export const RuleList = (props: IRuleListProps) => {
univer-min-w-0 univer-max-w-full univer-flex-shrink univer-overflow-hidden
`}
>
- <div className="univer-text-sm univer-text-gray-900">
+ <div
+ className={`
+ univer-text-sm univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
{getRuleDescribe(rule, localeService)}
</div>
<div className="univer-text-xs univer-text-gray-400">
diff --git a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
index b9378d1cbb..f4aa0d4727 100644
--- a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
@@ -106,16 +106,14 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
>
<div
className={`
- univer-overflow-hidden univer-text-ellipsis univer-text-sm univer-font-medium univer-leading-[22px]
- univer-text-gray-900
+ univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900
+ dark:univer-text-white
`}
>
{validator?.generateRuleName(rule)}
</div>
<div
- className={`
- univer-text-secondary univer-overflow-hidden univer-text-ellipsis univer-text-xs univer-leading-[18px]
- `}
+ className="univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]"
>
{rule.ranges.map((range) => serializeRange(range)).join(',')}
</div>
diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
index 974a0bab80..bced44c879 100644
--- a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
@@ -40,6 +40,7 @@ export function DataValidationOptions(props: IDataValidationOptionsParams) {
<div
className={`
univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900
+ dark:univer-text-white
`}
onClick={() => setShow(!show)}
>
diff --git a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
index 92212c7116..3fa22503a1 100644
--- a/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
+++ b/packages/sheets-drawing-ui/src/views/sheet-image-panel/SheetDrawingAnchor.tsx
@@ -141,18 +141,14 @@ export const SheetDrawingAnchor = (props: ISheetDrawingAnchorProps) => {
})}
>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-w-full univer-text-left univer-text-gray-400">
<div>{localeService.t('drawing-anchor.title')}</div>
</div>
</div>
<div
- className={`
- univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
- `}
+ className="univer-relative univer-mt-2.5 univer-flex univer-h-full"
>
<div className="univer-flex univer-items-center univer-gap-1">
<RadioGroup value={value} onChange={handleChange} direction="vertical">
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
index 48ac302195..b2ab6af307 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
@@ -100,7 +100,7 @@ export function FilterByValue(props: { model: ByValuesModel }) {
data-u-comp="sheets-filter-panel-values-item-text"
className={`
univer-mx-1 univer-inline-block univer-flex-shrink univer-overflow-hidden
- univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-950
+ univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-900
dark:univer-text-white
`}
>
@@ -132,7 +132,7 @@ export function FilterByValue(props: { model: ByValuesModel }) {
univer-pr-2 univer-border-box univer-max-w-[245px] univer-rounded-md
[&:hover_a]:univer-inline-block
hover:univer-bg-gray-50 univer-h-full
- univer-text-gray-950 dark:hover:univer-bg-gray-900
+ univer-text-gray-900 dark:hover:univer-bg-gray-900
dark:univer-text-white
`}
attachRender={(item) => (
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
index 101a590402..04341468ee 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
@@ -36,10 +36,10 @@ interface IParamsProps {
const Params = ({ className, title, value }: IParamsProps) => (
<div className="univer-my-2">
<div
- className={`
+ className={clsx(`
univer-mb-2 univer-text-sm univer-font-medium univer-text-gray-900
- ${className}
- `}
+ dark:univer-text-white
+ `, className)}
>
{title}
</div>
@@ -136,6 +136,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
className={clsx(`
univer-box-border univer-flex univer-items-center univer-justify-between univer-px-4
univer-py-3 univer-text-xs univer-font-medium univer-text-gray-900 univer-wrap-anywhere
+ dark:univer-text-white
`, borderTopClassName)}
>
<Help
@@ -164,6 +165,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
univer-items-center univer-justify-center univer-rounded univer-bg-transparent
univer-p-0 univer-text-xs univer-text-gray-600 univer-outline-none
univer-transition-colors
+ dark:univer-text-gray-200
hover:univer-bg-gray-300
`}
onClick={onClose}
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
index ff6d12b66c..1ce4e10019 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
@@ -205,13 +205,13 @@ function SearchFunctionFactory(props: ISearchFunctionProps, ref: any) {
{searchList.map((item, index) => (
<li
key={item.name}
- className={`
+ className={clsx(`
univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-1
univer-text-gray-900 univer-transition-colors
- ${active === index
- ? 'univer-bg-gray-200'
- : ''}
- `}
+ dark:univer-text-white
+ `, {
+ 'univer-bg-gray-200 dark:univer-bg-gray-600': active === index,
+ })}
onMouseEnter={() => handleLiMouseEnter(index)}
onMouseLeave={handleLiMouseLeave}
onMouseMove={debounceResetMouseState}
diff --git a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
index 3574eaf1b6..3c28024bb7 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
@@ -34,7 +34,12 @@ export function FunctionParams(props: IParamsProps) {
>
{title}
</div>
- <div className="univer-text-gray-900">
+ <div
+ className={`
+ univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
{value}
</div>
</div>
diff --git a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
index fae7a54dbb..24381d965d 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
@@ -175,6 +175,7 @@ export function SelectFunction(props: ISelectFunctionProps) {
className={clsx(`
univer-relative univer-box-border univer-cursor-pointer univer-rounded univer-px-7 univer-py-1
univer-text-sm univer-text-gray-900 univer-transition-colors
+ dark:univer-text-white
`, {
'univer-bg-gray-200': active === index,
})}
@@ -186,7 +187,7 @@ export function SelectFunction(props: ISelectFunctionProps) {
<CheckMarkSingle
className={`
univer-absolute univer-left-1.5 univer-top-1/2 univer-inline-flex
- univer--translate-y-1/2 univer-text-base univer-text-green-500
+ -univer-translate-y-1/2 univer-text-base univer-text-primary-600
`}
/>
)}
diff --git a/packages/sheets-formula-ui/src/views/range-selector/index.tsx b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
index 397933345e..6821613e67 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/index.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
@@ -186,7 +186,7 @@ export function RangeSelectorDialog(props: IRangeSelectorDialogProps) {
{ranges.map((text, index) => (
<div
key={index}
- className="univer-mb-2 univer-flex univer-items-center univer-justify-start univer-gap-4"
+ className="univer-mb-2 univer-flex univer-items-center univer-gap-4"
>
<Input
className="univer-w-full"
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
index 5789577c24..9e144dbedc 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
@@ -435,6 +435,7 @@ export const CellLinkEdit = () => {
<div
className={clsx(`
univer-box-border univer-w-[296px] univer-rounded-xl univer-bg-white univer-p-4 univer-shadow-md
+ dark:univer-bg-gray-900
`, borderClassName)}
>
{showLabel
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
index f8af816b0f..4d399676a3 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
@@ -69,15 +69,15 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={clsx(`
univer-mb-1 univer-flex univer-max-w-80 univer-flex-row univer-items-center univer-justify-between
univer-overflow-hidden univer-rounded-lg univer-bg-white univer-p-3 univer-shadow-md
+ dark:univer-bg-gray-900
`, borderClassName)}
onClick={() => popupService.hideCurrentPopup()}
>
<div
className={clsx(`
univer-flex univer-h-6 univer-flex-1 univer-cursor-pointer univer-flex-row univer-items-center
- univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap univer-text-sm univer-leading-5
- univer-text-blue-500
- `, { 'univer-text-gray-500': isError })}
+ univer-truncate univer-text-sm univer-leading-5 univer-text-primary-600
+ `, { 'univer-text-red-500': isError })}
onClick={() => {
if (zenZoneService.visible) {
return;
@@ -94,6 +94,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
className={`
univer-mr-2 univer-flex univer-h-5 univer-w-5 univer-flex-none univer-items-center
univer-justify-center univer-text-base univer-text-gray-900
+ dark:univer-text-white
`}
>
{iconsMap[linkObj.type]}
@@ -110,10 +111,11 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
{copyPermission && (
<div
className={clsx(`
- univer-ml-2 univer-flex univer-h-6 univer-w-6 univer-cursor-pointer univer-flex-row
+ univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- hover:univer-bg-gray-200
- `, { 'univer-text-gray-500': isError })}
+ dark:hover:univer-bg-gray-700
+ hover:univer-bg-gray-100
+ `, { 'univer-text-red-500': isError })}
onClick={() => {
if (isError) {
return;
@@ -132,7 +134,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.copy')}>
- <CopySingle />
+ <CopySingle className="dark:univer-text-white" />
</Tooltip>
</div>
)}
@@ -140,9 +142,10 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
<>
<div
className={`
- univer-ml-2 univer-flex univer-h-6 univer-w-6 univer-cursor-pointer univer-flex-row
+ univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- hover:univer-bg-gray-200
+ dark:hover:univer-bg-gray-700
+ hover:univer-bg-gray-100
`}
onClick={() => {
commandService.executeCommand(OpenHyperLinkEditPanelOperation.id, {
@@ -156,14 +159,15 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.edit')}>
- <WriteSingle />
+ <WriteSingle className="dark:univer-text-white" />
</Tooltip>
</div>
<div
className={`
- univer-ml-2 univer-flex univer-h-6 univer-w-6 univer-cursor-pointer univer-flex-row
+ univer-ml-2 univer-flex univer-size-6 univer-cursor-pointer univer-flex-row
univer-items-center univer-justify-center univer-rounded univer-text-base
- hover:univer-bg-gray-200
+ dark:hover:univer-bg-gray-700
+ hover:univer-bg-gray-100
`}
onClick={() => {
const commandId = (type === HyperLinkEditSourceType.EDITING || type === HyperLinkEditSourceType.ZEN_EDITOR) ? CancelRichHyperLinkCommand.id : CancelHyperLinkCommand.id;
@@ -182,7 +186,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.cancel')}>
- <UnlinkSingle />
+ <UnlinkSingle className="dark:univer-text-white" />
</Tooltip>
</div>
</>
diff --git a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
index 594d0206e2..a945253940 100644
--- a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
@@ -99,7 +99,12 @@ export function CustomFormat(props: IBusinessComponentProps) {
</div>
))}
</div>
- <div className="univer-mt-3 univer-text-sm univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3 univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.numfmt.customFormatDes')}
</div>
</div>
diff --git a/packages/sheets-numfmt-ui/src/views/components/Date.tsx b/packages/sheets-numfmt-ui/src/views/components/Date.tsx
index 8ee2b3e28f..e8319da4bc 100644
--- a/packages/sheets-numfmt-ui/src/views/components/Date.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/Date.tsx
@@ -61,7 +61,12 @@ export const DatePanel: FC<IBusinessComponentProps> = (props) => {
<div className="univer-mt-2">
<SelectList value={suffix} options={options} onChange={onChange} />
</div>
- <div className="univer-mt-3.5 univer-text-sm/5 univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{t('sheet.numfmt.dateDes')}
</div>
</div>
diff --git a/packages/sheets-numfmt-ui/src/views/components/General.tsx b/packages/sheets-numfmt-ui/src/views/components/General.tsx
index 50d517c3bd..c3862809f5 100644
--- a/packages/sheets-numfmt-ui/src/views/components/General.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/General.tsx
@@ -30,7 +30,12 @@ export const GeneralPanel: FC<IBusinessComponentProps> = (props) => {
return (
<div>
- <div className="univer-mt-3.5 univer-text-sm/5 univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{t('sheet.numfmt.generalDes')}
</div>
</div>
diff --git a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
index e445de63a0..8dbf6dc0a1 100644
--- a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
@@ -87,6 +87,7 @@ export const Options = () => {
className={`
univer-flex univer-h-7 univer-items-center univer-justify-between univer-gap-6 univer-rounded
univer-px-2 univer-text-sm
+ dark:hover:univer-bg-gray-700
hover:univer-bg-gray-100
`}
onClick={() => {
diff --git a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
index 237564d10b..9615e101f5 100644
--- a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
@@ -74,7 +74,12 @@ export const ThousandthPercentilePanel: FC<IBusinessComponentProps> = (props) =>
<div className="univer-mt-2">
<SelectList onChange={handleClick} options={options} value={suffix} />
</div>
- <div className="univer-mt-3.5 univer-text-sm/5 univer-text-gray-600">
+ <div
+ className={`
+ univer-mt-3.5 univer-text-sm/5 univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
{localeService.t('sheet.numfmt.thousandthPercentileDes')}
</div>
</div>
diff --git a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
index f20fc95864..f079062b4c 100644
--- a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
+++ b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
@@ -281,13 +281,11 @@ export function SortOptionItem(props: ISortOptionItemProps) {
univer-ml-2 univer-flex univer-w-[236px] univer-items-center univer-justify-between
univer-overflow-hidden univer-rounded-md univer-border univer-border-gray-200
univer-px-2.5 univer-py-1.5 univer-text-sm univer-text-gray-900
+ dark:univer-text-white
`}
>
<span
- className={`
- univer-max-w-[220px] univer-overflow-hidden univer-text-ellipsis
- univer-whitespace-nowrap
- `}
+ className="univer-max-w-[220px] univer-truncate"
>
{itemLabel}
</span>
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
index caf459f08a..a360a14375 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
@@ -18,7 +18,7 @@ import type { ISortRangeCommandParams } from '@univerjs/sheets-sort';
import type { ITableConditionFilterItem, ITableManualFilterItem } from '@univerjs/sheets-table';
import type { IConditionInfo } from './type';
import { ICommandService, IPermissionService, LocaleService } from '@univerjs/core';
-import { borderClassName, Button, clsx, Segmented } from '@univerjs/design';
+import { Button, ButtonGroup, Segmented } from '@univerjs/design';
import { AscendingSingle, DescendingSingle } from '@univerjs/icons';
import { WorkbookEditablePermission } from '@univerjs/sheets';
import { SortRangeCommand, SortType } from '@univerjs/sheets-sort';
@@ -148,37 +148,21 @@ export function SheetTableFilterPanel() {
className={`
univer-box-border univer-flex univer-w-[312px] univer-flex-col univer-rounded-[10px] univer-bg-white
univer-p-4 univer-shadow-lg
+ dark:univer-border-gray-600 dark:univer-bg-gray-700
`}
>
{editable && (
<div className="univer-mb-3 univer-flex">
- <div
- className={clsx(`
- univer-flex univer-w-[140px] univer-flex-1 univer-cursor-default univer-items-center
- univer-justify-center univer-gap-1 univer-rounded-l-md univer-py-1.5 univer-text-sm
- hover:univer-cursor-pointer hover:univer-bg-gray-100
- `, borderClassName, {
- 'univer-bg-gray-100': isAsc,
- })}
- onClick={() => applySort(true)}
- >
- <AscendingSingle className="univer-text-base univer-text-color-[#1e222b] univer-mr-1" />
- {localeService.t('sheets-sort.general.sort-asc')}
- </div>
- <div
- className={clsx(`
- univer-flex univer-w-[140px] univer-flex-1 univer-cursor-default univer-items-center
- univer-justify-center univer-gap-1 univer-rounded-r-md univer-py-1.5 univer-text-sm
- hover:univer-cursor-pointer hover:univer-bg-gray-100
- `, borderClassName, {
- 'univer-bg-gray-100': isDesc,
- })}
- onClick={() => applySort(false)}
- >
- <DescendingSingle className="univer-text-base univer-text-color-[#1e222b] univer-mr-1" />
- {localeService.t('sheets-sort.general.sort-desc')}
- </div>
-
+ <ButtonGroup className="univer-mb-3 univer-w-full">
+ <Button className="univer-w-1/2" onClick={() => applySort(true)}>
+ <AscendingSingle className="univer-mr-1" />
+ {localeService.t('sheets-sort.general.sort-asc')}
+ </Button>
+ <Button className="univer-w-1/2" onClick={() => applySort(false)}>
+ <DescendingSingle className="univer-mr-1" />
+ {localeService.t('sheets-sort.general.sort-desc')}
+ </Button>
+ </ButtonGroup>
</div>
)}
<div className="univer-w-full">
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
index 8beec0fbc4..aca3d39dd6 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
@@ -127,23 +127,18 @@ export function SheetTableItemsFilterPanel(props: ISheetTableItemsFilterPanelPro
className={clsx('univer-h-40 univer-overflow-y-auto univer-py-1 univer-pl-2', scrollbarClassName)}
>
<div className="univer-h-full">
- <div
- className="univer-flex univer-items-center univer-px-2 univer-py-1"
- >
+ <div className="univer-flex univer-items-center univer-px-2 univer-py-1">
<Checkbox
indeterminate={indeterminate}
disabled={items.length === 0}
checked={allChecked}
onChange={onCheckAllToggled}
- />
- <div
- className={`
- univer-ml-1 univer-flex univer-h-5 univer-flex-1 univer-items-center univer-text-sm
- `}
>
- <span className="univer-inline-block univer-truncate">{`${localeService.t('sheets-filter.panel.select-all')}`}</span>
- <span className="univer-ml univer-text-gray-400">{`(${checkedCount}/${searchText ? displayItems.length : allItemsCount})`}</span>
- </div>
+ <div className="univer-flex univer-h-5 univer-flex-1 univer-items-center univer-text-sm">
+ <span className="univer-inline-block univer-truncate">{`${localeService.t('sheets-filter.panel.select-all')}`}</span>
+ <span className="univer-ml univer-text-gray-400">{`(${checkedCount}/${searchText ? displayItems.length : allItemsCount})`}</span>
+ </div>
+ </Checkbox>
</div>
{displayItems.map((item) => {
return (
@@ -151,17 +146,15 @@ export function SheetTableItemsFilterPanel(props: ISheetTableItemsFilterPanelPro
key={item.key}
className="univer-flex univer-items-center univer-px-2 univer-py-1"
>
- <Checkbox checked={allChecked || checkedItemSet.has(item.title)} onChange={() => { onCheckItemToggled(item.title); }} />
- <div
- className={`
- univer-ml-1 univer-flex univer-h-5 univer-flex-1 univer-items-start
- univer-text-sm
- `}
+ <Checkbox
+ checked={allChecked || checkedItemSet.has(item.title)}
+ onChange={() => { onCheckItemToggled(item.title); }}
>
-
- <span className="univer-inline-block univer-truncate">{item.title}</span>
- <span className="univer-ml-1 univer-text-gray-400">{`(${itemsCountMap.get(item.title) || 0})`}</span>
- </div>
+ <div className="univer-flex univer-h-5 univer-flex-1 univer-text-sm">
+ <span className="univer-inline-block univer-truncate">{item.title}</span>
+ <span className="univer-ml-1 univer-text-gray-400">{`(${itemsCountMap.get(item.title) || 0})`}</span>
+ </div>
+ </Checkbox>
</div>
);
})}
diff --git a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
index 2f0ace615d..7ef07e6266 100644
--- a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
+++ b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
@@ -95,7 +95,7 @@ export function BorderPanel(props: IBorderPanelProps) {
<div
className={`
univer-box-border univer-grid univer-grid-cols-5 univer-gap-2 univer-text-gray-600
- dark:univer-text-gray-400
+ dark:univer-text-gray-200
`}
>
{BORDER_LINE_CHILDREN.map((item) => (
diff --git a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
index d535965b39..77916ee8d4 100644
--- a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
@@ -201,14 +201,20 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {
<div
className={clsx(`
univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
+ dark:hover:univer-bg-gray-800
hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100': visible,
- 'univer-bg-white': !visible,
+ 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
+ 'univer-bg-white dark:univer-bg-gray-900': !visible,
})}
>
- <Autofill className="univer-fill-primary-600 univer-text-gray-900" />
- {showMore && <MoreDownSingle />}
+ <Autofill
+ className={`
+ univer-fill-primary-600 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ />
+ {showMore && <MoreDownSingle className="dark:univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
index 96bdbcb0f7..f14ccfd020 100644
--- a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
@@ -17,9 +17,9 @@
import type { IDiscreteRange } from '../../controllers/utils/range-tools';
import type { IPasteHookKeyType } from '../../services/clipboard/type';
import { ICommandService, IUniverInstanceService, LocaleService } from '@univerjs/core';
-import { borderClassName, clsx, Dropdown } from '@univerjs/design';
+import { borderClassName, clsx, DropdownMenu } from '@univerjs/design';
import { convertTransformToOffsetX, convertTransformToOffsetY, IRenderManagerService } from '@univerjs/engine-render';
-import { CheckMarkSingle, MoreDownSingle, PasteSpecial } from '@univerjs/icons';
+import { MoreDownSingle, PasteSpecial } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
import { SheetOptionalPasteCommand } from '../../commands/commands/clipboard.command';
@@ -115,7 +115,7 @@ export const ClipboardPopupMenu = () => {
const commandService = useDependency(ICommandService);
const [menuHovered, setMenuHovered] = useState(false);
- const [menuVisible, setMenuVisible] = useState(false);
+ const [visible, setVisible] = useState(false);
// const version = useObservable(clipboardController.refreshOptionalPaste$, Math.random());
@@ -127,80 +127,56 @@ export const ClipboardPopupMenu = () => {
if (relativePosition.positionX < 50 || relativePosition.positionY < 30) return null;
- const iconVisible = menuHovered || menuVisible;
+ const showMore = menuHovered || visible;
const handleClick = (type: string) => {
- setMenuVisible(false);
+ setVisible(false);
commandService.executeCommand(SheetOptionalPasteCommand.id, { type });
};
return (
- <div
- className={clsx(`
- univer-absolute univer-z-[1080] univer-flex univer-cursor-pointer univer-items-center
- univer-justify-center univer-gap-2 univer-rounded univer-bg-white univer-p-1
- hover:univer-bg-gray-100
- `, borderClassName)}
- style={{
- left: relativePosition.positionX + DEFAULT_PADDING,
- top: relativePosition.positionY + DEFAULT_PADDING,
- }}
- onMouseEnter={() => setMenuHovered(true)}
- onMouseLeave={() => setMenuHovered(false)}
- >
- <Dropdown
- align="start"
- overlay={(
- <ul className="univer-m-0 univer-list-none univer-p-1.5">
- {SheetPasteOptions.map((item) => {
- const itemType = PREDEFINED_HOOK_NAME[item.value as IPasteHookKeyType];
- const selected = pasteOptionsCache?.pasteType === itemType;
- return (
- <li
- key={item.value}
- className={`
- univer-cursor-pointer univer-rounded univer-px-2 univer-py-1.5
- univer-transition-colors
- hover:univer-bg-gray-100
- `}
- onClick={() => handleClick(item.value)}
- >
- <span>
- {selected && (
- <CheckMarkSingle className="univer-absolute univer-text-primary-600" />
- )}
- </span>
- <div
- className={`
- univer-ml-5 univer-text-sm univer-text-gray-700
- dark:univer-text-white
- `}
- >
- {localeService.t(item.label)}
- </div>
- </li>
- );
- })}
- </ul>
- )}
- open={menuVisible}
- onOpenChange={setMenuVisible}
+ <div className="univer-absolute univer-inset-0 univer-z-10 univer-size-0">
+ <div
+ className="univer-absolute"
+ style={{
+ left: relativePosition.positionX + DEFAULT_PADDING,
+ top: relativePosition.positionY + DEFAULT_PADDING,
+ }}
+ onMouseEnter={() => setMenuHovered(true)}
+ onMouseLeave={() => setMenuHovered(false)}
>
- <div
- className={`
- univer-flex univer-cursor-pointer univer-content-center univer-items-center univer-rounded
- univer-py-1
- `}
- onClick={() => {
- setMenuVisible(!menuVisible);
- }}
+ <DropdownMenu
+ align="start"
+ items={SheetPasteOptions.map((item) => ({
+ type: 'checkbox',
+ value: item.value,
+ label: localeService.t(item.label),
+ checked: pasteOptionsCache?.pasteType === PREDEFINED_HOOK_NAME[item.value as IPasteHookKeyType],
+ onSelect: () => handleClick(item.value),
+ }))}
+ open={visible}
+ onOpenChange={setVisible}
>
- <PasteSpecial
- className="univer-fill-primary-600 univer-text-gray-900"
- />
- {iconVisible && <MoreDownSingle />}
- </div>
- </Dropdown>
+ <div
+ className={clsx(`
+ univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
+ dark:hover:univer-bg-gray-800
+ hover:univer-bg-gray-100
+ `, borderClassName, {
+ 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
+ 'univer-bg-white dark:univer-bg-gray-900': !visible,
+ })}
+ >
+ <PasteSpecial
+ className={`
+ univer-fill-primary-600 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ />
+ {showMore && <MoreDownSingle className="dark:univer-text-white" />}
+ </div>
+ </DropdownMenu>
+ </div>
</div>
);
};
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
index 1fa6b3d879..b1735257e7 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
@@ -117,6 +117,7 @@ export function DefinedNameOverlay() {
className={`
univer-w-[50%] univer-flex-shrink-0 univer-overflow-hidden univer-text-ellipsis
univer-whitespace-nowrap univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
`}
title={definedName.name}
>
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
index ba4180fd55..1743f16fff 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
@@ -135,7 +135,8 @@ export const PermissionDetailUserPart = (props: IPermissionDetailUserPartProps)
<Avatar size={24} src={item.subject?.avatar} />
<span
className={`
- univer-ml-1.5 univer-w-[130px] univer-text-ellipsis univer-text-gray-900
+ univer-ml-1.5 univer-w-[130px] univer-truncate univer-text-gray-900
+ dark:univer-text-white
`}
>
{item.subject?.name}
diff --git a/packages/sheets-ui/src/views/permission/panel-list/index.tsx b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
index a889cf8a6b..a56407b301 100644
--- a/packages/sheets-ui/src/views/permission/panel-list/index.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
@@ -340,22 +340,38 @@ export const SheetPermissionPanelList = () => {
<span
className={`
univer-h-4 univer-flex-grow univer-text-xs univer-text-gray-900
+ dark:univer-text-white
`}
>
{localeService.t('permission.panel.created')}
</span>
- <span className="univer-h-4 univer-text-xs univer-text-gray-900">{editPermission ? `${localeService.t('permission.panel.iCanEdit')}` : `${localeService.t('permission.panel.iCanNotEdit')}`}</span>
+ <span
+ className={`
+ univer-h-4 univer-text-xs univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
+ {editPermission ? `${localeService.t('permission.panel.iCanEdit')}` : `${localeService.t('permission.panel.iCanNotEdit')}`}
+ </span>
</div>
<div className="univer-mt-2 univer-flex univer-items-center">
<span
className={`
univer-h-4 univer-flex-grow univer-text-xs univer-text-gray-900
+ dark:univer-text-white
`}
>
{localeService.t('permission.panel.viewPermission')}
</span>
- <span className="univer-h-4 univer-text-xs univer-text-gray-900">{viewPermission ? `${localeService.t('permission.panel.iCanView')}` : `${localeService.t('permission.panel.iCanNotView')}`}</span>
+ <span
+ className={`
+ univer-h-4 univer-text-xs univer-text-gray-900
+ dark:univer-text-white
+ `}
+ >
+ {viewPermission ? `${localeService.t('permission.panel.iCanView')}` : `${localeService.t('permission.panel.iCanNotView')}`}
+ </span>
</div>
{rule.description && (
<Tooltip title={rule.description}>
diff --git a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
index 1fc8cc9dd3..a7bc654a52 100644
--- a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
@@ -109,13 +109,21 @@ export function SlideImagePopupMenu(props: IImagePopupMenuProps) {
>
<div
className={clsx(`
- univer-flex univer-items-center univer-justify-center univer-rounded univer-bg-white univer-p-1
+ univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1
+ dark:hover:univer-bg-gray-800
+ hover:univer-bg-gray-100
`, borderClassName, {
- 'univer-bg-gray-100': visible,
+ 'univer-bg-gray-100 dark:univer-bg-gray-800': visible,
+ 'univer-bg-white dark:univer-bg-gray-900': !visible,
})}
>
- <Autofill className="univer-fill-primary-600 univer-text-gray-900" />
- {showMore && <MoreDownSingle />}
+ <Autofill
+ className={`
+ univer-fill-primary-600 univer-text-gray-900
+ dark:univer-text-white
+ `}
+ />
+ {showMore && <MoreDownSingle className="dark:univer-text-white" />}
</div>
</Dropdown>
</div>
diff --git a/packages/slides-ui/src/components/panels/ArrangePanel.tsx b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
index 5fe667279f..89de15ba2f 100644
--- a/packages/slides-ui/src/components/panels/ArrangePanel.tsx
+++ b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
@@ -90,12 +90,17 @@ export default function ArrangePanel(props: IProps) {
return (
<div className="univer-relative univer-w-full">
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
- <div className="univer-w-full univer-text-left univer-text-gray-600">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-w-full univer-text-left univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
<div>{localeService.t('image-panel.arrange.title')}</div>
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.forward); }}>
<span className="univer-flex univer-items-center univer-gap-1">
@@ -115,7 +120,7 @@ export default function ArrangePanel(props: IProps) {
</Button>
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.front); }}>
<span className="univer-flex univer-items-center univer-gap-1">
diff --git a/packages/slides-ui/src/components/panels/FillPanel.tsx b/packages/slides-ui/src/components/panels/FillPanel.tsx
index 14ddba7a33..7f003fe988 100644
--- a/packages/slides-ui/src/components/panels/FillPanel.tsx
+++ b/packages/slides-ui/src/components/panels/FillPanel.tsx
@@ -84,12 +84,17 @@ export default function ArrangePanel(props: IProps) {
className={clsx('univer-relative univer-bottom-0 univer-mt-5 univer-w-full', borderTopClassName)}
>
<div className="univer-relative univer-w-full">
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
- <div className="univer-w-full univer-text-left univer-text-gray-600">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-w-full univer-text-left univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
<div>{localeService.t('slide.panel.fill.title')}</div>
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-1/2">
<Dropdown
overlay={(
diff --git a/packages/slides-ui/src/components/panels/TransformPanel.tsx b/packages/slides-ui/src/components/panels/TransformPanel.tsx
index ed8eb8a5b3..4429307884 100644
--- a/packages/slides-ui/src/components/panels/TransformPanel.tsx
+++ b/packages/slides-ui/src/components/panels/TransformPanel.tsx
@@ -183,20 +183,25 @@ export default function TransformPanel(props: IProps) {
<div
className={clsx('univer-relative univer-bottom-0 univer-mt-5 univer-w-full', borderTopClassName)}
>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
- <div className="univer-w-full univer-text-left univer-text-gray-600">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
+ <div
+ className={`
+ univer-w-full univer-text-left univer-text-gray-600
+ dark:univer-text-gray-200
+ `}
+ >
<div>{localeService.t('image-panel.transform.title')}</div>
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-1/3">
<label>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
{localeService.t('image-panel.transform.width')}
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
<InputNumber
className="univer-w-11/12"
@@ -210,12 +215,12 @@ export default function TransformPanel(props: IProps) {
</div>
<div className="univer-w-1/3">
<label>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
{localeService.t('image-panel.transform.height')}
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
<InputNumber
className="univer-w-11/12"
@@ -228,15 +233,15 @@ export default function TransformPanel(props: IProps) {
</label>
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-1/3">
<label>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
{localeService.t('image-panel.transform.x')}
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
<InputNumber
className="univer-w-11/12"
@@ -251,12 +256,12 @@ export default function TransformPanel(props: IProps) {
</div>
<div className="univer-w-1/3">
<label>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
{localeService.t('image-panel.transform.y')}
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
<InputNumber
className="univer-w-11/12"
@@ -271,12 +276,12 @@ export default function TransformPanel(props: IProps) {
</div>
<div className="univer-w-1/3">
<label>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
{localeService.t('image-panel.transform.rotate')}
</div>
</div>
- <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start">
+ <div className="univer-relative univer-mt-2.5 univer-flex univer-h-full">
<div className="univer-w-full">
<InputNumber
className="univer-w-11/12"
diff --git a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
index 98c4ca0c42..64174288bc 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
@@ -159,8 +159,11 @@ export const ThreadCommentEditor = forwardRef<IThreadCommentEditorInstance, IThr
export const ThreadCommentSuggestion = ({ active, user }: { active: boolean; user: IUser }) => (
<div
className={clsx(
- 'univer-flex univer-items-center univer-text-sm univer-text-gray-900',
- { 'univer-bg-gray-50': active }
+ `
+ univer-flex univer-items-center univer-text-sm univer-text-gray-900
+ dark:univer-text-white
+ `,
+ { 'univer-bg-gray-50 dark:univer-bg-gray-900': active }
)}
>
<img
diff --git a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
index 8768610a4b..e3962a56eb 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
@@ -247,6 +247,7 @@ export const ThreadCommentPanel = (props: IThreadCommentPanelProps) => {
className={`
univer-flex univer-flex-1 univer-flex-col univer-items-center univer-justify-center
univer-text-sm univer-text-gray-600
+ dark:univer-text-gray-200
`}
>
{localeService.t('threadCommentUI.panel.empty')}
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
index 5aa5c47a63..39ee3719dc 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
@@ -191,7 +191,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
<time
className={`
univer-mb-1 univer-text-xs/normal univer-text-gray-600
- dark:univer-text-gray-400
+ dark:univer-text-gray-200
`}
>
{item.dT}
@@ -226,7 +226,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
: (
<div
className={`
- univer-text-smmal univer-text-gray-900
+ univer-text-sm univer-text-gray-900
dark:univer-text-white
`}
>
@@ -404,9 +404,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
/>
<Tooltip showIfEllipsis title={title}>
<div
- className={`
- univer-flex-1 univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap
- `}
+ className="univer-flex-1 univer-truncate"
>
{title}
</div>
diff --git a/packages/ui/src/components/progress-bar/ProgressBar.tsx b/packages/ui/src/components/progress-bar/ProgressBar.tsx
index e82f01d173..ed1c3482a5 100644
--- a/packages/ui/src/components/progress-bar/ProgressBar.tsx
+++ b/packages/ui/src/components/progress-bar/ProgressBar.tsx
@@ -109,7 +109,12 @@ export function ProgressBar(props: IProgressBarProps) {
type="button"
onClick={onTerminate}
>
- <CloseSingle className="univer-size-3.5 univer-text-gray-900" />
+ <CloseSingle
+ className={`
+ univer-size-3.5
+ dark:univer-text-white
+ `}
+ />
</button>
</div>
);
diff --git a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
index b3e09b212d..b215ff2386 100644
--- a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
+++ b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
@@ -90,9 +90,8 @@ export function ToolbarButton(props: IBaseToolbarButtonProps) {
univer-flex univer-h-6 univer-min-w-6 univer-cursor-pointer univer-items-center univer-justify-center
univer-rounded univer-border-none univer-bg-transparent univer-p-0 univer-text-base univer-text-gray-900
univer-outline-none univer-transition-colors univer-animate-in univer-fade-in
- dark:univer-text-white dark:hover:univer-bg-gray-700
- disabled:univer-cursor-not-allowed disabled:univer-text-gray-200 disabled:univer-text-gray-800/20
- disabled:hover:univer-bg-transparent
+ dark:univer-text-white dark:hover:univer-bg-gray-700 dark:disabled:univer-text-gray-600
+ disabled:univer-cursor-not-allowed disabled:univer-text-gray-300 disabled:hover:univer-bg-transparent
hover:univer-bg-gray-100
`, {
'univer-p-4': noIcon,
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 2372ad6cb9..333ceee055 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -112,7 +112,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
hover:univer-bg-gray-100
`, {
'univer-text-gray-900 dark:univer-text-white': !disabled,
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-800/20': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
})}
data-disabled={disabled}
>
@@ -153,7 +153,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
dark:hover:univer-bg-gray-600
hover:univer-bg-gray-200
`, {
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-800/20': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
'univer-bg-gray-200 dark:univer-bg-gray-500': activated,
'univer-bg-gray-100': activated && disabled,
})}
@@ -183,7 +183,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
hover:univer-bg-gray-100
`, {
'univer-text-gray-900 dark:univer-text-white': !disabled,
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-800/20': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
'univer-bg-gray-200': activated,
'univer-bg-gray-100': activated && disabled,
})}
@@ -197,7 +197,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
/>
<div
className={clsx('univer-flex univer-h-full univer-items-center', {
- 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-800/20': disabled,
+ 'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
})}
>
<MoreDownSingle />