Skip to content

Commit 94f3b94

Browse files
pkp/pkp-lib#9499 introduce semantic-defaults instead of legacyDefaults, apply on description and other html fields
1 parent 8e67fb6 commit 94f3b94

26 files changed

+103
-29
lines changed

src/components/Form/FormGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div
66
v-if="description"
77
v-strip-unsafe-html="description"
8-
class="pkpFormGroup__description"
8+
class="pkpFormGroup__description semantic-defaults"
99
></div>
1010
</div>
1111
<div class="pkpFormGroup__fields">

src/components/Form/fields/FieldArchivingPn.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
v-if="description"
3535
:id="describedByDescriptionId"
3636
v-strip-unsafe-html="description"
37-
class="pkpFormField__description pkpFormField--options__description"
37+
class="pkpFormField__description pkpFormField--options__description semantic-defaults"
3838
/>
3939
<div
4040
v-if="terms && value"
4141
v-strip-unsafe-html="terms"
42-
class="pkpFormField__description pkpFormField--options__description pkpFormField--archivingPn__terms"
42+
class="pkpFormField__description pkpFormField--options__description pkpFormField--archivingPn__terms semantic-defaults"
4343
/>
4444
<FieldError
4545
v-if="errors && errors.length"

src/components/Form/fields/FieldBaseAutosuggest.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
v-if="isPrimaryLocale && description"
3636
:id="describedByDescriptionId"
3737
v-strip-unsafe-html="description"
38-
class="pkpFormField__description"
38+
class="pkpFormField__description semantic-defaults"
3939
/>
4040
<div class="pkpFormField__control pkpAutosuggest__control">
4141
<div
@@ -83,7 +83,7 @@
8383
<Autosuggest
8484
v-bind="autoSuggestProps"
8585
ref="inputRef"
86-
v-model:inputValue="inputValue"
86+
v-model:input-value="inputValue"
8787
@select-suggestion="selectSuggestion"
8888
@deselect="deselect"
8989
@focus-changed="changeFocus"

src/components/Form/fields/FieldColor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
v-if="isPrimaryLocale && description"
3737
:id="describedByDescriptionId"
3838
v-strip-unsafe-html="description"
39-
class="pkpFormField__description"
39+
class="pkpFormField__description semantic-defaults"
4040
/>
4141
<div class="pkpFormField__control">
4242
<color-picker

src/components/Form/fields/FieldHtml.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</div>
2020
<div
2121
v-strip-unsafe-html="description"
22-
class="pkpFormField__control pkpFormField__control--html"
22+
class="pkpFormField__control pkpFormField__control--html semantic-defaults"
2323
/>
2424
</div>
2525
</template>

src/components/Form/fields/FieldMetadataSetting.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
v-if="description"
2222
:id="describedByDescriptionId"
2323
v-strip-unsafe-html="description"
24-
class="pkpFormField__description pkpFormField--options__description"
24+
class="pkpFormField__description pkpFormField--options__description semantic-defaults"
2525
/>
2626
<FieldError
2727
v-if="errors && errors.length"

src/components/Form/fields/FieldOptions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
v-if="isPrimaryLocale && description"
3737
:id="describedByDescriptionId"
3838
v-strip-unsafe-html="description"
39-
class="pkpFormField__description pkpFormField--options__description"
39+
class="pkpFormField__description pkpFormField--options__description semantic-defaults"
4040
/>
4141
<div class="pkpFormField__control">
4242
<!-- avoid creating VueDraggable when not necessary as it was causing random problems with multiple VueDraggables in the form -->

src/components/Form/fields/FieldOrcid.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<div
4343
v-if="hasOrcid"
4444
v-strip-unsafe-html="orcidDisplayText"
45-
class="pkpFormField__control pkpFormField__control--html"
45+
class="pkpFormField__control pkpFormField__control--html semantic-defaults"
4646
/>
4747
<PkpButton
4848
v-if="hasOrcid"

src/components/Form/fields/FieldPubId.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
v-if="description"
2828
:id="describedByDescriptionId"
2929
v-strip-unsafe-html="description"
30-
class="pkpFormField__description"
30+
class="pkpFormField__description semantic-defaults"
3131
/>
3232
<div class="pkpFormField__control">
3333
<input

