);
diff --git a/src/features/AuthByUsername/ui/LoginModal/LoginModal.tsx b/src/features/AuthByUsername/ui/LoginModal/LoginModal.tsx
index 3071ee8..c250f4f 100644
--- a/src/features/AuthByUsername/ui/LoginModal/LoginModal.tsx
+++ b/src/features/AuthByUsername/ui/LoginModal/LoginModal.tsx
@@ -1,7 +1,7 @@
import { Suspense } from 'react';
+import { Modal } from '@/shared/ui/redesigned/Modal';
import { LoginFormAsync } from '../LoginForm/LoginForm.async';
import { PageLoader } from '../../../PageLoader';
-import { Modal } from '@/shared/ui/deprecated/Modal';
interface LoginModalProps {
className?: string;
diff --git a/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx b/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx
index 8d81a77..123c858 100644
--- a/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx
+++ b/src/features/articlePageGreeting/ui/ArticlePageGreeting/ArticlePageGreeting.tsx
@@ -1,11 +1,11 @@
import { useTranslation } from 'react-i18next';
import { memo, useEffect, useState } from 'react';
import { isMobile } from 'react-device-detect';
+import { Drawer } from '@/shared/ui/redesigned/Drawer';
+import { Modal } from '@/shared/ui/redesigned/Modal';
import { Text } from '@/shared/ui/deprecated/Text';
import { saveJsonSettings, useJsonSettings } from '@/entities/User';
import { useAppDispatch } from '@/shared/lib/hook/useAppDispatch/useAppDispatch';
-import { Drawer } from '@/shared/ui/deprecated/Drawer';
-import { Modal } from '@/shared/ui/deprecated/Modal';
export const ArticlePageGreeting = memo(() => {
const { t } = useTranslation();
diff --git a/src/features/notificationButton/ui/NotificationButton/NotificationButton.tsx b/src/features/notificationButton/ui/NotificationButton/NotificationButton.tsx
index 0b4d7db..b3bd187 100644
--- a/src/features/notificationButton/ui/NotificationButton/NotificationButton.tsx
+++ b/src/features/notificationButton/ui/NotificationButton/NotificationButton.tsx
@@ -1,10 +1,10 @@
import React, { memo, useCallback, useState } from 'react';
import { BrowserView, MobileView } from 'react-device-detect';
+import { Drawer } from '@/shared/ui/redesigned/Drawer';
import NotificationIcon from '@/shared/assets/icons/notification.svg';
import { NotificationList } from '../../../../entities/Notification';
import cls from './NotificationButton.module.scss';
-import { Drawer as DrawerDeprecated } from '@/shared/ui/deprecated/Drawer';
import { Icon } from '@/shared/ui/redesigned/Icon';
import { Popover } from '@/shared/ui/redesigned/Popups';
@@ -32,9 +32,9 @@ export const NotificationButton = memo(() => {
{trigger}
-
+
-
+
);
diff --git a/src/shared/lib/features/lib/setGetFeatures.ts b/src/shared/lib/features/lib/setGetFeatures.ts
index ddc3adf..9d96321 100644
--- a/src/shared/lib/features/lib/setGetFeatures.ts
+++ b/src/shared/lib/features/lib/setGetFeatures.ts
@@ -10,7 +10,7 @@ export function setFeatureFlags(newFeatureFlags?: FeatureFlags) {
}
export function getFeatureFlag(flag: keyof FeatureFlags) {
- return featureFlags[flag];
+ return featureFlags[flag] ?? true;
}
export function getAllFeatureFlags() {
diff --git a/src/shared/ui/deprecated/Drawer/Drawer.module.scss b/src/shared/ui/redesigned/Drawer/Drawer.module.scss
similarity index 92%
rename from src/shared/ui/deprecated/Drawer/Drawer.module.scss
rename to src/shared/ui/redesigned/Drawer/Drawer.module.scss
index 330dafb..746a53a 100644
--- a/src/shared/ui/deprecated/Drawer/Drawer.module.scss
+++ b/src/shared/ui/redesigned/Drawer/Drawer.module.scss
@@ -26,7 +26,7 @@
height: calc(100vh + 100px);
width: 96vw;
border-radius: 12px 12px 0;
- background: var(--bg-color);
+ background: var(--light-bg-redesigned);
touch-action: none;
padding: 15px;
}
diff --git a/src/shared/ui/deprecated/Drawer/Drawer.tsx b/src/shared/ui/redesigned/Drawer/Drawer.tsx
similarity index 92%
rename from src/shared/ui/deprecated/Drawer/Drawer.tsx
rename to src/shared/ui/redesigned/Drawer/Drawer.tsx
index 7ea3832..5ea8c0e 100644
--- a/src/shared/ui/deprecated/Drawer/Drawer.tsx
+++ b/src/shared/ui/redesigned/Drawer/Drawer.tsx
@@ -4,9 +4,9 @@ import {
AnimationProvider,
useAnimationLibs,
} from '@/shared/lib/components/AnimationProvider';
-import { Overlay } from '../../redesigned/Overlay/Overlay';
+import { Overlay } from '../Overlay/Overlay';
import cls from './Drawer.module.scss';
-import { Portal } from '../../redesigned/Portal/Portal';
+import { Portal } from '../Portal/Portal';
import { useTheme } from '@/shared/lib/hook/useTheme/useTheme';
interface DrawerProps {
@@ -79,7 +79,7 @@ export const DrawerContent = memo((props: DrawerProps) => {
const display = y.to((py) => (py < height ? 'block' : 'none'));
return (
-
+
{
);
});
-/**
- * Устарел, используем новые компоненты из папки redesigned
- * @deprecated
- */
-
const DrawerAsync = (props: DrawerProps) => {
const { isLoaded } = useAnimationLibs();
diff --git a/src/shared/ui/deprecated/Drawer/index.ts b/src/shared/ui/redesigned/Drawer/index.ts
similarity index 100%
rename from src/shared/ui/deprecated/Drawer/index.ts
rename to src/shared/ui/redesigned/Drawer/index.ts
diff --git a/src/shared/ui/deprecated/Modal/Modal.module.scss b/src/shared/ui/redesigned/Modal/Modal.module.scss
similarity index 93%
rename from src/shared/ui/deprecated/Modal/Modal.module.scss
rename to src/shared/ui/redesigned/Modal/Modal.module.scss
index e87fd0c..2829cb2 100644
--- a/src/shared/ui/deprecated/Modal/Modal.module.scss
+++ b/src/shared/ui/redesigned/Modal/Modal.module.scss
@@ -15,7 +15,7 @@
.content {
padding: 20px;
border-radius: 12px;
- background: var(--bg-color);
+ background: var(--light-bg-redesigned);
transition: 0.3s transform;
transform: scale(0.5);
max-width: 60%;
diff --git a/src/shared/ui/deprecated/Modal/Modal.stories.tsx b/src/shared/ui/redesigned/Modal/Modal.stories.tsx
similarity index 97%
rename from src/shared/ui/deprecated/Modal/Modal.stories.tsx
rename to src/shared/ui/redesigned/Modal/Modal.stories.tsx
index 4dbb39e..794bdf9 100644
--- a/src/shared/ui/deprecated/Modal/Modal.stories.tsx
+++ b/src/shared/ui/redesigned/Modal/Modal.stories.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { ThemeDecorator } from '@/shared/config/storybook/ThemeDecorator/ThemeDecorator';
-import { Modal } from '../Modal/Modal';
+import { Modal } from './Modal';
import { Theme } from '@/shared/const/theme';
export default {
diff --git a/src/shared/ui/deprecated/Modal/Modal.tsx b/src/shared/ui/redesigned/Modal/Modal.tsx
similarity index 80%
rename from src/shared/ui/deprecated/Modal/Modal.tsx
rename to src/shared/ui/redesigned/Modal/Modal.tsx
index ab7b991..1ed922e 100644
--- a/src/shared/ui/deprecated/Modal/Modal.tsx
+++ b/src/shared/ui/redesigned/Modal/Modal.tsx
@@ -1,8 +1,8 @@
import React, { ReactNode } from 'react';
import { classNames, Mods } from '@/shared/lib/classNames/classNames';
import { useModal } from '@/shared/lib/hook/useModal/useModal';
-import { Overlay } from '../../redesigned/Overlay/Overlay';
-import { Portal } from '../../redesigned/Portal/Portal';
+import { Overlay } from '../Overlay/Overlay';
+import { Portal } from '../Portal/Portal';
import cls from './Modal.module.scss';
import { useTheme } from '@/shared/lib/hook/useTheme/useTheme';
@@ -35,12 +35,9 @@ export const Modal = (props: ModalProps) => {
if (lazy && !isMounted) {
return null;
}
- /**
- * Устарел, используем новые компоненты из папки redesigned
- * @deprecated
- */
+
return (
-
+
{children}
diff --git a/src/shared/ui/deprecated/Modal/index.ts b/src/shared/ui/redesigned/Modal/index.ts
similarity index 100%
rename from src/shared/ui/deprecated/Modal/index.ts
rename to src/shared/ui/redesigned/Modal/index.ts