Skip to content

refactor(themed): drop broken, unused, regexp arg support #10425

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

Merged
jcfranco merged 1 commit into from
Sep 27, 2024
Merged

refactor(themed): drop broken, unused, regexp arg support #10425

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
7 changes: 2 additions & 5 deletions packages/calcite-components/src/tests/commonTests/themed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export function themed(componentTestSetup: ComponentTestSetup, tokens: Component
});
}

type ContextSelectByAttr = { attribute: string; value: string | RegExp };
type ContextSelectByAttr = { attribute: string; value: string };

type CSSProp = Extract<keyof CSSStyleDeclaration, string>;

Expand Down Expand Up @@ -303,16 +303,13 @@ async function assertThemedProps(page: E2EPage, options: TestTarget): Promise<vo
const searchInShadowDom = (node: Node): HTMLElement | SVGElement | Node | undefined => {
const { attribute, value } = context as {
attribute: string;
value: string | RegExp;
value: string;
};
if (node.nodeType === 1) {
const attr = (node as Element).getAttribute(attribute);
if (typeof value === "string" && attr === value) {
return node;
}
if (value instanceof RegExp && attr && value.test(attr)) {
return node ?? undefined;
}
if (attr === value) {
return node;
}
Expand Down