Merge branch 'develop' into bugfix/CSR-1484

This commit is contained in:
Adam Caouette 2023-07-16 15:34:55 -04:00
commit be6e9b1438
2 changed files with 4 additions and 7 deletions

View file

@ -26,6 +26,7 @@
badgeText badgeText
}}</span> }}</span>
<loader v-if="isLoaderDisplayed" :class="['left', 'no-block']" /> <loader v-if="isLoaderDisplayed" :class="['left', 'no-block']" />
<!-- no-block allows the user to click between shops while availability indicators are loading -->
</div> </div>
</div> </div>
<div class="row-two"> <div class="row-two">

View file

@ -3,7 +3,7 @@
class="loader" class="loader"
role="alert" role="alert"
aria-label="Loading new page" aria-label="Loading new page"
v-bind:class="[this.loaderColor, this.loaderPosition, this.blockUi]"></div> v-bind:class="[this.loaderColor, this.loaderPosition]"></div>
</template> </template>
<script> <script>
@ -19,11 +19,6 @@ export default {
loaderPosition: { loaderPosition: {
type: String, type: String,
}, },
/* Controls whether we block the UI when the loader is active or now, defaults to true*/
blockUi: {
type: Boolean,
default: true,
},
}, },
}; };
</script> </script>
@ -31,6 +26,7 @@ export default {
<style lang="scss"> <style lang="scss">
.loader { .loader {
display: flex; display: flex;
pointer-events: all;
//Open an overlay to prevent page interaction //Open an overlay to prevent page interaction
&:before { &:before {
@ -87,7 +83,7 @@ export default {
&.black:after { &.black:after {
background-color: $black; background-color: $black;
} }
//no-block to enable clicking on certain buttons with loaders while the loader is actives
&.no-block::before { &.no-block::before {
z-index: -1; z-index: -1;
} }