Skip to content

Commit c67ed24

Browse files
hunghg255hunghg255
committed
fix: conflict
1 parent ec440b7 commit c67ed24

File tree

15 files changed

+324
-335
lines changed

15 files changed

+324
-335
lines changed

‎playground/src/App.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ import 'katex/dist/katex.min.css'
8686
import 'easydrawer/styles.css'
8787
import "@excalidraw/excalidraw/index.css";
8888

89-
import Collaboration from '@tiptap/extension-collaboration'
90-
import CollaborationCaret from '@tiptap/extension-collaboration-caret'
91-
import { HocuspocusProvider } from '@hocuspocus/provider'
92-
import * as Y from 'yjs'
89+
// import Collaboration from '@tiptap/extension-collaboration'
90+
// import CollaborationCaret from '@tiptap/extension-collaboration-caret'
91+
// import { HocuspocusProvider } from '@hocuspocus/provider'
92+
// import * as Y from 'yjs'
9393
import { EditorContent, useEditor } from '@tiptap/react';
9494

95-
const ydoc = new Y.Doc()
95+
// const ydoc = new Y.Doc()
9696

97-
const hocuspocusProvider = new HocuspocusProvider({
98-
url: 'ws://0.0.0.0:8080',
99-
name: 'github.com/hunghg255',
100-
document: ydoc,
101-
})
97+
// const hocuspocusProvider = new HocuspocusProvider({
98+
// url: 'ws://0.0.0.0:8080',
99+
// name: 'github.com/hunghg255',
100+
// document: ydoc,
101+
// })
102102

