From dd5ff737d110c35270c38d6d80b315bd92340342 Mon Sep 17 00:00:00 2001
From: Palanikannan1437 <73993394+Palanikannan1437@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:00:47 +0530
Subject: [PATCH] remirror instances commented out to avoid prosemirror
conflicts
---
.../command-palette/command-pallette.tsx | 5 +-
apps/app/components/core/feeds.tsx | 26 ++--
.../core/modals/gpt-assistant-modal.tsx | 48 +++----
.../components/issues/comment/add-comment.tsx | 60 ++++-----
.../issues/comment/comment-card.tsx | 36 +++---
apps/app/components/issues/main-content.tsx | 63 +++++----
.../pages/create-update-block-inline.tsx | 122 +++++++++---------
apps/app/components/pages/page-form.tsx | 16 +--
.../components/pages/single-page-block.tsx | 40 +++---
apps/app/package.json | 11 +-
10 files changed, 214 insertions(+), 213 deletions(-)
diff --git a/apps/app/components/command-palette/command-pallette.tsx b/apps/app/components/command-palette/command-pallette.tsx
index 0b4c9577b..2a8a4aa4d 100644
--- a/apps/app/components/command-palette/command-pallette.tsx
+++ b/apps/app/components/command-palette/command-pallette.tsx
@@ -49,7 +49,7 @@ export const CommandPalette: React.FC = () => {
workspaceSlug && projectId && issueId ? ISSUE_DETAILS(issueId as string) : null,
workspaceSlug && projectId && issueId
? () =>
- issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
+ issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
: null
);
@@ -81,7 +81,8 @@ export const CommandPalette: React.FC = () => {
if (
!(e.target instanceof HTMLTextAreaElement) &&
!(e.target instanceof HTMLInputElement) &&
- !(e.target as Element).classList?.contains("remirror-editor")
+ // !(e.target as Element).classList?.contains("remirror-editor") &&
+ !(e.target as Element).closest(".tiptap-editor-container")
) {
if ((ctrlKey || metaKey) && keyPressed === "k") {
e.preventDefault();
diff --git a/apps/app/components/core/feeds.tsx b/apps/app/components/core/feeds.tsx
index 2924ec456..8144bfc97 100644
--- a/apps/app/components/core/feeds.tsx
+++ b/apps/app/components/core/feeds.tsx
@@ -16,7 +16,7 @@ import { Icon } from "components/ui";
import { renderShortDateWithYearFormat, timeAgo } from "helpers/date-time.helper";
import { addSpaceIfCamelCase } from "helpers/string.helper";
// types
-import RemirrorRichTextEditor from "components/rich-text-editor";
+// import RemirrorRichTextEditor from "components/rich-text-editor";
const activityDetails: {
[key: string]: {
@@ -250,18 +250,18 @@ export const Feeds: React.FC
- {block.description_stripped} -
- )} + {/* {showBlockDetails */} + {/* ? block.description_html.length > 7 && ( */} + {/**/} + {/* {block.description_stripped} */} + {/*
*/} + {/* )} */}