([
@@ -493,13 +461,6 @@ describe('Alert', () => {
descriptionClassNames: [captionStyles.level1],
platform: Platform.IOS,
},
- {
- title: 'Header',
- titleClassNames: [titleStyles.level2, typographyStyles.weight2],
- description: 'Text',
- descriptionClassNames: [footnoteStyles.host],
- platform: Platform.VKCOM,
- },
{
title: 'Header',
titleClassNames: [titleStyles.level2, typographyStyles.weight2],
diff --git a/packages/vkui/src/components/Alert/AlertAction.tsx b/packages/vkui/src/components/Alert/AlertAction.tsx
index 87e2ebd5e4a..85f621f73c8 100644
--- a/packages/vkui/src/components/Alert/AlertAction.tsx
+++ b/packages/vkui/src/components/Alert/AlertAction.tsx
@@ -4,7 +4,7 @@ import type * as React from 'react';
import { classNames } from '@vkontakte/vkjs';
import { usePlatform } from '../../hooks/usePlatform';
import type { AnchorHTMLAttributesOnly } from '../../types';
-import { Button, type ButtonProps } from '../Button/Button';
+import { Button } from '../Button/Button';
import { Tappable } from '../Tappable/Tappable';
import type { AlertActionInterface } from './Alert';
import styles from './Alert.module.css';
@@ -37,22 +37,7 @@ const AlertActionIos = ({ mode, ...restProps }: AlertActionProps) => {
};
const AlertActionBase = ({ mode, ...restProps }: AlertActionProps) => {
- const platform = usePlatform();
-
- let buttonMode: ButtonProps['mode'] = 'tertiary';
-
- if (platform === 'vkcom') {
- buttonMode = mode === 'cancel' ? 'secondary' : 'primary';
- }
-
- return (
-
- );
+ return ;
};
export const AlertAction = (props: AlertActionProps): React.ReactNode => {
diff --git a/packages/vkui/src/components/Alert/AlertActions.tsx b/packages/vkui/src/components/Alert/AlertActions.tsx
index 55d4816e829..d8ea5c9502c 100644
--- a/packages/vkui/src/components/Alert/AlertActions.tsx
+++ b/packages/vkui/src/components/Alert/AlertActions.tsx
@@ -1,8 +1,5 @@
-'use client';
-
import * as React from 'react';
import { classNames } from '@vkontakte/vkjs';
-import { usePlatform } from '../../hooks/usePlatform';
import type { AlertActionInterface, AlertProps } from './Alert';
import { AlertAction } from './AlertAction';
import styles from './Alert.module.css';
@@ -33,17 +30,12 @@ export const AlertActions = ({
actionsAlign,
actionsLayout,
}: AlertActionsProps): React.ReactNode => {
- const platform = usePlatform();
-
- const direction: AlertProps['actionsLayout'] =
- platform === 'vkcom' ? 'horizontal' : actionsLayout;
-
return (
{actions.map((action, i) => {
diff --git a/packages/vkui/src/components/Alert/AlertBase.tsx b/packages/vkui/src/components/Alert/AlertBase.tsx
index 088780e2809..96dcb022d5d 100644
--- a/packages/vkui/src/components/Alert/AlertBase.tsx
+++ b/packages/vkui/src/components/Alert/AlertBase.tsx
@@ -129,7 +129,6 @@ export const AlertBase = ({
className={classNames(
styles.host,
platform === 'ios' && styles.ios,
- platform === 'vkcom' && styles.vkcom,
closing ? styles.closing : styles.opening,
isDesktop && styles.desktop,
)}
diff --git a/packages/vkui/src/components/Alert/AlertTypography.tsx b/packages/vkui/src/components/Alert/AlertTypography.tsx
index c52dd0ef8a4..93168e57380 100644
--- a/packages/vkui/src/components/Alert/AlertTypography.tsx
+++ b/packages/vkui/src/components/Alert/AlertTypography.tsx
@@ -5,7 +5,6 @@ import type * as React from 'react';
import { usePlatform } from '../../hooks/usePlatform';
import type { HasChildren } from '../../types';
import { Caption } from '../Typography/Caption/Caption';
-import { Footnote } from '../Typography/Footnote/Footnote';
import { Text } from '../Typography/Text/Text';
import { Title } from '../Typography/Title/Title';
import styles from './Alert.module.css';
@@ -17,22 +16,18 @@ interface AlertTypography extends HasChildren {
export const AlertTitle = (props: AlertTypography): React.ReactNode => {
const platform = usePlatform();
- switch (platform) {
- case 'ios':
- return
;
- default:
- return ;
+ if (platform === 'ios') {
+ return ;
}
+
+ return ;
};
export const AlertDescription = (props: AlertTypography): React.ReactNode => {
const platform = usePlatform();
- switch (platform) {
- case 'vkcom':
- return ;
- case 'ios':
- return ;
- default:
- return ;
+ if (platform === 'ios') {
+ return ;
}
+
+ return ;
};
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-dark-1-snap.png
index e1a03e3a96e..d13f04d5fc8 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-dark-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-dark-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bcadb2ddc7fba14240935a85aa334cb1d7f4c51a80fc8561f497858849b5d7a6
-size 29613
+oid sha256:dd1c1fafa2df194e7a81542c2bd14155a2f973ca67ffb6675dc55dcdc7414c41
+size 26231
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-light-1-snap.png
index e4f22f527d1..c3ed470b7b3 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-chromium-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:37d04afc1ad5fed43a54b6cdb06c5f1b461e0a9e862a59dab1d0c0f3d9cb5f25
-size 37837
+oid sha256:b11d880a3535e911670957bb786d7f0a9e7aa53277a425c0a2a64919257225dc
+size 28286
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-dark-1-snap.png
index ae5743a2732..6d093dc3d78 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-dark-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-dark-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5cb63c0b4177e3315461fbae60d565084498725d9e0229eee9854550edf78cdf
-size 47187
+oid sha256:633e25af8dc654cf7f1bc334475ac4902b5d9b71a9d248ae74ebc6e7922d340a
+size 35175
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-light-1-snap.png
index 684661613a2..c48994d7c65 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-firefox-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bc3edf670d6fc520d6afd6cae7ea1a2026131dc4fb70372ce842c0a459253277
-size 65127
+oid sha256:43d425da34ca36e1323d1d7c382fa468abcbcbe859a15feb45e202659d9e2782
+size 39768
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-dark-1-snap.png
index aad228d6b6d..c9efb74d63f 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-dark-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-dark-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:995020cccd647ab731699e850334e918138e7e59beec9f30422892eb12861fc5
-size 39650
+oid sha256:7e1936f8b591c3a5a2b006b45ad74fcff283039afd9726bcb2c5736a87a45eab
+size 36798
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-light-1-snap.png
index e94c187cac8..9c9f77dd640 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-desktop-vkcom-webkit-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c43eb9027e7881972f687deeb13fdc6f3aa6a64a13deae13e19af054e63629c8
-size 49703
+oid sha256:0b0a2d3072c76ec9929d5e28554e172a0b137227685b04fd628d209f6b00f43c
+size 39747
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-android-chromium-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-android-chromium-light-1-snap.png
index ecd590474bb..5171177572c 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-android-chromium-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-android-chromium-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cb6d4d3b14e398296fb47511c770da6d7f01a91661eb40f9569fb97fe689812d
-size 21449
+oid sha256:cbc620b5ab0498e904fdabe0325065c4b2aa32dcac277a629807d44d41b934d9
+size 20776
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-chromium-light-1-snap.png
index eb4f48db092..a3a29b299c6 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-chromium-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-chromium-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:883565b9669a9eef68f702689a1a731ca89f9ffa7b04e55a34050fd33c1340c8
-size 26816
+oid sha256:3727171d1e33f8a83d13d0d45da40e9ad5faa888fd46cdcd02695137bbbc6d58
+size 23288
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-firefox-light-1-snap.png
index f2518f8941d..6e815a26e68 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-firefox-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-firefox-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6b55f3f58a97a1b1e13e9ef524c6f4fd65ad2220059590b0d049441b9824ab21
-size 49697
+oid sha256:1bdae4524f23993524054d25b5ca335c3471e240e67fb14bea94b23954802606
+size 35834
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-webkit-light-1-snap.png
index abd9c3ca3c9..95888d2985a 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-webkit-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-long-word-vkcom-webkit-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:390ab51060b456a52247e2f29e9d9c52c4e3a1d0cd0af68fc8a6751d44198d0f
-size 42840
+oid sha256:cb74dc889b2b02d55a8505d3d1335df80fb5f4eca5fafed15afab95e400cae3b
+size 39114
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-dark-1-snap.png
index ef9c19b6bd6..8c28028371b 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-dark-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-dark-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a91d4dd073201f7a0758d28cb14d13e3a70c7430d105c932b1ce0189c17292df
-size 56078
+oid sha256:e8e59c33afa422e3b50ca59deb777a1840a09b5a775bd9a10e519f74c28240ee
+size 54756
diff --git a/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-light-1-snap.png b/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-light-1-snap.png
index 5f6bee87b44..2f10d178ab9 100644
--- a/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-light-1-snap.png
+++ b/packages/vkui/src/components/Alert/__image_snapshots__/alert-mobile-android-chromium-light-1-snap.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:273b503a6196817c5ba940b81f2fecc7eb673571244593a818f7f8f1c46964b2
-size 59058
+oid sha256:28726d02eb019756d8193c0156806e4a775f8b96ff4123fbd5e4a7a9aa25575c
+size 57665