@fy-/fws-vue 2.1.24 → 2.1.26

package/components/ui/DefaultPaging.vue

@@ -30,15 +30,19 @@ const props = withDefaults(
     hash: '',
   },
 )
+
 const route = useRoute()
 const eventBus = useEventBus()
 const history = useServerRouter()
-const prevNextSeo = ref<any>({})
+
+const prevNextSeo = ref<{ prev?: string, next?: string }>({})
+
 function isNewPage(page: number) {
   return (
     page >= 1 && page <= props.items.page_max && page !== props.items.page_no
   )
 }
+
 const pageWatcher = ref<WatchStopHandle>()
 
 function next() {
@@ -53,6 +57,7 @@ function next() {
     hash: props.hash !== '' ? `#${props.hash}` : undefined,
   })
 }
+
 function prev() {
   const page = props.items.page_no - 1
   if (!isNewPage(page)) return
@@ -76,61 +81,63 @@ function page(page: number): RouteLocationRaw {
 }
 
 function checkPageNumber(page: number = 1) {
+  // Reset prev and next
   prevNextSeo.value.next = undefined
   prevNextSeo.value.prev = undefined
-  const pagePlus = page + 1
-  const pageMinus = page - 1
+
   if (hasFW()) {
     const url = getURL()
-    if (pagePlus <= props.items.page_max && url) {
-      prevNextSeo.value.next
-        = `${url.Scheme}://${url.Host}${route.path}?page=${pagePlus}${
-          props.hash !== '' ? `#${props.hash}` : ''}`
-    }
-    if (pageMinus >= 1 && url) {
-      prevNextSeo.value.prev
-        = `${url.Scheme}://${url.Host}${route.path}?page=${pageMinus}${
-          props.hash !== '' ? `#${props.hash}` : ''}`
+    if (url) {
+      if (page + 1 <= props.items.page_max) {
+        prevNextSeo.value.next = `${url.Scheme}://${url.Host}${url.Path}?page=${page + 1}${props.hash !== '' ? `#${props.hash}` : ''}`
+      }
+      if (page - 1 >= 1) {
+        prevNextSeo.value.prev = `${url.Scheme}://${url.Host}${url.Path}?page=${page - 1}${props.hash !== '' ? `#${props.hash}` : ''}`
+      }
     }
   }
 }
 
+// Watch for changes in the current page number
 pageWatcher.value = watch(
-  () => route.query.page,
-  (v) => {
-    eventBus.emit(`${props.id}GoToPage`, v || 1)
+  () => props.items.page_no,
+  (newPage) => {
+    checkPageNumber(newPage)
   },
+  { immediate: true }, // Ensure it's called initially
 )
+
 onMounted(() => {
   eventBus.on(`${props.id}GoToPage`, checkPageNumber)
 })
 onUnmounted(() => {
   eventBus.off(`${props.id}GoToPage`, checkPageNumber)
-  // if (pageWatcher.value) pageWatcher.value();
+  if (pageWatcher.value) pageWatcher.value()
 })
 
+// Initial check
 checkPageNumber(props.items.page_no)
+
+// Setup SEO head
 useServerHead({
   link: computed(() => {
-    const result: any = []
+    const links: any[] = []
+
     if (prevNextSeo.value.next) {
-      result.push({
+      links.push({
         href: prevNextSeo.value.next,
         rel: 'next',
-        key: 'next',
-        hid: 'paging-next',
+        key: 'paging-next',
       })
     }
     if (prevNextSeo.value.prev) {
-      result.push({
+      links.push({
         href: prevNextSeo.value.prev,
         rel: 'prev',
-        key: 'prev',
-        hid: 'paging-prev',
+        key: 'paging-prev',
       })
     }
-
-    return result
+    return links
   }),
 })
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "homepage": "https://github.com/fy-to/FWJS#readme",