diff --git a/.checks/wcag-report.json b/.checks/wcag-report.json
index 5675119..7c2497a 100644
--- a/.checks/wcag-report.json
+++ b/.checks/wcag-report.json
@@ -4,7 +4,7 @@
"id": "color-contrast",
"impact": "serious",
"description": "Ensure the contrast between foreground and background colors meets WCAG 2 AA minimum contrast ratio thresholds",
- "helpUrl": "https://dequeuniversity.com/rules/axe/4.11/color-contrast?application=webdriverjs",
+ "helpUrl": "https://dequeuniversity.com/rules/axe/4.12/color-contrast?application=webdriverjs",
"nodes": [
{
"target": [
@@ -20,7 +20,7 @@
"id": "scrollable-region-focusable",
"impact": "serious",
"description": "Ensure elements that have scrollable content are accessible by keyboard in Safari",
- "helpUrl": "https://dequeuniversity.com/rules/axe/4.11/scrollable-region-focusable?application=webdriverjs",
+ "helpUrl": "https://dequeuniversity.com/rules/axe/4.12/scrollable-region-focusable?application=webdriverjs",
"nodes": [
{
"target": [
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 165c2fa..c06533c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
contents: write
steps:
- name: Checkout code
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Bepaal branch voor terugschrijven
id: commit-target
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c0fd98f..e5dbe72 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
pull-requests: write
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Download snapshot artefact
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -176,7 +176,7 @@ jobs:
docs.geostandaarden.nl
- name: Checkout private docs
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
repository: Geonovum/docs.geostandaarden.nl
token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/update-workflows.yml b/.github/workflows/update-workflows.yml
index 7b00f4d..5dc88c8 100644
--- a/.github/workflows/update-workflows.yml
+++ b/.github/workflows/update-workflows.yml
@@ -17,7 +17,7 @@ jobs:
contents: write
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
@@ -80,7 +80,7 @@ jobs:
org: [Geonovum, BROprogramma]
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
ref: ${{ github.ref }}
diff --git a/snapshot.html b/snapshot.html
index e990ad6..b5161b1 100644
--- a/snapshot.html
+++ b/snapshot.html
@@ -1,7 +1,7 @@
-
+
A
B
C
D
+
A
B
C
D
Figuur 2 Mermaid voorbeeld
@@ -1546,11 +1579,12 @@
↑
-
+
Referenced in:
@@ -1573,8 +1607,11 @@
}
function panelListener() {
- /** @type {HTMLElement} */
+ /** @type {HTMLElement | null} */
let panel = null;
+ /**
+ * @param {KeyboardEvent|MouseEvent} event
+ */
return event => {
const { target, type } = event;
@@ -1582,24 +1619,34 @@
// For keys, we only care about Enter key to activate the panel
// otherwise it's activated via a click.
- if (type === "keydown" && event.key !== "Enter") return;
+ if (
+ type === "keydown" &&
+ /** @type {KeyboardEvent} */ (event).key !== "Enter"
+ )
+ return;
const action = deriveAction(event);
switch (action) {
case "show": {
hidePanel(panel);
- /** @type {HTMLElement} */
+ /** @type {HTMLElement | null} */
const dfn = target.closest("dfn, .index-term");
+ if (!dfn?.id) break;
panel = document.getElementById(`dfn-panel-for-${dfn.id}`);
- const coords = deriveCoordinates(event);
+ if (!panel) break;
+ const coords = deriveCoordinates(
+ /** @type {MouseEvent|KeyboardEvent} */ (event)
+ );
displayPanel(dfn, panel, coords);
break;
}
case "dock": {
- panel.style.left = null;
- panel.style.top = null;
- panel.classList.add("docked");
+ if (panel) {
+ panel.style.left = "";
+ panel.style.top = "";
+ panel.classList.add("docked");
+ }
break;
}
case "hide": {
@@ -1650,7 +1697,8 @@
if (hitALink) {
return target.classList.contains("self-link") ? "hide" : "dock";
}
- const panel = target.closest(".dfn-panel");
+
+ const panel = /** @type {HTMLElement} */ (target.closest(".dfn-panel"));
return panel.classList.contains("docked") ? "hide" : "none";
}
if (document.querySelector(".dfn-panel:not([hidden])")) {
@@ -1694,9 +1742,9 @@
const newLeft = Math.max(MARGIN, x + MARGIN - panelRect.width);
const newCaretOffset = left - newLeft;
panel.style.left = `${newLeft}px`;
- /** @type {HTMLElement} */
+ /** @type {HTMLElement | null} */
const caret = panel.querySelector(".caret");
- caret.style.left = `${newCaretOffset}px`;
+ if (caret) caret.style.left = `${newCaretOffset}px`;
}
// As it's a dialog, we trap focus.
@@ -1745,6 +1793,9 @@
function createTrapListener(anchors, panel, dfn) {
const lastIndex = anchors.length - 1;
let currentIndex = 0;
+ /**
+ * @param {KeyboardEvent} event
+ */
return event => {
switch (event.key) {
// Hitting "Tab" traps us in a nice loop around elements.
@@ -1774,7 +1825,7 @@
};
}
-/** @param {HTMLElement} panel */
+/** @param {HTMLElement | null} panel */
function hidePanel(panel) {
if (!panel) return;
panel.hidden = true;