Skip to content

Commit 0fe7da6

Browse files
authored
[WIKI-345] chore: pass disabled and flagged extensions to block menu (#7152)
* chore: refactor editor * sync changes * feat: api service update * refactor : update sync * fix : package sync * fix: requested changes * fix : embedhandler type * fix : remove commands * refactor : space * refactor : rich lite editors * refactor : minor ce changes * chore : minor ui fix * package: tldjs * refactor : remove tldjs * refactor: flagged * refactor: flagged * chore : remove disbaled check in menu * refactor: fix space * refactor: NodeViewProps * refactor: type * refactor : update community types * refactor : remove external embed CE * remove : external embed config from ce * refactor : update disabled * chore: pass disabled * chore : update utils
1 parent 8801ab0 commit 0fe7da6

19 files changed

Lines changed: 53 additions & 11 deletions

File tree

apps/live/src/core/services/api.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export abstract class APIService {
1414
this.axiosInstance = axios.create({
1515
baseURL,
1616
withCredentials: true,
17+
timeout: 20000,
1718
});
1819
}
1920

apps/space/helpers/string.helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export const isCommentEmpty = (comment: string | undefined): boolean => {
7171
return (
7272
comment?.trim() === "" ||
7373
comment === "<p></p>" ||
74-
isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component"])
74+
isEmptyHtmlString(comment ?? "", ["img", "mention-component", "image-component", "embed-component"])
7575
);
7676
};
7777

apps/web/core/components/editor/lite-text/editor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useState } from "react";
2-
// plane imports
2+
// plane constants
33
import { EIssueCommentAccessSpecifier } from "@plane/constants";
4+
// plane imports
45
import { type EditorRefApi, type ILiteTextEditorProps, LiteTextEditorWithRef, type TFileHandler } from "@plane/editor";
56
import { useTranslation } from "@plane/i18n";
67
import type { MakeOptional } from "@plane/types";
@@ -87,7 +88,6 @@ export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapp
8788
// derived values
8889
const isEmpty = isCommentEmpty(props.initialValue);
8990
const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;
90-
9191
return (
9292
<div
9393
className={cn(

apps/web/core/components/editor/sticky-editor/editor.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ export const StickyEditor = React.forwardRef<EditorRefApi, StickyEditorWrapperPr
5959
}
6060
// derived values
6161
const editorRef = isMutableRefObject<EditorRefApi>(ref) ? ref.current : null;
62-
6362
return (
6463
<div
6564
className={cn("relative border border-custom-border-200 rounded", parentClassName)}

apps/web/next.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const nextConfig = {
1212
return [
1313
{
1414
source: "/(.*)?",
15-
headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],
15+
headers: [{ key: "X-Frame-Options", value: "DENY" }],
1616
},
1717
];
1818
},

packages/editor/src/core/components/editors/document/collaborative-editor.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =
108108
isTouchDevice={!!isTouchDevice}
109109
isLoading={!hasServerSynced && !hasServerConnectionFailed}
110110
tabIndex={tabIndex}
111+
flaggedExtensions={flaggedExtensions}
112+
disabledExtensions={disabledExtensions}
111113
/>
112114
);
113115
};

packages/editor/src/core/components/editors/document/editor.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
8282
initialValue: value,
8383
mentionHandler,
8484
onChange,
85+
embedHandler,
8586
});
8687

8788
const editorContainerClassName = getEditorClassNames({
@@ -98,6 +99,8 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
9899
editorContainerClassName={cn(editorContainerClassName, "document-editor")}
99100
id={id}
100101
isTouchDevice={!!isTouchDevice}
102+
flaggedExtensions={flaggedExtensions}
103+
disabledExtensions={disabledExtensions}
101104
/>
102105
);
103106
};

packages/editor/src/core/components/editors/document/page-renderer.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cn } from "@plane/utils";
55
import { DocumentContentLoader, EditorContainer, EditorContentWrapper } from "@/components/editors";
66
import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus";
77
// types
8-
import { TAIHandler, TDisplayConfig } from "@/types";
8+
import { IEditorProps, TAIHandler, TDisplayConfig } from "@/types";
99

1010
type Props = {
1111
aiHandler?: TAIHandler;
@@ -18,6 +18,8 @@ type Props = {
1818
isLoading?: boolean;
1919
isTouchDevice: boolean;
2020
tabIndex?: number;
21+
flaggedExtensions?: IEditorProps["flaggedExtensions"];
22+
disabledExtensions?: IEditorProps["disabledExtensions"];
2123
};
2224

2325
export const PageRenderer = (props: Props) => {
@@ -32,6 +34,8 @@ export const PageRenderer = (props: Props) => {
3234
isLoading,
3335
isTouchDevice,
3436
tabIndex,
37+
flaggedExtensions,
38+
disabledExtensions,
3539
} = props;
3640

3741
return (
@@ -54,7 +58,11 @@ export const PageRenderer = (props: Props) => {
5458
{editor.isEditable && !isTouchDevice && (
5559
<div>
5660
{bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}
57-
<BlockMenu editor={editor} />
61+
<BlockMenu
62+
editor={editor}
63+
flaggedExtensions={flaggedExtensions}
64+
disabledExtensions={disabledExtensions}
65+
/>
5866
<AIFeaturesMenu menu={aiHandler?.menu} />
5967
</div>
6068
)}

packages/editor/src/core/components/editors/editor-wrapper.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {
4141
placeholder,
4242
tabIndex,
4343
value,
44+
embedHandler,
4445
} = props;
4546

4647
const editor = useEditor({
@@ -65,6 +66,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {
6566
placeholder,
6667
tabIndex,
6768
value,
69+
embedHandler,
6870
});
6971

7072
const editorContainerClassName = getEditorClassNames({

packages/editor/src/core/components/editors/link-view-container.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import { autoUpdate, flip, hide, shift, useDismiss, useFloating, useInteractions } from "@floating-ui/react";
22
import { Editor, useEditorState } from "@tiptap/react";
33
import { FC, useCallback, useEffect, useRef, useState } from "react";
4+
45
// components
56
import { LinkView, LinkViewProps } from "@/components/links";
7+
import { CORE_EXTENSIONS } from "@/constants/extension";
8+
// components
9+
import { getExtensionStorage } from "@/helpers/get-extension-storage";
610

711
type Props = {
812
editor: Editor;
@@ -18,7 +22,7 @@ export const LinkViewContainer: FC<Props> = ({ editor, containerRef }) => {
1822
const editorState = useEditorState({
1923
editor,
2024
selector: ({ editor }: { editor: Editor }) => ({
21-
linkExtensionStorage: editor.storage.link,
25+
linkExtensionStorage: getExtensionStorage(editor, CORE_EXTENSIONS.CUSTOM_LINK),
2226
}),
2327
});
2428

0 commit comments

Comments
 (0)