Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Bubble support more variant #140

Merged
merged 7 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
381 changes: 249 additions & 132 deletions components/bubble/__tests__/__snapshots__/demo-extend.test.ts.snap

Large diffs are not rendered by default.

381 changes: 249 additions & 132 deletions components/bubble/__tests__/__snapshots__/demo.test.ts.snap

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions components/bubble/demo/variant.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { CoffeeOutlined, FireOutlined, SmileOutlined, UserOutlined } from '@ant-design/icons';
import { Bubble, Prompts, PromptsProps } from '@ant-design/x';
import { Flex } from 'antd';
import React from 'react';

const items: PromptsProps['items'] = [
Expand All @@ -21,11 +22,16 @@ const items: PromptsProps['items'] = [
];

const App = () => (
<Bubble
variant="borderless"
avatar={{ icon: <UserOutlined /> }}
content={<Prompts items={items} vertical />}
/>
<Flex vertical gap="middle">
<Bubble variant="filled" avatar={{ icon: <UserOutlined /> }} content="variant: filled" />
<Bubble variant="outlined" avatar={{ icon: <UserOutlined /> }} content="variant: outlined" />
<Bubble variant="shadow" avatar={{ icon: <UserOutlined /> }} content="variant: shadow" />
<Bubble
variant="borderless"
avatar={{ icon: <UserOutlined /> }}
content={<Prompts title="variant: borderless to customize" items={items} vertical />}
/>
</Flex>
);

export default App;
2 changes: 1 addition & 1 deletion components/bubble/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ export interface BubbleProps extends Omit<React.HTMLAttributes<HTMLDivElement>,
typing?: boolean | TypingOption;
content?: React.ReactNode | object;
messageRender?: (content: string) => React.ReactNode;
variant?: 'filled' | 'borderless';
variant?: 'filled' | 'borderless' | 'outlined' | 'shadow';
onTypingComplete?: VoidFunction;
}
18 changes: 7 additions & 11 deletions components/bubble/style/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { mergeToken } from '@ant-design/cssinjs-utils';
import type { FullToken, GenerateStyle, GetDefaultToken } from '../../theme/cssinjs-utils';
import { genStyleHooks } from '../../theme/genStyleUtils';
import genBubbleListStyle from './list';
import genVariantStyle from './variant';

const loadingMove = new Keyframes('loadingMove', {
'0%': {
Expand Down Expand Up @@ -42,8 +43,7 @@ export interface BubbleToken extends FullToken<'Bubble'> {
}

const genBubbleStyle: GenerateStyle<BubbleToken> = (token) => {
const { componentCls, fontSize, lineHeight, paddingSM, padding, paddingXS, colorText, calc } =
token;
const { componentCls, fontSize, lineHeight, paddingSM, paddingXS, colorText, calc } = token;
return {
[componentCls]: {
display: 'flex',
Expand Down Expand Up @@ -84,14 +84,6 @@ const genBubbleStyle: GenerateStyle<BubbleToken> = (token) => {

wordBreak: 'break-word',

// Variant
'&-filled': {
padding: `${unit(paddingSM)} ${unit(padding)}`,
backgroundColor: token.colorInfoBg,
borderRadius: token.borderRadiusLG,
boxShadow: token.boxShadowTertiary,
},

[`& ${componentCls}-dot`]: {
position: 'relative',
height: '100%',
Expand Down Expand Up @@ -133,7 +125,11 @@ export default genStyleHooks<'Bubble'>(
const bubbleToken = mergeToken<BubbleToken>(token, {
bubbleContentMaxWidth: `calc(100% - ${unit(calc(paddingXS).add(32).equal())})`,
});
return [genBubbleStyle(bubbleToken), genBubbleListStyle(bubbleToken)];
return [
genBubbleStyle(bubbleToken),
genBubbleListStyle(bubbleToken),
genVariantStyle(bubbleToken),
];
},
prepareComponentToken,
);
35 changes: 35 additions & 0 deletions components/bubble/style/variant.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { unit } from '@ant-design/cssinjs';
import type { BubbleToken } from '.';
import type { GenerateStyle } from '../../theme/cssinjs-utils';

const genVariantStyle: GenerateStyle<BubbleToken> = (token) => {
const { componentCls, paddingSM, padding } = token;
return {
[componentCls]: {
[`${componentCls}-content`]: {
// Shared: filled, outlined, shadow
'&-filled,&-outlined,&-shadow': {
padding: `${unit(paddingSM)} ${unit(padding)}`,
borderRadius: token.borderRadiusLG,
},

// Filled:
'&-filled': {
backgroundColor: token.colorFillContent,
},

// Outlined:
'&-outlined': {
border: `1px solid ${token.colorBorderSecondary}`,
},

// Shadow:
'&-shadow': {
boxShadow: token.boxShadowTertiary,
},
},
},
};
};

export default genVariantStyle;
5 changes: 4 additions & 1 deletion components/prompts/style/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ const genPromptsStyle: GenerateStyle<PromptsToken> = (token) => {
[`&${componentCls}-rtl`]: {
direction: 'rtl',
},
[`& ${componentCls}-title`]: {},
[`& ${componentCls}-title`]: {
marginBlockStart: 0,
},

[`& ${componentCls}-list`]: {
display: 'flex',
gap: token.paddingSM,
Expand Down
Loading