@fy-/fws-vue 2.1.28 → 2.1.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/components/ui/DefaultPaging.vue +51 -49
  2. package/package.json +1 -1
package/components/ui/DefaultPaging.vue CHANGED
@@ -4,8 +4,8 @@ import type { RouteLocationRaw } from 'vue-router'
4
4
  import type { APIPaging } from '../../composables/rest'
5
5
  import { getURL, hasFW } from '@fy-/fws-js'
6
6
  import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/24/solid'
7
- import { useServerHead } from '@unhead/vue'
8
- import { computed, ref, watch } from 'vue'
7
+ import { useHead } from '@unhead/vue'
8
+ import { computed, ref, watch, watchEffect } from 'vue'
9
9
  import { useRoute } from 'vue-router'
10
10
  import { useEventBus } from '../../composables/event-bus'
11
11
  import { useServerRouter } from '../../stores/serverRouter'
@@ -77,56 +77,58 @@ pageWatcher.value = watch(
77
77
  },
78
78
  )
79
79
 
80
- useServerHead({
81
- link: computed(() => {
82
- const result: any = []
83
- const page = props.items.page_no
84
- const page_max = props.items.page_max
85
-
86
- let next
87
- let prev
88
-
89
- if (hasFW()) {
90
- const url = getURL()
91
- if (url) {
92
- const currentQuery = { ...route.query }
93
- // Remove the existing 'page' parameter to avoid duplicates
94
- delete currentQuery.page
95
-
96
- const baseURL = `${url.Scheme}://${url.Host}${url.Path}`
97
- const hashPart = props.hash !== '' ? `#${props.hash}` : ''
98
-
99
- if (page + 1 <= page_max) {
100
- const nextQuery = { ...currentQuery, page: (page + 1).toString() }
101
- const nextQueryString = new URLSearchParams(nextQuery).toString()
102
- next = `${baseURL}?${nextQueryString}${hashPart}`
80
+ watchEffect(() => {
81
+ useHead({
82
+ link: computed(() => {
83
+ const result: any = []
84
+ const page = props.items.page_no
85
+ const page_max = props.items.page_max
86
+
87
+ let next
88
+ let prev
89
+
90
+ if (hasFW()) {
91
+ const url = getURL()
92
+ if (url) {
93
+ const currentQuery = { ...route.query }
94
+ // Remove the existing 'page' parameter to avoid duplicates
95
+ delete currentQuery.page
96
+
97
+ const baseURL = `${url.Scheme}://${url.Host}${url.Path}`
98
+ const hashPart = props.hash !== '' ? `#${props.hash}` : ''
99
+
100
+ if (page + 1 <= page_max) {
101
+ const nextQuery = { ...currentQuery, page: (page + 1).toString() }
102
+ const nextQueryString = new URLSearchParams(nextQuery).toString()
103
+ next = `${baseURL}?${nextQueryString}${hashPart}`
104
+ }
105
+
106
+ if (page - 1 >= 1) {
107
+ const prevQuery = { ...currentQuery, page: (page - 1).toString() }
108
+ const prevQueryString = new URLSearchParams(prevQuery).toString()
109
+ prev = `${baseURL}?${prevQueryString}${hashPart}`
110
+ }
103
111
  }
112
+ }
104
113
 
105
- if (page - 1 >= 1) {
106
- const prevQuery = { ...currentQuery, page: (page - 1).toString() }
107
- const prevQueryString = new URLSearchParams(prevQuery).toString()
108
- prev = `${baseURL}?${prevQueryString}${hashPart}`
109
- }
114
+ if (next) {
115
+ result.push({
116
+ href: next,
117
+ rel: 'next',
118
+ key: `paging-next${props.id}`,
119
+ })
120
+ }
121
+ if (prev) {
122
+ result.push({
123
+ href: prev,
124
+ rel: 'prev',
125
+ key: `paging-prev${props.id}`,
126
+ })
110
127
  }
111
- }
112
-
113
- if (next) {
114
- result.push({
115
- href: next,
116
- rel: 'next',
117
- key: `paging-next${props.id}`,
118
- })
119
- }
120
- if (prev) {
121
- result.push({
122
- href: prev,
123
- rel: 'prev',
124
- key: `paging-prev${props.id}`,
125
- })
126
- }
127
-
128
- return result
129
- }),
128
+
129
+ return result
130
+ }),
131
+ })
130
132
  })
131
133
  </script>
132
134
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fy-/fws-vue",
3
- "version": "2.1.28",
3
+ "version": "2.1.29",
4
4
  "author": "Florian 'Fy' Gasquez <m@fy.to>",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/fy-to/FWJS#readme",