Skip to content

Commit 0da448d

Browse files
arpandhakalarpandhakal
committed
fix(OUT2269-hotfix): issue of save footer showing up even after saving fixed, used replaceCustomLabelsWithPlaceholder instead of prepareCustomLabel util
1 parent 90b3836 commit 0da448d

1 file changed

Lines changed: 44 additions & 41 deletions

File tree

‎src/app/components/EditorInterface.tsx‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,67 @@
11
'use client'
22

3-
import { useEditor, EditorContent } from '@tiptap/react'
3+
import { EditorContent, useEditor } from '@tiptap/react'
44
import { useEffect, useState } from 'react'
55

6-
import { Toaster } from 'react-hot-toast'
7-
import Handlebars from 'handlebars'
8-
import { Scrollbars } from 'react-custom-scrollbars'
6+
import { autofillMenuSuggestion } from '@/components/tiptap/autofieldSelector/autofillMenuSuggestion'
97
import CalloutExtension from '@/components/tiptap/callout/CalloutExtension'
8+
import FloatingCommandExtension from '@/components/tiptap/floatingMenu/floatingCommandExtension'
9+
import { floatingMenuSuggestion } from '@/components/tiptap/floatingMenu/floatingMenuSuggestion'
10+
import { ImageResize } from '@/components/tiptap/image/image'
1011
import LinkpdfExtension from '@/components/tiptap/pdf/PdfExtension'
12+
import { TableCell } from '@/components/tiptap/table/table-cell'
13+
import Bold from '@tiptap/extension-bold'
14+
import BulletList from '@tiptap/extension-bullet-list'
15+
import Code from '@tiptap/extension-code'
16+
import CodeBlock from '@tiptap/extension-code-block'
1117
import Document from '@tiptap/extension-document'
12-
import Paragraph from '@tiptap/extension-paragraph'
18+
import Gapcursor from '@tiptap/extension-gapcursor'
19+
import Hardbreak from '@tiptap/extension-hard-break'
1320
import Heading from '@tiptap/extension-heading'
14-
import Text from '@tiptap/extension-text'
15-
import OrderedList from '@tiptap/extension-ordered-list'
16-
import BulletList from '@tiptap/extension-bullet-list'
21+
import History from '@tiptap/extension-history'
22+
import Italic from '@tiptap/extension-italic'
23+
import Link from '@tiptap/extension-link'
1724
import ListItem from '@tiptap/extension-list-item'
25+
import Mention from '@tiptap/extension-mention'
26+
import OrderedList from '@tiptap/extension-ordered-list'
27+
import Paragraph from '@tiptap/extension-paragraph'
28+
import Placeholder from '@tiptap/extension-placeholder'
29+
import Strike from '@tiptap/extension-strike'
1830
import Table from '@tiptap/extension-table'
19-
import { TableCell } from '@/components/tiptap/table/table-cell'
2031
import TableHeader from '@tiptap/extension-table-header'
2132
import TableRow from '@tiptap/extension-table-row'
33+
import Text from '@tiptap/extension-text'
2234
import Underline from '@tiptap/extension-underline'
23-
import CodeBlock from '@tiptap/extension-code-block'
24-
import Code from '@tiptap/extension-code'
25-
import Link from '@tiptap/extension-link'
26-
import Bold from '@tiptap/extension-bold'
27-
import Italic from '@tiptap/extension-italic'
28-
import Strike from '@tiptap/extension-strike'
29-
import Gapcursor from '@tiptap/extension-gapcursor'
30-
import History from '@tiptap/extension-history'
31-
import Placeholder from '@tiptap/extension-placeholder'
32-
import Mention from '@tiptap/extension-mention'
33-
import FloatingCommandExtension from '@/components/tiptap/floatingMenu/floatingCommandExtension'
34-
import Hardbreak from '@tiptap/extension-hard-break'
35-
import { floatingMenuSuggestion } from '@/components/tiptap/floatingMenu/floatingMenuSuggestion'
36-
import { autofillMenuSuggestion } from '@/components/tiptap/autofieldSelector/autofillMenuSuggestion'
37-
import { ImageResize } from '@/components/tiptap/image/image'
35+
import Handlebars from 'handlebars'
36+
import { Scrollbars } from 'react-custom-scrollbars'
37+
import { Toaster } from 'react-hot-toast'
3838

