Skip to content

Commit e9fec95

Browse files
committed
fix(richtext): fix conflict name with p-table
1 parent eb2bcf6 commit e9fec95

18 files changed

+17
-15
lines changed

packages/persona/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"defu": "6.1.4",
9191
"fast-equals": "5.0.1",
9292
"fuse.js": "7.0.0",
93+
"html-escaper": "^3.0.3",
9394
"interactjs": "1.10.27",
9495
"lodash-es": "4.17.21",
9596
"marked": "14.1.2",

src/components/richtext/Richtext.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ import Link from '@tiptap/extension-link'
6666
import ToolbarSimple from './RichtextToolbarSimple.vue'
6767
import ToolbarAdvance from './RichtextToolbarAdvance.vue'
6868
69-
import ImageEdit from './floating-menu/ImageEdit.vue'
70-
import LinkDetail from './floating-menu/LinkDetail.vue'
69+
import ImageEdit from './popup/RichtextPopupImageEdit.vue'
70+
import LinkDetail from './popup/RichtextPopupLinkDetail.vue'
7171
7272
import { useVModel } from '../input'
7373
import { defuFn } from 'defu'

src/components/richtext/RichtextToolbarAdvance.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
</template>
2424

2525
<script lang="ts" setup>
26-
import History from './controls/History.vue'
27-
import TextAlign from './controls/TextAlign.vue'
28-
import TextHeading from './controls/TextHeading.vue'
29-
import TextFormat from './controls/TextFormat.vue'
30-
import FontFamily from './controls/FontFamily.vue'
31-
import FontSize from './controls/FontSize.vue'
32-
import Highlight from './controls/Highlight.vue'
33-
import Image from './controls/Image.vue'
34-
import Table from './controls/Table.vue'
35-
import Link from './controls/Link.vue'
36-
import List from './controls/List.vue'
26+
import History from './control/RichtextControlHistory.vue'
27+
import TextAlign from './control/RichtextControlTextAlign.vue'
28+
import TextHeading from './control/RichtextControlTextHeading.vue'
29+
import TextFormat from './control/RichtextControlTextFormat.vue'
30+
import FontFamily from './control/RichtextControlFontFamily.vue'
31+
import FontSize from './control/RichtextControlFontSize.vue'
32+
import Highlight from './control/RichtextControlHighlight.vue'
33+
import Image from './control/RichtextControlImage.vue'
34+
import Table from './control/RichtextControlTable.vue'
35+
import Link from './control/RichtextControlLink.vue'
36+
import List from './control/RichtextControlList.vue'
3737
</script>

src/components/richtext/controls/Link.vue renamed to src/components/richtext/control/RichtextControlLink.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import pDropdown from '../../dropdown/Dropdown.vue'
2626
import IconLink from '@privyid/persona-icon/vue/link/20.vue'
2727
import { useRichtextEditor } from '..'
2828
import { ref } from 'vue-demi'
29-
import LinkEdit from '../floating-menu/LinkEdit.vue'
29+
import LinkEdit from '../popup/RichtextPopupLinkEdit.vue'
3030
import { withHttps } from 'ufo'
3131
3232
const editor = useRichtextEditor()

0 commit comments

Comments
 (0)