Skip to content

Commit 9f44fa4

Browse files
committed
refactor(menu): removed setReturnFocus
1 parent c2620f8 commit 9f44fa4

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

addon/components/menu/items.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
clickOutsideDeactivates=this.clickOutsideFocusTrapDeactivates
1515
fallbackFocus=this.menuItemsElementSelector
1616
initialFocus=this.menuItemsElementSelector
17-
setReturnFocus=@setReturnFocus
1817
onDeactivate=@closeMenu
1918
)
2019
}}

tests/integration/components/menu-test.js

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -934,53 +934,6 @@ module('Integration | Component | <Menu>', (hooks) => {
934934
// Verify the button is focused again
935935
await assertActiveElement(getMenuButton());
936936
});
937-
938-
test('it should be possible to close the menu with Escape, and return focus to another element', async function (assert) {
939-
await render(hbs`
940-
<button type="button" data-test-alternate-button>Other Target</button>
941-
<Menu as |menu|>
942-
<menu.Button data-test-menu-button>Trigger</menu.Button>
943-
<menu.Items @setReturnFocus="[data-test-alternate-button]" data-test-menu-items as |items|>
944-
<items.Item as |item|>
945-
<item.Element>
946-
Item A
947-
</item.Element>
948-
</items.Item>
949-
<items.Item as |item|>
950-
<item.Element>
951-
Item B
952-
</item.Element>
953-
</items.Item>
954-
<items.Item as |item|>
955-
<item.Element>
956-
Item C
957-
</item.Element>
958-
</items.Item>
959-
</menu.Items>
960-
</Menu>
961-
`);
962-
963-
// Verify it is closed
964-
assertClosedMenuButton('[data-test-menu-button]');
965-
966-
// Focus the button
967-
getMenuButton()?.focus();
968-
969-
// Open menu
970-
await triggerKeyEvent('[data-test-menu-button]', 'keydown', Keys.Space);
971-
972-
// Verify it is open
973-
assertOpenMenuButton('[data-test-menu-button]');
974-
975-
// Close menu
976-
await triggerKeyEvent('[data-test-menu-items]', 'keydown', Keys.Escape);
977-
978-
// Verify it is closed
979-
assertClosedMenuButton('[data-test-menu-button]');
980-
981-
// Verify the alternate element has focus
982-
assert.dom('[data-test-alternate-button]').isFocused();
983-
});
984937
});
985938

986939
module('`Tab` key', () => {

0 commit comments

Comments
 (0)