Skip to content

Commit d8c76b4

Browse files
fix: omit role=button and tabIndex when openFileDialogOnClick is false
1 parent c927881 commit d8c76b4

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎src/AjaxUploader.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ class AjaxUploader extends Component<UploadProps> {
373373
const dirProps: any = directory
374374
? { directory: 'directory', webkitdirectory: 'webkitdirectory' }
375375
: {};
376+
const isInteractive = openFileDialogOnClick && !hasControlInside;
376377
const events = disabled
377378
? {}
378379
: {
@@ -382,10 +383,10 @@ class AjaxUploader extends Component<UploadProps> {
382383
onMouseLeave,
383384
onDrop: this.onFileDrop,
384385
onDragOver: this.onFileDragOver,
385-
tabIndex: hasControlInside ? undefined : '0',
386+
tabIndex: isInteractive ? '0' : undefined,
386387
};
387388
return (
388-
<Tag {...events} className={cls} role={hasControlInside ? undefined : 'button'} style={style}>
389+
<Tag {...events} className={cls} role={isInteractive ? 'button' : undefined} style={style}>
389390
<input
390391
{...pickAttrs(otherProps, { aria: true, data: true })}
391392
id={id}

‎tests/uploader.spec.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,13 @@ describe('uploader', () => {
13991399
expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
14001400
});
14011401

1402+
it("Should not be focusable and doesn't have role=button with openFileDialogOnClick=false", () => {
1403+
const { container } = render(<Upload openFileDialogOnClick={false} />);
1404+
1405+
expect(container.querySelector('span')!.tabIndex).not.toBe(0);
1406+
expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
1407+
});
1408+
14021409
it('should receive same defaultRequest as src', done => {
14031410
const { default: srcRequest } = require('../src/request');
14041411
let receivedDefaultRequest: any;

0 commit comments

Comments
 (0)