Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix: Token 'use client' + TopNav context naming conventions (#1465)

Cindy Zhang3544faab2623
diff --git a/packages/core/src/Token/XDSToken.tsx b/packages/core/src/Token/XDSToken.tsx
index ab8f6cc554..f378111ca7 100644
--- a/packages/core/src/Token/XDSToken.tsx
+++ b/packages/core/src/Token/XDSToken.tsx
@@ -1,3 +1,5 @@
+'use client';
+
/**
* @file XDSToken.tsx
* @input Uses React, ReactNode, StyleXStyles
diff --git a/packages/core/src/Token/index.ts b/packages/core/src/Token/index.ts
index 50b93b1904..859653f75b 100644
--- a/packages/core/src/Token/index.ts
+++ b/packages/core/src/Token/index.ts
@@ -1,5 +1,12 @@
+'use client';
+
/**
- * @file Token component barrel export
+ * @file index.ts
+ * @input Token component
+ * @output Exports all Token module public API
+ * @position Entry point for Token module
+ *
+ * SYNC: When adding new Token files, update exports here
*/
export {XDSToken} from './XDSToken';
diff --git a/packages/core/src/TopNav/TopNavContext.ts b/packages/core/src/TopNav/TopNavContext.ts
index f1eac9c656..eb837b9f85 100644
--- a/packages/core/src/TopNav/TopNavContext.ts
+++ b/packages/core/src/TopNav/TopNavContext.ts
@@ -2,10 +2,20 @@
import {createContext, useContext} from 'react';
-export type TopNavSlot = 'start' | 'center' | 'end';
+export type XDSTopNavSlot = 'start' | 'center' | 'end';
-export const TopNavSlotContext = createContext<TopNavSlot>('start');
+/**
+ * @deprecated Use XDSTopNavSlotContext instead.
+ */
+export type TopNavSlot = XDSTopNavSlot;
-export function useTopNavSlot(): TopNavSlot {
- return useContext(TopNavSlotContext);
+export const XDSTopNavSlotContext = createContext<XDSTopNavSlot>('start');
+
+/**
+ * @deprecated Use XDSTopNavSlotContext instead.
+ */
+export const TopNavSlotContext = XDSTopNavSlotContext;
+
+export function useTopNavSlot(): XDSTopNavSlot {
+ return useContext(XDSTopNavSlotContext);
}
diff --git a/packages/core/src/TopNav/XDSTopNav.tsx b/packages/core/src/TopNav/XDSTopNav.tsx
index 7186e7bc38..544d2dbd84 100644
--- a/packages/core/src/TopNav/XDSTopNav.tsx
+++ b/packages/core/src/TopNav/XDSTopNav.tsx
@@ -19,7 +19,7 @@ import * as stylex from '@stylexjs/stylex';
import {colorVars, spacingVars} from '../theme/tokens.stylex';
import {edgeSignals} from '../Layout/edgeCompensation.stylex';
import {xdsClassName, mergeProps} from '../utils';
-import {TopNavSlotContext} from './TopNavContext';
+import {XDSTopNavSlotContext} from './TopNavContext';
import {useXDSTopNavRenderMode} from './XDSTopNavRenderContext';
import {useXDSTopNavMobileContent} from './XDSTopNavMobileContentContext';
import {XDSDivider} from '../Divider/XDSDivider';
@@ -259,24 +259,26 @@ export function XDSTopNav({
<div {...stylex.props(styles.leftSection, edgeSignals.start)}>
{heading && <div {...stylex.props(styles.heading)}>{heading}</div>}
{startContent && (
- <TopNavSlotContext value="start">
+ <XDSTopNavSlotContext value="start">
<div {...stylex.props(styles.startContent)}>{startContent}</div>
- </TopNavSlotContext>
+ </XDSTopNavSlotContext>
)}
</div>
{hasCenterContent && (
- <TopNavSlotContext value="center">
+ <XDSTopNavSlotContext value="center">
<div {...stylex.props(styles.centerContent)}>{centerContent}</div>
- </TopNavSlotContext>
+ </XDSTopNavSlotContext>
)}
{hasCenterContent ? (
<div {...stylex.props(styles.rightSection, edgeSignals.end)}>
- <TopNavSlotContext value="end">{endContent}</TopNavSlotContext>
+ <XDSTopNavSlotContext value="end">{endContent}</XDSTopNavSlotContext>
</div>
) : (
endContent && (
<div {...stylex.props(styles.endContent, edgeSignals.end)}>
- <TopNavSlotContext value="end">{endContent}</TopNavSlotContext>
+ <XDSTopNavSlotContext value="end">
+ {endContent}
+ </XDSTopNavSlotContext>
</div>
)
)}