Skip to content

feat(theme): consolidate interactive cursors into one base layer #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anilsoylu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(theme): consolidate interactive cursors into one base layer #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions test/block-theme.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,51 @@ describe("DocsPress block theme constraints", () => {
}
});

it("resolves interactive cursors from one base layer instead of per component", async () => {
const styles = await fs.readFile(path.join(root, "theme", "style.css"), "utf8");
const rule = (selector) => {
const escaped = selector.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
return styles.match(new RegExp(`\\n${escaped}\\s*\\{([^}]*)\\}`, "m"))?.[1] ?? "";
};

expect(rule("body")).toMatch(/cursor:\s*default;/);
expect(
rule(`a,
button,
summary,
[role="button"],
input[type="button"],
input[type="checkbox"],
input[type="radio"],
input[type="submit"]`)
).toMatch(/cursor:\s*pointer;/);
expect(
rule(`input,
textarea,
[contenteditable="true"]`)
).toMatch(/cursor:\s*text;/);
expect(
rule(`a,
button,
[role="button"]`)
).toMatch(/touch-action:\s*manipulation;/);

// Disabled-looking states still opt out, and .drawer-scrim is a div the base layer
// cannot reach.
expect(rule(".docs-nav.is-filtering .docs-nav-toggle")).toMatch(/cursor:\s*default;/);
expect(styles).toMatch(/\.drawer-scrim\s*\{[^}]*cursor:\s*pointer;/);

for (const selector of [
".command-search-close",
".copy-code",
".docs-nav-toggle",
".sidebar-collapse-toggle",
".sidebar-search-clear",
]) {
expect(rule(selector)).not.toMatch(/cursor:\s*pointer;/);
}
});

it("lets Global Styles flow through the homepage shell and custom blocks", async () => {
const theme = JSON.parse(await fs.readFile(path.join(root, "theme", "theme.json"), "utf8"));
const styles = await fs.readFile(path.join(root, "theme", "style.css"), "utf8");
Expand Down
31 changes: 24 additions & 7 deletions theme/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ body {
margin: 0;
overflow-x: clip;
-webkit-font-smoothing: antialiased;
cursor: default;
}

body.drawer-open {
Expand All @@ -167,11 +168,34 @@ select {
font: inherit;
}

a,
button,
summary,
[role="button"],
input[type="button"],
input[type="checkbox"],
input[type="radio"],
input[type="submit"] {
cursor: pointer;
}

input,
textarea,
[contenteditable="true"] {
cursor: text;
}

button,
a {
-webkit-tap-highlight-color: transparent;
}

a,
button,
[role="button"] {
touch-action: manipulation;
}

:focus-visible {
outline: 3px solid color-mix(in srgb, var(--dp-blue) 45%, transparent);
outline-offset: 3px;
Expand Down Expand Up @@ -346,7 +370,6 @@ a {
border-radius: 8px;
background: var(--dp-canvas);
color: var(--dp-muted);
cursor: pointer;
transition: border-color 160ms ease, color 160ms ease, transform 160ms ease, background 160ms ease;
}

Expand Down Expand Up @@ -492,7 +515,6 @@ body.command-search-open {
background: var(--dp-canvas);
color: var(--dp-muted);
font: 22px/1 var(--dp-font-ui);
cursor: pointer;
transition: border-color 150ms ease, background 150ms ease, color 150ms ease;
}

Expand Down Expand Up @@ -767,7 +789,6 @@ body.command-search-open {
border-radius: 50%;
background: var(--dp-paper);
color: var(--dp-muted);
cursor: pointer;
box-shadow: 0 2px 8px color-mix(in srgb, var(--dp-ink) 10%, transparent);
transform: translate(50%, -50%);
transition: border-color 140ms ease, background 140ms ease, color 140ms ease, box-shadow 140ms ease, transform 140ms ease;
Expand Down Expand Up @@ -964,7 +985,6 @@ body.command-search-open {
border-radius: 6px;
background: transparent;
color: var(--dp-muted);
cursor: pointer;
}

.sidebar-search-clear.is-visible {
Expand Down Expand Up @@ -1034,7 +1054,6 @@ body.command-search-open {
border-radius: 7px;
background: transparent;
color: var(--dp-muted);
cursor: pointer;
transition: background 140ms ease, color 140ms ease, transform 140ms ease;
}

Expand Down Expand Up @@ -1322,7 +1341,6 @@ body.command-search-open {
background: #202633;
color: #c6ccda;
font: 11px/1.3 var(--dp-font-ui);
cursor: pointer;
opacity: 0;
transition: opacity 140ms ease, background 140ms ease;
}
Expand Down Expand Up @@ -2886,7 +2904,6 @@ body.command-search-open {
.comment-form .submit,
.post-password-form input[type="submit"] {
min-height: 44px;
cursor: pointer;
}

.alignleft {
Expand Down