Skip to content

Commit 869b4d5

Browse files
committed
chore(web): replace static ID with React.useId
1 parent f554f42 commit 869b4d5

5 files changed

Lines changed: 7 additions & 12 deletions

File tree

packages/recorder/src/recorder.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ export const Recorder: React.FC<RecorderProps> = ({
168168
sidebarSize={200}
169169
main={<CodeMirrorWrapper text={source.text} language={source.language} highlight={source.highlight} revealLine={source.revealLine} readOnly={true} lineNumbers={true} />}
170170
sidebar={<TabbedPane
171-
id='recorder-sidebar'
172171
rightToolbar={selectedTab === 'locator' || selectedTab === 'aria' ? [<ToolbarButton key={1} icon='files' title='Copy' onClick={() => copy((selectedTab === 'locator' ? locator : ariaSnapshot) || '')} />] : []}
173172
tabs={[
174173
{

packages/trace-viewer/src/ui/networkResourceDetails.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export const NetworkResourceDetails: React.FunctionComponent<{
3131

3232
return <TabbedPane
3333
dataTestId='network-request-details'
34-
id='network-request-tabs'
3534
leftToolbar={[<ToolbarButton key='close' icon='close' title='Close' onClick={onClose}></ToolbarButton>]}
3635
tabs={[
3736
{

packages/trace-viewer/src/ui/recorder/recorderView.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export const Workbench: React.FunctionComponent = () => {
151151
<ToolbarButton icon='color-mode' title='Toggle color mode' toggled={false} onClick={() => toggleTheme()}></ToolbarButton>
152152
</Toolbar>;
153153

154-
const sidebarTabbedPane = <TabbedPane id='recorder-actions-tab' tabs={[actionsTab]} />;
154+
const sidebarTabbedPane = <TabbedPane tabs={[actionsTab]} />;
155155
const traceView = <TraceView
156156
sdkLanguage={sdkLanguage}
157157
callId={traceCallId}
@@ -249,7 +249,6 @@ const PropertiesView: React.FunctionComponent<{
249249
];
250250

251251
return <TabbedPane
252-
id='properties-tabs'
253252
tabs={tabs}
254253
selectedTab={selectedPropertiesTab}
255254
setSelectedTab={setSelectedPropertiesTab}

packages/trace-viewer/src/ui/workbench.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,15 +348,13 @@ export const Workbench: React.FunctionComponent<{
348348
openPage={openPage} />}
349349
sidebar={
350350
<TabbedPane
351-
id='actionlist-sidebar'
352351
tabs={[actionsTab, metadataTab]}
353352
selectedTab={selectedNavigatorTab}
354353
setSelectedTab={setSelectedNavigatorTab}
355354
/>
356355
}
357356
/>}
358357
sidebar={<TabbedPane
359-
id='workbench-sidebar'
360358
tabs={tabs}
361359
selectedTab={selectedPropertiesTab}
362360
setSelectedTab={selectPropertiesTab}

packages/web/src/components/tabbedPane.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ export const TabbedPane: React.FunctionComponent<{
3636
setSelectedTab?: (tab: string) => void,
3737
dataTestId?: string,
3838
mode?: 'default' | 'select',
39-
id: string,
40-
}> = ({ tabs, selectedTab, setSelectedTab, leftToolbar, rightToolbar, dataTestId, mode, id }) => {
39+
}> = ({ tabs, selectedTab, setSelectedTab, leftToolbar, rightToolbar, dataTestId, mode }) => {
40+
const id = React.useId();
4141
if (!selectedTab)
4242
selectedTab = tabs[0].id;
4343
if (!mode)
@@ -53,7 +53,7 @@ export const TabbedPane: React.FunctionComponent<{
5353
<TabbedPaneTab
5454
key={tab.id}
5555
id={tab.id}
56-
ariaControls={`pane-${id}-tab-${tab.id}`}
56+
ariaControls={`${id}-${tab.id}`}
5757
title={tab.title}
5858
count={tab.count}
5959
errorCount={tab.errorCount}
@@ -72,7 +72,7 @@ export const TabbedPane: React.FunctionComponent<{
7272
suffix = ` (${tab.count})`;
7373
if (tab.errorCount)
7474
suffix = ` (${tab.errorCount})`;
75-
return <option key={tab.id} value={tab.id} selected={tab.id === selectedTab} role='tab' aria-controls={`pane-${id}-tab-${tab.id}`}>{tab.title}{suffix}</option>;
75+
return <option key={tab.id} value={tab.id} selected={tab.id === selectedTab} role='tab' aria-controls={`${id}-${tab.id}`}>{tab.title}{suffix}</option>;
7676
})}
7777
</select>
7878
</div>}
@@ -84,9 +84,9 @@ export const TabbedPane: React.FunctionComponent<{
8484
tabs.map(tab => {
8585
const className = 'tab-content tab-' + tab.id;
8686
if (tab.component)
87-
return <div key={tab.id} id={`pane-${id}-tab-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className} style={{ display: selectedTab === tab.id ? 'inherit' : 'none' }}>{tab.component}</div>;
87+
return <div key={tab.id} id={`${id}-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className} style={{ display: selectedTab === tab.id ? 'inherit' : 'none' }}>{tab.component}</div>;
8888
if (selectedTab === tab.id)
89-
return <div key={tab.id} id={`pane-${id}-tab-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className}>{tab.render!()}</div>;
89+
return <div key={tab.id} id={`${id}-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className}>{tab.render!()}</div>;
9090
})
9191
}
9292
</div>

0 commit comments

Comments
 (0)