') + ')', '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,types): Update OrganizationPreview appearance descriptors for OrganizationSwitcher by octoper · Pull Request #2158 · clerk/javascript · GitHub
Skip to content

feat(clerk-js,types): Update OrganizationPreview appearance descriptors for OrganizationSwitcher - #2158

Merged
octoper merged 4 commits into
mainfrom
vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances
Nov 22, 2023
Merged

feat(clerk-js,types): Update OrganizationPreview appearance descriptors for OrganizationSwitcher #2158
octoper merged 4 commits into
mainfrom
vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances

Conversation

@octoper

@octoperoctoper commented Nov 17, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

This PR introduces some breaking changes and some additions to the organzationPreview descriptor

Breaking Changes

  • The organizationSwitcher id has been renamed to organizationSwitcherTrigger and the generated element class will be .cl-organizationPreview__organizationSwitcherTrigger

Additions

  • The organizationSwitcherListedOrganization for styling listed organization in the <OrganizationSwitcher/> and the generated class will be .cl-organizationPreview__organizationSwitcherListedOrganization
  • The organizationSwitcherActiveOrganization for styling the active organization in the <OrganizationSwitcher/> and the generated class will be .cl-organizationPreview__organizationSwitcherActiveOrganizationn

Checklist

  • npm test runs as expected.
  • npm run build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Packages affected

  • @clerk/backend
  • @clerk/chrome-extension
  • @clerk/clerk-js
  • @clerk/clerk-expo
  • @clerk/fastify
  • gatsby-plugin-clerk
  • @clerk/localizations
  • @clerk/nextjs
  • @clerk/clerk-react
  • @clerk/remix
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/themes
  • @clerk/types
  • build/tooling/chore

@changeset-bot

changeset-botBot commented Nov 17, 2023•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: dfa0e52

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 11 packages
NameType
@clerk/clerk-jsMajor
@clerk/typesPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch
@clerk/backendPatch
@clerk/fastifyPatch
gatsby-plugin-clerkPatch
@clerk/nextjsPatch
@clerk/clerk-reactPatch
@clerk/remixPatch
@clerk/clerk-sdk-nodePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@octoper
octoperforce-pushed the vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances branch from 698b4e1 to 9226af2CompareNovember 20, 2023 09:42
@octoper

octoper commented Nov 20, 2023

Copy link
Copy Markdown
ContributorAuthor

!preview

@octoper
octoperforce-pushed the vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances branch from 9226af2 to 6984731CompareNovember 20, 2023 10:36
@octoper
octoper marked this pull request as ready for review November 20, 2023 10:37
@octoperoctoper self-assigned this Nov 20, 2023
@octoper
octoperforce-pushed the vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances branch from 6984731 to cfb3015CompareNovember 21, 2023 19:19
brkalow
brkalow reviewed Nov 22, 2023
View reviewed changes

@brkalowbrkalow left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@octoper can you add a changeset outlining the changes and how to migrate? 🙏

@octoper
octoper requested a review from brkalowNovember 22, 2023 09:10
@octoper

octoper commented Nov 22, 2023

Copy link
Copy Markdown
ContributorAuthor

@brkalow Added!

panteliselef
panteliselef reviewed Nov 22, 2023
View reviewed changes

@panteliselefpanteliselef left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@octoper can we double the descriptor i commented about ?

Comment thread...ges/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx Outdated
Comment threadpackages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx Outdated
@panteliselef

panteliselef commented Nov 22, 2023

Copy link
Copy Markdown
Contributor

This PR should resolve #1518

@octoper
octoperforce-pushed the vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances branch from f6081cf to dfa0e52CompareNovember 22, 2023 14:02
@octoper
octoper added this pull request to the merge queue Nov 22, 2023
Merged via the queue into main with commit 429d030Nov 22, 2023
@octoper
octoper deleted the vaggelis/sdk-861-use-different-css-class-for-organizationpreview-instances branch November 22, 2023 14:21
@clerk-cookieclerk-cookie mentioned this pull request Nov 22, 2023
Merged
desiprisg pushed a commit that referenced this pull request Nov 23, 2023
@octoper@desiprisg
feat(clerk-js,types): Update OrganizationPreview appearance descripto…
75b9625
…rs for OrganizationSwitcher (#2158)
* feat(clerk-js,types): Add id's to the organizationPreview descriptor to allow better customization
* feat(clerk-js): Apply changes to ui.retheme
* chore(repo): Added Changeset
* fix(clerk-js): Use the correct element id for the invitation preview
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dimkldimklAwaiting requested review from dimkl
@brkalowbrkalowAwaiting requested review from brkalow
1 more reviewer
@panteliselefpanteliselefpanteliselef approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@octoperoctoper

Labels

clerk-jstypes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@octoper@panteliselef@brkalow@clerk-cookie