Skip to content

Commit

Permalink
fix/bug useTablist adobe#5996 (adobe#6023)
Browse files Browse the repository at this point in the history 
* fix/bug useTabist adobe#5996 and added tests
  • Loading branch information
@mdhmaiti
mdhmaiti authored Aug 13, 2024
1 parent 6943a6b commit c4a783e
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 31 deletions.
44 changes: 28 additions & 16 deletions packages/@react-aria/selection/src/useSelectableCollection.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,49 +164,57 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
switch (e.key) {
case 'ArrowDown': {
if (delegate.getKeyBelow) {
e.preventDefault();
let nextKey = manager.focusedKey != null
? delegate.getKeyBelow(manager.focusedKey)
? delegate.getKeyBelow?.(manager.focusedKey)
: delegate.getFirstKey?.();
if (nextKey == null && shouldFocusWrap) {
nextKey = delegate.getFirstKey?.(manager.focusedKey);
}
navigateToKey(nextKey);
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey);
}
}
break;
}
case 'ArrowUp': {
if (delegate.getKeyAbove) {
e.preventDefault();
let nextKey = manager.focusedKey != null
? delegate.getKeyAbove(manager.focusedKey)
? delegate.getKeyAbove?.(manager.focusedKey)
: delegate.getLastKey?.();
if (nextKey == null && shouldFocusWrap) {
nextKey = delegate.getLastKey?.(manager.focusedKey);
}
navigateToKey(nextKey);
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey);
}
}
break;
}
case 'ArrowLeft': {
if (delegate.getKeyLeftOf) {
e.preventDefault();
let nextKey = delegate.getKeyLeftOf(manager.focusedKey);
let nextKey = delegate.getKeyLeftOf?.(manager.focusedKey);
if (nextKey == null && shouldFocusWrap) {
nextKey = direction === 'rtl' ? delegate.getFirstKey?.(manager.focusedKey) : delegate.getLastKey?.(manager.focusedKey);
}
navigateToKey(nextKey, direction === 'rtl' ? 'first' : 'last');
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey, direction === 'rtl' ? 'first' : 'last');
}
}
break;
}
case 'ArrowRight': {
if (delegate.getKeyRightOf) {
e.preventDefault();
let nextKey = delegate.getKeyRightOf(manager.focusedKey);
let nextKey = delegate.getKeyRightOf?.(manager.focusedKey);
if (nextKey == null && shouldFocusWrap) {
nextKey = direction === 'rtl' ? delegate.getLastKey?.(manager.focusedKey) : delegate.getFirstKey?.(manager.focusedKey);
}
navigateToKey(nextKey, direction === 'rtl' ? 'last' : 'first');
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey, direction === 'rtl' ? 'last' : 'first');
}
}
break;
}
Expand Down Expand Up @@ -236,16 +244,20 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
break;
case 'PageDown':
if (delegate.getKeyPageBelow) {
e.preventDefault();
let nextKey = delegate.getKeyPageBelow(manager.focusedKey);
navigateToKey(nextKey);
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey);
}
}
break;
case 'PageUp':
if (delegate.getKeyPageAbove) {
e.preventDefault();
let nextKey = delegate.getKeyPageAbove(manager.focusedKey);
navigateToKey(nextKey);
if (nextKey != null) {
e.preventDefault();
navigateToKey(nextKey);
}
}
break;
case 'a':
Expand Down
23 changes: 16 additions & 7 deletions packages/@react-aria/tabs/src/TabsKeyboardDelegate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
private collection: Collection<Node<T>>;
private flipDirection: boolean;
private disabledKeys: Set<Key>;
private tabDirection: boolean;

constructor(collection: Collection<Node<T>>, direction: Direction, orientation: Orientation, disabledKeys: Set<Key> = new Set()) {
this.collection = collection;
this.flipDirection = direction === 'rtl' && orientation === 'horizontal';
this.disabledKeys = disabledKeys;
this.tabDirection = orientation === 'horizontal';
}

getKeyLeftOf(key: Key) {
Expand All @@ -37,13 +39,6 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
return this.getNextKey(key);
}

getKeyAbove(key: Key) {
return this.getPreviousKey(key);
}

getKeyBelow(key: Key) {
return this.getNextKey(key);
}

private isDisabled(key: Key) {
return this.disabledKeys.has(key) || !!this.collection.getItem(key)?.props?.isDisabled;
Expand All @@ -64,6 +59,20 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
}
return key;
}

getKeyAbove(key: Key) {
if (this.tabDirection) {
return null;
}
return this.getPreviousKey(key);
}

getKeyBelow(key: Key) {
if (this.tabDirection) {
return null;
}
return this.getNextKey(key);
}

getNextKey(key) {
do {
Expand Down
23 changes: 15 additions & 8 deletions packages/@react-spectrum/tabs/test/Tabs.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* governing permissions and limitations under the License.
*/

import {act, fireEvent, mockImplementation, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
import {act, createEvent, fireEvent, mockImplementation, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
import {Item, TabList, TabPanels, Tabs} from '../src';
import {Links as LinksExample} from '../stories/Tabs.stories';
import {Provider} from '@react-spectrum/provider';
Expand Down Expand Up @@ -113,18 +113,25 @@ describe('Tabs', function () {

expect(selectedItem).toHaveAttribute('aria-selected', 'true');
act(() => {selectedItem.focus();});
fireEvent.keyDown(selectedItem, {key: 'ArrowRight', code: 39, charCode: 39});
let arrowRight = createEvent.keyDown(selectedItem, {key: 'ArrowRight', code: 39, charCode: 39});
fireEvent(selectedItem, arrowRight);
let nextSelectedItem = tabs[1];
expect(nextSelectedItem).toHaveAttribute('aria-selected', 'true');
fireEvent.keyDown(nextSelectedItem, {key: 'ArrowLeft', code: 37, charCode: 37});
expect(arrowRight.defaultPrevented).toBe(true);
let arrowLeft = createEvent.keyDown(nextSelectedItem, {key: 'ArrowLeft', code: 37, charCode: 37});
fireEvent(nextSelectedItem, arrowLeft);
expect(selectedItem).toHaveAttribute('aria-selected', 'true');
expect(arrowLeft.defaultPrevented).toBe(true);

/** Changes selection regardless if it's horizontal tabs. */
fireEvent.keyDown(selectedItem, {key: 'ArrowUp', code: 38, charCode: 38});
nextSelectedItem = tabs[2];
expect(nextSelectedItem).toHaveAttribute('aria-selected', 'true');
fireEvent.keyDown(selectedItem, {key: 'ArrowDown', code: 40, charCode: 40});
/** prevent changing tabs for horizontal orientations in aria-selected */
let arrowUp = createEvent.keyDown(selectedItem, {key: 'ArrowUp', code: 38, charCode: 38});
fireEvent(selectedItem, arrowUp);
expect(selectedItem).toHaveAttribute('aria-selected', 'true');
expect(arrowUp.defaultPrevented).toBe(false);
let arrowDown = createEvent.keyDown(selectedItem, {key: 'ArrowDown', code: 40, charCode: 40});
fireEvent(selectedItem, arrowDown);
expect(selectedItem).toHaveAttribute('aria-selected', 'true');
expect(arrowDown.defaultPrevented).toBe(false);
});

it('allows user to change tab item select via arrow keys with vertical tabs', function () {
Expand Down

0 comments on commit c4a783e

Please sign in to comment.