Skip to content

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

TypeScript

fix(SideNav): use design tokens for drag handle transition, rename collapse state type (#1381)

Cindy Zhang2142084cf14f
diff --git a/packages/core/src/SideNav/XDSSideNav.tsx b/packages/core/src/SideNav/XDSSideNav.tsx
index 45d79035d0..643ae8b988 100644
--- a/packages/core/src/SideNav/XDSSideNav.tsx
+++ b/packages/core/src/SideNav/XDSSideNav.tsx
@@ -22,7 +22,7 @@ import {useCallback, useState, type ReactNode} from 'react';
import type {XDSBaseProps} from '../XDSBaseProps';
import * as stylex from '@stylexjs/stylex';
import type {StyleXStyles} from '@stylexjs/stylex';
-import {borderVars, colorVars, spacingVars} from '../theme/tokens.stylex';
+import {borderVars, colorVars, durationVars, easeVars, spacingVars} from '../theme/tokens.stylex';
import {xdsClassName, mergeProps} from '../utils';
import {XDSSideNavCollapseContext} from './XDSSideNavCollapseContext';
import {XDSSideNavCollapseButton} from './XDSSideNavCollapseButton';
@@ -154,7 +154,9 @@ const styles = stylex.create({
zIndex: 2,
// Invisible by default; visible on hover
backgroundColor: 'transparent',
- transition: 'background-color 0.15s ease',
+ transitionProperty: 'background-color',
+ transitionDuration: durationVars['--duration-fast'],
+ transitionTimingFunction: easeVars['--ease-standard'],
touchAction: 'none',
},
dragHandleHover: {
diff --git a/packages/core/src/SideNav/XDSSideNavCollapseContext.ts b/packages/core/src/SideNav/XDSSideNavCollapseContext.ts
index cb298737c7..35d4c370a1 100644
--- a/packages/core/src/SideNav/XDSSideNavCollapseContext.ts
+++ b/packages/core/src/SideNav/XDSSideNavCollapseContext.ts
@@ -12,7 +12,7 @@
import {createContext, useContext} from 'react';
-export interface SideNavCollapseState {
+export interface XDSSideNavCollapseState {
/** Whether the sidenav is currently collapsed */
isCollapsed: boolean;
/** Toggle collapse state */
@@ -21,17 +21,23 @@ export interface SideNavCollapseState {
isCollapsible: boolean;
}
-export const XDSSideNavCollapseContext = createContext<SideNavCollapseState>({
- isCollapsed: false,
- toggle: () => {},
- isCollapsible: false,
-});
+/**
+ * @deprecated Use XDSSideNavCollapseState instead.
+ */
+export type SideNavCollapseState = XDSSideNavCollapseState;
+
+export const XDSSideNavCollapseContext =
+ createContext<XDSSideNavCollapseState>({
+ isCollapsed: false,
+ toggle: () => {},
+ isCollapsible: false,
+ });
/**
* Read the sidenav collapse state from context.
* Returns { isCollapsed, toggle, isCollapsible }.
* When used outside a sidenav with isCollapsible, isCollapsible is false.
*/
-export function useXDSSideNavCollapse(): SideNavCollapseState {
+export function useXDSSideNavCollapse(): XDSSideNavCollapseState {
return useContext(XDSSideNavCollapseContext);
}
diff --git a/packages/core/src/SideNav/index.ts b/packages/core/src/SideNav/index.ts
index d320ce5327..2597c9423a 100644
--- a/packages/core/src/SideNav/index.ts
+++ b/packages/core/src/SideNav/index.ts
@@ -25,6 +25,7 @@ export {XDSSideNavCollapseButton} from './XDSSideNavCollapseButton';
export type {XDSSideNavCollapseButtonProps} from './XDSSideNavCollapseButton';
export {useXDSSideNavCollapse} from './XDSSideNavCollapseContext';
+export type {XDSSideNavCollapseState} from './XDSSideNavCollapseContext';
export {
XDSSideNavRenderContext,