Skip to content

Commit c81a23c

Browse files
authored
chore: revert ts update (#8060)
1 parent a654a33 commit c81a23c

40 files changed

+132
-184
lines changed

.yarn/patches/@types-node-npm-20.14.13-41f92d384c.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

lib/viewTransitions.d.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright 2025 Adobe. All rights reserved.
3+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License. You may obtain a copy
5+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under
8+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
9+
* OF ANY KIND, either express or implied. See the License for the specific language
10+
* governing permissions and limitations under the License.
11+
*/
12+
13+
interface Document {
14+
startViewTransition(fn: () => void): ViewTransition;
15+
}
16+
17+
interface ViewTransition {
18+
ready: Promise<void>;
19+
}

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
"tailwindcss": "^4.0.0",
207207
"tailwindcss-animate": "^1.0.7",
208208
"tempy": "^0.5.0",
209-
"typescript": "^5.8.2",
209+
"typescript": "^5.5.0",
210210
"typescript-eslint": "^8.9.0",
211211
"verdaccio": "^6.0.0",
212212
"walk-object": "^4.0.0",
@@ -234,10 +234,7 @@
234234
"recast": "0.23.6",
235235
"ast-types": "0.16.1",
236236
"svgo": "^3",
237-
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch",
238-
"@types/node@npm:*": "patch:@types/node@npm%3A20.14.13#~/.yarn/patches/@types-node-npm-20.14.13-41f92d384c.patch",
239-
"@types/node@npm:^18.0.0": "patch:@types/node@npm%3A20.14.13#~/.yarn/patches/@types-node-npm-20.14.13-41f92d384c.patch",
240-
"@types/node@npm:>= 8": "patch:@types/node@npm%3A20.14.13#~/.yarn/patches/@types-node-npm-20.14.13-41f92d384c.patch"
237+
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.1#~/.yarn/patches/@testing-library-user-event-npm-14.6.1-5da7e1d4e2.patch"
241238
},
242239
"@parcel/transformer-css": {
243240
"cssModules": {

packages/@react-aria/dnd/src/useDroppableCollection.ts

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -258,25 +258,18 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
258258
// inserted item. If selection is disabled, then also show the focus ring so there
259259
// is some indication that items were added.
260260
if (state.selectionManager.focusedKey === prevFocusedKey) {
261-
let first: Key | null | undefined = newKeys.keys().next().value;
262-
if (first != null) {
263-
let item = state.collection.getItem(first);
264-
265-
// If this is a cell, focus the parent row.
266-
// eslint-disable-next-line max-depth
267-
if (item?.type === 'cell') {
268-
first = item.parentKey;
269-
}
261+
let first = newKeys.keys().next().value;
262+
let item = state.collection.getItem(first);
270263

271-
// eslint-disable-next-line max-depth
272-
if (first != null) {
273-
state.selectionManager.setFocusedKey(first);
274-
}
264+
// If this is a cell, focus the parent row.
265+
if (item?.type === 'cell') {
266+
first = item.parentKey;
267+
}
275268

276-
// eslint-disable-next-line max-depth
277-
if (state.selectionManager.selectionMode === 'none') {
278-
setInteractionModality('keyboard');
279-
}
269+
state.selectionManager.setFocusedKey(first);
270+
271+
if (state.selectionManager.selectionMode === 'none') {
272+
setInteractionModality('keyboard');
280273
}
281274
}
282275
} else if (
@@ -342,7 +335,7 @@ export function useDroppableCollection(props: DroppableCollectionOptions, state:
342335
}, 50);
343336
}, [localState, defaultOnDrop, ref, updateFocusAfterDrop]);
344337

