Code

Conflict resolution#8

Code

Merged

ritz078 merged 4 commits intodevelopPSPDFKit-labs/react-spectrum:developfrom

ritesh/conflict-resPSPDFKit-labs/react-spectrum:ritesh/conflict-resCopy head branch name to clipboard

Apr 10, 2025

Commits

Commits on Apr 3, 2025

• chore: Fix generated code sample for S2 TooltipTrigger docs (#8000)

  Show description for f75223a
  LFDanLu

  authored
  f75223a

  Copy full SHA for f75223a

Commits on Apr 4, 2025

• fix: export SortDescriptor type from S2 (#8030)

  ToyWalrus

  authored
  148fcf1

  Copy full SHA for 148fcf1

Commits on Apr 10, 2025

• Conflict resolution

  ritz078

  committed
  dfd3048

  Copy full SHA for dfd3048

• Merge branch 'develop' of https://github.com/PSPDFKit-labs/react-spectrum into ritesh/conflict-res

  ritz078

  committed
  5fa90bd

  Copy full SHA for 5fa90bd