From 7a898e2bb594d578d1bc5f5c313324e123ce7be7 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Thu, 2 Nov 2023 21:49:13 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=BC=94=E8=AE=B2=E8=80=85=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Editor/Remark/Editor.vue | 47 +++++++++++++++++++++++-------
 src/views/Screen/PresenterView.vue |  2 +-
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/views/Editor/Remark/Editor.vue b/src/views/Editor/Remark/Editor.vue
index 1009c7f2..10b18bb1 100644
--- a/src/views/Editor/Remark/Editor.vue
+++ b/src/views/Editor/Remark/Editor.vue
@@ -22,6 +22,8 @@
         </template>
         <button><IconHighLight /></button>
       </Popover>
+      <button :class="{ 'active': attr?.bulletList }" @click="execCommand('bulletList')"><IconList /></button>
+      <button :class="{ 'active': attr?.orderedList }" @click="execCommand('orderedList')"><IconOrderedList /></button>
       <button @click="execCommand('clear')"><IconFormat /></button>
     </div>
   </div>
@@ -34,6 +36,7 @@ import { useMainStore } from '@/store'
 import type { EditorView } from 'prosemirror-view'
 import { initProsemirrorEditor, createDocument } from '@/utils/prosemirror'
 import { addMark, autoSelectAll, getTextAttrs, type TextAttrs } from '@/utils/prosemirror/utils'
+import { toggleList } from '@/utils/prosemirror/commands/toggleList'
 import tippy, { type Instance } from 'tippy.js'
 
 import ColorPicker from '@/components/ColorPicker/index.vue'
@@ -99,18 +102,21 @@ const handleMouseup = () => {
   if (menuInstance.value) {
     attr.value = getTextAttrs(editorView)
 
+    const { x, y, left, top } = range.getBoundingClientRect()
+
     menuInstance.value.setProps({
-      getReferenceClientRect: () => range.getBoundingClientRect(),
+      getReferenceClientRect: () => ({
+        x, y, left, top,
+        height: 0,
+        width: 0,
+        right: left,
+        bottom: top,
+      } as DOMRect),
     })
     menuInstance.value.show()
   }
 }
 
-const handleMousedown = () => {
-  hideMenuInstance()
-  window.getSelection()?.removeAllRanges()
-}
-
 const execCommand = (command: string, value?: string) => {
   if (command === 'color' && value) {
     const mark = editorView.state.schema.marks.forecolor.create({ color: value })
@@ -138,6 +144,14 @@ const execCommand = (command: string, value?: string) => {
     autoSelectAll(editorView)
     toggleMark(editorView.state.schema.marks.strikethrough)(editorView.state, editorView.dispatch)
   }
+  else if (command === 'bulletList') {
+    const { bullet_list: bulletList, list_item: listItem } = editorView.state.schema.nodes
+    toggleList(bulletList, listItem)(editorView.state, editorView.dispatch)
+  }
+  else if (command === 'orderedList') {
+    const { ordered_list: orderedList, list_item: listItem } = editorView.state.schema.nodes
+    toggleList(orderedList, listItem)(editorView.state, editorView.dispatch)
+  }
   else if (command === 'clear') {
     autoSelectAll(editorView)
     const { $from, $to } = editorView.state.selection
@@ -155,7 +169,11 @@ onMounted(() => {
       focus: handleFocus,
       blur: handleBlur,
       mouseup: handleMouseup,
-      mousedown: handleMousedown,
+      mousedown: () => {
+        window.getSelection()?.removeAllRanges()
+        hideMenuInstance()
+      },
+      keydown: hideMenuInstance,
       input: handleInput,
     },
   }, {
@@ -167,7 +185,7 @@ onMounted(() => {
     content: menuRef.value!,
     interactive: true,
     trigger: 'manual',
-    placement: 'top',
+    placement: 'top-start',
     hideOnClick: 'toggle',
     offset: [0, 6],
   })
@@ -179,10 +197,16 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
+.editor {
+  height: 100%;
+  overflow: auto;
+}
 .prosemirror-editor {
+  height: 100%;
   cursor: text;
 
   ::v-deep(.ProseMirror) {
+    height: 100%;
     font-size: 12px;
     overflow: auto;
     padding: 8px;
@@ -200,7 +224,7 @@ onUnmounted(() => {
 .menu {
   display: flex;
   background-color: #fff;
-  padding: 5px;
+  padding: 6px 4px;
   border-radius: $borderRadius;
   box-shadow: 0 0 20px 0 rgba(0, 0, 0, .15);
 
@@ -210,8 +234,11 @@ onUnmounted(() => {
     background-color: #fff;
     padding: 3px;
     border-radius: $borderRadius;
-    font-size: 15px;
+    font-size: 16px;
     margin: 0 3px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     cursor: pointer;
 
     &:hover, &.active {
diff --git a/src/views/Screen/PresenterView.vue b/src/views/Screen/PresenterView.vue
index 36df0571..953e6e38 100644
--- a/src/views/Screen/PresenterView.vue
+++ b/src/views/Screen/PresenterView.vue
@@ -67,7 +67,7 @@
         <span>演讲者备注</span>
         <span>P {{slideIndex + 1}} / {{slides.length}}</span>
       </div>
-      <div class="remark-content" :style="{ fontSize: remarkFontSize + 'px' }" v-html="currentSlideRemark"></div>
+      <div class="remark-content ProseMirror-static" :style="{ fontSize: remarkFontSize + 'px' }" v-html="currentSlideRemark"></div>
       <div class="remark-scale">
         <div :class="['scale-btn', { 'disable': remarkFontSize === 12 }]" @click="setRemarkFontSize(remarkFontSize - 2)"><IconMinus /></div>
         <div :class="['scale-btn', { 'disable': remarkFontSize === 40 }]" @click="setRemarkFontSize(remarkFontSize + 2)"><IconPlus /></div>