@asd20/ui 3.2.861 → 3.2.862
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.
package/package.json
CHANGED
|
@@ -1,9 +1,23 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
|
|
2
|
+
<!-- If outerScrollable is true, the outermost div gets the scrollable attributes -->
|
|
3
|
+
<div
|
|
4
|
+
v-if="outerScrollable"
|
|
5
|
+
:class="outerClasses"
|
|
6
|
+
:style="outerStyles"
|
|
7
|
+
ref="viewport"
|
|
8
|
+
@scroll="handleScroll"
|
|
9
|
+
>
|
|
10
|
+
<div>
|
|
11
|
+
<slot />
|
|
12
|
+
</div>
|
|
13
|
+
<div class="arrow-wrapper">
|
|
14
|
+
<div v-if="showDownArrow" class="down-arrow"></div>
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
<!-- If outerScrollable is false, the inner div gets the scrollable attributes -->
|
|
18
|
+
<div v-else>
|
|
3
19
|
<div :class="classes" :style="styles" ref="viewport" @scroll="handleScroll">
|
|
4
20
|
<slot />
|
|
5
|
-
|
|
6
|
-
<!-- CSS-based down arrow (conditionally displayed) -->
|
|
7
21
|
</div>
|
|
8
22
|
<div class="arrow-wrapper">
|
|
9
23
|
<div v-if="showDownArrow" class="down-arrow"></div>
|
|
@@ -18,6 +32,7 @@ export default {
|
|
|
18
32
|
scrollable: { type: Boolean, default: false },
|
|
19
33
|
padded: { type: Boolean, default: false },
|
|
20
34
|
maxHeight: { type: String, default: '' },
|
|
35
|
+
outerScrollable: { type: Boolean, default: false }, // Prop to control which div is scrollable
|
|
21
36
|
},
|
|
22
37
|
data() {
|
|
23
38
|
return {
|
|
@@ -37,6 +52,19 @@ export default {
|
|
|
37
52
|
'max-height': this.maxHeight ? this.maxHeight : 'auto',
|
|
38
53
|
}
|
|
39
54
|
},
|
|
55
|
+
outerClasses() {
|
|
56
|
+
return {
|
|
57
|
+
'asd20-viewport': true,
|
|
58
|
+
'asd20-viewport--scrollable': this.outerScrollable || this.scrollable,
|
|
59
|
+
'asd20-viewport--padded': this.padded,
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
outerStyles() {
|
|
63
|
+
return {
|
|
64
|
+
'max-height': this.maxHeight ? this.maxHeight : 'auto',
|
|
65
|
+
'overflow-y': this.outerScrollable ? 'auto' : 'hidden', // Outer div becomes scrollable when enabled
|
|
66
|
+
}
|
|
67
|
+
},
|
|
40
68
|
},
|
|
41
69
|
mounted() {
|
|
42
70
|
this.checkForOverflow()
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
windowed
|
|
22
22
|
:icon="modalIcon"
|
|
23
23
|
>
|
|
24
|
-
<asd20-viewport scrollable>
|
|
24
|
+
<asd20-viewport scrollable outerScrollable>
|
|
25
25
|
<asd20-list-item
|
|
26
26
|
v-if="organization.title !== 'Academy District 20'"
|
|
27
27
|
class="district-link"
|
|
@@ -293,6 +293,7 @@ export default {
|
|
|
293
293
|
|
|
294
294
|
.asd20-picker__modal {
|
|
295
295
|
border-bottom: 2px solid rgba(235, 235, 235, 0.8);
|
|
296
|
+
|
|
296
297
|
.district-link {
|
|
297
298
|
margin-left: space(0.5) !important;
|
|
298
299
|
font-weight: bold;
|
|
@@ -305,6 +306,9 @@ export default {
|
|
|
305
306
|
}
|
|
306
307
|
}
|
|
307
308
|
height: min-content;
|
|
309
|
+
&::v-deep .arrow-wrapper {
|
|
310
|
+
display: none !important;
|
|
311
|
+
}
|
|
308
312
|
&::v-deep h2 {
|
|
309
313
|
font-size: 1.15rem;
|
|
310
314
|
margin: space(0.5) 0;
|
|
@@ -24,7 +24,11 @@
|
|
|
24
24
|
/>
|
|
25
25
|
</div>
|
|
26
26
|
<asd20-tab-bar :tabs="tabs" @tabClick="onTabClick" />
|
|
27
|
-
<asd20-viewport
|
|
27
|
+
<asd20-viewport
|
|
28
|
+
class="asd20-site-search__results"
|
|
29
|
+
scrollable
|
|
30
|
+
outerScrollable
|
|
31
|
+
>
|
|
28
32
|
<asd20-notification
|
|
29
33
|
v-if="!keywords && !searchingFiles && !searchingPages"
|
|
30
34
|
title="Search by Keyword"
|