Skip to content
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.

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

[QTable] Fix loader position in QTable while scrolling #35

Merged
merged 1 commit into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/qComponents/QTable/__snapshots__/QTable.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ exports[`QTable QTable should match snapshot 1`] = `
viewtag="div"
wrapclass="q-table__scroll-wrapper"
>
<!---->

<div
class="q-table__wrapper"
style="transition: all 0.2s;"
>
<!---->

<!---->

<table
cellpadding="0"
cellspacing="0"
Expand Down
25 changes: 12 additions & 13 deletions src/qComponents/QTable/src/QTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,24 @@
wrap-class="q-table__scroll-wrapper"
theme="secondary"
>
<div
v-if="isLoading || !isLoadingAnimationComplete"
class="q-table__loader"
:class="{ 'q-table__loader_is-loading': isLoading }"
>
<div class="q-table__loader-circle">
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
Esvalirion marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
<div
ref="tableWrapper"
class="q-table__wrapper"
:class="wrapperClass"
:style="loadingWrapperClass"
>
<div
v-if="isLoading || !isLoadingAnimationComplete"
class="q-table__loader"
:class="{ 'q-table__loader_is-loading': isLoading }"
>
<div class="q-table__loader-circle">
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
<div class="q-table__loader-circle_quarter" />
</div>
</div>

<template v-if="isDraggable">
<div class="dnd-handler" />
<div class="dnd-separator" />
Expand Down