Skip to content

Commit e17c7f4

Browse files
authored
Release fixes (#6902)
1 parent 86eb91f commit e17c7f4

File tree

16 files changed

+121
-32
lines changed

16 files changed

+121
-32
lines changed

.parcelrc-build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"packages/**/intl/*.json": ["parcel-transformer-intl"],
88
"bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
99
"illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
10+
"illustrations-module:*svg": ["@react-spectrum/parcel-transformer-s2-icon"],
11+
"illustrations-main:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
12+
"illustrations-module:*": ["..."],
13+
"illustrations-main:*": ["..."],
1014
"packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
1115
// Disable PostCSS from running over style macro output
1216
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ const inputButton = style({
126126
forcedColors: {
127127
default: 'ButtonFace'
128128
}
129-
}
129+
},
130+
cursor: 'default'
130131
});
131132

132133
const iconStyles = style({

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ import {
1616
TabPanelProps as AriaTabPanelProps,
1717
TabProps as AriaTabProps,
1818
TabsProps as AriaTabsProps,
19+
ContextValue,
1920
Provider,
2021
Tab as RACTab,
2122
TabList as RACTabList,
2223
Tabs as RACTabs,
2324
TabListStateContext,
24-
ContextValue,
2525
useSlottedContext} from 'react-aria-components';
2626
import {centerBaseline} from './CenterBaseline';
2727
import {Collection, DOMRef, DOMRefValue, Key, Node, Orientation} from '@react-types/shared';
2828
import {createContext, forwardRef, ReactNode, useCallback, useContext, useEffect, useRef, useState} from 'react';
29-
import {focusRing, getAllowedOverrides, UnsafeStyles, StylesPropWithHeight, StyleProps} from './style-utils' with {type: 'macro'};
29+
import {focusRing, getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
3030
import {IconContext} from './Icon';
3131
import {style} from '../style/spectrum-theme' with {type: 'macro'};
3232
import {Text, TextContext} from './Content';
@@ -77,7 +77,7 @@ export function TabPanel(props: TabPanelProps) {
7777
<AriaTabPanel
7878
{...props}
7979
style={props.UNSAFE_style}
80-
className={(props.UNSAFE_className || '') + tabPanel(null , props.styles)} />
80+
className={(props.UNSAFE_className || '') + tabPanel(null, props.styles)} />
8181
);
8282
}
8383

@@ -191,13 +191,13 @@ export function TabList<T extends object>(props: TabListProps<T>) {
191191
style={props.UNSAFE_style}
192192
className={(props.UNSAFE_className || '') + style({position: 'relative'}, getAllowedOverrides())(null, props.styles)}>
193193
{orientation === 'vertical' &&
194-
<TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density}/>}
194+
<TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density} />}
195195
<RACTabList
196196
{...props}
197197
ref={tablistRef}
198198
className={renderProps => tablist({...renderProps, density})} />
199199
{orientation === 'horizontal' &&
200-
<TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density}/>}
200+
<TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density} />}
201201
</div>
202202
);
203203
}
@@ -214,7 +214,7 @@ function isAllTabsDisabled<T>(collection: Collection<Node<T>> | null, disabledKe
214214
return false;
215215
}
216216

217-
testKey = collection.getKeyAfter(testKey)
217+
testKey = collection.getKeyAfter(testKey);
218218
index++;
219219
}
220220
return true;
@@ -258,7 +258,7 @@ const selectedIndicator = style({
258258
borderStyle: 'none',
259259
borderRadius: 'full',
260260
transitionDuration: 130,
261-
transitionTimingFunction: 'in-out',
261+
transitionTimingFunction: 'in-out'
262262
});
263263

264264
function TabLine(props: TabLineProps) {
@@ -329,16 +329,14 @@ const tabs = style({
329329
}
330330
}, getAllowedOverrides({height: true}));
331331