src/components/Form/fields/FieldRadioInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
v-if="isPrimaryLocale && description"
3737
:id="describedByDescriptionId"
3838
v-strip-unsafe-html="description"
39-
class="pkpFormField__description pkpFormField--options__description"
39+
class="pkpFormField__description pkpFormField--options__description semantic-defaults"
4040
/>
4141
<FieldError
4242
v-if="errors && errors.length"

src/components/Form/fields/FieldRichTextarea.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
v-if="isPrimaryLocale && description"
3838
:id="describedByDescriptionId"
3939
v-strip-unsafe-html="description"
40-
class="pkpFormField__description"
40+
class="pkpFormField__description semantic-defaults"
4141
/>
4242
<div
4343
class="pkpFormField__control pkpFormField--richTextarea__control"

src/components/Form/fields/FieldSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
v-if="isPrimaryLocale && description"
3030
:id="describedByDescriptionId"
3131
v-strip-unsafe-html="description"
32-
class="pkpFormField__description"
32+
class="pkpFormField__description semantic-defaults"
3333
/>
3434
<div
3535
class="pkpFormField__control"

src/components/Form/fields/FieldSelectIssue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
v-if="description"
2828
:id="describedByDescriptionId"
2929
v-strip-unsafe-html="description"
30-
class="pkpFormField__description"
30+
class="pkpFormField__description semantic-defaults"
3131
/>
3232
<div class="pkpFormField__control">
3333
<span class="pkpFormField__description">

src/components/Form/fields/FieldSlider.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
v-if="isPrimaryLocale && description"
3535
:id="describedByDescriptionId"
3636
v-strip-unsafe-html="description"
37-
class="pkpFormField__description"
37+
class="pkpFormField__description semantic-defaults"
3838
/>
3939
<div class="mt-2 flex">
4040
<div class="mt-3 grow">

src/components/Form/fields/FieldText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
v-if="isPrimaryLocale && description"
3535
:id="describedByDescriptionId"
3636
v-strip-unsafe-html="description"
37-
class="pkpFormField__description"
37+
class="pkpFormField__description semantic-defaults"
3838
/>
3939
<div class="pkpFormField__control" :class="controlClasses">
4040
<div class="pkpFormField__control_top">

src/components/Form/fields/FieldTextarea.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
v-if="isPrimaryLocale && description"
3535
:id="describedByDescriptionId"
3636
v-strip-unsafe-html="description"
37-
class="pkpFormField__description"
37+
class="pkpFormField__description semantic-defaults"
3838
/>
3939
<div class="pkpFormField__control">
4040
<textarea

src/components/Form/fields/FieldUpload.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
v-if="isPrimaryLocale && description"
3030
:id="describedByDescriptionId"
3131
v-strip-unsafe-html="description"
32-
class="pkpFormField__description"
32+
class="pkpFormField__description semantic-defaults"
3333
/>
3434
<div
3535
:id="controlId"

src/components/Form/fields/FieldUploadImage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
v-if="isPrimaryLocale && description"
3030
:id="describedByDescriptionId"
3131
v-strip-unsafe-html="description"
32-
class="pkpFormField__description"
32+
class="pkpFormField__description semantic-defaults"
3333
/>
3434
<div
3535
:id="controlId"

src/components/ListPanel/users/SelectReviewerListItem.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,10 @@
227227
<div class="listPanel__item--reviewer__detailHeading">
228228
{{ biographyLabel }}
229229
</div>
230-
<div v-strip-unsafe-html="localize(item.biography)"></div>
230+
<div
231+
v-strip-unsafe-html="localize(item.biography)"
232+
class="semantic-defaults"
233+
></div>
231234
</ListItem>
232235
</List>
233236
</div>

src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</div>
1313
<div
1414
v-strip-unsafe-html="localize(item.suggestionReason)"
15-
class="reviewer_sugestion_reason_container"
15+
class="reviewer_sugestion_reason_container semantic-defaults"
1616
></div>
1717
</div>
1818

src/components/Modal/Dialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</DialogTitle>
5656
</div>
5757
<div class="modal-content" :class="icon ? 'px-24' : 'pt- px-12'">
58-
<div v-strip-unsafe-html="message" />
58+
<div v-strip-unsafe-html="message" class="semantic-defaults" />
5959
<component
6060
:is="bodyComponent"
6161
v-if="bodyComponent"

