From 613dc17bdada2f5413067498a40ec4a8b9d65b17 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Fri, 20 Oct 2023 12:50:03 +0800
Subject: [PATCH 1/4] fix: blurred font

---
 .../src/runtime/plugins/view/FrameBox.vue     |  3 ++
 .../src/runtime/plugins/view/Main.vue         | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/devtools/src/runtime/plugins/view/FrameBox.vue b/packages/devtools/src/runtime/plugins/view/FrameBox.vue
index 3303b93331..899c5a1878 100644
--- a/packages/devtools/src/runtime/plugins/view/FrameBox.vue
+++ b/packages/devtools/src/runtime/plugins/view/FrameBox.vue
@@ -161,8 +161,11 @@ useEventListener(window, 'mouseleave', () => {
 
 <style scoped>
 .nuxt-devtools-frame {
+  width: 100%;
+  height: 100%;
   position: fixed;
   z-index: 2147483645;
+  -webkit-font-smoothing: antialiased;
 }
 
 .nuxt-devtools-frame :deep(iframe) {
diff --git a/packages/devtools/src/runtime/plugins/view/Main.vue b/packages/devtools/src/runtime/plugins/view/Main.vue
index c812ac8baa..cd624eb00e 100644
--- a/packages/devtools/src/runtime/plugins/view/Main.vue
+++ b/packages/devtools/src/runtime/plugins/view/Main.vue
@@ -47,7 +47,7 @@ const vars = computed(() => {
   }
 })
 
-const frameBox = ref<InstanceType<typeof FrameBox>>()
+const frameBox = ref<HTMLDivElement>()
 const panelEl = ref<HTMLDivElement>()
 const anchorEl = ref<HTMLDivElement>()
 
@@ -239,6 +239,8 @@ const iframeStyle = computed(() => {
   // eslint-disable-next-line no-unused-expressions, no-sequences
   mousePosition.x, mousePosition.y
 
+  const { width: frameWidth, height: frameHeight } = frameBox.value?.getBoundingClientRect() || { width: 0, height: 0 }
+
   const halfHeight = (panelEl.value?.clientHeight || 0) / 2
 
   const frameMargin = {
@@ -255,6 +257,7 @@ const iframeStyle = computed(() => {
   const maxHeight = windowSize.height - marginVertical
 
   const style: CSSProperties = {
+    position: 'fixed',
     zIndex: -1,
     pointerEvents: isDragging.value ? 'none' : 'auto',
     width: `min(${state.value.width}vw, calc(100vw - ${marginHorizontal}px))`,
@@ -271,21 +274,21 @@ const iframeStyle = computed(() => {
   switch (state.value.position) {
     case 'top':
     case 'bottom':
-      style.left = 0
-      style.transform = 'translate(-50%, 0)'
+      style.left = `${-frameWidth / 2}px`
+      style.transform = 'translate(0, 0)'
       if ((anchorX - frameMargin.left) < width / 2)
-        style.left = `${width / 2 - anchorX + frameMargin.left}px`
+        style.left = `${width / 2 - anchorX + frameMargin.left - frameWidth / 2}px`
       else if ((windowSize.width - anchorX - frameMargin.right) < width / 2)
-        style.left = `${windowSize.width - anchorX - width / 2 - frameMargin.right}px`
+        style.left = `${windowSize.width - anchorX - width / 2 - frameMargin.right - frameWidth / 2}px`
       break
     case 'right':
     case 'left':
-      style.top = 0
-      style.transform = 'translate(0, -50%)'
+      style.top = `${-frameHeight / 2}px`
+      style.transform = 'translate(0, 0)'
       if ((anchorY - frameMargin.top) < height / 2)
-        style.top = `${height / 2 - anchorY + frameMargin.top}px`
+        style.top = `${height / 2 - anchorY + frameMargin.top - frameHeight / 2}px`
       else if ((windowSize.height - anchorY - frameMargin.bottom) < height / 2)
-        style.top = `${windowSize.height - anchorY - height / 2 - frameMargin.bottom}px`
+        style.top = `${windowSize.height - anchorY - height / 2 - frameMargin.bottom - frameHeight / 2}px`
       break
   }
 
@@ -398,12 +401,13 @@ onMounted(() => {
         </button>
       </template>
     </div>
-    <FrameBox
-      ref="frameBox"
-      :client="client"
-      :style="iframeStyle"
-      :is-dragging="isDragging"
-    />
+
+    <div ref="frameBox" :style="iframeStyle">
+      <FrameBox
+        :client="client"
+        :is-dragging="isDragging"
+      />
+    </div>
   </div>
 </template>
 

From 5390526b63aaf11958fc768ae75551fa10da837e Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Fri, 20 Oct 2023 13:39:31 +0800
Subject: [PATCH 2/4] perf: improve computing performance

---
 .../src/runtime/plugins/view/Main.vue         | 18 ++--
 .../src/runtime/plugins/view/utils.ts         | 85 ++++++++++++++++++-
 2 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/packages/devtools/src/runtime/plugins/view/Main.vue b/packages/devtools/src/runtime/plugins/view/Main.vue
index cd624eb00e..2fb6fcb87b 100644
--- a/packages/devtools/src/runtime/plugins/view/Main.vue
+++ b/packages/devtools/src/runtime/plugins/view/Main.vue
@@ -4,7 +4,7 @@ import type { CSSProperties } from 'vue'
 import type { NuxtDevtoolsHostClient } from '../../../types'
 import { settings } from '../../settings'
 import { state } from './state'
-import { millisecondToHumanreadable, useEventListener, useScreenSafeArea } from './utils'
+import { millisecondToHumanreadable, useElementBounding, useEventListener, useScreenSafeArea } from './utils'
 import FrameBox from './FrameBox.vue'
 
 const props = defineProps<{
@@ -235,12 +235,12 @@ const panelStyle = computed(() => {
   return style
 })
 
+const { width: frameWidth, height: frameHeight } = useElementBounding(frameBox)
+
 const iframeStyle = computed(() => {
   // eslint-disable-next-line no-unused-expressions, no-sequences
   mousePosition.x, mousePosition.y
 
-  const { width: frameWidth, height: frameHeight } = frameBox.value?.getBoundingClientRect() || { width: 0, height: 0 }
-
   const halfHeight = (panelEl.value?.clientHeight || 0) / 2
 
   const frameMargin = {
@@ -274,21 +274,21 @@ const iframeStyle = computed(() => {
   switch (state.value.position) {
     case 'top':
     case 'bottom':
-      style.left = `${-frameWidth / 2}px`
+      style.left = `${-frameWidth.value / 2}px`
       style.transform = 'translate(0, 0)'
       if ((anchorX - frameMargin.left) < width / 2)
-        style.left = `${width / 2 - anchorX + frameMargin.left - frameWidth / 2}px`
+        style.left = `${width / 2 - anchorX + frameMargin.left - frameWidth.value / 2}px`
       else if ((windowSize.width - anchorX - frameMargin.right) < width / 2)
-        style.left = `${windowSize.width - anchorX - width / 2 - frameMargin.right - frameWidth / 2}px`
+        style.left = `${windowSize.width - anchorX - width / 2 - frameMargin.right - frameWidth.value / 2}px`
       break
     case 'right':
     case 'left':
-      style.top = `${-frameHeight / 2}px`
+      style.top = `${-frameHeight.value / 2}px`
       style.transform = 'translate(0, 0)'
       if ((anchorY - frameMargin.top) < height / 2)
-        style.top = `${height / 2 - anchorY + frameMargin.top - frameHeight / 2}px`
+        style.top = `${height / 2 - anchorY + frameMargin.top - frameHeight.value / 2}px`
       else if ((windowSize.height - anchorY - frameMargin.bottom) < height / 2)
-        style.top = `${windowSize.height - anchorY - height / 2 - frameMargin.bottom - frameHeight / 2}px`
+        style.top = `${windowSize.height - anchorY - height / 2 - frameMargin.bottom - frameHeight.value / 2}px`
       break
   }
 
diff --git a/packages/devtools/src/runtime/plugins/view/utils.ts b/packages/devtools/src/runtime/plugins/view/utils.ts
index 4c1b8972c3..99f2c59d96 100644
--- a/packages/devtools/src/runtime/plugins/view/utils.ts
+++ b/packages/devtools/src/runtime/plugins/view/utils.ts
@@ -1,5 +1,5 @@
 import type { Ref } from 'vue'
-import { computed, getCurrentScope, onScopeDispose, ref, watch } from 'vue'
+import { computed, getCurrentInstance, getCurrentScope, onMounted, onScopeDispose, ref, toValue, watch } from 'vue'
 
 export function useObjectStorage<T>(key: string, initial: T, listenToStorage = true): Ref<T> {
   const raw = localStorage.getItem(key)
@@ -49,6 +49,89 @@ export function useEventListener(target: EventTarget, type: string, listener: an
   getCurrentScope() && onScopeDispose(() => target.removeEventListener(type, listener, options))
 }
 
+/**
+ * @see https://vueuse.org/useElementBounding
+ */
+export function useElementBounding(target: Ref<HTMLElement | null | undefined>) {
+  const height = ref(0)
+  const bottom = ref(0)
+  const left = ref(0)
+  const right = ref(0)
+  const top = ref(0)
+  const width = ref(0)
+  const x = ref(0)
+  const y = ref(0)
+
+  function update() {
+    const el = toValue(target)
+
+    if (!el) {
+      height.value = 0
+      bottom.value = 0
+      left.value = 0
+      right.value = 0
+      top.value = 0
+      width.value = 0
+      x.value = 0
+      y.value = 0
+      return
+    }
+
+    const rect = el.getBoundingClientRect()
+
+    height.value = rect.height
+    bottom.value = rect.bottom
+    left.value = rect.left
+    right.value = rect.right
+    top.value = rect.top
+    width.value = rect.width
+    x.value = rect.x
+    y.value = rect.y
+  }
+
+  watch(() => toValue(target), update)
+  useEventListener(window, 'resize', update)
+  if (getCurrentInstance())
+    onMounted(() => update())
+
+  // observer resize
+  let observer: ResizeObserver | undefined
+  const cleanup = () => {
+    if (observer) {
+      observer.disconnect()
+      observer = undefined
+    }
+  }
+  const stopWatch = watch(
+    () => toValue(target),
+    (el) => {
+      cleanup()
+      if (window) {
+        observer = new ResizeObserver(update)
+        el && observer!.observe(el)
+      }
+    },
+    { immediate: true, flush: 'post', deep: true },
+  )
+
+  getCurrentScope() && onScopeDispose(() => {
+    cleanup()
+    stopWatch()
+  })
+
+  return {
+    height,
+    bottom,
+    left,
+    right,
+    top,
+    width,
+    x,
+    y,
+    update,
+  }
+}
+
 export function millisecondToHumanreadable(ms: number): [number, string] {
   if (ms < 1000)
     return [+ms.toFixed(0), 'ms']

From a48900a987b1e97a8786b27f9e56ac1055aea775 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 23 Oct 2023 12:57:22 +0800
Subject: [PATCH 3/4] fix: frame box pointer event

---
 packages/devtools/src/runtime/plugins/view/Main.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/devtools/src/runtime/plugins/view/Main.vue b/packages/devtools/src/runtime/plugins/view/Main.vue
index 2fb6fcb87b..1773df6898 100644
--- a/packages/devtools/src/runtime/plugins/view/Main.vue
+++ b/packages/devtools/src/runtime/plugins/view/Main.vue
@@ -259,7 +259,7 @@ const iframeStyle = computed(() => {
   const style: CSSProperties = {
     position: 'fixed',
     zIndex: -1,
-    pointerEvents: isDragging.value ? 'none' : 'auto',
+    pointerEvents: isDragging.value || !isHidden.value ? 'none' : 'auto',
     width: `min(${state.value.width}vw, calc(100vw - ${marginHorizontal}px))`,
     height: `min(${state.value.height}vh, calc(100vh - ${marginVertical}px))`,
   }

From 7b2983955fd841d92852375f9857ecbca873166c Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Mon, 23 Oct 2023 13:29:23 +0800
Subject: [PATCH 4/4] fix: frame box pointer event

---
 packages/devtools/src/runtime/plugins/view/Main.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/devtools/src/runtime/plugins/view/Main.vue b/packages/devtools/src/runtime/plugins/view/Main.vue
index 1773df6898..78d86ecce8 100644
--- a/packages/devtools/src/runtime/plugins/view/Main.vue
+++ b/packages/devtools/src/runtime/plugins/view/Main.vue
@@ -259,7 +259,7 @@ const iframeStyle = computed(() => {
   const style: CSSProperties = {
     position: 'fixed',
     zIndex: -1,
-    pointerEvents: isDragging.value || !isHidden.value ? 'none' : 'auto',
+    pointerEvents: isDragging.value || !state.value.open ? 'none' : 'auto',
     width: `min(${state.value.width}vw, calc(100vw - ${marginHorizontal}px))`,
     height: `min(${state.value.height}vh, calc(100vh - ${marginVertical}px))`,
   }