Skip to content

fix(s2): fix undefined class name outputs #8074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

fix(s2): fix undefined class name outputs #8074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@react-spectrum/s2/src/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ export interface CardPreviewProps extends UnsafeStyles, DOMProps {

export const CardPreview = forwardRef(function CardPreview(props: CardPreviewProps, ref: DOMRef<HTMLDivElement>) {
let {size, isQuiet, isHovered, isFocusVisible, isSelected, isPressed, isCheckboxSelection} = useContext(InternalCardContext);
let {UNSAFE_className, UNSAFE_style} = props;
let {UNSAFE_className = '', UNSAFE_style} = props;
let domRef = useDOMRef(ref);
return (
<div
Expand Down
3 changes: 2 additions & 1 deletion packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const ColorSwatchPicker = forwardRef(function ColorSwatchPicker(props: Co
density = 'regular',
size = 'M',
rounding = 'none',
UNSAFE_className = '',
...otherProps
} = props;
let domRef = useDOMRef(ref);
Expand All @@ -58,7 +59,7 @@ export const ColorSwatchPicker = forwardRef(function ColorSwatchPicker(props: Co
<AriaColorSwatchPicker
{...otherProps}
ref={domRef}
className={props.UNSAFE_className + style({
className={UNSAFE_className + style({
display: 'flex',
flexWrap: 'wrap',
gap: {
Expand Down
12 changes: 6 additions & 6 deletions packages/@react-spectrum/s2/src/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Heading = forwardRef(// Wrapper around RAC Heading to unmount when
function Heading(props: HeadingProps, ref: DOMRef<HTMLHeadingElement>) {
[props, ref] = useSpectrumContextProps(props, ref, HeadingContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, ...otherProps} = props;
if (isHidden) {
return null;
}
Expand All @@ -57,7 +57,7 @@ export const HeaderContext = createContext<ContextValue<Partial<ContentProps>, D
export const Header = forwardRef(function Header(props: ContentProps, ref: DOMRef) {
[props, ref] = useSpectrumContextProps(props, ref, HeaderContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, ...otherProps} = props;
if (isHidden) {
return null;
}
Expand All @@ -77,7 +77,7 @@ export const ContentContext = createContext<ContextValue<Partial<ContentProps>,
export const Content = forwardRef(function Content(props: ContentProps, ref: DOMRef<HTMLDivElement>) {
[props, ref] = useSpectrumContextProps(props, ref, ContentContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, ...otherProps} = props;
if (isHidden) {
return null;
}
Expand All @@ -96,7 +96,7 @@ export const TextContext = createContext<ContextValue<Partial<ContentProps>, DOM
export const Text = forwardRef(function Text(props: ContentProps, ref: DOMRef) {
[props, ref] = useSpectrumContextProps(props, ref, TextContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, children, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, children, ...otherProps} = props;
let racContext = useContext(RACTextContext);
let isSkeleton = useIsSkeleton();
[children, UNSAFE_style] = useSkeletonText(children, UNSAFE_style);
Expand Down Expand Up @@ -130,7 +130,7 @@ export const KeyboardContext = createContext<ContextValue<Partial<ContentProps>,
export const Keyboard = forwardRef(function Keyboard(props: ContentProps, ref: DOMRef) {
[props, ref] = useSpectrumContextProps(props, ref, KeyboardContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, ...otherProps} = props;
if (isHidden) {
return null;
}
Expand All @@ -149,7 +149,7 @@ export const FooterContext = createContext<ContextValue<Partial<ContentProps>, D
export const Footer = forwardRef(function Footer(props: ContentProps, ref: DOMRef) {
[props, ref] = useSpectrumContextProps(props, ref, FooterContext);
let domRef = useDOMRef(ref);
let {UNSAFE_className = '', UNSAFE_style, styles, isHidden, slot, ...otherProps} = props;
let {UNSAFE_className = '', UNSAFE_style, styles = '', isHidden, slot, ...otherProps} = props;
if (isHidden) {
return null;
}
Expand Down