Skip to content

Commit 47d9cab

Browse files
snowystingersnowystinger
authored
Merge branch 'main' into constrain-date
2 parents 673361b + ecb05e2 commit 47d9cab

File tree

431 files changed

+22509
-3920
lines changed

Some content is hidden

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

431 files changed

+22509
-3920
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,9 @@ jobs:
757757
name: deploy
758758
command: |
759759
if [ $AZURE_STORAGE_SAS_TOKEN ]; then
760-
azcopy copy "/tmp/dist/*" "https://reactspectrum.blob.core.windows.net/reactspectrum${AZURE_STORAGE_SAS_TOKEN}" --recursive
760+
azcopy copy "/tmp/dist/*" "https://reactspectrum.blob.core.windows.net/reactspectrum${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt"
761+
azcopy copy "/tmp/dist/*" "https://reactspectrum.blob.core.windows.net/reactspectrum${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8"
762+
azcopy copy "/tmp/dist/*" "https://reactspectrum.blob.core.windows.net/reactspectrum${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8"
761763
fi
762764
763765
# Separate deploy workflow for the test docs built w/ verdaccio packages so it doesn't hold up the other deploy workflows
@@ -778,7 +780,9 @@ jobs:
778780
command: |
779781
if [ $AZURE_STORAGE_SAS_TOKEN ]; then
780782
for dir in /tmp/verdaccio_dist/*/verdaccio; do
781-
azcopy copy "$dir/*" "https://reactspectrum.blob.core.windows.net/reactspectrum/$CIRCLE_SHA1/verdaccio${AZURE_STORAGE_SAS_TOKEN}" --recursive
783+
azcopy copy "$dir/*" "https://reactspectrum.blob.core.windows.net/reactspectrum/$CIRCLE_SHA1/verdaccio${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt"
784+
azcopy copy "$dir/*" "https://reactspectrum.blob.core.windows.net/reactspectrum/$CIRCLE_SHA1/verdaccio${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8"
785+
azcopy copy "$dir/*" "https://reactspectrum.blob.core.windows.net/reactspectrum/$CIRCLE_SHA1/verdaccio${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8"
782786
done
783787
fi
784788
@@ -796,7 +800,10 @@ jobs:
796800
mv ./azcopy_linux_amd64_*/azcopy /usr/local/bin/
797801
- run:
798802
name: deploy
799-
command: azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive
803+
command: |
804+
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt"
805+
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8"
806+
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8"
800807
801808
comment:
802809
executor: rsp

