Skip to content

Commit e7b0fc6

Browse files
committed
Merge branch 'feat/new-prop-variant-to-snackbar' into break/2.0.0-venus-version
2 parents 584b823 + 6957ddd commit e7b0fc6

8 files changed

Lines changed: 533 additions & 798 deletions

File tree

packages/components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"react-dom": "^18.3.0 || ^19.0.0"
164164
},
165165
"dependencies": {
166-
"@floating-ui/dom": "^1.7.5"
166+
"@floating-ui/dom": "^1.7.6"
167167
},
168168
"devDependencies": {
169169
"@kubit-ui-web/design-system": "workspace:*",
@@ -184,7 +184,7 @@
184184
"eslint": "^10.0.2",
185185
"eslint-config-kubit": "2.0.2",
186186
"glob": "^13.0.6",
187-
"html-validate": "^10.9.0",
187+
"html-validate": "^10.11.0",
188188
"jsdom": "^28.1.0",
189189
"prettier": "^3.8.1",
190190
"react": "^19.2.4",

packages/components/src/components/snackbar/snackbar.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,20 @@ import { SnackbarStandAlone } from './snackbarStandAlone';
3131
* ```
3232
*/
3333
const SnackbarComponent = (
34-
{ additionalClasses, closeTimeout, open = false, ...props }: ISnackbar,
34+
{
35+
additionalClasses,
36+
additionalVariantClasses,
37+
closeTimeout,
38+
open = false,
39+
variant,
40+
...props
41+
}: ISnackbar,
3542
ref: ForwardedRef<HTMLDivElement> | undefined | null,
3643
): JSX.Element => {
37-
const cssClasses = useClassName({
44+
const cssVariantClasses = useClassName({
3845
additionalClassNames: additionalClasses,
3946
component: 'SNACKBAR',
47+
variant: variant,
4048
});
4149

4250
const innerRef = useRef<HTMLDivElement>(null);
@@ -53,7 +61,7 @@ const SnackbarComponent = (
5361
<SnackbarStandAlone
5462
{...props}
5563
ref={innerRef}
56-
cssClasses={cssClasses}
64+
cssVariantClasses={cssVariantClasses}
5765
open={open}
5866
onBlur={handleBlur}
5967
onFocus={handleFocus}

packages/components/src/components/snackbar/snackbarStandAlone.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { Popover } from '../popover/popover';
2525
const SnackbarStandAloneComponent = (
2626
{
2727
children,
28-
cssClasses,
28+
cssVariantClasses,
2929
onClose,
3030
open,
3131
popover,
@@ -44,7 +44,7 @@ const SnackbarStandAloneComponent = (
4444
>
4545
<div
4646
ref={ref}
47-
className={classNames(cssClasses?.container)}
47+
className={classNames(cssVariantClasses?.container)}
4848
data-testid="snackbar"
4949
{...props}
5050
>

packages/components/src/components/snackbar/types/snackbar.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export type SnackbarV2CssClasses = ComponentSelected<
1414
>;
1515

1616
export interface ISnackbarStandAlone extends DataAttributes, AriaAttributes {
17-
cssClasses?: SnackbarV2CssClasses;
17+
cssVariantClasses?: SnackbarV2CssClasses;
1818
popover?: SnackbarPopover;
1919
open?: boolean;
2020
children?: React.ReactNode;
@@ -25,10 +25,16 @@ export interface ISnackbarStandAlone extends DataAttributes, AriaAttributes {
2525
onBlur?: React.FocusEventHandler<HTMLDivElement>;
2626
}
2727

28-
export interface ISnackbar extends Omit<
28+
export interface ISnackbar<
29+
Variant = undefined extends string | unknown
30+
? string | undefined
31+
: string | unknown,
32+
> extends Omit<
2933
ISnackbarStandAlone,
30-
'onMouseEnter' | 'onMouseLeave' | 'onFocus' | 'onBlur'
34+
'onMouseEnter' | 'onMouseLeave' | 'onFocus' | 'onBlur' | 'cssVariantClasses'
3135
> {
36+
variant?: Variant;
37+
additionalVariantClasses?: Partial<SnackbarV2CssClasses>;
3238
additionalClasses?: SnackbarV2CssClasses;
3339
closeTimeout?: number;
3440
}

packages/components/src/components/snackbar/types/snackbarTheme.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@ export interface SnackbarStyleProps extends CssLibPropsType {
44
_container?: CssLibPropsType;
55
}
66

7-
export type SnackBarStyles = SnackbarStyleProps;
7+
export type SnackbarVariantStyles<Variant extends string> = {
8+
[key in Variant]: SnackbarStyleProps;
9+
};
10+
11+
export type SnackBarStyles<Variant extends string = string> =
12+
SnackbarStyleProps & SnackbarVariantStyles<Variant>;

packages/design-system/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"url": "https://github.com/kubit-ui/kubit-react-components/graphs/contributors"
3636
}
3737
],
38-
"packageManager": "pnpm@10.30.2",
38+
"packageManager": "pnpm@10.30.3",
3939
"keywords": [
4040
"design-system",
4141
"css-in-js",
@@ -132,13 +132,13 @@
132132
},
133133
"devDependencies": {
134134
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
135-
"@types/node": "^25.3.1",
135+
"@types/node": "^25.3.3",
136136
"bernova": "1.6.0",
137137
"cssnano": "^7.1.2",
138138
"eslint": "^10.0.2",
139139
"eslint-config-kubit": "2.0.2",
140140
"glob": "^13.0.6",
141-
"postcss": "^8.5.6",
141+
"postcss": "^8.5.8",
142142
"prettier": "^3.8.1",
143143
"typescript": "^5.9.3",
144144
"typescript-eslint": "^8.56.1",

packages/storybook/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
"devDependencies": {
2929
"@figma/code-connect": "^1.4.1",
3030
"@rsbuild/core": "^1.7.3",
31-
"@storybook/addon-a11y": "^10.2.13",
32-
"@storybook/addon-docs": "^10.2.13",
33-
"@storybook/addon-links": "^10.2.13",
34-
"@storybook/react": "^10.2.13",
31+
"@storybook/addon-a11y": "^10.2.15",
32+
"@storybook/addon-docs": "^10.2.15",
33+
"@storybook/addon-links": "^10.2.15",
34+
"@storybook/react": "^10.2.15",
3535
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
36-
"@types/node": "^25.3.2",
36+
"@types/node": "^25.3.3",
3737
"@types/react": "^19.2.14",
3838
"@types/react-dom": "^19.2.3",
3939
"eslint": "^10.0.2",
4040
"eslint-config-kubit": "2.0.2",
41-
"eslint-plugin-storybook": "10.2.13",
42-
"html-validate": "^10.9.0",
41+
"eslint-plugin-storybook": "10.2.15",
42+
"html-validate": "^10.11.0",
4343
"prettier": "^3.8.1",
4444
"prismjs": "^1.30.0",
45-
"storybook": "^10.2.13",
45+
"storybook": "^10.2.15",
4646
"storybook-addon-deep-controls": "^0.10.0",
47-
"storybook-addon-pseudo-states": "^10.2.13",
47+
"storybook-addon-pseudo-states": "^10.2.15",
4848
"storybook-addon-rslib": "^3.3.0",
4949
"storybook-react-rsbuild": "^3.3.0",
5050
"typescript": "^5.9.3",

0 commit comments

Comments
 (0)