fix: improve UI layout of pages tab

nuxt · Oct 11, 2023 · 66e59ae · 66e59ae
1 parent c930126
commit 66e59ae
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 26 deletions.
diff --git a/packages/devtools-ui-kit/src/components/NTextInput.vue b/packages/devtools-ui-kit/src/components/NTextInput.vue
@@ -16,6 +16,7 @@ const props = withDefaults(
     type: 'text',
   },
 )
+
 const emit = defineEmits<{ (...args: any): void }>()
 const input = useVModel(props, 'modelValue', emit, { passive: true })
 </script>

diff --git a/packages/devtools/client/components/RoutesTable.vue b/packages/devtools/client/components/RoutesTable.vue
@@ -64,7 +64,7 @@ function getMiddlewarePath(name: any) {
                 v-text="'active'"
               />
               <NBadge
-                v-if="matchedPending.find(m => m.name === item.name)"
+                v-else-if="matchedPending.find(m => m.name === item.name)"
                 n="teal"
                 title="next"
                 v-text="'next'"

diff --git a/packages/devtools/client/composables/client.ts b/packages/devtools/client/composables/client.ts
@@ -8,7 +8,7 @@ export function useClient() {
   return useState<NuxtDevtoolsHostClient>('devtools-client')
 }
 
-export function useClientRoute() {
+export function useClientRoute(): ComputedRef<ReturnType<typeof useRoute>> {
   const client = useClient()
   return computed(() => client.value?.nuxt.vueApp.config.globalProperties?.$route)
 }

diff --git a/packages/devtools/client/pages/__blank.vue b/packages/devtools/client/pages/__blank.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+definePageMeta({
+  layout: 'none',
+})
+</script>
+
+<template>
+  <div h-screen w-screen bg-black />
+</template>
diff --git a/packages/devtools/client/pages/modules/pages.vue b/packages/devtools/client/pages/modules/pages.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { nextTick } from 'vue'
-
 definePageMeta({
   icon: 'carbon-tree-view-alt',
   title: 'Pages',
@@ -20,21 +18,15 @@ const layouts = useLayouts()
 
 const routes = useMergedRouteList()
 
-const middleware = computed(() => {
-  return serverApp.value?.middleware || []
-})
-
+const middleware = computed(() => serverApp.value?.middleware || [])
 const routeInput = ref('')
 
-until(route).toBeTruthy().then((v) => {
-  routeInput.value = v.path
-})
+onMounted(() => {
+  if (route.value)
+    routeInput.value = route.value.path
 
-until(router).toBeTruthy().then((v) => {
-  v.afterEach(() => {
-    nextTick(() => {
-      routeInput.value = route.value.path
-    })
+  router.value?.afterEach((to) => {
+    routeInput.value = to.fullPath
   })
 })
 
@@ -44,13 +36,12 @@ async function navigate() {
 }
 
 const routeInputMatched = computed(() => {
-  if (routeInput.value === route.value.path)
-    return []
   return router.value.resolve(routeInput.value || '/').matched
 })
 
 function navigateToRoute(path: string) {
   router.value.push(path)
+  routeInput.value = path
 }
 </script>
 
@@ -85,18 +76,23 @@ function navigateToRoute(path: string) {
       </div>
     </div>
     <NSectionBlock
-      v-if="routeInputMatched.length"
       icon="carbon-tree-view"
       text="Matched Routes"
       :padding="false"
     >
-      <RoutesTable
-        :pages="routeInputMatched"
-        :layouts="layouts || []"
-        :matched="[]"
-        :matched-pending="routeInputMatched"
-        @navigate="navigateToRoute"
-      />
+      <div min-h-14>
+        <RoutesTable
+          v-if="routeInputMatched.length"
+          :pages="routeInputMatched"
+          :layouts="layouts || []"
+          :matched="route.matched"
+          :matched-pending="routeInputMatched"
+          @navigate="navigateToRoute"
+        />
+        <div v-else class="py-4 text-center">
+          <span op50>No routes matched</span>
+        </div>
+      </div>
     </NSectionBlock>
     <NSectionBlock
       icon="carbon-tree-view-alt"