src/components/Modal/DialogBody.vue

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<template>
2+
<div class="modal-content" :class="hasIcon ? 'px-24' : 'pt- px-12'">
3+
<slot>
4+
<div
5+
v-if="message"
6+
v-strip-unsafe-html="message"
7+
class="semantic-defaults"
8+
/>
9+
</slot>
10+
</div>
11+
12+
<div
13+
class="flex items-center gap-x-4"
14+
:class="hasIcon ? 'p-10 ps-24' : 'p-12'"
15+
>
16+
<slot name="actions">
17+
<PkpButton
18+
v-for="action in actions"
19+
:key="action.label"
20+
:element="action.element || 'button'"
21+
:href="action.href || null"
22+
:is-primary="action.isPrimary || null"
23+
:is-warnable="action.isWarnable || null"
24+
:is-disabled="isLoading"
25+
@click="action.callback ? fireCallback(action.callback) : null"
26+
>
27+
{{ action.label }}
28+
</PkpButton>
29+
</slot>
30+
31+
<Spinner v-if="isLoading || isDialogLoading" />
32+
</div>
33+
</template>
34+
35+
<script setup>
36+
import {ref} from 'vue';
37+
import PkpButton from '@/components/Button/Button.vue';
38+
import Spinner from '@/components/Spinner/Spinner.vue';
39+
40+
const props = defineProps({
41+
message: {
42+
type: String,
43+
required: true,
44+
},
45+
actions: {type: Array, default: () => []},
46+
hasIcon: Boolean,
47+
onClose: {
48+
type: Function,
49+
default: () => () => {},
50+
},
51+
isLoading: {
52+
type: Boolean,
53+
default: false,
54+
},
55+
});
56+
57+
// for components that doesn't manually handle loading state
58+
const isDialogLoading = ref(props.isLoading);
59+
60+
function fireCallback(callback) {
61+
isDialogLoading.value = true;
62+
if (typeof callback === 'function') {
63+
callback(() => {
64+
props.onClose?.();
65+
});
66+
}
67+
}
68+
</script>

src/pages/jobs/FailedJobsPage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span v-strip-unsafe-html="label"></span>
55
</template>
66
<template v-if="description" #description>
7-
<span v-strip-unsafe-html="description"></span>
7+
<span v-strip-unsafe-html="description" class="semantic-defaults"></span>
88
</template>
99
<template v-if="total > 0" #top-controls>
1010
<Spinner v-if="isLoadingItems"></Spinner>

src/pages/jobs/JobsPage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span v-strip-unsafe-html="label"></span>
55
</template>
66
<template v-if="description" #description>
7-
<span v-strip-unsafe-html="description"></span>
7+
<span v-strip-unsafe-html="description" class="semantic-defaults"></span>
88
</template>
99
<TableHeader>
1010
<TableColumn

src/pages/reviewerSubmission/RoundHistoryModal.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
v-strip-unsafe-html="
4444
store.reviewRoundHistory.declineEmail.subject
4545
"
46-
class="mb-4 text-lg-normal text-secondary"
46+
class="semantic-defaults mb-4 text-lg-normal text-secondary"
4747
></p>
4848
<p
4949
v-strip-unsafe-html="
5050
store.reviewRoundHistory.declineEmail.body
5151
"
52-
class="mt-4"
52+
class="semantic-defaults mt-4"
5353
></p>
5454
</div>
5555
<p v-else>
@@ -110,7 +110,10 @@
110110
})
111111
}}
112112
</dt>
113-
<dd v-strip-unsafe-html="reviewComment"></dd>
113+
<dd
114+
v-strip-unsafe-html="reviewComment"
115+
class="semantic-defaults"
116+
></dd>
114117
</template>
115118
</dl>
116119
</div>

src/styles/_global.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939

4040
/* To compensate for tailwindcss default, which breaks legacy unstyled html */
41-
.legacyDefaults {
41+
.semantic-defaults {
4242
/* Default browser styles for common HTML elements */
4343

4444
/* Heading 2 */

0 commit comments

Comments
 (0)