‎.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ index 39a24b8f2ccdc52739d130480ab18975073616cb..0c3f5199401c15b90230c25a02de364e
1111
}
1212
UI.clearInitialValue(el);
1313
}
14+
diff --git a/dist/cjs/event/behavior/keydown.js b/dist/cjs/event/behavior/keydown.js
15+
index 55027cb256f66b808d17280dc01bc55a796a1032..993d5de5a838a711d7ae009344354772a42ed0c1 100644
16+
--- a/dist/cjs/event/behavior/keydown.js
17+
+++ b/dist/cjs/event/behavior/keydown.js
18+
@@ -110,7 +110,7 @@ const keydownBehavior = {
19+
},
20+
Tab: (event, target, instance)=>{
21+
return ()=>{
22+
- const dest = getTabDestination.getTabDestination(target, instance.system.keyboard.modifiers.Shift);
23+
+ const dest = getTabDestination.getTabDestination(document.activeElement, instance.system.keyboard.modifiers.Shift);
24+
focus.focusElement(dest);
25+
if (selection.hasOwnSelection(dest)) {
26+
UI.setUISelection(dest, {
1427
diff --git a/dist/cjs/utils/focus/getActiveElement.js b/dist/cjs/utils/focus/getActiveElement.js
1528
index d25f3a8ef67e856e43614559f73012899c0b53d7..4ed9ee45565ed438ee9284d8d3043c0bd50463eb 100644
1629
--- a/dist/cjs/utils/focus/getActiveElement.js

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ s2-api-diff:
143143
node scripts/api-diff.js --skip-same --skip-style-props
144144

145145
s2-docs:
146-
node scripts/extractStarter.mjs
146+
yarn workspace @react-spectrum/s2-docs generate:md
147+
yarn workspace @react-spectrum/s2-docs generate:og
147148
REGISTRY_URL=https://reactspectrum.blob.core.windows.net/reactspectrum/$$(git rev-parse HEAD)/s2-docs/registry node scripts/buildRegistry.mjs
148149
REGISTRY_URL=https://reactspectrum.blob.core.windows.net/reactspectrum/$$(git rev-parse HEAD)/s2-docs/registry yarn build:s2-docs --public-url /reactspectrum/$$(git rev-parse HEAD)/s2-docs/
149150
mkdir -p dist/$$(git rev-parse HEAD)

‎examples/s2-esbuild-starter-app/src/app.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313

1414
import "@react-spectrum/s2/page.css";
1515
import { style } from "@react-spectrum/s2/style" with { type: "macro" };
16-
import { Button } from "@react-spectrum/s2";
16+
import { Button, Provider } from "@react-spectrum/s2";
1717

1818
function App() {
1919
return (
20-
<main>
20+
<Provider elementType="main">
2121
<Button
2222
styles={style({
2323
marginStart: 16,
2424
})}
2525
>
2626
Hello Spectrum 2!
2727
</Button>
28-
</main>
28+
</Provider>
2929
);
3030
}
3131

‎examples/s2-next-macros/src/app/Lazy.js‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
Breadcrumbs,
2626
Button,
2727
ButtonGroup,
28+
Calendar,
2829
Checkbox,
2930
CheckboxGroup,
3031
CloseButton,
@@ -39,6 +40,9 @@ import {
3940
Content,
4041
ContextualHelp,
4142
CustomDialog,
43+
DateField,
44+
DatePicker,
45+
DateRangePicker,
4246
Dialog,
4347
DialogContainer,
4448
DialogTrigger,
@@ -49,6 +53,7 @@ import {
4953
DropZone,
5054
Footer,
5155
Form,
56+
FullscreenDialog,
5257
Header,
5358
Heading,
5459
IllustratedMessage,
@@ -65,10 +70,13 @@ import {
6570
ProgressCircle,
6671
Radio,
6772
RadioGroup,
73+
RangeCalendar,
6874
RangeSlider,
6975
SearchField,
7076
SegmentedControl,
7177
SegmentedControlItem,
78+
SelectBox,
79+
SelectBoxGroup,
7280
Slider,
7381
StatusLight,
7482
Switch,
@@ -81,12 +89,17 @@ import {
8189
Text,
8290
TextArea,
8391
TextField,
92+
TimeField,
8493
Tooltip,
8594
TooltipTrigger,
8695
} from "@react-spectrum/s2";
8796
import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark';
8897
import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud";
8998
import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload";
99+
import Server from "@react-spectrum/s2/illustrations/linear/Server";
100+
import AlertNotice from "@react-spectrum/s2/illustrations/linear/AlertNotice";
101+
import PaperAirplane from "@react-spectrum/s2/illustrations/linear/Paperairplane";
102+
import StarFilled1 from "@react-spectrum/s2/illustrations/linear/Star";
90103
import Edit from "@react-spectrum/s2/icons/Edit";
91104
import Section from "./components/Section";
92105
import { style } from "@react-spectrum/s2/style" with { type: "macro" };
@@ -110,6 +123,15 @@ export default function Lazy() {
110123
<ColorWheel defaultValue="hsl(30, 100%, 50%)" />
111124
</Section>
112125

126+
<Section title="Date and time">
127+
<Calendar aria-label="Calendar" />
128+
<DateField label="Date Field" />
129+
<DatePicker label="Date Picker" />
130+
<DateRangePicker label="Date Range Picker" />
131+
<RangeCalendar aria-label="Range Calendar" />
132+
<TimeField label="Time Field" />
133+
</Section>
134+
113135
<Section title="Drag and Drop">
114136
<DropZone>
115137
<IllustratedMessage>
@@ -141,6 +163,26 @@ export default function Lazy() {
141163
<TextArea label="Description" />
142164
<TextField label="Email" />
143165
<TextField label="Password" />
166+
<SelectBoxGroup aria-label="Choose a cloud">
167+
<SelectBox id="aws" textValue="Amazon Web Services">
168+
<Server />
169+
<Text slot="label">Amazon Web Services</Text>
170+
<Text slot="description">Reliable cloud infrastructure</Text>
171+
</SelectBox>
172+
<SelectBox id="azure" textValue="Microsoft Azure">
173+
<AlertNotice />
174+
<Text slot="label">Microsoft Azure</Text>
175+
</SelectBox>
176+
<SelectBox id="gcp" textValue="Google Cloud Platform">
177+
<PaperAirplane />
178+
<Text slot="label">Google Cloud Platform</Text>
179+
</SelectBox>
180+
<SelectBox id="ibm" textValue="IBM Cloud">
181+
<StarFilled1 />
182+
<Text slot="label">IBM Cloud</Text>
183+
<Text slot="description">Hybrid cloud solutions</Text>
184+
</SelectBox>
185+
</SelectBoxGroup>
144186
</Form>
145187
</Section>
146188

@@ -288,6 +330,26 @@ export default function Lazy() {
288330
</Popover>
289331
</DialogTrigger>
290332

333+
<DialogTrigger>
334+
<Button variant="primary">Fullscreen</Button>
335+
<FullscreenDialog>
336+
{({close}) => <>
337+
<Heading slot="title">Dialog title</Heading>
338+
<Header>Header</Header>
339+
<Content>
340+
{[...Array(5)].map((_, i) => <p key={i} style={{
341+
marginTop: i === 0 ? 0 : undefined,
342+
marginBottom: i === 4 ? 0 : undefined
343+
}}>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in</p>)}
344+
</Content>
345+
<ButtonGroup>
346+
<Button onPress={close} variant="secondary">Cancel</Button>
347+
<Button onPress={close} variant="accent">Save</Button>
348+
</ButtonGroup>
349+
</>}
350+
</FullscreenDialog>
351+
</DialogTrigger>
352+
291353
<TooltipTrigger>
292354
<ActionButton aria-label="Edit Name">
293355
<Edit />

‎examples/s2-next-macros/src/app/page.tsx‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import React, { useState } from "react";
1616
import "@react-spectrum/s2/page.css";
1717
import {
18+
ActionBar,
1819
ActionButton,
1920
ActionButtonGroup,
2021
ActionMenu,
@@ -28,8 +29,10 @@ import {
2829
Menu,
2930
MenuItem,
3031
MenuTrigger,
32+
NotificationBadge,
3133
Picker,
3234
PickerItem,
35+
Provider,
3336
Row,
3437
SubmenuTrigger,
3538
TableBody,
@@ -70,7 +73,7 @@ function App() {
7073
{id: 'waterfall', label: 'Waterfall'}
7174
];
7275
return (
73-
<main>
76+
<Provider elementType="main">
7477
<Heading
7578
styles={style({ font: "heading-xl", textAlign: "center" })}
7679
level={1}
@@ -96,10 +99,11 @@ function App() {
9699
<Section title="Buttons">
97100
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
98101
<Button variant="primary">Primary</Button>
99-
<Button variant="secondary">Secondary</Button>
102+
<Button variant="secondary"><Text>Secondary</Text></Button>
100103
<ActionButton>
101104
<Edit />
102105
<Text>Action Button</Text>
106+
<NotificationBadge value={2} />
103107
</ActionButton>
104108
<ToggleButton>Toggle Button</ToggleButton>
105109
<LinkButton
@@ -180,7 +184,17 @@ function App() {
180184
<MenuItem>Paste</MenuItem>
181185
</Menu>
182186
</MenuTrigger>
183-
<TableView aria-label="Files" styles={style({width: 320, height: 320})}>
187+
<TableView
188+
aria-label="Files"
189+
styles={style({width: 320, height: 320})}
190+
selectionMode="multiple"
191+
renderActionBar={selectedKeys => (
192+
<ActionBar>
193+
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
194+
<ActionButton onPress={() => console.log('copy', selectedKeys)}>Copy</ActionButton>
195+
<ActionButton onPress={() => console.log('delete', selectedKeys)}>Delete</ActionButton>
196+
</ActionBar>
197+
)}>
184198
<TableHeader>
185199
<Column isRowHeader>Name</Column>
186200
<Column>Type</Column>
@@ -257,7 +271,7 @@ function App() {
257271
<Lazy />
258272
</React.Suspense>}
259273
</div>
260-
</main>
274+
</Provider>
261275
);
262276
}
263277

‎examples/s2-parcel-example/src/App.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import React, { useState } from "react";
1414
import "@react-spectrum/s2/page.css";
1515
import {
16+
ActionBar,
1617
ActionButton,
1718
ActionButtonGroup,
1819
ActionMenu,
@@ -26,8 +27,10 @@ import {
2627
Menu,
2728
MenuItem,
2829
MenuTrigger,
30+
NotificationBadge,
2931
Picker,
3032
PickerItem,
33+
Provider,
3134
Row,
3235
SubmenuTrigger,
3336
TableBody,
@@ -68,7 +71,7 @@ function App() {
6871
{id: 'waterfall', label: 'Waterfall'}
6972
];
7073
return (
71-
<main>
74+
<Provider elementType="main">
7275
<Heading
7376
styles={style({ font: "heading-xl", textAlign: "center" })}
7477
level={1}
@@ -94,10 +97,11 @@ function App() {
9497
<Section title="Buttons">
9598
<ButtonGroup align="center" styles={style({maxWidth: '[100vw]'})}>
9699
<Button variant="primary">Primary</Button>
97-
<Button variant="secondary">Secondary</Button>
100+
<Button variant="secondary"><Text>Secondary</Text></Button>
98101
<ActionButton>
99102
<Edit />
100103
<Text>Action Button</Text>
104+
<NotificationBadge value={2} />
101105
</ActionButton>
102106
<ToggleButton>Toggle Button</ToggleButton>
103107
<LinkButton
@@ -178,7 +182,17 @@ function App() {
178182
<MenuItem>Paste</MenuItem>
179183
</Menu>
180184
</MenuTrigger>
181-
<TableView aria-label="Files" styles={style({width: 320, height: 320})}>
185+
<TableView
186+
aria-label="Files"
187+
styles={style({width: 320, height: 320})}
188+
selectionMode="multiple"
189+
renderActionBar={selectedKeys => (
190+
<ActionBar>
191+
<ActionButton onPress={() => console.log('edit', selectedKeys)}>Edit</ActionButton>
192+
<ActionButton onPress={() => console.log('copy', selectedKeys)}>Copy</ActionButton>
193+
<ActionButton onPress={() => console.log('delete', selectedKeys)}>Delete</ActionButton>
194+
</ActionBar>
195+
)}>
182196
<TableHeader>
183197
<Column isRowHeader>Name</Column>
184198
<Column>Type</Column>
@@ -255,7 +269,7 @@ function App() {
255269
<Lazy />
256270
</React.Suspense>}
257271
</div>
258-
</main>
272+
</Provider>
259273
);
260274
}
261275

0 commit comments

Comments
 (0)