mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-11 12:33:53 -06:00
fix: space Starlight's previous and next links
The word and the page title were split by a <br> only, which a copy, textContent and an assistant read as "PreviousWhat the packs do not hold". The override keeps Starlight's look, spaces them, names each link by direction and page, and makes the pair a navigation landmark.
This commit is contained in:
1 parent
baa42df2a7
commit
8d69ad54df
4 files changed
+125
-4
No files matched your search
@@ -396,7 +396,7 @@ class _Page(HTMLParser):
|
||||
def handle_endtag(self, tag: str) -> None:
|
||||
if tag == "nav" and self._crumbs:
|
||||
self._crumbs = 0
|
||||
if tag == "div" and self._pagination and not self.pagination:
|
||||
if tag == "nav" and self._pagination and not self.pagination:
|
||||
self._pagination = False
|
||||
if self._text is not None and tag in ("a", "summary"):
|
||||
self.sidebar.append(" ".join("".join(self._text).split()))
|
||||
@@ -621,7 +621,7 @@ def _html(url: str) -> str:
|
||||
|
||||
|
||||
def _pagination(text: str) -> tuple[str | None, str | None]:
|
||||
start = text.find('<div class="pagination-links')
|
||||
start = text.find('<nav class="pagination-links')
|
||||
if start == -1:
|
||||
return None, None
|
||||
links = text[start:text.find("</footer>", start)]
|
||||
|
||||
@@ -44,13 +44,17 @@ PAGES = ("which-pack", "wiki/first-install", "wiki/architecture", "wiki/what-are
|
||||
"wiki/installer", "platforms/retrodeck", "provenance-no-intro", "explore", "index")
|
||||
|
||||
BLOCKS = frozenset(
|
||||
"address article aside blockquote br caption dd details dialog div dl dt fieldset figcaption "
|
||||
"address article aside blockquote caption dd details dialog div dl dt fieldset figcaption "
|
||||
"figure footer form h1 h2 h3 h4 h5 h6 header hr li main nav ol option p pre section select "
|
||||
"summary table tbody td tfoot th thead tr ul".split())
|
||||
VOID = frozenset("area base br col embed hr img input link meta source track wbr".split())
|
||||
# What the stylesheet lays out as its own box beside the text before it:
|
||||
# the markup has to space it, a reader without the stylesheet sees no box.
|
||||
OWN_BOX = ("rb-tile-name", "rb-tile-runs", "rb-stat-label", "rb-badge", "rb-table-filter-count")
|
||||
# A <br> breaks a line on screen only: a copy and textContent join across
|
||||
# it, so it separates nothing here. link-title is the page name of
|
||||
# Starlight's previous and next links.
|
||||
OWN_BOX = ("rb-tile-name", "rb-tile-runs", "rb-stat-label", "rb-badge", "rb-table-filter-count",
|
||||
"link-title")
|
||||
|
||||
|
||||
class PageText(HTMLParser):
|
||||
@@ -272,6 +276,35 @@ class TheTwoFilterBoxesAreOne(unittest.TestCase):
|
||||
self.assertIn(".rb-table-filter[hidden] { visibility: hidden; }", css)
|
||||
|
||||
|
||||
class PreviousAndNextAreSpaced(unittest.TestCase):
|
||||
"""Starlight's previous and next links read "PreviousWhat the packs do
|
||||
not hold": the word and the title were split by a <br> only. The
|
||||
override (src/components/Pagination.astro) spaces them and names each
|
||||
link by its direction and its page."""
|
||||
|
||||
def test_the_override_is_registered(self):
|
||||
config = (WEBSITE / "astro.config.mjs").read_text(encoding="utf-8")
|
||||
self.assertIn("Pagination: './src/components/Pagination.astro',", config)
|
||||
|
||||
def test_word_and_title_are_spaced_and_named(self):
|
||||
source = (WEBSITE / "src" / "components" / "Pagination.astro").read_text(encoding="utf-8")
|
||||
for word, rel, page in (("previousWord", "prev", "prev"), ("nextWord", "next", "next")):
|
||||
with self.subTest(rel=rel):
|
||||
self.assertIn(f"{{{word}}}{{' '}}\n\t\t\t\t\t<br />", source)
|
||||
self.assertIn(f'rel="{rel}" aria-label={{`${{{word}}}: ${{{page}.label}}`}}', source)
|
||||
self.assertRegex(source, r'<nav class="pagination-links[^"]*" dir=\{dir\} aria-label=')
|
||||
|
||||
def test_a_rendered_pair_reads_spaced(self):
|
||||
html = ('<div class="sl-markdown-content"></div><nav class="pagination-links">'
|
||||
'<a href="/a/" rel="prev"><span>Previous <br><span class="link-title">A</span>'
|
||||
'</span></a> <a href="/b/" rel="next"><span>Next <br>'
|
||||
'<span class="link-title">B</span></span></a></nav>')
|
||||
page = read(html, article_only=True)
|
||||
self.assertEqual(page.glued, [])
|
||||
self.assertEqual(page.text, "Previous A Next B")
|
||||
self.assertTrue(read(html.replace("Previous <br>", "Previous<br>"), article_only=True).glued)
|
||||
|
||||
|
||||
class ThePickerWaitsForItsScript(unittest.TestCase):
|
||||
def test_hidden_until_the_setups_are_listed(self):
|
||||
source = (WEBSITE / "src" / "components" / "FilePicker.astro").read_text(encoding="utf-8")
|
||||
|
||||
@@ -105,6 +105,7 @@ export default defineConfig({
|
||||
PageTitle: './src/components/PageTitle.astro',
|
||||
MarkdownContent: './src/components/MarkdownContent.astro',
|
||||
Footer: './src/components/Footer.astro',
|
||||
Pagination: './src/components/Pagination.astro',
|
||||
Header: './src/components/Header.astro',
|
||||
Search: './src/components/Search.astro',
|
||||
},
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
---
|
||||
// Starlight's previous and next links (its Pagination.astro, 0.42), with a
|
||||
// space after the word: the line break alone left "PreviousWhat the packs
|
||||
// do not hold" in the page text a copy, a crawler or an assistant reads.
|
||||
// Each link is named by its direction and its page, and the pair is a
|
||||
// navigation landmark.
|
||||
import { Icon } from '@astrojs/starlight/components';
|
||||
|
||||
const { dir, pagination } = Astro.locals.starlightRoute;
|
||||
const { prev, next } = pagination;
|
||||
const isRtl = dir === 'rtl';
|
||||
const previousWord = Astro.locals.t('page.previousLink');
|
||||
const nextWord = Astro.locals.t('page.nextLink');
|
||||
---
|
||||
|
||||
<nav class="pagination-links print:hidden" dir={dir} aria-label={`${previousWord} and ${nextWord.toLowerCase()} page`}>
|
||||
{
|
||||
prev && (
|
||||
<a href={prev.href} rel="prev" aria-label={`${previousWord}: ${prev.label}`}>
|
||||
<Icon name={isRtl ? 'right-arrow' : 'left-arrow'} size="1.5rem" />
|
||||
<span>
|
||||
{previousWord}{' '}
|
||||
<br />
|
||||
<span class="link-title">{prev.label}</span>
|
||||
</span>
|
||||
</a>
|
||||
)
|
||||
}
|
||||
{' '}
|
||||
{
|
||||
next && (
|
||||
<a href={next.href} rel="next" aria-label={`${nextWord}: ${next.label}`}>
|
||||
<Icon name={isRtl ? 'left-arrow' : 'right-arrow'} size="1.5rem" />
|
||||
<span>
|
||||
{nextWord}{' '}
|
||||
<br />
|
||||
<span class="link-title">{next.label}</span>
|
||||
</span>
|
||||
</a>
|
||||
)
|
||||
}
|
||||
</nav>
|
||||
|
||||
<style>
|
||||
@layer starlight.core {
|
||||
.pagination-links {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(min(18rem, 100%), 1fr));
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
a {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 0.5rem;
|
||||
width: 100%;
|
||||
flex-basis: calc(50% - 0.5rem);
|
||||
flex-grow: 1;
|
||||
border: 1px solid var(--sl-color-gray-5);
|
||||
border-radius: 0.5rem;
|
||||
padding: 1rem;
|
||||
text-decoration: none;
|
||||
color: var(--sl-color-gray-2);
|
||||
box-shadow: var(--sl-shadow-md);
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
[rel='next'] {
|
||||
justify-content: end;
|
||||
text-align: end;
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
a:hover {
|
||||
border-color: var(--sl-color-gray-2);
|
||||
}
|
||||
|
||||
.link-title {
|
||||
color: var(--sl-color-white);
|
||||
font-size: var(--sl-text-2xl);
|
||||
line-height: var(--sl-line-height-headings);
|
||||
}
|
||||
|
||||
svg {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user