mirror of
https://github.com/docusealco/docuseal
synced 2026-11-12 07:42:32 -05:00
fix infinite scroll reload
This commit is contained in:
1 parent
05fa75f9a2
commit
ef28b80589
4 files changed
+15
-12
No files matched your search
@@ -69,8 +69,6 @@ import HistoryBack from './elements/history_back'
|
|||||||
import DatePlaceholder from './elements/date_placeholder'
|
import DatePlaceholder from './elements/date_placeholder'
|
||||||
import FlashMessage from './elements/flash_message'
|
import FlashMessage from './elements/flash_message'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
document.addEventListener('turbo:before-cache', () => {
|
document.addEventListener('turbo:before-cache', () => {
|
||||||
window.flash?.remove()
|
window.flash?.remove()
|
||||||
})
|
})
|
||||||
@@ -99,6 +97,16 @@ if (window.webkit?.messageHandlers?.native) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
document.addEventListener('turbo:before-fetch-request', (event) => {
|
||||||
|
const { session } = window.Turbo
|
||||||
|
const visit = session.navigator.currentVisit
|
||||||
|
const limit = document.getElementById('infinite_scroll')?.dataset.limit
|
||||||
|
|
||||||
|
if (limit && window.scrollY > 0 && event.target === document.documentElement && visit?.location.href === session.view.lastRenderedLocation.href && session.view.isPageRefresh(visit)) {
|
||||||
|
event.detail.url.searchParams.set('limit', limit)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
document.addEventListener('turbo:visit', (e) => {
|
document.addEventListener('turbo:visit', (e) => {
|
||||||
isRestoring = e.detail.action === 'restore'
|
isRestoring = e.detail.action === 'restore'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -2,11 +2,7 @@ import { renderStreamMessage } from '@hotwired/turbo'
|
|||||||
|
|
||||||
export default class extends HTMLElement {
|
export default class extends HTMLElement {
|
||||||
connectedCallback () {
|
connectedCallback () {
|
||||||
if (!this.dataset.src) {
|
if (!this.dataset.src) return
|
||||||
this.remove()
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.observer = new IntersectionObserver((entries) => {
|
this.observer = new IntersectionObserver((entries) => {
|
||||||
if (entries.some((entry) => entry.isIntersecting)) {
|
if (entries.some((entry) => entry.isIntersecting)) {
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<% if pagy.next || pagy.page > 1 %>
|
<infinite-scroll id="infinite_scroll" class="<%= pagy.next ? 'col-span-full flex justify-center py-2' : 'hidden' %>" data-limit="<%= pagy.page * pagy.limit %>" data-src="<%= url_for(params: request.query_parameters.merge(local_assigns[:query_params].to_h).merge('page' => pagy.next)) if pagy.next %>">
|
||||||
<infinite-scroll id="infinite_scroll" class="col-span-full flex justify-center py-2" data-src="<%= url_for(params: request.query_parameters.merge(local_assigns[:query_params].to_h).merge('page' => pagy.next)) if pagy.next %>">
|
<%= svg_icon('loader', class: 'w-6 h-6 animate-spin') if pagy.next %>
|
||||||
<%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
|
</infinite-scroll>
|
||||||
</infinite-scroll>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
Pagy::OPTIONS[:limit] = 10
|
Pagy::OPTIONS[:limit] = 10
|
||||||
|
Pagy::OPTIONS[:max_limit] = 200
|
||||||
Reference in new issue
Block a user