From 920c6de8de9b753bcb140ad64ca23bd2325b1804 Mon Sep 17 00:00:00 2001 From: Untone Date: Sat, 3 Feb 2024 08:19:15 +0300 Subject: [PATCH] modal-fix --- src/components/Views/Edit.tsx | 6 +++++- src/components/Views/Feed/Feed.tsx | 6 +++++- src/components/Views/Inbox/Inbox.tsx | 5 ++++- src/components/_shared/InviteMembers/InviteMembers.tsx | 2 +- src/graphql/query/core/reactions-load-by.ts | 1 - 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx index e3779df8..9803ee78 100644 --- a/src/components/Views/Edit.tsx +++ b/src/components/Views/Edit.tsx @@ -26,6 +26,7 @@ import { TableOfContents } from '../TableOfContents' import { PublishSettings } from './PublishSettings' import styles from './Edit.module.scss' +import { Modal } from '../Nav/Modal' const SimplifiedEditor = lazy(() => import('../Editor/SimplifiedEditor')) const GrowingTextarea = lazy(() => import('../_shared/GrowingTextarea/GrowingTextarea')) @@ -413,7 +414,10 @@ export const EditView = (props: Props) => { - + + + + ) } diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx index 07c46e50..84646e85 100644 --- a/src/components/Views/Feed/Feed.tsx +++ b/src/components/Views/Feed/Feed.tsx @@ -34,6 +34,7 @@ import { Sidebar } from '../../Feed/Sidebar' import styles from './Feed.module.scss' import stylesBeside from '../../Feed/Beside.module.scss' import stylesTopic from '../../Feed/CardTopic.module.scss' +import { Modal } from '../../Nav/Modal' export const FEED_PAGE_SIZE = 20 const UNRATED_ARTICLES_COUNT = 5 @@ -439,7 +440,10 @@ export const FeedView = (props: Props) => { shareUrl={getShareUrl({ pathname: `/${shareData().slug}` })} /> - + + + + ) } diff --git a/src/components/Views/Inbox/Inbox.tsx b/src/components/Views/Inbox/Inbox.tsx index 593df862..fd47e06d 100644 --- a/src/components/Views/Inbox/Inbox.tsx +++ b/src/components/Views/Inbox/Inbox.tsx @@ -21,6 +21,7 @@ import MessagesFallback from '../../Inbox/MessagesFallback' import Search from '../../Inbox/Search' import styles from './Inbox.module.scss' +import { Modal } from '../../Nav/Modal' type InboxSearchParams = { by?: string @@ -181,7 +182,9 @@ export const InboxView = (props: Props) => { return (
- + + + {/**/}
diff --git a/src/components/_shared/InviteMembers/InviteMembers.tsx b/src/components/_shared/InviteMembers/InviteMembers.tsx index a1563d0e..1d2aadef 100644 --- a/src/components/_shared/InviteMembers/InviteMembers.tsx +++ b/src/components/_shared/InviteMembers/InviteMembers.tsx @@ -8,7 +8,7 @@ import { Author } from '../../../graphql/schema/core.gen' import { hideModal } from '../../../stores/ui' import { useAuthorsStore } from '../../../stores/zine/authors' import { AuthorBadge } from '../../Author/AuthorBadge' -import { Modal } from '../../Nav/Modal' +// import { Modal } from '../../Nav/Modal' import { Button } from '../Button' import { DropdownSelect } from '../DropdownSelect' import { Loading } from '../Loading' diff --git a/src/graphql/query/core/reactions-load-by.ts b/src/graphql/query/core/reactions-load-by.ts index 02aff493..c0700f07 100644 --- a/src/graphql/query/core/reactions-load-by.ts +++ b/src/graphql/query/core/reactions-load-by.ts @@ -6,7 +6,6 @@ export default gql` id kind body - range reply_to shout { id