Skip to content

[pull] main from adobe:main #355

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 14, 2026
Merged

[pull] main from adobe:main #355

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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ build-s2-docs:

# Build old docs pages, which get inter-mixed with the new pages
# TODO: We probably don't need to build this on every PR
yarn parcel build 'packages/@react-spectrum/*/docs/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx' --dist-dir dist/s2-docs/s2/$(PUBLIC_URL) --public-url $(PUBLIC_URL)
yarn parcel build 'packages/@react-{aria,stately}/*/docs/*.mdx' --dist-dir dist/s2-docs/react-aria/$(PUBLIC_URL) --public-url $(PUBLIC_URL)
yarn parcel build 'packages/@adobe/react-spectrum/docs/**/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx' --dist-dir dist/s2-docs/s2/$(PUBLIC_URL) --public-url $(PUBLIC_URL)
yarn parcel build 'packages/{react-aria,react-stately}/docs/**/*.mdx' --dist-dir dist/s2-docs/react-aria/$(PUBLIC_URL) --public-url $(PUBLIC_URL)

build-starters:
$(MAKE) starter-zip
Expand Down
2 changes: 1 addition & 1 deletion packages/@adobe/react-spectrum/docs/table/TableView.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default Layout;

import docs from 'docs:@react-spectrum/table';
import dndDocs from 'docs:@react-spectrum/dnd';
import tableUtil from 'docs:@react-aria/test-utils/src/table.ts';
import tableUtil from 'docs:@react-aria/test-utils';
import tableTypes from 'docs:@react-stately/table';
import {HeaderInfo, PropTable, PageDescription, TypeLink, VersionBadge, ClassAPI} from '@react-spectrum/docs';
import {Keyboard} from '@react-spectrum/text';
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/dnd/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

/// <reference types="css-module-types" />

export {useDragAndDrop} from '@adobe/react-spectrum/useDragAndDrop';
export {useDragAndDrop, DIRECTORY_DRAG_TYPE} from '@adobe/react-spectrum/useDragAndDrop';

export type {DragAndDropOptions, DragAndDropHooks, DIRECTORY_DRAG_TYPE} from '@adobe/react-spectrum/useDragAndDrop';
export type {DragAndDropOptions, DragAndDropHooks} from '@adobe/react-spectrum/useDragAndDrop';

export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
2 changes: 1 addition & 1 deletion packages/dev/parcel-namer-docs/DocsNamer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = new Namer({

// move @react-spectrum pages under /v3 aka components and stuff
let namespace = parts[1].replace(/^@/, '');
if (namespace === 'adobe') {
if (namespace === 'adobe' || namespace === 'react-spectrum') {
return `v3/${basename}`;
}

Expand Down
Loading