Skip to content

Commit cb4478d

Browse files
committed
Merge branch 'main' into homepage
# Conflicts: # packages/dev/s2-docs/pages/s2/home/Home.tsx
2 parents fd4164c + 299e241 commit cb4478d

File tree

400 files changed

+2730
-1315
lines changed

Some content is hidden

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

400 files changed

+2730
-1315
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ publish: build
9292
yarn publish
9393

9494
publish-nightly: build
95-
git update-index --refresh
95+
rm -f .git/index
96+
git reset
9697
yarn version:nightly
9798
yarn publish:nightly
9899

@@ -124,7 +125,7 @@ website-production:
124125
mv starters/tailwind/react-aria-tailwind-starter.zip dist/production/docs/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip
125126

126127
check-examples:
127-
node scripts/extractExamples.mjs
128+
node scripts/extractExamplesS2.mjs
128129
yarn tsc --project dist/docs-examples/tsconfig.json
129130

130131
starter:

bin/imports.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ const devDependencies = new Set([
2020
'@adobe/spectrum-css-temp',
2121
'@react-spectrum/style-macro-s1',
2222
'@parcel/macros',
23-
'@adobe/spectrum-tokens'
23+
'@adobe/spectrum-tokens',
24+
'playwright',
25+
'axe-playwright'
2426
]);
2527

2628
module.exports = {

packages/@react-spectrum/s2/chromatic/Picker.stories.tsx

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import {AsyncPickerStory, AsyncPickerStoryType, ContextualHelpExample, CustomWidth, Dynamic, Example, Sections, WithAvatars, WithIcons} from '../stories/Picker.stories';
1414
import {expect} from '@storybook/jest';
1515
import type {Meta, StoryObj} from '@storybook/react';
16-
import {Picker} from '../src';
16+
import {Picker, PickerItem} from '../src';
1717
import {userEvent, waitFor, within} from '@storybook/test';
1818

1919
const meta: Meta<typeof Picker<any>> = {
@@ -39,6 +39,19 @@ export const Default: Story = {
3939
}
4040
};
4141

42+
export const isQuiet: Story = {
43+
render: () => (
44+
<Picker isQuiet label="Favorite Ice Cream">
45+
<PickerItem>Chocolate</PickerItem>
46+
<PickerItem>Mint</PickerItem>
47+
<PickerItem>Strawberry</PickerItem>
48+
<PickerItem>Vanilla</PickerItem>
49+
<PickerItem>Chocolate Chip Cookie Dough</PickerItem>
50+
</Picker>
51+
),
52+
play: Default.play
53+
};
54+
4255
export const WithSections: Story = {
4356
...Sections,
4457
play: Default.play

packages/@react-spectrum/s2/intl/sr-SP.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"notificationbadge.indicatorOnly": "Nova aktivnost",
2727
"notificationbadge.plus": "{notifications}+",
2828
"picker.placeholder": "Izaberite...",
29-
"picker.selectedCount": "{count, plural, =0 {No items selected} one {# item selected} other {# items selected}}",
29+
"picker.selectedCount": "{count, plural, =0 {Nije izabrana nijedna stavka} one {Izabrana je # stavka} other {Izabrano je # stavki}}",
3030
"slider.maximum": "Najviše",
3131
"slider.minimum": "Najmanje",
3232
"table.cancel": "Otkaži",
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading
Lines changed: 4 additions & 4 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)