332-
const TabsInternalContext = createContext<TabsProps>({});
333-
334332
function Tabs(props: TabsProps, ref: DOMRef<HTMLDivElement>) {
335333
[props, ref] = useSpectrumContextProps(props, ref, TabsContext);
336334
let {
337335
density = 'regular',
338336
isDisabled,
339337
disabledKeys,
340338
orientation = 'horizontal'
341-
} = props
339+
} = props;
342340
let domRef = useDOMRef(ref);
343341

344342
return (

packages/dev/codemods/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343
},
4444
"rsp": {
4545
"type": "cli"
46+
},
47+
"publishConfig": {
48+
"access": "public"
4649
}
4750
}

packages/dev/codemods/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env node
12
const {parseArgs} = require('node:util');
23
import {s1_to_s2} from './s1-to-s2/src';
34
import {use_monopackages} from './use-monopackages/src';

packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/combobox.test.ts.snap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,14 @@ let props = {validationState: 'invalid'};
223223
</ComboBox>
224224
</div>"
225225
`;
226+
227+
exports[`handles sections 1`] = `
228+
"import { ComboBoxSection, ComboBoxItem, ComboBox } from "@react-spectrum/s2";
229+
import { Section, Item } from '@adobe/react-spectrum';
230+
<ComboBox>
231+
<ComboBoxSection><Header>Section title</Header>
232+
<ComboBoxItem>Item one</ComboBoxItem>
233+
<ComboBoxItem>Item two</ComboBoxItem>
234+
</ComboBoxSection>
235+
</ComboBox>"
236+
`;

packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/imports.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import { Section, Item, ListBox } from '@adobe/react-spectrum';
6363
6464
<div>
6565
<Menu aria-label="Text">
66-
<MenuSection title="Styles">
66+
<MenuSection><Header>Styles</Header>
6767
<MenuItem id="bold">Bold</MenuItem>
6868
<MenuItem id="underline">Underline</MenuItem>
6969
</MenuSection>

packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/menu.test.ts.snap

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ import { Item, Section } from '@adobe/react-spectrum';
180180
<MenuItem>Email</MenuItem>
181181
</Menu>
182182
</SubmenuTrigger>
183-
<MenuSection>
184-
<Header>
185-
<Heading>Section heading</Heading>
186-
</Header>
183+
<MenuSection><Header>Section heading</Header>
187184
<MenuItem>Save</MenuItem>
188185
</MenuSection>
189186
</Menu>
@@ -218,10 +215,7 @@ import { Item, Section } from '@adobe/react-spectrum';
218215
<MenuItem id="email">Email</MenuItem>
219216
</Menu>
220217
</SubmenuTrigger>
221-
<MenuSection>
222-
<Header>
223-
<Heading>Section heading</Heading>
224-
</Header>
218+
<MenuSection><Header>Section heading</Header>
225219
<MenuItem id="save">Save</MenuItem>
226220
</MenuSection>
227221
</Menu>

packages/dev/codemods/src/s1-to-s2/__tests__/__snapshots__/picker.test.ts.snap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,14 @@ let props = {validationState: 'invalid'};
144144
</Picker>
145145
</div>"
146146
`;
147+
148+
exports[`handles sections 1`] = `
149+
"import { PickerSection, PickerItem, Picker } from "@react-spectrum/s2";
150+
import { Section, Item } from '@adobe/react-spectrum';
151+
<Picker>
152+
<PickerSection><Header>Section title</Header>
153+
<PickerItem>Item one</PickerItem>
154+
<PickerItem>Item two</PickerItem>
155+
</PickerSection>
156+
</Picker>"
157+
`;

packages/dev/codemods/src/s1-to-s2/__tests__/combobox.test.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,13 @@ let props = {validationState: 'invalid'};
213213
</ComboBox>
214214
</div>
215215
`);
216+
217+
test('handles sections', `
218+
import {ComboBox, Section, Item} from '@adobe/react-spectrum';
219+
<ComboBox>
220+
<Section title="Section title">
221+
<Item>Item one</Item>
222+
<Item>Item two</Item>
223+
</Section>
224+
</ComboBox>
225+
`);

0 commit comments

Comments
 (0)