Skip to content

Commit dc2c64f

Browse files
authored
Merge branch 'main' into lockfiles-for-all-apps
2 parents 637a5dd + 5ede892 commit dc2c64f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+4337
-290
lines changed

packages/@react-spectrum/s2/src/ActionBar.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ export interface ActionBarProps extends SlotProps {
8989

9090
export const ActionBarContext = createContext<ContextValue<Partial<ActionBarProps>, DOMRefValue<HTMLDivElement>>>(null);
9191

92+
/**
93+
* Action bars are used for single and bulk selection patterns when a user needs to perform actions on one or more items at the same time.
94+
*/
9295
export const ActionBar = forwardRef(function ActionBar(props: ActionBarProps, ref: DOMRef<HTMLDivElement>) {
9396
[props, ref] = useSpectrumContextProps(props, ref, ActionBarContext);
9497
let domRef = useDOMRef(ref);

packages/@react-spectrum/s2/src/Calendar.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ const selectionSpanStyles = style({
284284
forcedColorAdjust: 'none'
285285
});
286286

287+
/**
288+
* Calendars display a grid of days in one or more months and allow users to select a single date.
289+
*/
287290
export const Calendar = /*#__PURE__*/ (forwardRef as forwardRefType)(function Calendar<T extends DateValue>(props: CalendarProps<T>, ref: ForwardedRef<HTMLDivElement>) {
288291
[props, ref] = useSpectrumContextProps(props, ref, CalendarContext);
289292
let {

packages/@react-spectrum/s2/src/Card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ export interface UserCardProps extends Omit<CardProps, 'density' | 'variant'> {
635635
variant?: 'primary' | 'secondary' | 'tertiary'
636636
}
637637

638-
export const UserCard = forwardRef(function UserCard(props: CardProps, ref: DOMRef<HTMLDivElement>) {
638+
export const UserCard = forwardRef(function UserCard(props: UserCardProps, ref: DOMRef<HTMLDivElement>) {
639639
let {size = 'M'} = props;
640640
return (
641641
<Card {...props} ref={ref} density="spacious">

packages/@react-spectrum/s2/src/DateField.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ const iconStyles = style({
8787
justifyContent: 'end'
8888
});
8989

90+
/**
91+
* DateFields allow users to enter and edit date and time values using a keyboard.
92+
* Each part of a date value is displayed in an individually editable segment.
93+
*/
9094
export const DateField = /*#__PURE__*/ (forwardRef as forwardRefType)(function DateField<T extends DateValue>(
9195
props: DateFieldProps<T>, ref: Ref<HTMLDivElement>
9296
): ReactElement {

packages/@react-spectrum/s2/src/DatePicker.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ export const timeField = style({
119119
width: 'unset'
120120
});
121121

122+
/**
123+
* DatePickers combine a DateField and a Calendar popover to allow users to enter or select a date and time value.
124+
*/
122125
export const DatePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(function DatePicker<T extends DateValue>(
123126
props: DatePickerProps<T>, ref: Ref<HTMLDivElement>
124127
): ReactElement {

packages/@react-spectrum/s2/src/DateRangePicker.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ export interface DateRangePickerProps<T extends DateValue> extends
5252

5353
export const DateRangePickerContext = createContext<ContextValue<Partial<DateRangePickerProps<any>>, HTMLDivElement>>(null);
5454

55+
/**
56+
* DateRangePickers combine two DateFields and a RangeCalendar popover to allow users
57+
* to enter or select a date and time range.
58+
*/
5559
export const DateRangePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(function DateRangePicker<T extends DateValue>(
5660
props: DateRangePickerProps<T>, ref: Ref<HTMLDivElement>
5761
): ReactElement {

packages/@react-spectrum/s2/src/RangeCalendar.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ const headerStyles = style({
6464
width: 'full'
6565
});
6666

67+
/**
68+
* RangeCalendars display a grid of days in one or more months and allow users to select a contiguous range of dates.
69+
*/
6770
export const RangeCalendar = /*#__PURE__*/ (forwardRef as forwardRefType)(function RangeCalendar<T extends DateValue>(props: RangeCalendarProps<T>, ref: ForwardedRef<HTMLDivElement>) {
6871
[props, ref] = useSpectrumContextProps(props, ref, RangeCalendarContext);
6972
let {

packages/@react-spectrum/s2/src/RangeSlider.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ export interface RangeSliderProps extends Omit<SliderBaseProps<RangeValue<number
4545

4646
export const RangeSliderContext = createContext<ContextValue<Partial<RangeSliderProps>, FocusableRefValue<HTMLDivElement>>>(null);
4747

48+
/**
49+
* RangeSliders allow users to quickly select a subset range. They should be used when the upper and lower bounds to the range are invariable.
50+
*/
4851
export const RangeSlider = /*#__PURE__*/ forwardRef(function RangeSlider(props: RangeSliderProps, ref: FocusableRef<HTMLDivElement>) {
4952
let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/s2');
5053
[props, ref] = useSpectrumContextProps(props, ref, RangeSliderContext);

packages/@react-spectrum/s2/src/TimeField.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ export interface TimeFieldProps<T extends TimeValue> extends
4141

4242
export const TimeFieldContext = createContext<ContextValue<Partial<TimeFieldProps<any>>, HTMLDivElement>>(null);
4343

44+
/**
45+
* TimeFields allow users to enter and edit time values using a keyboard.
46+
* Each part of the time is displayed in an individually editable segment.
47+
*/
4448
export const TimeField = /*#__PURE__*/ (forwardRef as forwardRefType)(function TimeField<T extends TimeValue>(
4549
props: TimeFieldProps<T>, ref: Ref<HTMLDivElement>
4650
): ReactElement {

packages/@react-spectrum/s2/stories/Card.stories.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const meta: Meta<CardProps & {isLoading?: boolean}> = {
5252

5353
export default meta;
5454
type Story = StoryObj<typeof Card>;
55+
type UserCardStory = StoryObj<typeof UserCard>;
5556

5657
export const Example: Story = {
5758
render: (args) => (
@@ -124,7 +125,7 @@ export const Asset: Story = {
124125
argTypes: specificArgTypes
125126
};
126127

127-
export const User: Story = {
128+
export const User: UserCardStory = {
128129
render: (args) => (
129130
<div style={{display: 'flex', gap: 16, flexWrap: 'wrap', justifyContent: 'center'}}>
130131
<UserCard {...args}>

0 commit comments

Comments
 (0)