mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[bugfix] Fix a couple accessibility issues with :focus
elements (#3979)
* [bugfix/frontend] Fix accessibility/focus issues in settings + web ui * fix little error * tweaks
This commit is contained in:
@ -80,6 +80,7 @@ $profile-bg: $gray4;
|
|||||||
$button-bg: $blue2;
|
$button-bg: $blue2;
|
||||||
$button-fg: $gray1;
|
$button-fg: $gray1;
|
||||||
$button-hover-bg: $blue3;
|
$button-hover-bg: $blue3;
|
||||||
|
$button-focus-border: $blue3;
|
||||||
|
|
||||||
$button-danger-bg: $error3;
|
$button-danger-bg: $error3;
|
||||||
$button-danger-fg: $white1;
|
$button-danger-fg: $white1;
|
||||||
|
@ -74,6 +74,14 @@
|
|||||||
div.blurhash-container > canvas {
|
div.blurhash-container > canvas {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Hide focus outline on click
|
||||||
|
to avoid ugly artifacts.
|
||||||
|
*/
|
||||||
|
&:focus {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
summary {
|
summary {
|
||||||
@ -109,6 +117,16 @@
|
|||||||
.hide {
|
.hide {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
/*
|
||||||
|
Can't rely on media having background with
|
||||||
|
decent contrast so inset and use button-fg
|
||||||
|
instead so focus is definitely visible.
|
||||||
|
*/
|
||||||
|
outline: 0.25rem dashed $button-fg;
|
||||||
|
outline-offset: -0.25rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.show.sensitive {
|
.show.sensitive {
|
||||||
@ -126,6 +144,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.photoswipe-slide {
|
||||||
|
display: inline-block;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Inset outline to avoid outline
|
||||||
|
being hidden by overflow: hidden.
|
||||||
|
*/
|
||||||
|
&:focus-visible {
|
||||||
|
outline: $button-focus-outline;
|
||||||
|
outline-offset: -0.25rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
video.plyr-video, .plyr {
|
video.plyr-video, .plyr {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
@ -81,6 +81,25 @@
|
|||||||
height: $avatar-size;
|
height: $avatar-size;
|
||||||
width: $avatar-size;
|
width: $avatar-size;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Link to open media in slide
|
||||||
|
should fill entire media wrapper.
|
||||||
|
*/
|
||||||
|
a.photoswipe-slide {
|
||||||
|
display: inline-block;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Offset to avoid clashing with
|
||||||
|
thick border around avatars.
|
||||||
|
*/
|
||||||
|
&:focus-visible {
|
||||||
|
outline: $button-focus-outline;
|
||||||
|
outline-offset: 0.25rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.avatar {
|
.avatar {
|
||||||
/*
|
/*
|
||||||
Fit 100% of the wrapper.
|
Fit 100% of the wrapper.
|
||||||
|
@ -68,6 +68,40 @@ $br-inner: 0.2rem;
|
|||||||
*/
|
*/
|
||||||
$fa-fw: 1.28571429em;
|
$fa-fw: 1.28571429em;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Outline to give links when they're
|
||||||
|
focused (ie., by clicking or tabbing to them).
|
||||||
|
*/
|
||||||
|
$link-focus-outline: 0.25rem dotted $link-fg;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Outline to give buttons when they're
|
||||||
|
focused (ie., by clicking or tabbing to them).
|
||||||
|
*/
|
||||||
|
$button-focus-outline: 0.25rem dashed $button-focus-border;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Outline to give input elements like radio buttons
|
||||||
|
and checkboxes when they're focused (ie., by clicking
|
||||||
|
or tabbing to them).
|
||||||
|
*/
|
||||||
|
$input-clickable-focus-outline: 0.25rem dashed $input-focus-border;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Outline to give summary elements when they're
|
||||||
|
focused (ie., by clicking or tabbing to them).
|
||||||
|
*/
|
||||||
|
$summary-focus-outline: 0.25rem dotted $link-fg;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Outline to give <pre> elements when they're
|
||||||
|
focused (ie., by clicking or tabbing to them).
|
||||||
|
|
||||||
|
This is used when we've got a preformatted
|
||||||
|
code block with a scroll bar inside of it.
|
||||||
|
*/
|
||||||
|
$pre-focus-outline: 0.25rem dashed $link-fg;
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
***** SECTION 2: BASIC GLOBAL STYLING *****
|
***** SECTION 2: BASIC GLOBAL STYLING *****
|
||||||
*******************************************/
|
*******************************************/
|
||||||
@ -88,6 +122,9 @@ body {
|
|||||||
|
|
||||||
a {
|
a {
|
||||||
color: $link-fg;
|
color: $link-fg;
|
||||||
|
&:focus-visible {
|
||||||
|
outline: $link-focus-outline;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -144,6 +181,14 @@ main {
|
|||||||
&:hover {
|
&:hover {
|
||||||
background: $button-hover-bg;
|
background: $button-hover-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
outline: $button-focus-outline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
summary:focus-visible {
|
||||||
|
outline: $summary-focus-outline;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -164,6 +209,11 @@ input, select, textarea, .input {
|
|||||||
border-color: $input-focus-border;
|
border-color: $input-focus-border;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&[type=checkbox]:focus-visible,
|
||||||
|
&[type=radio]:focus-visible {
|
||||||
|
outline: $input-clickable-focus-outline;
|
||||||
|
}
|
||||||
|
|
||||||
&:invalid, .invalid & {
|
&:invalid, .invalid & {
|
||||||
border-color: $input-error-border;
|
border-color: $input-error-border;
|
||||||
}
|
}
|
||||||
@ -342,6 +392,10 @@ pre, pre[class*="language-"] {
|
|||||||
white-space: pre;
|
white-space: pre;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
outline: $pre-focus-outline;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Code inside a pre block, ie.,
|
Code inside a pre block, ie.,
|
||||||
|
|
||||||
|
@ -299,6 +299,14 @@
|
|||||||
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
|
|
||||||
|
&:focus-visible {
|
||||||
|
/*
|
||||||
|
Inset focus to compensate for themes where
|
||||||
|
statuses have a really thick border.
|
||||||
|
*/
|
||||||
|
outline-offset: -0.25rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:first-child {
|
&:first-child {
|
||||||
|
@ -143,9 +143,21 @@ lightbox.on('uiRegister', function() {
|
|||||||
el.setAttribute('target', '_blank');
|
el.setAttribute('target', '_blank');
|
||||||
el.setAttribute('rel', 'noopener');
|
el.setAttribute('rel', 'noopener');
|
||||||
pswp.on('change', () => {
|
pswp.on('change', () => {
|
||||||
el.href = pswp.currSlide.data.parentStatus
|
switch (true) {
|
||||||
? pswp.currSlide.data.parentStatus
|
case pswp.currSlide.data.parentStatus !== undefined:
|
||||||
: pswp.currSlide.data.element.dataset.pswpParentStatus;
|
// Link to parent status.
|
||||||
|
el.href = pswp.currSlide.data.parentStatus;
|
||||||
|
break;
|
||||||
|
case pswp.currSlide.data.element !== undefined &&
|
||||||
|
pswp.currSlide.data.element.dataset.pswpParentStatus !== undefined:
|
||||||
|
// Link to parent status.
|
||||||
|
el.href = pswp.currSlide.data.element.dataset.pswpParentStatus;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Link to profile.
|
||||||
|
const location = window.location;
|
||||||
|
el.href = "//" + location.host + location.pathname;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -163,26 +175,63 @@ function dynamicSpoiler(className, updateFunc) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
dynamicSpoiler("text-spoiler", (spoiler) => {
|
dynamicSpoiler("text-spoiler", (details) => {
|
||||||
const button = spoiler.querySelector(".button");
|
const summary = details.children[0];
|
||||||
|
const button = details.querySelector(".button");
|
||||||
|
|
||||||
|
// Use button inside summary to
|
||||||
|
// toggle post body visibility.
|
||||||
|
button.tabIndex = "0";
|
||||||
|
button.setAttribute("aria-role", "button");
|
||||||
|
button.onclick = () => {
|
||||||
|
details.click();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Let enter also trigger the button
|
||||||
|
// (for those using keyboard to navigate).
|
||||||
|
button.addEventListener("keydown", (e) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
summary.click();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Change button text depending on
|
||||||
|
// whether spoiler is open or closed rn.
|
||||||
return () => {
|
return () => {
|
||||||
button.textContent = spoiler.open
|
button.textContent = details.open
|
||||||
? "Show less"
|
? "Show less"
|
||||||
: "Show more";
|
: "Show more";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
dynamicSpoiler("media-spoiler", (spoiler) => {
|
dynamicSpoiler("media-spoiler", (details) => {
|
||||||
const eye = spoiler.querySelector(".eye.button");
|
const summary = details.children[0];
|
||||||
const video = spoiler.querySelector(".plyr-video");
|
const button = details.querySelector(".eye.button");
|
||||||
|
const video = details.querySelector(".plyr-video");
|
||||||
const loopingAuto = !reduceMotion.matches && video != null && video.classList.contains("gifv");
|
const loopingAuto = !reduceMotion.matches && video != null && video.classList.contains("gifv");
|
||||||
|
|
||||||
|
// Use button *instead of summary*
|
||||||
|
// to toggle media visibility.
|
||||||
|
summary.tabIndex = "-1";
|
||||||
|
button.tabIndex = "0";
|
||||||
|
button.setAttribute("aria-role", "button");
|
||||||
|
button.onclick = () => {
|
||||||
|
details.click();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Let enter also trigger the button
|
||||||
|
// (for those using keyboard to navigate).
|
||||||
|
button.addEventListener("keydown", (e) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
summary.click();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (spoiler.open) {
|
if (details.open) {
|
||||||
eye.setAttribute("aria-label", "Hide media");
|
button.setAttribute("aria-label", "Hide media");
|
||||||
} else {
|
} else {
|
||||||
eye.setAttribute("aria-label", "Show media");
|
button.setAttribute("aria-label", "Show media");
|
||||||
if (video && !loopingAuto) {
|
if (video && !loopingAuto) {
|
||||||
video.pause();
|
video.pause();
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React, { useRef } from "react";
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
ReactNode,
|
ReactNode,
|
||||||
@ -119,23 +119,36 @@ export interface FileInputProps extends React.DetailedHTMLProps<
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function FileInput({ label, field, ...props }: FileInputProps) {
|
export function FileInput({ label, field, ...props }: FileInputProps) {
|
||||||
const { onChange, ref, infoComponent } = field;
|
const ref = useRef<HTMLInputElement>(null);
|
||||||
|
const { onChange, infoComponent } = field;
|
||||||
const id = nanoid();
|
const id = nanoid();
|
||||||
|
const onClick = () => {
|
||||||
|
ref.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="form-field file">
|
<div className="form-field file">
|
||||||
<label className="label-label" htmlFor={id}>
|
<label
|
||||||
|
className="label-wrapper"
|
||||||
|
htmlFor={id}
|
||||||
|
tabIndex={0}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
|
role="button"
|
||||||
|
>
|
||||||
|
<div className="label-label">
|
||||||
{label}
|
{label}
|
||||||
</label>
|
</div>
|
||||||
<label className="label-button" htmlFor={id}>
|
<div className="label-button">
|
||||||
<div className="file-input button">Browse</div>
|
<div className="file-input button">Browse</div>
|
||||||
|
</div>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id={id}
|
id={id}
|
||||||
type="file"
|
type="file"
|
||||||
className="hidden"
|
className="hidden"
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
ref={ref ? ref as RefObject<HTMLInputElement> : undefined}
|
ref={ref}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
{infoComponent}
|
{infoComponent}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React, { useRef } from "react";
|
||||||
import { useVerifyCredentialsQuery } from "../lib/query/login";
|
import { useVerifyCredentialsQuery } from "../lib/query/login";
|
||||||
import { MediaAttachment, Status as StatusType } from "../lib/types/status";
|
import { MediaAttachment, Status as StatusType } from "../lib/types/status";
|
||||||
import sanitize from "sanitize-html";
|
import sanitize from "sanitize-html";
|
||||||
@ -122,10 +122,26 @@ function StatusBody({ status }: { status: StatusType }) {
|
|||||||
content = sanitize(status.content);
|
content = sanitize(status.content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const detailsRef = useRef<HTMLDetailsElement>(null);
|
||||||
|
const detailsOnClick = () => {
|
||||||
|
detailsRef.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
|
const summaryRef = useRef<HTMLElement>(null);
|
||||||
|
const summaryOnClick = () => {
|
||||||
|
summaryRef.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="status-body">
|
<div className="status-body">
|
||||||
<details className="text-spoiler">
|
<details
|
||||||
<summary>
|
className="text-spoiler"
|
||||||
|
ref={detailsRef}
|
||||||
|
>
|
||||||
|
<summary
|
||||||
|
tabIndex={-1}
|
||||||
|
ref={summaryRef}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
className="spoiler-content"
|
className="spoiler-content"
|
||||||
lang={status.language}
|
lang={status.language}
|
||||||
@ -140,6 +156,8 @@ function StatusBody({ status }: { status: StatusType }) {
|
|||||||
role="button"
|
role="button"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
aria-label="Toggle content visibility"
|
aria-label="Toggle content visibility"
|
||||||
|
onClick={detailsOnClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && summaryOnClick()}
|
||||||
>
|
>
|
||||||
Toggle content visibility
|
Toggle content visibility
|
||||||
</span>
|
</span>
|
||||||
@ -183,23 +201,41 @@ function StatusMedia({ status }: { status: StatusType }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function StatusMediaEntry({ media }: { media: MediaAttachment }) {
|
function StatusMediaEntry({ media }: { media: MediaAttachment }) {
|
||||||
|
const detailsRef = useRef<HTMLDetailsElement>(null);
|
||||||
|
const detailsOnClick = () => {
|
||||||
|
detailsRef.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
|
const summaryRef = useRef<HTMLElement>(null);
|
||||||
|
const summaryOnClick = () => {
|
||||||
|
summaryRef.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="media-wrapper">
|
<div className="media-wrapper">
|
||||||
<details className="image-spoiler media-spoiler">
|
<details className="image-spoiler media-spoiler">
|
||||||
<summary>
|
<summary tabIndex={-1} ref={summaryRef}>
|
||||||
<div className="show sensitive button" aria-hidden="true">Show media</div>
|
<div
|
||||||
<span className="eye button" role="button" tabIndex={0} aria-label="Toggle show media">
|
className="show sensitive button"
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-hidden="true"
|
||||||
|
onClick={detailsOnClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && summaryOnClick()}
|
||||||
|
>
|
||||||
|
Show media
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
className="eye button"
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label="Toggle show media"
|
||||||
|
onClick={detailsOnClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && summaryOnClick()}
|
||||||
|
>
|
||||||
<i className="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
|
<i className="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
|
||||||
<i className="show fa fa-fw fa-eye" aria-hidden="true"></i>
|
<i className="show fa fa-fw fa-eye" aria-hidden="true"></i>
|
||||||
</span>
|
</span>
|
||||||
<img
|
|
||||||
src={media.preview_url}
|
|
||||||
loading="lazy"
|
|
||||||
alt={media.description}
|
|
||||||
title={media.description}
|
|
||||||
width={media.meta.small.width}
|
|
||||||
height={media.meta.small.height}
|
|
||||||
/>
|
|
||||||
</summary>
|
</summary>
|
||||||
<a
|
<a
|
||||||
href={media.url}
|
href={media.url}
|
||||||
|
@ -150,10 +150,7 @@ function ReadyUsernameLozenge({ account, linkTo, backLocation, classNames }: Rea
|
|||||||
|
|
||||||
if (linkTo) {
|
if (linkTo) {
|
||||||
className += " pseudolink";
|
className += " pseudolink";
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={className}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on an account, direct
|
// When clicking on an account, direct
|
||||||
// to the detail view for that account.
|
// to the detail view for that account.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -162,7 +159,12 @@ function ReadyUsernameLozenge({ account, linkTo, backLocation, classNames }: Rea
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={className}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -84,7 +84,7 @@ export default function useFileInput(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const infoComponent = (
|
const infoComponent = (
|
||||||
<span className="form-info">
|
<span className="form-info text-cutoff">
|
||||||
{info
|
{info
|
||||||
? info
|
? info
|
||||||
: initialInfo
|
: initialInfo
|
||||||
|
@ -567,24 +567,27 @@ form {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.form-field.file {
|
.form-field.file {
|
||||||
display: grid;
|
display: flex;
|
||||||
grid-template-columns: auto 1fr;
|
position: relative;
|
||||||
grid-template-rows: auto auto;
|
overflow: hidden;
|
||||||
grid-template-areas:
|
|
||||||
"label-label label-label"
|
|
||||||
"label-button file-info"
|
|
||||||
;
|
|
||||||
|
|
||||||
.label-label {
|
.label-wrapper {
|
||||||
grid-area: label-label;
|
width: fit-content;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
&:focus-visible {
|
||||||
|
outline: 0.15rem dashed $button-focus-border;
|
||||||
|
outline-offset: -0.15rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.label-button {
|
|
||||||
grid-area: label-button;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-info {
|
.form-info {
|
||||||
grid-area: file-info;
|
position: absolute;
|
||||||
|
font-weight: initial;
|
||||||
|
align-self: end;
|
||||||
|
margin-left: 4.25rem;
|
||||||
|
margin-bottom: 0.3rem;
|
||||||
|
|
||||||
.error {
|
.error {
|
||||||
padding: 0.1rem;
|
padding: 0.1rem;
|
||||||
line-height: 1.4rem;
|
line-height: 1.4rem;
|
||||||
@ -592,15 +595,6 @@ form {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
span.form-info {
|
|
||||||
flex: 1 1 auto;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
padding: 0.3rem 0;
|
|
||||||
font-weight: initial;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox-list {
|
.checkbox-list {
|
||||||
.header, .entry {
|
.header, .entry {
|
||||||
display: grid;
|
display: grid;
|
||||||
@ -1337,6 +1331,9 @@ button.tab-button {
|
|||||||
.pseudolink {
|
.pseudolink {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
&:focus-visible {
|
||||||
|
outline: 0.15rem dotted $button-focus-border;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.info-list {
|
.info-list {
|
||||||
@ -1738,7 +1735,6 @@ button.tab-button {
|
|||||||
|
|
||||||
.mutation-button {
|
.mutation-button {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
overflow-x: hidden;
|
|
||||||
|
|
||||||
button {
|
button {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
|
@ -65,11 +65,7 @@ export default function HeaderPermsOverview() {
|
|||||||
} = useGetHeaderAllowsQuery(NoArg, { skip: permType !== "allow" });
|
} = useGetHeaderAllowsQuery(NoArg, { skip: permType !== "allow" });
|
||||||
|
|
||||||
const itemToEntry = (perm: HeaderPermission) => {
|
const itemToEntry = (perm: HeaderPermission) => {
|
||||||
return (
|
const onClick = () => {
|
||||||
<dl
|
|
||||||
key={perm.id}
|
|
||||||
className="entry pseudolink"
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a header perm,
|
// When clicking on a header perm,
|
||||||
// go to the detail view for perm.
|
// go to the detail view for perm.
|
||||||
setLocation(`/${permType}s/${perm.id}`, {
|
setLocation(`/${permType}s/${perm.id}`, {
|
||||||
@ -78,7 +74,14 @@ export default function HeaderPermsOverview() {
|
|||||||
// can use it to return here.
|
// can use it to return here.
|
||||||
state: { backLocation: location }
|
state: { backLocation: location }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<dl
|
||||||
|
key={perm.id}
|
||||||
|
className="entry pseudolink"
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -211,12 +211,7 @@ function DraftListEntry({ permDraft, linkTo, backLocation }: DraftEntryProps) {
|
|||||||
|
|
||||||
const title = `${permTypeUpper} ${domain}`;
|
const title = `${permTypeUpper} ${domain}`;
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink domain-permission-draft entry ${permType}`}
|
|
||||||
aria-label={title}
|
|
||||||
title={title}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a draft, direct
|
// When clicking on a draft, direct
|
||||||
// to the detail view for that draft.
|
// to the detail view for that draft.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -225,7 +220,15 @@ function DraftListEntry({ permDraft, linkTo, backLocation }: DraftEntryProps) {
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink domain-permission-draft entry ${permType}`}
|
||||||
|
aria-label={title}
|
||||||
|
title={title}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -186,12 +186,7 @@ function ExcludeListEntry({ permExclude, linkTo, backLocation }: ExcludeEntryPro
|
|||||||
return <ErrorC error={new Error("id was undefined")} />;
|
return <ErrorC error={new Error("id was undefined")} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink domain-permission-exclude entry`}
|
|
||||||
aria-label={`Exclude ${domain}`}
|
|
||||||
title={`Exclude ${domain}`}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a exclude, direct
|
// When clicking on a exclude, direct
|
||||||
// to the detail view for that exclude.
|
// to the detail view for that exclude.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -200,7 +195,15 @@ function ExcludeListEntry({ permExclude, linkTo, backLocation }: ExcludeEntryPro
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink domain-permission-exclude entry`}
|
||||||
|
aria-label={`Exclude ${domain}`}
|
||||||
|
title={`Exclude ${domain}`}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React, { useRef } from "react";
|
||||||
|
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { useExportDomainListMutation } from "../../../lib/query/admin/domain-permissions/export";
|
import { useExportDomainListMutation } from "../../../lib/query/admin/domain-permissions/export";
|
||||||
@ -70,6 +70,11 @@ export default function ImportExportForm({ form, submitParse, parseResult }: Imp
|
|||||||
/* eslint-disable-next-line react-hooks/exhaustive-deps */
|
/* eslint-disable-next-line react-hooks/exhaustive-deps */
|
||||||
}, [exportResult]);
|
}, [exportResult]);
|
||||||
|
|
||||||
|
const importFileRef = useRef<HTMLInputElement>(null);
|
||||||
|
const importFileOnClick = () => {
|
||||||
|
importFileRef.current?.click();
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<h1>Import / Export domain permissions</h1>
|
<h1>Import / Export domain permissions</h1>
|
||||||
@ -101,7 +106,13 @@ export default function ImportExportForm({ form, submitParse, parseResult }: Imp
|
|||||||
showError={false}
|
showError={false}
|
||||||
disabled={form.permType.value === undefined || form.permType.value.length === 0}
|
disabled={form.permType.value === undefined || form.permType.value.length === 0}
|
||||||
/>
|
/>
|
||||||
<label className={`button with-icon${form.permType.value === undefined || form.permType.value.length === 0 ? " disabled" : ""}`}>
|
<label
|
||||||
|
className={`button with-icon${form.permType.value === undefined || form.permType.value.length === 0 ? " disabled" : ""}`}
|
||||||
|
tabIndex={0}
|
||||||
|
onClick={importFileOnClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && importFileOnClick()}
|
||||||
|
role="button"
|
||||||
|
>
|
||||||
<i className="fa fa-fw " aria-hidden="true" />
|
<i className="fa fa-fw " aria-hidden="true" />
|
||||||
Import file
|
Import file
|
||||||
<input
|
<input
|
||||||
@ -110,6 +121,7 @@ export default function ImportExportForm({ form, submitParse, parseResult }: Imp
|
|||||||
onChange={fileChanged}
|
onChange={fileChanged}
|
||||||
accept="application/json,text/plain,text/csv"
|
accept="application/json,text/plain,text/csv"
|
||||||
disabled={form.permType.value === undefined || form.permType.value.length === 0}
|
disabled={form.permType.value === undefined || form.permType.value.length === 0}
|
||||||
|
ref={importFileRef}
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<b /> {/* grid filler */}
|
<b /> {/* grid filler */}
|
||||||
|
@ -109,12 +109,7 @@ export function SubscriptionListEntry({ permSub, linkTo, backLocation }: Subscri
|
|||||||
successfullyFetchedAtStr = new Date(successfullyFetchedAt).toDateString();
|
successfullyFetchedAtStr = new Date(successfullyFetchedAt).toDateString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink domain-permission-subscription entry`}
|
|
||||||
aria-label={ariaLabel}
|
|
||||||
title={ariaLabel}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a subscription, direct
|
// When clicking on a subscription, direct
|
||||||
// to the detail view for that subscription.
|
// to the detail view for that subscription.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -123,7 +118,15 @@ export function SubscriptionListEntry({ permSub, linkTo, backLocation }: Subscri
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink domain-permission-subscription entry`}
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
title={ariaLabel}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -184,12 +184,7 @@ function ReportListEntry({ report, linkTo, backLocation }: ReportEntryProps) {
|
|||||||
const created = new Date(report.created_at).toLocaleString();
|
const created = new Date(report.created_at).toLocaleString();
|
||||||
const title = `${status}. @${target.account.acct} was reported by @${from.account.acct} on ${created}. Reason: "${comment}"`;
|
const title = `${status}. @${target.account.acct} was reported by @${from.account.acct} on ${created}. Reason: "${comment}"`;
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink report entry${report.action_taken ? " resolved" : ""}`}
|
|
||||||
aria-label={title}
|
|
||||||
title={title}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a report, direct
|
// When clicking on a report, direct
|
||||||
// to the detail view for that report.
|
// to the detail view for that report.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -198,7 +193,15 @@ function ReportListEntry({ report, linkTo, backLocation }: ReportEntryProps) {
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink report entry${report.action_taken ? " resolved" : ""}`}
|
||||||
|
aria-label={title}
|
||||||
|
title={title}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -139,12 +139,7 @@ function ApplicationListEntry({ app, linkTo, backLocation }: ApplicationListEntr
|
|||||||
const created = useCreated(app);
|
const created = useCreated(app);
|
||||||
const redirectURIs = useRedirectURIs(app);
|
const redirectURIs = useRedirectURIs(app);
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink application entry`}
|
|
||||||
aria-label={`${app.name}`}
|
|
||||||
title={`${app.name}`}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on an app, direct
|
// When clicking on an app, direct
|
||||||
// to the detail view for that app.
|
// to the detail view for that app.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -153,7 +148,15 @@ function ApplicationListEntry({ app, linkTo, backLocation }: ApplicationListEntr
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink application entry`}
|
||||||
|
aria-label={`${app.name}`}
|
||||||
|
title={`${app.name}`}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -102,7 +102,6 @@ export default function Export({ exportStats }: { exportStats: AccountExportStat
|
|||||||
Following {exportStats.following_count} account{ exportStats.following_count !== 1 && "s" }
|
Following {exportStats.following_count} account{ exportStats.following_count !== 1 && "s" }
|
||||||
</span>
|
</span>
|
||||||
<MutationButton
|
<MutationButton
|
||||||
className="text-cutoff"
|
|
||||||
label="Download following.csv"
|
label="Download following.csv"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => exportFollowing()}
|
onClick={() => exportFollowing()}
|
||||||
@ -116,7 +115,6 @@ export default function Export({ exportStats }: { exportStats: AccountExportStat
|
|||||||
Followed by {exportStats.followers_count} account{ exportStats.followers_count !== 1 && "s" }
|
Followed by {exportStats.followers_count} account{ exportStats.followers_count !== 1 && "s" }
|
||||||
</span>
|
</span>
|
||||||
<MutationButton
|
<MutationButton
|
||||||
className="text-cutoff"
|
|
||||||
label="Download followers.csv"
|
label="Download followers.csv"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => exportFollowers()}
|
onClick={() => exportFollowers()}
|
||||||
@ -130,7 +128,6 @@ export default function Export({ exportStats }: { exportStats: AccountExportStat
|
|||||||
Created {exportStats.lists_count} list{ exportStats.lists_count !== 1 && "s" }
|
Created {exportStats.lists_count} list{ exportStats.lists_count !== 1 && "s" }
|
||||||
</span>
|
</span>
|
||||||
<MutationButton
|
<MutationButton
|
||||||
className="text-cutoff"
|
|
||||||
label="Download lists.csv"
|
label="Download lists.csv"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => exportLists()}
|
onClick={() => exportLists()}
|
||||||
@ -144,7 +141,6 @@ export default function Export({ exportStats }: { exportStats: AccountExportStat
|
|||||||
Blocking {exportStats.blocks_count} account{ exportStats.blocks_count !== 1 && "s" }
|
Blocking {exportStats.blocks_count} account{ exportStats.blocks_count !== 1 && "s" }
|
||||||
</span>
|
</span>
|
||||||
<MutationButton
|
<MutationButton
|
||||||
className="text-cutoff"
|
|
||||||
label="Download blocks.csv"
|
label="Download blocks.csv"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => exportBlocks()}
|
onClick={() => exportBlocks()}
|
||||||
@ -158,7 +154,6 @@ export default function Export({ exportStats }: { exportStats: AccountExportStat
|
|||||||
Muting {exportStats.mutes_count} account{ exportStats.mutes_count !== 1 && "s" }
|
Muting {exportStats.mutes_count} account{ exportStats.mutes_count !== 1 && "s" }
|
||||||
</span>
|
</span>
|
||||||
<MutationButton
|
<MutationButton
|
||||||
className="text-cutoff"
|
|
||||||
label="Download mutes.csv"
|
label="Download mutes.csv"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => exportMutes()}
|
onClick={() => exportMutes()}
|
||||||
|
@ -174,12 +174,7 @@ function ReqsListEntry({ req, linkTo, backLocation }: ReqsListEntryProps) {
|
|||||||
const ourContent = useContent(req.status);
|
const ourContent = useContent(req.status);
|
||||||
const theirContent = useContent(req.reply);
|
const theirContent = useContent(req.reply);
|
||||||
|
|
||||||
return (
|
const onClick = () => {
|
||||||
<span
|
|
||||||
className={`pseudolink entry interaction-request`}
|
|
||||||
aria-label={label}
|
|
||||||
title={label}
|
|
||||||
onClick={() => {
|
|
||||||
// When clicking on a request, direct
|
// When clicking on a request, direct
|
||||||
// to the detail view for that request.
|
// to the detail view for that request.
|
||||||
setLocation(linkTo, {
|
setLocation(linkTo, {
|
||||||
@ -188,7 +183,15 @@ function ReqsListEntry({ req, linkTo, backLocation }: ReqsListEntryProps) {
|
|||||||
// this page (including query parameters).
|
// this page (including query parameters).
|
||||||
state: { backLocation: backLocation }
|
state: { backLocation: backLocation }
|
||||||
});
|
});
|
||||||
}}
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`pseudolink entry interaction-request`}
|
||||||
|
aria-label={label}
|
||||||
|
title={label}
|
||||||
|
onClick={onClick}
|
||||||
|
onKeyDown={e => e.key === "Enter" && onClick()}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
|
@ -167,6 +167,7 @@ function ProfileForm({ data: profile }: ProfileFormProps) {
|
|||||||
<MutationButton
|
<MutationButton
|
||||||
className="delete-header-button"
|
className="delete-header-button"
|
||||||
label="Delete header"
|
label="Delete header"
|
||||||
|
tabIndex={0}
|
||||||
disabled={noHeader}
|
disabled={noHeader}
|
||||||
result={deleteHeaderRes}
|
result={deleteHeaderRes}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
@ -197,6 +198,7 @@ function ProfileForm({ data: profile }: ProfileFormProps) {
|
|||||||
<MutationButton
|
<MutationButton
|
||||||
className="delete-avatar-button"
|
className="delete-avatar-button"
|
||||||
label="Delete avatar"
|
label="Delete avatar"
|
||||||
|
tabIndex={0}
|
||||||
disabled={noAvatar}
|
disabled={noAvatar}
|
||||||
result={deleteAvatarRes}
|
result={deleteAvatarRes}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
|
@ -18,5 +18,5 @@
|
|||||||
*/ -}}
|
*/ -}}
|
||||||
|
|
||||||
{{- if .showLoginButton }}
|
{{- if .showLoginButton }}
|
||||||
<div class="login"><a href="/login" class="button with-icon">Log in</a></div>
|
<div class="login"><a tabindex="0" href="/login" class="button with-icon">Log in</a></div>
|
||||||
{{- end }}
|
{{- end }}
|
@ -51,7 +51,13 @@ media photoswipe-gallery {{ (len .) | oddOrEven }} {{ if eq (len .) 1 }}single{{
|
|||||||
<div class="spoiler-content p-summary" lang="{{- .LanguageTag.TagStr -}}">
|
<div class="spoiler-content p-summary" lang="{{- .LanguageTag.TagStr -}}">
|
||||||
{{ noescape .SpoilerContent | emojify .Emojis }}
|
{{ noescape .SpoilerContent | emojify .Emojis }}
|
||||||
</div>
|
</div>
|
||||||
<span class="button" role="button" tabindex="0">Toggle visibility</span>
|
{{- with . }}
|
||||||
|
{{- /*
|
||||||
|
IMPORTANT: Button semantics and aria labels in "button" class below are added in
|
||||||
|
frontend/index.js, as the button doesn't function as a button without javascript.
|
||||||
|
*/ -}}
|
||||||
|
{{- end }}
|
||||||
|
<span class="button">Toggle visibility</span>
|
||||||
</summary>
|
</summary>
|
||||||
<div class="text">
|
<div class="text">
|
||||||
{{- with . }}
|
{{- with . }}
|
||||||
|
@ -54,7 +54,13 @@
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
>
|
>
|
||||||
<div class="show sensitive button" aria-hidden="true">Show sensitive</div>
|
<div class="show sensitive button" aria-hidden="true">Show sensitive</div>
|
||||||
<span class="eye button" role="button" tabindex="0" aria-label="Toggle media visibility">
|
{{- with . }}
|
||||||
|
{{- /*
|
||||||
|
IMPORTANT: Button semantics and aria labels in "eye button" class below are added in
|
||||||
|
frontend/index.js, as the button doesn't function as a button without javascript.
|
||||||
|
*/ -}}
|
||||||
|
{{- end }}
|
||||||
|
<span class="eye button">
|
||||||
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
|
<i class="hide fa fa-fw fa-eye-slash" aria-hidden="true"></i>
|
||||||
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
|
<i class="show fa fa-fw fa-eye" aria-hidden="true"></i>
|
||||||
</span>
|
</span>
|
||||||
|
Reference in New Issue
Block a user