Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ea6316e
Replace process.env.DOCS_ENV in build
devongovett Dec 13, 2025
7e140a0
Fix Image objectFit and objectPosition styles with picture wrapper
devongovett Dec 13, 2025
bd606ca
A few tailwind example app fixes
devongovett Dec 13, 2025
7273b77
Fix copying folded code
devongovett Dec 13, 2025
257c061
Fix header flickering during toast view transition
devongovett Dec 13, 2025
09c50c6
Preload card images when hovering tag in search menu
devongovett Dec 13, 2025
28cac3f
Merge internationalized into React Aria in search
devongovett Dec 13, 2025
a0196ea
Update home page headers
devongovett Dec 13, 2025
b1f6104
Update logo
devongovett Dec 13, 2025
5e67d1a
Fix DOCS_ENV in development
devongovett Dec 13, 2025
5a7d251
Fix typescript
devongovett Dec 13, 2025
378025d
lint
devongovett Dec 13, 2025
968f6a5
Fix internationalized nav
devongovett Dec 13, 2025
d1d7324
Fix skeleton showing when clicking links on home page
devongovett Dec 13, 2025
99b9235
Order guides above interactions in nav
devongovett Dec 13, 2025
0dd1543
Make home page header line up with other pages
devongovett Dec 13, 2025
9e2a3ce
Fix some tailwind css conflicts between home page and other pages
devongovett Dec 14, 2025
39e9ae9
Adjust size of logos in mobile search menu
devongovett Dec 14, 2025
203b710
Fix library in AI prompt
devongovett Dec 14, 2025
a1460f8
Sort getting started to the top
devongovett Dec 15, 2025
34de325
Slight improvements
devongovett Dec 15, 2025
59c3f03
Re-title internationalized intro pages
devongovett Dec 15, 2025
598cf34
Updates for testing
devongovett Dec 15, 2025
408f2e3
Merge branch 'main' into home-updates
devongovett Dec 15, 2025
a0c9e55
Improve background on mobile
devongovett Dec 16, 2025
ce758ac
Fix focus ring on component links
devongovett Dec 16, 2025
33787bc
Update logo and favicon
devongovett Dec 16, 2025
2fc74be
Delay pre-fetching until after view transitions
devongovett Dec 16, 2025
c9744ae
Fix colors
devongovett Dec 16, 2025
39a7b85
Update video
devongovett Dec 16, 2025
4e9fff0
Update react aria open graph image
devongovett Dec 16, 2025
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
3 changes: 2 additions & 1 deletion packages/@react-spectrum/s2/src/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
import {filterDOMProps} from '@react-aria/utils';
import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
import {Image} from './Image';
import {isDocsEnv} from './macros' with {type: 'macro'};
import {style} from '../style' with { type: 'macro' };
import {useDOMRef} from '@react-spectrum/utils';
import {useSpectrumContextProps} from './useSpectrumContextProps';
Expand Down Expand Up @@ -77,7 +78,7 @@ export const Avatar = forwardRef(function Avatar(props: AvatarProps, ref: DOMRef
const domProps = filterDOMProps(otherProps);

// In the docs build, we need to be able to simulate font scaling.
let remSize = process.env.DOCS_ENV ? `calc(${size / 16} * var(--rem, 1rem))` : `${size / 16}rem`;
let remSize = isDocsEnv() ? `calc(${size / 16} * var(--rem, 1rem))` : `${size / 16}rem`;
let isLarge = size >= 64;
return (
<Image
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/s2/src/Image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export const Image = forwardRef(function Image(props: ImageProps, domRef: Forwar

if (Array.isArray(srcProp)) {
img = (
<picture>
<picture className={style({objectFit: 'inherit', objectPosition: 'inherit'})}>
{srcProp.map((source, i) => {
let {colorScheme: sourceColorScheme, ...sourceProps} = source;
if (sourceColorScheme) {
Expand Down
15 changes: 15 additions & 0 deletions packages/@react-spectrum/s2/src/macros.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright 2025 Adobe. All rights reserved.
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
* OF ANY KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/

export function isDocsEnv(): boolean {
return !!process.env.DOCS_ENV;
}
6 changes: 3 additions & 3 deletions packages/dev/docs/pages/react-aria/home/ExampleApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export function ExampleApp(): React.ReactNode {
</DialogTrigger>
<MenuTrigger>
<TooltipTrigger>
<Button aria-label="Columns" variant="secondary" className="!h-9 shrink-0 p-0 hidden sm:inline-flex">
<Button aria-label="Columns" variant="secondary" className="!w-9 !h-9 shrink-0 p-0 hidden sm:inline-flex">
<SlidersIcon aria-hidden className="block w-5 h-5" />
</Button>
<Tooltip>Columns</Tooltip>
Expand All @@ -222,7 +222,7 @@ export function ExampleApp(): React.ReactNode {
</Menu>
</MenuTrigger>
<DialogTrigger>
<Button aria-label="Add plant" variant="secondary" className="!h-9 shrink-0 p-0 col-start-5">
<Button aria-label="Add plant" variant="secondary" className="!w-9 !h-9 shrink-0 p-0 col-start-5">
<PlusIcon aria-hidden className="block w-5 h-5" />
</Button>
<PlantModal>
Expand Down Expand Up @@ -506,7 +506,7 @@ function PlantModal(props: ModalOverlayProps) {
// Use position: absolute instead of fixed to avoid
// being clipped to the "inner" viewport in iOS 26
className={({isEntering, isExiting}) => `
absolute top-0 left-0 w-full h-(--page-height) isolate z-20 bg-black/[15%] backdrop-blur-lg
absolute top-0 left-0 w-full h-(--page-height) max-h-[5000px] isolate z-20 bg-black/[15%] backdrop-blur-lg
${isEntering ? 'animate-in fade-in duration-200 ease-out' : ''}
${isExiting ? 'animate-out fade-out duration-200 ease-in' : ''}
`}>
Expand Down
10 changes: 6 additions & 4 deletions packages/dev/docs/pages/react-aria/home/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
* governing permissions and limitations under the License.
*/
import {ArrowRight} from 'lucide-react';
import {BaseLink} from '@react-spectrum/s2-docs/src/Link';
import React, {ForwardedRef, HTMLAttributes, ReactNode} from 'react';
import {twMerge} from 'tailwind-merge';

export function Window({children, className = '', isBackground = false, toolbar}: {children: ReactNode, className?: string, isBackground?: boolean, toolbar: ReactNode}): ReactNode {
return (
Expand All @@ -33,7 +35,7 @@ export function FileTab({children, className = ''}: {children: ReactNode, classN
}

export function AddressBar({children}: {children: ReactNode}): ReactNode {
return <div className="bg-gray-400/40 dark:bg-zinc-500/40 px-5 md:px-10 py-1 ml-20 sm:mx-auto my-2.5 rounded-md text-slate-600 dark:text-slate-300 text-xs">{children}</div>;
return <div className="bg-gray-400/40 dark:bg-zinc-500/40 px-5 md:px-10 py-1 ml-20 flex-1 text-center sm:flex-none sm:mx-auto my-2.5 rounded-md text-slate-600 dark:text-slate-300 text-xs">{children}</div>;
}

export function GradientText({children}: {children: ReactNode}): ReactNode {
Expand Down Expand Up @@ -74,7 +76,7 @@ export function Arrow({href, children, textX, x1, x2, points, y, marker = 'marke
? <polyline points={points} {...markerProps} className="stroke-slate-800 dark:stroke-white fill-none" />
: <line x1={x1} y1={y} x2={x2} y2={y} {...markerProps} className="stroke-slate-800 dark:stroke-white" />
}
<a href={href} target="_blank" className="pointer-events-auto outline-hidden rounded-xs focus:outline-blue-600 dark:focus:outline-blue-500 outline-offset-2"><text x={textX} y={y + 3} className="text-xs fill-slate-900 dark:fill-white underline">{children}</text></a>
<a href={href} target="_blank" className="pointer-events-auto outline-hidden rounded-xs outline-0 outline-solid focus-visible:outline-2 focus-visible:outline-black dark:focus-visible:outline-white outline-offset-2"><text x={textX} y={y + 3} className="text-xs fill-slate-900 dark:fill-white underline">{children}</text></a>
</>
);
}
Expand All @@ -85,8 +87,8 @@ React.forwardRef((props: HTMLAttributes<HTMLDivElement>, ref: ForwardedRef<HTMLD
return <div ref={ref} className="z-10 pointer-events-none absolute w-10 h-10 rounded-full border border-black/80 bg-black/80 dark:border-white/80 dark:bg-white/80 dark:mix-blend-difference opacity-0 [--hover-opacity:0.15] [--pressed-opacity:0.3] forced-colors:[--hover-opacity:0.5] forced-colors:[--pressed-opacity:1] forced-colors:bg-[Highlight]! forced-colors:mix-blend-normal!" {...props} />;
});

export function LearnMoreLink({href, className}: {href: string, className: string}): ReactNode {
return <a href={href} className={`group inline-block mt-6 mb-12 no-underline text-xl rounded-full px-4 -mx-4 py-1 transition focus-ring active:scale-95 ${className}`}>Learn more<ArrowRight aria-hidden className="inline w-5 h-5 align-middle ml-1 will-change-transform group-hover:translate-x-0.5 transition -mt-1" /></a>;
export function LearnMoreLink({children, href, className}: {children?: string, href: string, className: string}): ReactNode {
return <BaseLink href={href} className={twMerge('group inline-block mt-6 mb-12 no-underline text-xl rounded-full px-4 -mx-4 py-1 transition focus-ring active:scale-95', className)}>{children || 'Learn more'}<ArrowRight aria-hidden className="inline w-5 h-5 align-middle ml-1 will-change-transform group-hover:translate-x-0.5 transition -mt-1" /></BaseLink>;
}

export function Scrollable({children, className = ''}: {children: ReactNode, className?: string}): ReactNode {
Expand Down
Loading