Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dashboard): keep the focus border on repainted fields

Yudhi Armyndharisd842831ae860
diff --git a/dashboard/src/focus-ring.test.ts b/dashboard/src/focus-ring.test.ts
index 90db86e47..4ae1a2930 100644
--- a/dashboard/src/focus-ring.test.ts
+++ b/dashboard/src/focus-ring.test.ts
@@ -135,9 +135,12 @@ test('every outline switched off leaves a keyboard focus cue in the --focus-ring
// These fields repaint their own border after the shared `select:focus` and `.modal-body input:focus` rules, which
// switch the outline off, so without a focus rule of their own a focused one looked like any other. A native checkbox
// or radio shows no border at all, so the text field rules that reach it leave it only the ring.
-test('filter builder fields and native checkboxes draw their own focus cue', () => {
+test('fields that repaint their own border and native checkboxes draw their own focus cue', () => {
for (const [selector, cue] of [
['.filter-row select:focus', /border-color:\s*var\(--focus-ring\)/],
+ [".chats-page .status-compose-modal input[type='color']:focus", /border-color:\s*var\(--focus-ring\)/],
+ [".sessions-page .proxy-form-section input[type='text']:focus", /border-color:\s*var\(--focus-ring\)/],
+ ['.plugins-page .sessions-select:focus', /border-color:\s*var\(--focus-ring\)/],
[".filter-text input[type='text']:focus", /border-color:\s*var\(--focus-ring\)/],
['.chips-row .chips-text:focus', /border-color:\s*var\(--focus-ring\)/],
["input[type='checkbox']:not(.toggle-switch input):focus-visible", /outline:\s*2px solid var\(--focus-ring\)/],
@@ -148,3 +151,49 @@ test('filter builder fields and native checkboxes draw their own focus cue', ()
assert.match(rule.body, cue, selector);
}
});
+
+// Specificity as one comparable number: ids, then classes, attributes and pseudo-classes, then element names. A
+// :not() counts its argument.
+const specificity = (selector: string): number => {
+ const s = selector.replace(/:not\(([^)]*)\)/g, ' $1 ');
+ const attributes = s.match(/\[[^\]]*\]/g)?.length ?? 0;
+ const bare = s.replace(/\[[^\]]*\]/g, '');
+ const ids = bare.match(/#[\w-]+/g)?.length ?? 0;
+ const classes = (bare.match(/\.[\w-]+|:(?!:)[\w-]+/g)?.length ?? 0) + attributes;
+ const elements = bare.match(/(?:^|[\s>+~])[a-z][\w-]*/gi)?.length ?? 0;
+ return ids * 10000 + classes * 100 + elements;
+};
+// The field a selector ends in, whatever container it names: `.a .b input` and `.a .c input` both end in `input`.
+const lastElement = (s: string): string => element(s).split(/\s+/).pop() ?? '';
+const unfocused = (s: string): string => s.replace(/:focus(?:-visible|-within)?\b/g, '');
+const drawsFocusBorder = (r: Rule): boolean => /(?:^|;)\s*border(?:-color)?\s*:[^;]*\bvar\(--focus-ring\)/.test(r.body);
+// `border: none` is a native checkbox or radio, which has no border to repaint and draws a ring instead.
+const paintsBorder = (r: Rule): boolean => /(?:^|;)\s*border(?:-color)?\s*:\s*(?!none\b)\S/.test(r.body);
+
+// A rule for one kind of field (`input[type='color']`) that comes later in the same stylesheet than the focus rule of
+// the fields around it, at the same weight or heavier, repaints the border that rule drew, so a focused field looks like
+// an idle one. It needs a focus rule of its own, one step heavier. A field styled by a class from another stylesheet is
+// out of reach here and is pinned below.
+test('no later rule repaints the border a focus rule draws', () => {
+ const offenders = all.flatMap((rule, i) =>
+ rule.selectors
+ .filter(focusState)
+ .filter(() => drawsFocusBorder(rule))
+ .flatMap(cue =>
+ all
+ .slice(i + 1)
+ .filter(later => later.file === rule.file && paintsBorder(later))
+ .flatMap(later => later.selectors.map(s => ({ s, at: later.file })))
+ .filter(
+ ({ s }) => !focusState(s) && lastElement(s) === lastElement(cue) && specificity(s) >= specificity(cue),
+ ),
+ ),
+ );
+ const restored = (s: string): boolean =>
+ all.some(
+ r =>
+ drawsFocusBorder(r) &&
+ r.selectors.some(f => focusState(f) && unfocused(f) === s && specificity(f) > specificity(s)),
+ );
+ assert.deepEqual([...new Set(offenders.filter(({ s }) => !restored(s)).map(({ at, s }) => `${at}: ${s}`))], []);
+});
diff --git a/dashboard/src/pages/Chats.css b/dashboard/src/pages/Chats.css
index f2f0baf78..0d382e5d2 100644
--- a/dashboard/src/pages/Chats.css
+++ b/dashboard/src/pages/Chats.css
@@ -1831,6 +1831,11 @@
box-sizing: border-box;
}
+/* The rule above repaints the border over `input:focus` at the same weight, so a focused color input needs its own. */
+.chats-page .status-compose-modal input[type='color']:focus {
+ border-color: var(--focus-ring);
+}
+
.chats-page .status-compose-modal input[type='file'] {
width: 100%;
font-size: 0.8125rem;
diff --git a/dashboard/src/pages/Plugins.css b/dashboard/src/pages/Plugins.css
index a975fc6ab..c0d79ac0c 100644
--- a/dashboard/src/pages/Plugins.css
+++ b/dashboard/src/pages/Plugins.css
@@ -1021,6 +1021,11 @@
box-sizing: border-box;
}
+/* The rule above out-weighs `select:focus` in index.css and repaints its border. */
+.plugins-page .sessions-select:focus {
+ border-color: var(--focus-ring);
+}
+
.plugins-page .sessions-override-actions {
display: flex;
justify-content: flex-end;
diff --git a/dashboard/src/pages/Sessions.css b/dashboard/src/pages/Sessions.css
index 2f3fadc4b..0acf76464 100644
--- a/dashboard/src/pages/Sessions.css
+++ b/dashboard/src/pages/Sessions.css
@@ -919,3 +919,8 @@
font-size: 0.9375rem;
box-sizing: border-box;
}
+
+/* The rule above repaints the border over `.sessions-page .modal-body input:focus` at the same weight. */
+.sessions-page .proxy-form-section input[type='text']:focus {
+ border-color: var(--focus-ring);
+}