345-
338+
346339
useEffect(() => {
347340
return () => {
348341
if (droppingState.current) {

packages/@react-aria/grid/src/useGridSelectionAnnouncement.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,20 @@ export function useGridSelectionAnnouncement<T>(props: GridSelectionAnnouncement
6161
let messages: string[] = [];
6262

6363
if ((state.selectionManager.selectedKeys.size === 1 && isReplace)) {
64-
let firstKey = state.selectionManager.selectedKeys.keys().next().value;
65-
if (firstKey != null && state.collection.getItem(firstKey)) {
66-
let currentSelectionText = getRowText(firstKey);
64+
if (state.collection.getItem(state.selectionManager.selectedKeys.keys().next().value)) {
65+
let currentSelectionText = getRowText(state.selectionManager.selectedKeys.keys().next().value);
6766
if (currentSelectionText) {
6867
messages.push(stringFormatter.format('selectedItem', {item: currentSelectionText}));
6968
}
7069
}
7170
} else if (addedKeys.size === 1 && removedKeys.size === 0) {
72-
let firstKey = addedKeys.keys().next().value;
73-
if (firstKey != null) {
74-
let addedText = getRowText(firstKey);
75-
if (addedText) {
76-
messages.push(stringFormatter.format('selectedItem', {item: addedText}));
77-
}
71+
let addedText = getRowText(addedKeys.keys().next().value);
72+
if (addedText) {
73+
messages.push(stringFormatter.format('selectedItem', {item: addedText}));
7874
}
7975
} else if (removedKeys.size === 1 && addedKeys.size === 0) {
80-
let firstKey = removedKeys.keys().next().value;
81-
if (firstKey != null && state.collection.getItem(firstKey)) {
82-
let removedText = getRowText(firstKey);
76+
if (state.collection.getItem(removedKeys.keys().next().value)) {
77+
let removedText = getRowText(removedKeys.keys().next().value);
8378
if (removedText) {
8479
messages.push(stringFormatter.format('deselectedItem', {item: removedText}));
8580
}

packages/@react-spectrum/calendar/stories/Calendar.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const calendars = [
209209

210210
function Example(props) {
211211
let [locale, setLocale] = React.useState('');
212-
let [calendar, setCalendar] = React.useState<Key | null>(calendars[0].key);
212+
let [calendar, setCalendar] = React.useState<Key>(calendars[0].key);
213213
let {locale: defaultLocale} = useLocale();
214214

215215
let pref = preferences.find(p => p.locale === locale)!;

packages/@react-spectrum/datepicker/stories/DateField.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export const IsDateUnavailable: DateFieldStory = {
212212
...Default,
213213
args: {
214214
isDateUnavailable: (date) => {
215-
return date.compare(new CalendarDate(1980, 1, 1)) >= 0
215+
return date.compare(new CalendarDate(1980, 1, 1)) >= 0
216216
&& date.compare(new CalendarDate(1980, 1, 8)) <= 0;
217217
},
218218
errorMessage: 'Date unavailable.',
@@ -310,7 +310,7 @@ const calendars = [
310310

311311
function Example(props) {
312312
let [locale, setLocale] = React.useState('');
313-
let [calendar, setCalendar] = React.useState<Key | null>(calendars[0].key);
313+
let [calendar, setCalendar] = React.useState<Key>(calendars[0].key);
314314
let {locale: defaultLocale} = useLocale();
315315

316316
let pref = preferences.find(p => p.locale === locale);

packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ const calendars = [
338338

339339
function Example(props) {
340340
let [locale, setLocale] = React.useState('');
341-
let [calendar, setCalendar] = React.useState<Key | null>(calendars[0].key);
341+
let [calendar, setCalendar] = React.useState<Key>(calendars[0].key);
342342
let {locale: defaultLocale} = useLocale();
343343

344344
let pref = preferences.find(p => p.locale === locale);

packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ const calendars = [
238238

239239
function Example(props) {
240240
let [locale, setLocale] = React.useState('');
241-
let [calendar, setCalendar] = React.useState<Key | null>(calendars[0].key);
241+
let [calendar, setCalendar] = React.useState<Key>(calendars[0].key);
242242
let {locale: defaultLocale} = useLocale();
243243

244244
let pref = preferences.find(p => p.locale === locale);

packages/@react-spectrum/form/stories/Form.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ function FormWithControls(props: any = {}) {
482482
let [firstName, setFirstName] = useState('hello');
483483
let [isHunter, setIsHunter] = useState(true);
484484
let [favoritePet, setFavoritePet] = useState('cats');
485-
let [favoriteColor, setFavoriteColor] = useState<Key | null>('green');
485+
let [favoriteColor, setFavoriteColor] = useState('green' as Key);
486486
let [howIFeel, setHowIFeel] = useState('I feel good, o I feel so good!');
487487
let [birthday, setBirthday] = useState<CalendarDate | null>(new CalendarDate(1732, 2, 22));
488488
let [money, setMoney] = useState(50);

0 commit comments

Comments
 (0)