Skip to content

fix: prevent skeleton layout shift during pagination #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tesaide wants to merge 3 commits into
base: next
Choose a base branch
from
Open

fix: prevent skeleton layout shift during pagination #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f15368
fix: prevent skeleton layout shift during pagination
tesaide Dec 4, 2025
a904494
fix: magic number replacement
tesaide Dec 5, 2025
bfc8a9b
fix: magic number solution
tesaide Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions adminforth/spa/src/components/ResourceListTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,12 @@ const rowHeights = ref<number[]>([]);
const columnWidths = ref<number[]>([]);
watch(() => props.rows, (newRows) => {
// rows are set to null when new records are loading
rowHeights.value = newRows || !rowRefs.value ? [] : rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
columnWidths.value = newRows || !headerRefs.value ? [] : [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
if (!newRows) return;
nextTick(() => {
if (rowRefs.value) rowHeights.value = rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
if (headerRefs.value) columnWidths.value = [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
});
});
Copy link
Contributor

@ivictbor ivictbor Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

watch(() => props.rows, async (newRows) => {
  // rows are set to null when new records are loading
  rowHeights.value = newRows || !rowRefs.value ? [] : rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
  columnWidths.value = newRows || !headerRefs.value ? [] : [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
  if (!newRows) return; 

  await nextTick();

  if (rowRefs.value) {
    rowHeights.value = rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
  }
  if (headerRefs.value) {
     columnWidths.value = [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
  }
  
});

function addToCheckedValues(id: string) {
Expand Down
12 changes: 10 additions & 2 deletions adminforth/spa/src/components/ResourceListTableVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,16 @@ const rowHeights = ref<number[]>([]);
const columnWidths = ref<number[]>([]);
watch(() => props.rows, (newRows) => {
// rows are set to null when new records are loading
rowHeights.value = newRows || !rowRefs.value ? [] : rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
columnWidths.value = newRows || !headerRefs.value ? [] : [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
if (!newRows) return;
nextTick(() => {
if (rowRefs.value) {
rowHeights.value = rowRefs.value.map((el: HTMLElement) => el.offsetHeight);
}
if (headerRefs.value) {
// 48 - это примерная ширина чекбокса, если он есть
Copy link
Collaborator

@SerVitasik SerVitasik Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comment

columnWidths.value = [48, ...headerRefs.value.map((el: HTMLElement) => el.offsetWidth)];
}
});
});

function addToCheckedValues(id: any) {
Expand Down