103103
function getRandomColor() {
104104
const letters = '0123456789ABCDEF'

‎pnpm-lock.yaml‎

Lines changed: 281 additions & 281 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/Bubble/RichTextBubbleText.tsx‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { TextSelection } from '@tiptap/pm/state';
22
import { BubbleMenu } from '@tiptap/react/menus';
33

4-
import { useEditorInstance } from '@/store/editor';
4+
import { Separator } from '@/components/ui';
55
import { RichTextBold } from '@/extensions/Bold';
6-
import { RichTextItalic } from '@/extensions/Italic';
7-
import { RichTextUnderline } from '@/extensions/TextUnderline';
8-
import { RichTextStrike } from '@/extensions/Strike';
96
import { RichTextCode } from '@/extensions/Code';
10-
import { RichTextLink } from '@/extensions/Link';
117
import { RichTextColor } from '@/extensions/Color';
128
import { RichTextHighlight } from '@/extensions/Highlight';
9+
import { RichTextItalic } from '@/extensions/Italic';
10+
import { RichTextLink } from '@/extensions/Link';
11+
import { RichTextStrike } from '@/extensions/Strike';
1312
import { RichTextAlign } from '@/extensions/TextAlign';
14-
import { Separator } from '@/components/ui';
13+
import { RichTextUnderline } from '@/extensions/TextUnderline';
14+
import { useEditorInstance } from '@/store/editor';
1515
import { useEditableEditor } from '@/store/store';
1616

1717
interface RichTextBubbleTextProps {
@@ -31,21 +31,25 @@ interface RichTextBubbleTextProps {
3131
// ];
3232

3333
function DefaultButtonBubble () {
34-
return <>
34+
return (
35+
<>
3536
<RichTextBold />
3637
<RichTextItalic />
3738
<RichTextUnderline />
3839
<RichTextUnderline />
3940
<RichTextStrike />
4041
<RichTextCode/>
4142
<RichTextLink />
43+
4244
<Separator className="!richtext-mx-1 !richtext-my-2 !richtext-h-[16px]"
4345
orientation="vertical"
4446
/>
47+
4548
<RichTextColor />
4649
<RichTextHighlight />
4750
<RichTextAlign />
48-
</>;
51+
</>
52+
);
4953
}
5054

5155
export function RichTextBubbleText({ buttonBubble }: RichTextBubbleTextProps) {
@@ -70,14 +74,14 @@ export function RichTextBubbleText({ buttonBubble }: RichTextBubbleTextProps) {
7074

7175
return (
7276
<BubbleMenu editor={editor}
73-
shouldShow={shouldShow}
7477
options={{ placement: 'bottom', offset: 8, flip: true }}
78+
shouldShow={shouldShow}
7579
>
7680
{buttonBubble
7781
? (
7882
<>
7983
{buttonBubble}
80-
</>
84+
</>
8185
)
8286
: (
8387
<div className="richtext-pointer-events-auto richtext-w-auto richtext-select-none richtext-rounded-sm !richtext-border richtext-border-neutral-200 richtext-bg-background richtext-px-3 richtext-py-2 richtext-shadow-sm richtext-transition-all dark:richtext-border-neutral-800">

‎src/extensions/Image/Image.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,5 +340,3 @@ export const Image = /* @__PURE__ */ TiptapImage.extend<IImageOptions>({
340340
// ];
341341
// },
342342
});
343-
344-
export default Image;

‎src/extensions/Image/components/RichTextImage.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import { useEffect, useMemo, useRef, useState } from 'react';
33
import { ActionButton, Button, Checkbox, Input, Label, Tabs, TabsContent, TabsList, TabsTrigger, useToast, IconComponent } from '@/components';
44
import { Dialog, DialogContent, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
55
import { ImageCropper } from '@/extensions/Image/components/ImageCropper';
6-
import Image from '@/extensions/Image/Image';
6+
import { Image } from '@/extensions/Image/Image';
77
import { actionDialogImage } from '@/extensions/Image/store';
88
import { useToggleActive } from '@/hooks/useActive';
99
import { useButtonProps } from '@/hooks/useButtonProps';
10+
import { useExtension } from '@/hooks/useExtension';
1011
import { useLocale } from '@/locales';
1112
import { useEditorInstance } from '@/store/editor';
1213
import { listenEvent } from '@/utils/customEvents/customEvents';
1314
import { EVENTS } from '@/utils/customEvents/events.constant';
1415
import { validateFiles } from '@/utils/validateFile';
15-
import { useExtension } from '@/hooks/useExtension';
1616

1717
export function RichTextImage() {
1818
const { t } = useLocale();
@@ -158,11 +158,12 @@ export function RichTextImage() {
158158
open={open}
159159
>
160160
<DialogTrigger
161-
asChild>
161+
asChild
162+
>
162163
<ActionButton
164+
disabled={editorDisabled}
163165
icon={icon}
164166
tooltip={tooltip}
165-
disabled={editorDisabled}
166167
action={() => {
167168
if (editorDisabled) return;
168169
setOpen(true);

‎src/extensions/ImageGif/ImageGif.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import type { ImageOptions } from '@tiptap/extension-image';
33
import TiptapImage from '@tiptap/extension-image';
44
import { ReactNodeViewRenderer } from '@tiptap/react';
55

6-
export * from '@/extensions/ImageGif/components/RichTextImageGif';
76
import ImageGifView from '@/extensions/ImageGif/components/ImageGifView';
87

8+
export * from '@/extensions/ImageGif/components/RichTextImageGif';
9+
910
export interface SetImageAttrsOptions {
1011
src?: string
1112
/** The alternative text for the image. */
@@ -176,5 +177,3 @@ export const ImageGif = /* @__PURE__ */ TiptapImage.extend<ImageGifOptions>({
176177
];
177178
},
178179
});
179-
180-
export default ImageGif;

‎src/extensions/ImageGif/components/RichTextImageGif.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { debounce } from 'lodash-es';
55

66
import { ActionButton, Input, Popover, PopoverContent, PopoverTrigger } from '@/components';
77
import { type GifItem, serviceGetTrendingGiphy, serviceGetTrendingTenor, serviceSearchGiphy, serviceSearchTenor } from '@/extensions/ImageGif/components/services';
8-
import { useButtonProps } from '@/hooks/useButtonProps';
9-
import ImageGif from '@/extensions/ImageGif/ImageGif';
8+
import { ImageGif } from '@/extensions/ImageGif/ImageGif';
109
import { useToggleActive } from '@/hooks/useActive';
10+
import { useButtonProps } from '@/hooks/useButtonProps';
1111

1212
interface IProps {
1313
showClear?: boolean
@@ -84,9 +84,10 @@ function ImageGifWrap({ selectImage, apiKey, provider, children }: IProps) {
8484

8585
return (
8686
<Popover
87-
open={open}
87+
modal
8888
onOpenChange={setOpen}
89-
modal>
89+
open={open}
90+
>
9091
<PopoverTrigger asChild>
9192
{children}
9293
</PopoverTrigger>
@@ -119,11 +120,11 @@ function ImageGifWrap({ selectImage, apiKey, provider, children }: IProps) {
119120
alt=''
120121
className="richtext-cursor-pointer richtext-object-contain richtext-text-center"
121122
key={item.id}
123+
src={item.src}
122124
onClick={() => {
123125
selectImage(item.src);
124126
setOpen(false);
125127
}}
126-
src={item.src}
127128
/>
128129
))
129130
: <p>

‎src/extensions/Link/Link.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,3 @@ export const Link = /* @__PURE__ */ TiptapLink.extend<LinkOptions>({
124124
// ];
125125
// },
126126
});
127-
128-
export default Link;

‎src/extensions/Link/components/LinkEditBlock.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { useEffect, useState, useRef } from 'react';
55
import type { Mark } from '@tiptap/pm/model';
66

77
import { Button, IconComponent, Input, Label, Switch } from '@/components';
8-
import Link from '@/extensions/Link/Link';
9-
import { useLocale } from '@/locales';
8+
import { Link } from '@/extensions/Link/Link';
109
import { useExtension } from '@/hooks/useExtension';
10+
import { useLocale } from '@/locales';
1111

1212
interface IPropsLinkEditBlock {
1313
editor: any;

‎src/extensions/Link/components/RichTextLink.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useState } from 'react';
22

33
import { ActionButton, IconComponent, Popover, PopoverContent, PopoverTrigger } from '@/components';
44
import LinkEditBlock from '@/extensions/Link/components/LinkEditBlock';
5-
import Link from '@/extensions/Link/Link';
5+
import { Link } from '@/extensions/Link/Link';
66
import { useToggleActive } from '@/hooks/useActive';
77
import { useButtonProps } from '@/hooks/useButtonProps';
88
import { useEditorInstance } from '@/store/editor';

0 commit comments

Comments
 (0)