blacklight-frontend 8.8.2 → 9.0.0-beta1
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/README.md +30 -8
- package/app/assets/builds/blacklight.css +448 -0
- package/app/assets/javascripts/blacklight/blacklight.esm.js +18 -15
- package/app/assets/javascripts/blacklight/blacklight.esm.js.map +1 -1
- package/app/assets/javascripts/blacklight/blacklight.js +18 -15
- package/app/assets/javascripts/blacklight/blacklight.js.map +1 -1
- package/app/assets/stylesheets/blacklight/_balanced_list.scss +1 -4
- package/app/assets/stylesheets/blacklight/_blacklight_base.scss +1 -3
- package/app/assets/stylesheets/blacklight/_bookmark.scss +44 -41
- package/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +7 -26
- package/app/assets/stylesheets/blacklight/_constraints.scss +15 -24
- package/app/assets/stylesheets/blacklight/_controls.scss +2 -18
- package/app/assets/stylesheets/blacklight/_facets.scss +15 -82
- package/app/assets/stylesheets/blacklight/_group.scss +2 -5
- package/app/assets/stylesheets/blacklight/_header.scss +4 -11
- package/app/assets/stylesheets/blacklight/_icons.scss +0 -8
- package/app/assets/stylesheets/blacklight/_modal.scss +2 -2
- package/app/assets/stylesheets/blacklight/_pagination.scss +0 -4
- package/app/assets/stylesheets/blacklight/_search_form.scss +0 -1
- package/app/assets/stylesheets/blacklight/_search_history.scss +0 -4
- package/app/assets/stylesheets/blacklight/_search_results.scss +1 -15
- package/app/assets/stylesheets/blacklight/blacklight_defaults.scss +9 -14
- package/app/assets/stylesheets/blacklight/build.scss +4 -0
- package/app/javascript/{blacklight → blacklight-frontend}/bookmark_toggle.js +1 -1
- package/app/javascript/{blacklight → blacklight-frontend}/core.js +2 -10
- package/app/javascript/{blacklight → blacklight-frontend}/debounce.js +1 -1
- package/app/javascript/{blacklight → blacklight-frontend}/facet_suggest.js +3 -3
- package/app/javascript/blacklight-frontend/index.js +18 -0
- package/app/javascript/{blacklight → blacklight-frontend}/modal.js +16 -2
- package/package.json +14 -4
- package/app/assets/stylesheets/blacklight/_autocomplete.scss +0 -25
- package/app/assets/stylesheets/blacklight/_mixins.scss +0 -20
- package/app/javascript/blacklight/index.js +0 -18
- /package/app/javascript/{blacklight → blacklight-frontend}/button_focus.js +0 -0
- /package/app/javascript/{blacklight → blacklight-frontend}/checkbox_submit.js +0 -0
- /package/app/javascript/{blacklight → blacklight-frontend}/modalForm.js +0 -0
- /package/app/javascript/{blacklight → blacklight-frontend}/search_context.js +0 -0
|
@@ -1,41 +1,32 @@
|
|
|
1
1
|
.constraints-container {
|
|
2
|
-
@extend .mb-2;
|
|
3
2
|
display: flex;
|
|
4
3
|
flex-wrap: wrap;
|
|
5
4
|
gap: 0.5rem 0.25rem;
|
|
6
5
|
}
|
|
7
6
|
|
|
8
7
|
.applied-filter {
|
|
9
|
-
|
|
8
|
+
--separator-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='currentColor'%3e%3cpath fill-rule='evenodd' d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708'/%3e%3c/svg%3e");
|
|
10
9
|
|
|
11
10
|
.constraint-value {
|
|
12
11
|
cursor: default;
|
|
13
12
|
text-overflow: ellipsis;
|
|
14
13
|
overflow: hidden;
|
|
15
14
|
white-space: nowrap;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
15
|
+
max-width: clamp(288px, calc(30vw), 500px);
|
|
16
|
+
|
|
17
|
+
.filter-name:after {
|
|
18
|
+
background-color: var(--bs-btn-color);
|
|
19
|
+
content: "";
|
|
20
|
+
mask: var(--separator-icon);
|
|
21
|
+
mask-repeat: no-repeat;
|
|
22
|
+
display: inline-block;
|
|
23
|
+
height: 1.1rem;
|
|
24
|
+
width: 1.25rem;
|
|
25
|
+
vertical-align: text-bottom;
|
|
26
|
+
margin-right: -0.2rem;
|
|
27
|
+
margin-left: 0.25rem;
|
|
28
|
+
transition: background-color 0.15s ease-in-out;
|
|
27
29
|
}
|
|
28
|
-
|
|
29
|
-
@media (min-width: breakpoint-min(lg)) {
|
|
30
|
-
max-width: breakpoint-min(lg) * 0.5;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
.filter-name:after {
|
|
35
|
-
color: $gray-500;
|
|
36
|
-
content: "❯";
|
|
37
|
-
font-size: 90%;
|
|
38
|
-
padding-left: $caret-width;
|
|
39
30
|
}
|
|
40
31
|
|
|
41
32
|
.remove {
|
|
@@ -1,21 +1,10 @@
|
|
|
1
1
|
.search-widgets {
|
|
2
2
|
display: flex;
|
|
3
|
-
|
|
4
|
-
> * {
|
|
5
|
-
@extend .mx-1;
|
|
6
|
-
}
|
|
7
3
|
}
|
|
8
4
|
|
|
9
5
|
.sort-pagination,
|
|
10
6
|
.pagination-search-widgets {
|
|
11
|
-
border-bottom:
|
|
12
|
-
margin-bottom: 1em;
|
|
13
|
-
padding-bottom: 1em;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
.pagination-search-widgets {
|
|
17
|
-
padding-top: 1px;
|
|
18
|
-
padding-bottom: $spacer;
|
|
7
|
+
border-bottom: var(--bs-border-width) solid var(--bs-border-color);
|
|
19
8
|
}
|
|
20
9
|
|
|
21
10
|
.sort-pagination .dropdown-toggle {
|
|
@@ -25,18 +14,13 @@
|
|
|
25
14
|
.no-js {
|
|
26
15
|
.btn-group:focus-within {
|
|
27
16
|
.dropdown-menu {
|
|
28
|
-
|
|
17
|
+
display: block; /* show menu when tabbing to it, without Javascript */
|
|
29
18
|
}
|
|
30
19
|
}
|
|
31
20
|
}
|
|
32
21
|
|
|
33
22
|
.view-type {
|
|
34
23
|
display: inline-block;
|
|
35
|
-
|
|
36
|
-
.caption {
|
|
37
|
-
@extend .sr-only !optional;
|
|
38
|
-
@extend .visually-hidden !optional;
|
|
39
|
-
}
|
|
40
24
|
}
|
|
41
25
|
|
|
42
26
|
.modal_form {
|
|
@@ -1,18 +1,11 @@
|
|
|
1
1
|
.sidenav {
|
|
2
|
-
--bl-facet-active-bg:
|
|
3
|
-
--bl-facet-active-item-color:
|
|
4
|
-
--bl-facet-margin-bottom: #{$spacer};
|
|
2
|
+
--bl-facet-active-bg: var(--bs-success);
|
|
3
|
+
--bl-facet-active-item-color: var(--bs-success);
|
|
5
4
|
--bl-facet-remove-color: var(--bs-secondary-color);
|
|
5
|
+
--bl-facet-remove-hover-color: var(--bs-danger);
|
|
6
6
|
--bl-facet-label-indent: -15px;
|
|
7
7
|
--bl-facet-label-padding-left: 15px;
|
|
8
|
-
|
|
9
|
-
--bl-facet-limit-body-padding: #{$spacer};
|
|
10
|
-
|
|
11
|
-
--bl-facets-smallish-padding: 0.25rem;
|
|
12
|
-
--bl-facets-smallish-border: var(--bs-border-width) solid
|
|
13
|
-
var(--bs-border-color);
|
|
14
|
-
--bl-facets-smallish-margin-bottom: #{$spacer};
|
|
15
|
-
--bl-facets-smallish-border-radius: #{$border-radius};
|
|
8
|
+
--bl-facet-header-padding-y: 0.5rem;
|
|
16
9
|
|
|
17
10
|
.facet-toggle-button {
|
|
18
11
|
[data-hide-label] {
|
|
@@ -33,34 +26,6 @@
|
|
|
33
26
|
}
|
|
34
27
|
}
|
|
35
28
|
|
|
36
|
-
.facets-toggleable {
|
|
37
|
-
@each $breakpoint in map-keys($grid-breakpoints) {
|
|
38
|
-
$next: breakpoint-next($breakpoint, $grid-breakpoints);
|
|
39
|
-
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);
|
|
40
|
-
|
|
41
|
-
&#{$infix} {
|
|
42
|
-
@include media-breakpoint-down($next) {
|
|
43
|
-
border: var(--bl-facets-smallish-border);
|
|
44
|
-
padding: var(--bl-facets-smallish-padding);
|
|
45
|
-
margin-bottom: var(--bl-facets-smallish-margin-bottom);
|
|
46
|
-
border-radius: var(--bl-facets-smallish-border-radius);
|
|
47
|
-
}
|
|
48
|
-
@include media-breakpoint-up($next) {
|
|
49
|
-
// scss-lint:disable ImportantRule
|
|
50
|
-
.facets-collapse {
|
|
51
|
-
display: block !important;
|
|
52
|
-
width: 100%;
|
|
53
|
-
}
|
|
54
|
-
// scss-lint:enable ImportantRule
|
|
55
|
-
|
|
56
|
-
.navbar-toggler {
|
|
57
|
-
display: none;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
29
|
.no-js {
|
|
65
30
|
@include media-breakpoint-down(lg) {
|
|
66
31
|
#sidebar {
|
|
@@ -88,49 +53,25 @@
|
|
|
88
53
|
.facets-header {
|
|
89
54
|
display: flex;
|
|
90
55
|
justify-content: space-between;
|
|
91
|
-
padding-
|
|
92
|
-
padding-top: 0.5rem;
|
|
56
|
+
padding-block: var(--bl-facet-header-padding-y);
|
|
93
57
|
}
|
|
94
58
|
|
|
95
59
|
.facets-heading {
|
|
96
|
-
@extend .h4;
|
|
97
60
|
line-height: inherit;
|
|
98
61
|
}
|
|
99
62
|
|
|
100
63
|
.facet-limit {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
padding: var(--bl-facet-limit-body-padding);
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
/* Provide a focus ring on the expand/collapse button */
|
|
108
|
-
.btn {
|
|
109
|
-
--bs-btn-focus-shadow-rgb: 50, 50, 50;
|
|
110
|
-
&:focus-visible {
|
|
111
|
-
border-color: var(--bs-btn-hover-border-color);
|
|
112
|
-
outline: 0;
|
|
113
|
-
box-shadow: var(--bs-btn-focus-box-shadow);
|
|
114
|
-
}
|
|
115
|
-
}
|
|
64
|
+
--bs-accordion-btn-bg: var(--bs-gray-100);
|
|
65
|
+
--bs-btn-hover-bg: var(--bs-gray-200);
|
|
66
|
+
--bs-accordion-active-bg: var(--bs-accordion-btn-bg);
|
|
116
67
|
}
|
|
117
68
|
|
|
118
69
|
.facet-limit-active {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
.btn {
|
|
125
|
-
@if function-exists(color-contrast) {
|
|
126
|
-
color: color-contrast($facet-active-bg);
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
@if function-exists(color-yiq) {
|
|
130
|
-
color: color-yiq($facet-active-bg);
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
}
|
|
70
|
+
--bs-accordion-btn-bg: var(--bl-facet-active-bg);
|
|
71
|
+
--bs-btn-hover-bg: var(--bs-accordion-btn-bg);
|
|
72
|
+
--bs-accordion-btn-color: var(--bs-light);
|
|
73
|
+
--bs-btn-hover-color: var(--bs-accordion-btn-color);
|
|
74
|
+
--bs-accordion-active-color: var(--bs-accordion-btn-color);
|
|
134
75
|
}
|
|
135
76
|
|
|
136
77
|
.facet-values {
|
|
@@ -145,7 +86,7 @@
|
|
|
145
86
|
align-items: flex-start;
|
|
146
87
|
padding: 3px 0;
|
|
147
88
|
|
|
148
|
-
|
|
89
|
+
&.treeitem {
|
|
149
90
|
display: block;
|
|
150
91
|
}
|
|
151
92
|
|
|
@@ -161,7 +102,7 @@
|
|
|
161
102
|
text-decoration: none;
|
|
162
103
|
|
|
163
104
|
&:hover {
|
|
164
|
-
color:
|
|
105
|
+
color: var(--bl-facet-remove-hover-color);
|
|
165
106
|
text-decoration: none;
|
|
166
107
|
}
|
|
167
108
|
}
|
|
@@ -194,8 +135,6 @@
|
|
|
194
135
|
}
|
|
195
136
|
|
|
196
137
|
.facet-field-heading {
|
|
197
|
-
@extend .h6;
|
|
198
|
-
|
|
199
138
|
a {
|
|
200
139
|
color: inherit;
|
|
201
140
|
}
|
|
@@ -207,12 +146,6 @@
|
|
|
207
146
|
/* Sidenav
|
|
208
147
|
-------------------------------------------------- */
|
|
209
148
|
|
|
210
|
-
.facet-pagination {
|
|
211
|
-
&.top {
|
|
212
|
-
padding: $modal-inner-padding;
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
|
|
216
149
|
.pivot-facet {
|
|
217
150
|
&.show {
|
|
218
151
|
display: flex;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
.group-key {
|
|
2
|
-
border-
|
|
2
|
+
--bl-border-color: var(--bs-gray-600);
|
|
3
|
+
border-bottom: 1px solid var(--bl-border-color);
|
|
3
4
|
clear: right;
|
|
4
5
|
}
|
|
5
6
|
|
|
@@ -8,7 +9,3 @@
|
|
|
8
9
|
border-bottom: 0;
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
|
-
|
|
12
|
-
.more-in-group {
|
|
13
|
-
float: right;
|
|
14
|
-
}
|
|
@@ -4,15 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
.navbar-logo {
|
|
6
6
|
/* The main logo image for the Blacklight instance */
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}
|
|
11
|
-
height: $logo-height;
|
|
7
|
+
background: transparent var(--bl-logo-image) no-repeat top left;
|
|
8
|
+
background-size: var(--bl-logo-width) var(--bl-logo-height);
|
|
9
|
+
height: var(--bl-logo-height);
|
|
12
10
|
overflow: hidden;
|
|
13
11
|
text-indent: 100%;
|
|
14
12
|
white-space: nowrap;
|
|
15
|
-
width:
|
|
13
|
+
width: var(--bl-logo-width);
|
|
16
14
|
}
|
|
17
15
|
|
|
18
16
|
.navbar-search {
|
|
@@ -26,9 +24,4 @@
|
|
|
26
24
|
// This prevents the widget from being squished so the text overflows
|
|
27
25
|
min-width: 7em;
|
|
28
26
|
}
|
|
29
|
-
|
|
30
|
-
.search-query-form {
|
|
31
|
-
@extend .col-md-12;
|
|
32
|
-
@extend .col-lg-8;
|
|
33
|
-
}
|
|
34
27
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
.modal-content {
|
|
6
6
|
.facet-pagination.top {
|
|
7
|
-
|
|
7
|
+
display: none; /* Doesn't display in a modal, but would display on a new page (e.g. without Javascript) */
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
.page-sidebar {
|
|
@@ -23,5 +23,5 @@
|
|
|
23
23
|
// app/views/catalog/facet.html.erb may be rendered as a modal or a whole page.
|
|
24
24
|
// When it's a whole page, don't show the close button.
|
|
25
25
|
.blacklight-modal-close {
|
|
26
|
-
|
|
26
|
+
display: none;
|
|
27
27
|
}
|
|
@@ -5,28 +5,14 @@
|
|
|
5
5
|
|
|
6
6
|
.document {
|
|
7
7
|
display: flex;
|
|
8
|
-
border-bottom: 1px dotted
|
|
8
|
+
border-bottom: 1px dotted var(--bs-border-color);
|
|
9
9
|
margin-top: var(--bl-results-document-margin-top);
|
|
10
10
|
padding-top: var(--bl-results-document-padding-top);
|
|
11
11
|
|
|
12
|
-
.document-title-heading {
|
|
13
|
-
@extend h5;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
12
|
.document-main-section {
|
|
17
13
|
flex-grow: 1;
|
|
18
14
|
}
|
|
19
15
|
|
|
20
|
-
// bookmarks checkbox on index, give it some
|
|
21
|
-
// lower margin when it collapses
|
|
22
|
-
.index-document-functions {
|
|
23
|
-
margin-bottom: ($spacer * 1.5);
|
|
24
|
-
|
|
25
|
-
@media (min-width: breakpoint-min(sm)) {
|
|
26
|
-
margin-bottom: 0;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
|
|
30
16
|
.document-thumbnail {
|
|
31
17
|
flex-grow: 0;
|
|
32
18
|
margin-bottom: ($spacer * 3);
|
|
@@ -1,18 +1,13 @@
|
|
|
1
|
-
/* Warning! If you want to change these, just copy them into your own theme css. But you want to remove the !default, which only will set them if not already set. */
|
|
2
|
-
|
|
3
|
-
$logo-image: image_url("blacklight/logo.png") !default;
|
|
4
|
-
$logo-width: 150px !default;
|
|
5
|
-
$logo-height: 50px !default;
|
|
6
|
-
|
|
7
|
-
$facet-active-border: $success !default;
|
|
8
|
-
$facet-active-bg: $success !default;
|
|
9
|
-
$facet-active-item-color: $success !default;
|
|
10
|
-
|
|
11
|
-
/* for compatability with BS < 5.3 */
|
|
12
|
-
$body-secondary-color: rgba($body-color, 0.75) !default;
|
|
13
|
-
|
|
14
1
|
:root {
|
|
15
|
-
--
|
|
2
|
+
--bl-logo-image: url("blacklight/logo.png");
|
|
3
|
+
--bl-logo-width: 150px;
|
|
4
|
+
--bl-logo-height: 50px;
|
|
5
|
+
--bs-secondary-color: rgba(
|
|
6
|
+
33,
|
|
7
|
+
37,
|
|
8
|
+
41,
|
|
9
|
+
0.75
|
|
10
|
+
); /* for compatability with BS < 5.3 */
|
|
16
11
|
|
|
17
12
|
--bl-main-padding-y: 0.5rem;
|
|
18
13
|
|
|
@@ -15,14 +15,6 @@ const Core = function() {
|
|
|
15
15
|
const listeners = [];
|
|
16
16
|
if (typeof Turbo !== 'undefined') {
|
|
17
17
|
listeners.push('turbo:load', 'turbo:frame-load');
|
|
18
|
-
} else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
|
|
19
|
-
// Turbolinks 5
|
|
20
|
-
if (Turbolinks.BrowserAdapter) {
|
|
21
|
-
listeners.push('turbolinks:load');
|
|
22
|
-
} else {
|
|
23
|
-
// Turbolinks < 5
|
|
24
|
-
listeners.push('page:load', 'DOMContentLoaded');
|
|
25
|
-
}
|
|
26
18
|
} else {
|
|
27
19
|
listeners.push('DOMContentLoaded');
|
|
28
20
|
}
|
|
@@ -32,8 +24,8 @@ const Core = function() {
|
|
|
32
24
|
};
|
|
33
25
|
}();
|
|
34
26
|
|
|
35
|
-
//
|
|
36
|
-
// If app isn't using
|
|
27
|
+
// turbo triggers turbo:load events on page transition
|
|
28
|
+
// If app isn't using turbo, this event will never be triggered, no prob.
|
|
37
29
|
Core.listeners().forEach(function(listener) {
|
|
38
30
|
document.addEventListener(listener, function() {
|
|
39
31
|
Core.activate()
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// const basicFunction = (entry) => console.log(entry)
|
|
4
4
|
// const debounced = debounce(basicFunction("I should only be called once"));
|
|
5
5
|
//
|
|
6
|
-
// debounced // does NOT print to the screen
|
|
6
|
+
// debounced // does NOT print to the screen becase it is invoked again less than 200 milliseconds later
|
|
7
7
|
// debounced // does print to the screen
|
|
8
8
|
// ```
|
|
9
9
|
export default function debounce(func, timeout = 200) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import debounce from "blacklight/debounce";
|
|
1
|
+
import debounce from "blacklight-frontend/debounce";
|
|
2
2
|
|
|
3
3
|
const FacetSuggest = async (e) => {
|
|
4
4
|
if (e.target.matches('.facet-suggest')) {
|
|
@@ -11,9 +11,9 @@ const FacetSuggest = async (e) => {
|
|
|
11
11
|
if (response.ok) {
|
|
12
12
|
const blob = await response.blob()
|
|
13
13
|
const text = await blob.text()
|
|
14
|
-
|
|
14
|
+
|
|
15
15
|
const facetArea = document.querySelector('.facet-extended-list');
|
|
16
|
-
|
|
16
|
+
|
|
17
17
|
if (text && facetArea) {
|
|
18
18
|
facetArea.innerHTML = text
|
|
19
19
|
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import BookmarkToggle from 'blacklight-frontend/bookmark_toggle'
|
|
2
|
+
import ButtonFocus from 'blacklight-frontend/button_focus'
|
|
3
|
+
import FacetSuggest from 'blacklight-frontend/facet_suggest'
|
|
4
|
+
import Modal from 'blacklight-frontend/modal'
|
|
5
|
+
import ModalForm from 'blacklight-frontend/modalForm'
|
|
6
|
+
import SearchContext from 'blacklight-frontend/search_context'
|
|
7
|
+
import Core from 'blacklight-frontend/core'
|
|
8
|
+
|
|
9
|
+
export default {
|
|
10
|
+
BookmarkToggle,
|
|
11
|
+
ButtonFocus,
|
|
12
|
+
FacetSuggest,
|
|
13
|
+
Modal,
|
|
14
|
+
ModalForm,
|
|
15
|
+
SearchContext,
|
|
16
|
+
Core,
|
|
17
|
+
onLoad: Core.onLoad
|
|
18
|
+
}
|
|
@@ -56,6 +56,9 @@
|
|
|
56
56
|
const Modal = (() => {
|
|
57
57
|
const modal = {}
|
|
58
58
|
|
|
59
|
+
// bootstrap class that will stop body scrolling when modal is open
|
|
60
|
+
const bootstrapBodyClassOpen = "modal-open";
|
|
61
|
+
|
|
59
62
|
// a Bootstrap modal div that should be already on the page hidden
|
|
60
63
|
modal.modalSelector = '#blacklight-modal';
|
|
61
64
|
|
|
@@ -110,7 +113,7 @@ const Modal = (() => {
|
|
|
110
113
|
}
|
|
111
114
|
elements.forEach((el) => frag.appendChild(el))
|
|
112
115
|
modal.activateScripts(frag)
|
|
113
|
-
|
|
116
|
+
|
|
114
117
|
modal.target().querySelector('.modal-content').replaceChildren(frag)
|
|
115
118
|
|
|
116
119
|
// send custom event with the modal dialog div as the target
|
|
@@ -119,7 +122,6 @@ const Modal = (() => {
|
|
|
119
122
|
|
|
120
123
|
// if they did preventDefault, don't show the dialog
|
|
121
124
|
if (e.defaultPrevented) return;
|
|
122
|
-
|
|
123
125
|
modal.show();
|
|
124
126
|
};
|
|
125
127
|
|
|
@@ -170,6 +172,12 @@ const Modal = (() => {
|
|
|
170
172
|
dom.dispatchEvent(e)
|
|
171
173
|
|
|
172
174
|
dom.close()
|
|
175
|
+
|
|
176
|
+
// Turn body scrolling back to what it was
|
|
177
|
+
document.body.style["overflow"] = modal.originalBodyOverflow;
|
|
178
|
+
document.body.style["padding-right"] = modal.originalBodyPaddingRight;
|
|
179
|
+
modal.originalBodyOverflow = undefined;
|
|
180
|
+
modal.originalBodyPaddingRight = undefined;
|
|
173
181
|
}
|
|
174
182
|
|
|
175
183
|
modal.show = function(el) {
|
|
@@ -181,6 +189,12 @@ const Modal = (() => {
|
|
|
181
189
|
dom.dispatchEvent(e)
|
|
182
190
|
|
|
183
191
|
dom.showModal()
|
|
192
|
+
|
|
193
|
+
// Turn off body scrolling
|
|
194
|
+
modal.originalBodyOverflow = document.body.style['overflow'];
|
|
195
|
+
modal.originalBodyPaddingRight = document.body.style['padding-right'];
|
|
196
|
+
document.body.style["overflow"] = "hidden"
|
|
197
|
+
document.body.style["padding-right"] = "0px"
|
|
184
198
|
}
|
|
185
199
|
|
|
186
200
|
modal.target = function() {
|
package/package.json
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "blacklight-frontend",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "9.0.0-beta1",
|
|
4
4
|
"description": "The frontend code and styles for Blacklight",
|
|
5
|
-
"
|
|
5
|
+
"exports": {
|
|
6
|
+
"./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",
|
|
7
|
+
"./stylesheets/*": "./app/assets/stylesheets/blacklight/*",
|
|
8
|
+
".": {
|
|
9
|
+
"import": "./app/javascript/blacklight-frontend/index.js",
|
|
10
|
+
"require": "./app/assets/javascripts/blacklight.js"
|
|
11
|
+
},
|
|
12
|
+
"./*": "./app/javascript/blacklight-frontend/*.js"
|
|
13
|
+
},
|
|
6
14
|
"type": "module",
|
|
7
|
-
"module": "app/assets/javascripts/blacklight/blacklight.esm.js",
|
|
8
15
|
"scripts": {
|
|
16
|
+
"build": "sass ./app/assets/stylesheets/blacklight/build.scss:./app/assets/builds/blacklight.css --no-source-map --load-path=node_modules --quiet-deps",
|
|
9
17
|
"prepare": "rollup --config rollup.config.js --sourcemap && ESM=true rollup --config rollup.config.js --sourcemap"
|
|
10
18
|
},
|
|
11
19
|
"repository": {
|
|
@@ -24,7 +32,9 @@
|
|
|
24
32
|
"homepage": "https://github.com/projectblacklight/blacklight#readme",
|
|
25
33
|
"devDependencies": {
|
|
26
34
|
"rollup": "^4.24.0",
|
|
27
|
-
"rollup-plugin-includepaths": "^0.2.4"
|
|
35
|
+
"rollup-plugin-includepaths": "^0.2.4",
|
|
36
|
+
"sass": "^1.80.3",
|
|
37
|
+
"bootstrap": "^5.3.3"
|
|
28
38
|
},
|
|
29
39
|
"browserslist": [
|
|
30
40
|
"defaults",
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
auto-complete [aria-selected="true"],
|
|
2
|
-
auto-complete [role="option"]:hover {
|
|
3
|
-
background-color: $dropdown-link-hover-bg;
|
|
4
|
-
}
|
|
5
|
-
auto-complete {
|
|
6
|
-
position: relative;
|
|
7
|
-
flex-grow: 3;
|
|
8
|
-
|
|
9
|
-
ul {
|
|
10
|
-
list-style-type: none;
|
|
11
|
-
position: absolute;
|
|
12
|
-
background-color: $dropdown-bg;
|
|
13
|
-
padding-left: 0;
|
|
14
|
-
border: 1px solid $dropdown-border-color;
|
|
15
|
-
border-radius: $dropdown-border-radius;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
[role="option"]{
|
|
19
|
-
padding: 0.25rem 1.5rem;
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
.no-js #autocomplete-popup {
|
|
24
|
-
display: none;
|
|
25
|
-
}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
// define a visually-hidden class that applies to a given breakpoint and below
|
|
2
|
-
// https://getbootstrap.com/docs/5.3/helpers/visually-hidden/
|
|
3
|
-
@if mixin-exists(visually-hidden) {
|
|
4
|
-
@each $breakpoint in map-keys($grid-breakpoints) {
|
|
5
|
-
.visually-hidden-#{$breakpoint} {
|
|
6
|
-
@include media-breakpoint-down($breakpoint) {
|
|
7
|
-
@include visually-hidden;
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
} @else if mixin-exists(sr-only) {
|
|
12
|
-
// Bootstrap 4 version
|
|
13
|
-
@each $breakpoint in map-keys($grid-breakpoints) {
|
|
14
|
-
.visually-hidden-#{$breakpoint} {
|
|
15
|
-
@include media-breakpoint-down($breakpoint) {
|
|
16
|
-
@include sr-only;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import BookmarkToggle from 'blacklight/bookmark_toggle'
|
|
2
|
-
import ButtonFocus from 'blacklight/button_focus'
|
|
3
|
-
import FacetSuggest from 'blacklight/facet_suggest'
|
|
4
|
-
import Modal from 'blacklight/modal'
|
|
5
|
-
import ModalForm from 'blacklight/modalForm'
|
|
6
|
-
import SearchContext from 'blacklight/search_context'
|
|
7
|
-
import Core from 'blacklight/core'
|
|
8
|
-
|
|
9
|
-
export default {
|
|
10
|
-
BookmarkToggle,
|
|
11
|
-
ButtonFocus,
|
|
12
|
-
FacetSuggest,
|
|
13
|
-
Modal,
|
|
14
|
-
ModalForm,
|
|
15
|
-
SearchContext,
|
|
16
|
-
Core,
|
|
17
|
-
onLoad: Core.onLoad
|
|
18
|
-
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|