Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + ' test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, '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" + ' test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, '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('^' + ".*" + ' test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, '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); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); test: snapi report on PR #8675 (do not merge) by jacekradko · Pull Request #8678 · clerk/javascript · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sharp-terms-boil.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add mobile support for `<ConfigureSSO />` navbar to display application name, logo and organization name
2 changes: 2 additions & 0 deletions .changeset/snapi-bump-version.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/workflows/api-changes.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@d42ed8b7857f9254bbb2a6e9ead44d5e7b1aa60c
SNAPI_PACKAGE: https://pkg.pr.new/clerk/snapi/@clerk/snapi@763ad1bb1da1da52fd8525a038405bb6ee1b7347
SNAPI_FILTERS: >-
--filter=@clerk/backend
--filter=@clerk/clerk-js
Expand Down
20 changes: 2 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import React from 'react';

import { useProtect } from '@/common';
import { withCoreUserGuard } from '@/contexts';
import { Col, descriptors, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { Col, Flex, Flow, Heading, Icon, localizationKeys, Text } from '@/customizables';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
import { ProfileCard } from '@/elements/ProfileCard';
import { ExclamationTriangle } from '@/icons';
Expand DownExpand Up@@ -43,23 +43,7 @@ const AuthenticatedContent = withCoreUserGuard(() => {
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<ConfigureSSONavbar contentRef={contentRef}>
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOContent contentRef={contentRef} />
</Col>
<ConfigureSSOContent contentRef={contentRef} />
</ConfigureSSONavbar>
</ProfileCard.Root>
);
Expand Down
113 changes: 107 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useOrganizationBase } from '@clerk/shared/react/index';
import React from 'react';

import { useEnvironment } from '@/contexts';
import { Box, Col, Flex, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Heading, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { BoxIcon } from '@/icons';
import { mqu } from '@/styledSystem';

type ConfigureSSONavbarProps = React.PropsWithChildren<{
contentRef: React.RefObject<HTMLDivElement>;
Expand DownExpand Up@@ -73,18 +74,118 @@ export const ConfigureSSONavbar = ({ children, contentRef }: ConfigureSSONavbarP
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSidebarSubtitle />}
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>
}
/>
{children}
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
flex: 1,
})}
>
<ConfigureSSOMobileNavbar />
{children}
</Col>
</NavbarContextProvider>
);
};

const OrganizationSidebarSubtitle = (): JSX.Element | null => {
const { organization } = useOrganization();
const ConfigureSSOMobileNavbar = () => {
const { parsedOptions } = useAppearance();
const {
organizationSettings,
displayConfig: { applicationName, logoImageUrl },
} = useEnvironment();

const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

return (
<Col
as='header'
elementDescriptor={descriptors.configureSSOMobileNavbar}
sx={t => ({
display: 'none',
[mqu.md]: {
display: 'flex',
},
gap: t.space.$4,
padding: t.space.$5,
borderBottomWidth: t.borderWidths.$normal,
borderBottomStyle: t.borderStyles.$solid,
borderBottomColor: t.colors.$borderAlpha100,
})}
>
<Flex
align='center'
sx={t => ({
gap: t.space.$2,
maxWidth: '100%',
})}
>
{hasLogo ? (
<ApplicationLogo
sx={t => ({
width: t.space.$9,
height: t.space.$9,
borderRadius: t.radii.$md,
overflow: 'hidden',
})}
/>
) : (
<Box
sx={t => ({
width: t.space.$9,
height: t.space.$9,
flexShrink: 0,
borderRadius: t.radii.$md,
backgroundColor: t.colors.$primary500,
color: t.colors.$colorPrimaryForeground,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
aria-hidden
>
<Icon
icon={BoxIcon}
sx={t => ({ width: t.sizes.$4, height: t.sizes.$4 })}
/>
</Box>
)}

<Col sx={{ minWidth: 0 }}>
<Text
as='p'
truncate
>
{applicationName}
</Text>
{organizationSettings.enabled && <OrganizationSubtitle />}
</Col>
</Flex>

<Heading
as='h3'
localizationKey={localizationKeys('configureSSO.navbar.title')}
sx={t => ({ fontSize: t.fontSizes.$lg })}
/>
</Col>
);
};

const OrganizationSubtitle = (): JSX.Element | null => {

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.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Avoid JSX.Element return type for React 19 compatibility in OrganizationSubtitle
packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx:187

With React 19/@types/react, relying on the global JSX namespace can break type-checking; use React.JSX.Element | null (or import type { JSX } from 'react') instead.

Suggested fix
-const OrganizationSubtitle = (): JSX.Element | null => {+const OrganizationSubtitle = (): React.JSX.Element | null => {
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constOrganizationSubtitle=(): JSX.Element|null=>{
constOrganizationSubtitle=(): React.JSX.Element|null=>{
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/ui/src/components/ConfigureSSO/ConfigureSSONavbar.tsx` at line 187,
The OrganizationSubtitle function currently uses the global JSX return type
which can break type-checking with React 19/@types/react; update its signature
to return React.JSX.Element | null (or import type { JSX } from 'react' and use
JSX.Element) so the type resolves from the react package; locate the
OrganizationSubtitle declaration and replace ": JSX.Element | null" with ":
React.JSX.Element | null" (or add the appropriate import and use that) and
adjust any imports if needed.

const organization = __internal_useOrganizationBase();

if (!organization) {
return null;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/customizables/elementDescriptors.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -538,6 +538,7 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'enterpriseConnectionButtonText',

'configureSSOHeader',
'configureSSOMobileNavbar',
'configureSSOStepper',
'configureSSOStepperItem',
'configureSSOStepperItemBullet',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/internal/appearance.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,6 +674,7 @@ export type ElementsConfig = {
enterpriseConnectionButtonText: WithOptions;

configureSSOHeader: WithOptions;
configureSSOMobileNavbar: WithOptions;
configureSSOStepper: WithOptions;
configureSSOStepperItem: WithOptions<string, ActiveState>;
configureSSOStepperItemBullet: WithOptions<string, ActiveState>;
Expand Down
Loading