39-
import ControlledBubbleMenu from '@/components/tiptap/bubbleMenu/ControlledBubbleMenu'
40-
import BubbleMenuContainer from '@/components/tiptap/bubbleMenu/BubbleMenu'
4139
import NoteDisplay from '@/components/display/NoteDisplay'
4240
import { When } from '@/components/hoc/When'
41+
import BubbleMenuContainer from '@/components/tiptap/bubbleMenu/BubbleMenu'
42+
import ControlledBubbleMenu from '@/components/tiptap/bubbleMenu/ControlledBubbleMenu'
4343

44-
import { useAppState } from '@/hooks/useAppState'
45-
import { ISettings } from '@/types/interfaces'
4644
import LoaderComponent from '@/components/display/Loader'
47-
import { ImagePickerUtils } from '@/utils/imagePickerUtils'
48-
import BubbleLinkInput from '@/components/tiptap/linkInput/BubbleLinkInput'
49-
import { defaultState } from '../../../defaultState'
50-
import Image from 'next/image'
51-
import { Box } from '@mui/material'
52-
import { Delete } from '@mui/icons-material'
53-
import { defaultBannerImagePath, defaultBgColor } from '@/utils/constants'
5445
import { AutofillExtension } from '@/components/tiptap/autofieldSelector/ext_autofill'
55-
import { NotificationWidgetExtension } from '@/components/tiptap/notificationWidget/ext_notification_widget'
56-
import { useAppDataContext } from '@/hooks/useAppData'
57-
import { defaultNotificationOptions } from '@/utils/notifications'
5846
import { IframeExtension } from '@/components/tiptap/iframe/ext_iframe'
5947
import BubbleEmbedInput from '@/components/tiptap/iframe/IFrameInput'
48+
import BubbleLinkInput from '@/components/tiptap/linkInput/BubbleLinkInput'
49+
import { NotificationWidgetExtension } from '@/components/tiptap/notificationWidget/ext_notification_widget'
50+
import { useAppDataContext } from '@/hooks/useAppData'
51+
import { useAppState } from '@/hooks/useAppState'
6052
import { CustomLabels } from '@/types/common'
61-
import { prepareCustomLabel } from '@/utils/customLabels'
53+
import { ISettings } from '@/types/interfaces'
54+
import { defaultBannerImagePath, defaultBgColor } from '@/utils/constants'
55+
import {
56+
prepareCustomLabel,
57+
replaceCustomLabelsWithPlaceholders,
58+
} from '@/utils/customLabels'
59+
import { ImagePickerUtils } from '@/utils/imagePickerUtils'
60+
import { defaultNotificationOptions } from '@/utils/notifications'
61+
import { Delete } from '@mui/icons-material'
62+
import { Box } from '@mui/material'
63+
import Image from 'next/image'
64+
import { defaultState } from '../../../defaultState'
6265

6366
interface IEditorInterface {
6467
settings: ISettings | null
@@ -213,7 +216,7 @@ const EditorInterface = ({
213216
) {
214217
if (
215218
appState?.appState.originalTemplate?.replace(/\s/g, '') !==
216-
prepareCustomLabel(
219+
replaceCustomLabelsWithPlaceholders(
217220
defaultState.replaceAll(' ', ''),
218221
appState?.appState?.customLabels,
219222
) ||
@@ -235,7 +238,7 @@ const EditorInterface = ({
235238
) {
236239
if (
237240
appState?.appState.originalTemplate?.toString() !==
238-
prepareCustomLabel(
241+
replaceCustomLabelsWithPlaceholders(
239242
appState?.appState.settings?.content?.toString(),
240243
appState?.appState?.customLabels,
241244
) ||

0 commit comments

Comments
 (0)