fix(front): Focus report comment input in report modal

Closes #1236

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2023-04-21 15:43:36 +02:00
parent 2043c98717
commit 2c28312fc9
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
7 changed files with 58 additions and 36 deletions

View file

@ -194,6 +194,8 @@
has-modal-card
ref="reportModal"
:close-button-aria-label="t('Close')"
:autoFocus="false"
:trapFocus="false"
>
<ReportModal
:on-confirm="reportComment"

View file

@ -190,6 +190,8 @@
has-modal-card
ref="reportModal"
:close-button-aria-label="t('Close')"
:autoFocus="false"
:trapFocus="false"
>
<ReportModal
:on-confirm="reportEvent"

View file

@ -20,10 +20,9 @@
}}
</p>
</div>
<div class="">
<div class="" v-if="comment">
<article class="">
<div class="">
<div>
<article v-if="comment">
<div>
<figure class="h-8 w-8" v-if="comment?.actor?.avatar">
<img
:src="comment.actor.avatar.url"
@ -34,7 +33,6 @@
</figure>
<AccountCircle v-else :size="48" />
</div>
<div class="">
<div class="prose dark:prose-invert">
<strong>{{ comment?.actor?.name }}</strong>
<small v-if="comment.actor"
@ -43,15 +41,19 @@
<br />
<p v-html="comment.text"></p>
</div>
</div>
</article>
</div>
<o-field
:label="t('Additional comments')"
label-for="additional-comments"
>
<o-input v-model="content" type="textarea" id="additional-comments" />
<o-input
v-model="content"
type="textarea"
id="additional-comments"
autofocus
ref="reportAdditionalCommentsInput"
/>
</o-field>
<div class="control" v-if="outsideDomain">
@ -91,6 +93,7 @@ import { useI18n } from "vue-i18n";
import { IComment } from "../../types/comment.model";
import { usernameWithDomain } from "@/types/actor";
import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
import { useFocus } from "@vueuse/core";
const props = withDefaults(
defineProps<{
@ -108,18 +111,17 @@ const props = withDefaults(
const emit = defineEmits(["close"]);
// @Component({
// mounted() {
// this.$data.isActive = true;
// },
// })
// isActive = false;
const content = ref("");
const forward = ref(false);
const reportAdditionalCommentsInput = ref();
// https://github.com/oruga-ui/oruga/issues/339
const reportAdditionalCommentsInputComp = computed(
() => reportAdditionalCommentsInput.value?.$refs.textarea
);
useFocus(reportAdditionalCommentsInputComp, { initialValue: true });
const { t } = useI18n({ useScope: "global" });
const translatedCancelText = computed((): string => {

View file

@ -31,6 +31,7 @@
ref="input"
v-bind="inputAttrs"
@keydown.enter="confirm"
autofocus
/>
</o-field>
</div>
@ -48,6 +49,7 @@
</template>
<script lang="ts" setup>
import { useFocus } from "@vueuse/core";
import { computed, nextTick, ref } from "vue";
import { useI18n } from "vue-i18n";
@ -87,6 +89,12 @@ const { t } = useI18n({ useScope: "global" });
const prompt = ref<string>(props.hasInput ? props.inputAttrs?.value ?? "" : "");
const input = ref();
// https://github.com/oruga-ui/oruga/issues/339
const promptInputComp = computed(() => input.value?.$refs.input);
if (props.hasInput) {
useFocus(promptInputComp, { initialValue: true });
}
// const dialogClass = computed(() => {
// return [props.size];
// });

View file

@ -48,6 +48,7 @@ export class Dialog {
inputAttrs,
hasInput,
},
autoFocus: false,
});
}

View file

@ -617,7 +617,12 @@
</div>
</o-modal>
</div>
<o-modal v-if="group" v-model:active="isReportModalActive">
<o-modal
v-if="group"
v-model:active="isReportModalActive"
:autoFocus="false"
:trapFocus="false"
>
<report-modal
ref="reportModalRef"
:on-confirm="reportGroup"

View file

@ -218,6 +218,8 @@
v-model:active="isReportModalActive"
has-modal-card
ref="reportModal"
:autoFocus="false"
:trapFocus="false"
>
<ReportModal
:on-confirm="reportPost"