') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); feat(clerk-js): Enable element descriptors for active devices [SDK-859] by tmilewski · Pull Request #1994 · clerk/javascript · GitHub
Skip to content

feat(clerk-js): Enable element descriptors for active devices [SDK-859]#1994

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
tmilewski merged 1 commit into from
Nov 1, 2023
Merged

feat(clerk-js): Enable element descriptors for active devices [SDK-859] #1994

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
11 changes: 11 additions & 0 deletions .changeset/mean-houses-juggle.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces new element appearance descriptors:

- `activeDeviceListItem` allows you to customize the appearance of the active device list (accordion) item
- `activeDeviceListItem__current` allows you to customize the appearance of the _current_ active device list (accordion) item
- `activeDevice` allows you to customize the appearance of the active device item
- `activeDevice__current` allows you to customize the appearance of the _current_ active device item
14 changes: 10 additions & 4 deletions packages/clerk-js/src/ui/components/UserProfile/ActiveDevicesSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,21 +47,25 @@ const DeviceAccordion = (props: { session: SessionWithActivitiesResource }) => {
};

return (
<UserProfileAccordion title={<DeviceInfo session={props.session} />}>
<UserProfileAccordion
elementDescriptor={descriptors.activeDeviceListItem}
elementId={isCurrent ? descriptors.activeDeviceListItem.setId('current') : undefined}
title={<DeviceInfo session={props.session} />}
>
<Col gap={4}>
{isCurrent && (
<LinkButtonWithDescription
title={localizationKeys('userProfile.start.activeDevicesSection.detailsTitle')}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.detailsSubtitle')}
title={localizationKeys('userProfile.start.activeDevicesSection.detailsTitle')}
/>
)}
{!isCurrent && (
<LinkButtonWithDescription
title={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionTitle')}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionSubtitle')}
actionLabel={localizationKeys('userProfile.start.activeDevicesSection.destructiveAction')}
colorScheme='danger'
onClick={revoke}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionSubtitle')}
title={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionTitle')}
/>
)}
</Col>
Expand All@@ -82,6 +86,8 @@ const DeviceInfo = (props: { session: SessionWithActivitiesResource }) => {

return (
<Flex
elementDescriptor={descriptors.activeDevice}
elementId={isCurrent ? descriptors.activeDevice.setId('current') : undefined}
align='center'
sx={t => ({
gap: t.space.$8,
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/customizables/elementDescriptors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,6 +246,8 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'page',
'pageHeader',

'activeDevice',
'activeDeviceListItem',
'activeDeviceIcon',

'impersonationFab',
Expand Down
25 changes: 14 additions & 11 deletions packages/clerk-js/src/ui/elements/Accordion.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,18 +2,20 @@ import React from 'react';

import { Col, descriptors } from '../customizables';
import { Caret } from '../icons';
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { ArrowBlockButton } from './ArrowBlockButton';

type AccordionItemProps = React.PropsWithChildren<{
title: React.ReactElement | string;
icon?: React.ReactElement;
badge?: React.ReactElement;
defaultOpen?: boolean;
toggleable?: boolean;
scrollOnOpen?: boolean;
onCloseCallback?: () => void;
}>;
type AccordionItemProps = Omit<PropsOfComponent<typeof Col>, 'title'> &
React.PropsWithChildren<{
title: React.ReactElement | string;
icon?: React.ReactElement;
badge?: React.ReactElement;
defaultOpen?: boolean;
toggleable?: boolean;
scrollOnOpen?: boolean;
onCloseCallback?: () => void;
}>;

export const AccordionItem = (props: AccordionItemProps) => {
const {
Expand All@@ -25,6 +27,7 @@ export const AccordionItem = (props: AccordionItemProps) => {
scrollOnOpen = false,
badge,
onCloseCallback = null,
...rest
} = props;
const [isOpen, setIsOpen] = React.useState(defaultOpen);
const contentRef = React.useRef<HTMLDivElement>(null);
Expand DownExpand Up@@ -52,10 +55,10 @@ export const AccordionItem = (props: AccordionItemProps) => {
}

return () => cancelAnimationFrame(requestRef);
}, [isOpen]);
}, [isOpen, scrollOnOpen]);

return (
<Col>
<Col {...rest}>
<ArrowBlockButton
elementDescriptor={descriptors.accordionTriggerButton}
variant='ghost'
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/appearance.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -399,6 +399,8 @@ export type ElementsConfig = {
page: WithOptions;
pageHeader: WithOptions;

activeDevice: WithOptions<'current'>;
activeDeviceListItem: WithOptions<'current'>;
activeDeviceIcon: WithOptions<'mobile' | 'desktop'>;

impersonationFab: WithOptions;
Expand Down