From 9428ac4db3de8fd0cf00bbb17b95ba6d89508c7c Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Mon, 8 Apr 2024 13:00:08 +0800 Subject: [PATCH] fix(comp:tooltip): tooltip content should wrap on line break --- packages/components/tooltip/docs/Theme.zh.md | 1 + packages/components/tooltip/style/index.less | 1 + packages/components/tooltip/theme/dark.css | 1 + packages/components/tooltip/theme/default.css | 1 + packages/components/tooltip/theme/default.ts | 2 ++ packages/components/tooltip/theme/tokens.ts | 2 ++ 6 files changed, 8 insertions(+) diff --git a/packages/components/tooltip/docs/Theme.zh.md b/packages/components/tooltip/docs/Theme.zh.md index eaa556717..2e5ab3ed5 100644 --- a/packages/components/tooltip/docs/Theme.zh.md +++ b/packages/components/tooltip/docs/Theme.zh.md @@ -4,3 +4,4 @@ | `fontSize` | | `number` | `12` | `12` | | `maxWidth` | | `number` | `400` | `400` | | `minWidth` | | `number` | `32` | `32` | +| `whiteSpace` | | `string` | `pre-wrap` | `pre-wrap` | diff --git a/packages/components/tooltip/style/index.less b/packages/components/tooltip/style/index.less index 05276d3e9..e4b33c85b 100644 --- a/packages/components/tooltip/style/index.less +++ b/packages/components/tooltip/style/index.less @@ -12,6 +12,7 @@ &-wrapper { position: relative; word-wrap: break-word; + white-space: var(--ix-tooltip-white-space); min-width: var(--ix-tooltip-min-width); max-width: var(--ix-tooltip-max-width); padding: var(--ix-padding-size-xs) var(--ix-padding-size-sm); diff --git a/packages/components/tooltip/theme/dark.css b/packages/components/tooltip/theme/dark.css index eff5b2eb0..017f9a079 100644 --- a/packages/components/tooltip/theme/dark.css +++ b/packages/components/tooltip/theme/dark.css @@ -4,4 +4,5 @@ --ix-tooltip-color: #808999; --ix-tooltip-min-width: 32px; --ix-tooltip-max-width: 400px; + --ix-tooltip-white-space: pre-wrap; } diff --git a/packages/components/tooltip/theme/default.css b/packages/components/tooltip/theme/default.css index ba198cc49..bc97c0df9 100644 --- a/packages/components/tooltip/theme/default.css +++ b/packages/components/tooltip/theme/default.css @@ -4,4 +4,5 @@ --ix-tooltip-color: #6f7785; --ix-tooltip-min-width: 32px; --ix-tooltip-max-width: 400px; + --ix-tooltip-white-space: pre-wrap; } diff --git a/packages/components/tooltip/theme/default.ts b/packages/components/tooltip/theme/default.ts index b764aa0c6..a98d04891 100644 --- a/packages/components/tooltip/theme/default.ts +++ b/packages/components/tooltip/theme/default.ts @@ -15,5 +15,7 @@ export function getDefaultThemeTokens(tokens: GlobalThemeTokens): CertainThemeTo minWidth: 32, maxWidth: 400, + + whiteSpace: 'pre-wrap', } } diff --git a/packages/components/tooltip/theme/tokens.ts b/packages/components/tooltip/theme/tokens.ts index fdc4f2aeb..0c3805a98 100644 --- a/packages/components/tooltip/theme/tokens.ts +++ b/packages/components/tooltip/theme/tokens.ts @@ -11,4 +11,6 @@ export interface TooltipThemeTokens { minWidth: number maxWidth: number + + whiteSpace: string }