diff --git a/demo/components/navigation/iterator.html b/demo/components/navigation/iterator.html
index e9e079f5..ffc4bac6 100644
--- a/demo/components/navigation/iterator.html
+++ b/demo/components/navigation/iterator.html
@@ -4,7 +4,6 @@
diff --git a/demo/components/navigation/navigation.html b/demo/components/navigation/navigation.html
index afef7af7..12de5d4d 100644
--- a/demo/components/navigation/navigation.html
+++ b/demo/components/navigation/navigation.html
@@ -7,7 +7,6 @@
import '../../../src/components/navigation/navigation.js';
import '../../../src/components/navigation/navigation-main-header.js';
import '../../../src/components/navigation/navigation-main-footer.js';
- import '../../../src/components/navigation/navigation-separator.js';
@@ -58,11 +57,6 @@
Just Header
- Separator
-
-
-
-
Band Default
diff --git a/demo/components/navigation/skip.html b/demo/components/navigation/skip.html
deleted file mode 100644
index ed23dd9c..00000000
--- a/demo/components/navigation/skip.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Custom
-
-
-
-
-
-
- Main
-
-
-
-
-
-
diff --git a/index.html b/index.html
index 5653a3ea..2792d142 100644
--- a/index.html
+++ b/index.html
@@ -45,7 +45,6 @@ Components
d2l-labs-navigation buttons and links
d2l-labs-navigation-immersive
d2l-labs-navigation-iterator
- d2l-labs-navigation-skip
Opt-In Flyout
diff --git a/package.json b/package.json
index e1d1edfa..d8dd212d 100644
--- a/package.json
+++ b/package.json
@@ -31,10 +31,7 @@
"./components/navigation/navigation-main-footer.js": "./src/components/navigation/navigation-main-footer.js",
"./components/navigation/navigation-main-header.js": "./src/components/navigation/navigation-main-header.js",
"./components/navigation/navigation-notification-icon.js": "./src/components/navigation/navigation-notification-icon.js",
- "./components/navigation/navigation-separator.js": "./src/components/navigation/navigation-separator.js",
"./components/navigation/navigation-shared-styles.js": "./src/components/navigation/navigation-shared-styles.js",
- "./components/navigation/navigation-skip-main.js": "./src/components/navigation/navigation-skip-main.js",
- "./components/navigation/navigation-skip.js": "./src/components/navigation/navigation-skip.js",
"./components/navigation/navigation-styles.js": "./src/components/navigation/navigation-styles.js",
"./components/navigation/navigation.js": "./src/components/navigation/navigation.js",
"./components/opt-in-flyout.js": "./src/components/opt-in-flyout/opt-in-flyout.js",
diff --git a/src/components/navigation/navigation-separator.js b/src/components/navigation/navigation-separator.js
deleted file mode 100644
index 60413a50..00000000
--- a/src/components/navigation/navigation-separator.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import '@brightspace-ui/core/components/colors/colors.js';
-import '@brightspace-ui/core/components/icons/icon.js';
-import { css, html, LitElement } from 'lit';
-
-/**
- * Separator component to be used between buttons in a navigational element.
- */
-class NavigationSeparator extends LitElement {
-
- static get styles() {
- return css`
- :host {
- display: inline-block;
- margin: 0 9px;
- }
- d2l-icon {
- color: var(--d2l-color-mica);
- }
- `;
- }
-
- render() {
- return html`
-
- `;
- }
-
-}
-
-customElements.define('d2l-labs-navigation-separator', NavigationSeparator);
diff --git a/src/components/navigation/navigation-skip-main.js b/src/components/navigation/navigation-skip-main.js
deleted file mode 100644
index ad3309fe..00000000
--- a/src/components/navigation/navigation-skip-main.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import './navigation-skip.js';
-import { html, LitElement } from 'lit';
-import { FocusMixin } from '@brightspace-ui/core/mixins/focus/focus-mixin.js';
-import { LocalizeLabsElement } from '../localize-labs-element.js';
-import { querySelectorComposed } from '@brightspace-ui/core/helpers/dom.js';
-
-class NavigationSkipMain extends FocusMixin(LocalizeLabsElement(LitElement)) {
-
- static get focusElementSelector() {
- return 'd2l-labs-navigation-skip';
- }
-
- render() {
- return html``;
- }
-
- _handleSkipNav() {
- const elem = querySelectorComposed(document, 'main') ||
- querySelectorComposed(document, '[role="main"]') ||
- querySelectorComposed(document, 'h1');
- if (elem) {
- elem.tabIndex = -1;
- elem.focus();
- } else {
- this.dispatchEvent(new CustomEvent('d2l-labs-navigation-skip-fail', { bubbles: false, composed: false }));
- }
- }
-
-}
-
-customElements.define('d2l-labs-navigation-skip-main', NavigationSkipMain);
diff --git a/src/components/navigation/navigation-skip.js b/src/components/navigation/navigation-skip.js
deleted file mode 100644
index 50f41acf..00000000
--- a/src/components/navigation/navigation-skip.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { css, html, LitElement } from 'lit';
-import { FocusMixin } from '@brightspace-ui/core/mixins/focus/focus-mixin.js';
-import { PropertyRequiredMixin } from '@brightspace-ui/core/mixins/property-required/property-required-mixin.js';
-
-class NavigationSkip extends FocusMixin(PropertyRequiredMixin(LitElement)) {
-
- static get properties() {
- return {
- text: { required: true, type: String }
- };
- }
-
- static get styles() {
- return css`
- a {
- inset-inline-start: -10000px;
- overflow: hidden;
- position: absolute;
- width: 1px;
- }
- a:active,
- a:focus {
- background-color: rgba(0, 0, 0, 0.7);
- border: 1px solid rgba(0, 0, 0, 0.8);
- color: #ffffff;
- cursor: pointer;
- display: block;
- font-weight: bold;
- inset-block-start: 0;
- inset-inline-start: 25%;
- margin: 0 auto;
- outline: none;
- padding: 0.3em;
- text-align: center;
- text-decoration: none;
- width: 50%;
- z-index: 10000;
- }
- `;
- }
-
- static get focusElementSelector() {
- return 'a';
- }
-
- render() {
- // Href attribute is needed for a11y tools to recognize anchor as a link
- // and for click events to be dispatched using key presses
- return html`${this.text}`;
- }
-
-}
-
-customElements.define('d2l-labs-navigation-skip', NavigationSkip);
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index ce455f5e..d9790328 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -1,5 +1,5 @@
+import '@brightspace-ui/core/components/skip-nav/skip-nav-main.js';
import './navigation-band.js';
-import './navigation-skip-main.js';
import { css, html, LitElement, nothing } from 'lit';
import { getNextFocusable } from '@brightspace-ui/core/helpers/focus.js';
@@ -40,7 +40,7 @@ class Navigation extends LitElement {
}
render() {
- const skipNav = this.hasSkipNav ? html`` : nothing;
+ const skipNav = this.hasSkipNav ? html`` : nothing;
return html`
${skipNav}
diff --git a/src/lang/ar.js b/src/lang/ar.js
index a54f1db6..3ed5e66a 100644
--- a/src/lang/ar.js
+++ b/src/lang/ar.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "العودة",
"components:navigation:next": "التالي",
"components:navigation:previous": "السابق",
- "components:navigation:skipNav": "تجاوز إلى المحتوى الرئيسي",
"components:optInFlyout:cancel": "إلغاء",
"components:optInFlyout:close": "إغلاق مربع الحوار هذا",
"components:optInFlyout:done": "تم",
diff --git a/src/lang/cy.js b/src/lang/cy.js
index aa886408..d8e9db6c 100644
--- a/src/lang/cy.js
+++ b/src/lang/cy.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Yn ôl",
"components:navigation:next": "Nesaf",
"components:navigation:previous": "Blaenorol",
- "components:navigation:skipNav": "neidio i’r prif gynnwys",
"components:optInFlyout:cancel": "Canslo",
"components:optInFlyout:close": "Cau’r dialog hwn",
"components:optInFlyout:done": "Wedi Gorffen",
diff --git a/src/lang/da.js b/src/lang/da.js
index dbd376e4..92c7ae5f 100644
--- a/src/lang/da.js
+++ b/src/lang/da.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Tilbage",
"components:navigation:next": "Næste",
"components:navigation:previous": "Forrige",
- "components:navigation:skipNav": "spring videre til hovedindhold",
"components:optInFlyout:cancel": "Annuller",
"components:optInFlyout:close": "Luk denne dialogboks",
"components:optInFlyout:done": "Udført",
diff --git a/src/lang/de.js b/src/lang/de.js
index f5f73b5c..cb0de58e 100644
--- a/src/lang/de.js
+++ b/src/lang/de.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Zurück",
"components:navigation:next": "Weiter",
"components:navigation:previous": "Zurück",
- "components:navigation:skipNav": "zum Hauptinhalt springen",
"components:optInFlyout:cancel": "Abbrechen",
"components:optInFlyout:close": "Dieses Dialogfeld schließen",
"components:optInFlyout:done": "Fertig",
diff --git a/src/lang/en-gb.js b/src/lang/en-gb.js
index 7ed5c68a..9a3e8465 100644
--- a/src/lang/en-gb.js
+++ b/src/lang/en-gb.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Back",
"components:navigation:next": "Next",
"components:navigation:previous": "Previous",
- "components:navigation:skipNav": "skip to main content",
"components:optInFlyout:cancel": "Cancel",
"components:optInFlyout:close": "Close this dialogue",
"components:optInFlyout:done": "Done",
diff --git a/src/lang/en.js b/src/lang/en.js
index 73d58c65..81cb2e55 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Back",
"components:navigation:next": "Next",
"components:navigation:previous": "Previous",
- "components:navigation:skipNav": "skip to main content",
"components:optInFlyout:cancel": "Cancel",
"components:optInFlyout:close": "Close this dialog",
"components:optInFlyout:done": "Done",
diff --git a/src/lang/es-es.js b/src/lang/es-es.js
index d7efcb1a..e81ce5a3 100644
--- a/src/lang/es-es.js
+++ b/src/lang/es-es.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Volver",
"components:navigation:next": "Siguiente",
"components:navigation:previous": "Anterior",
- "components:navigation:skipNav": "pasar al contenido principal",
"components:optInFlyout:cancel": "Cancelar",
"components:optInFlyout:close": "Cerrar este cuadro de diálogo",
"components:optInFlyout:done": "Hecho",
diff --git a/src/lang/es.js b/src/lang/es.js
index 3a159613..cc638e23 100644
--- a/src/lang/es.js
+++ b/src/lang/es.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Volver",
"components:navigation:next": "Siguiente",
"components:navigation:previous": "Anterior",
- "components:navigation:skipNav": "pasar al contenido principal",
"components:optInFlyout:cancel": "Cancelar",
"components:optInFlyout:close": "Cerrar este cuadro de diálogo",
"components:optInFlyout:done": "Listo",
diff --git a/src/lang/fr-fr.js b/src/lang/fr-fr.js
index 095f0052..902816cd 100644
--- a/src/lang/fr-fr.js
+++ b/src/lang/fr-fr.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Retour",
"components:navigation:next": "Suivant",
"components:navigation:previous": "Précédent",
- "components:navigation:skipNav": "passer au contenu principal",
"components:optInFlyout:cancel": "Annuler",
"components:optInFlyout:close": "Fermer cette boîte de dialogue",
"components:optInFlyout:done": "Terminé",
diff --git a/src/lang/fr-on.js b/src/lang/fr-on.js
index 30b345f9..3075a750 100644
--- a/src/lang/fr-on.js
+++ b/src/lang/fr-on.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Retour",
"components:navigation:next": "Page suivante",
"components:navigation:previous": "Précédent",
- "components:navigation:skipNav": "passer au contenu principal",
"components:optInFlyout:cancel": "Annuler",
"components:optInFlyout:close": "Fermer cette boîte de dialogue",
"components:optInFlyout:done": "Terminé",
diff --git a/src/lang/fr.js b/src/lang/fr.js
index 53a67e19..5d4bc8e5 100644
--- a/src/lang/fr.js
+++ b/src/lang/fr.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Retour",
"components:navigation:next": "Suivant",
"components:navigation:previous": "Précédent",
- "components:navigation:skipNav": "passer au contenu principal",
"components:optInFlyout:cancel": "Annuler",
"components:optInFlyout:close": "Fermer cette boîte de dialogue",
"components:optInFlyout:done": "Terminé",
diff --git a/src/lang/haw.js b/src/lang/haw.js
index 82989642..6f5fb383 100644
--- a/src/lang/haw.js
+++ b/src/lang/haw.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Hoʻi",
"components:navigation:next": "Hiki mai",
"components:navigation:previous": "I mua",
- "components:navigation:skipNav": "lele i ka mea nui o ka ʻike",
"components:optInFlyout:cancel": "Hoʻopau",
"components:optInFlyout:close": "Pani i kēia kamaʻilio",
"components:optInFlyout:done": "Pau",
diff --git a/src/lang/hi.js b/src/lang/hi.js
index 3f7d7d41..df4cd02d 100644
--- a/src/lang/hi.js
+++ b/src/lang/hi.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "वापस जाएँ",
"components:navigation:next": "अगला",
"components:navigation:previous": "पिछला",
- "components:navigation:skipNav": "मुख्य सामग्री में जाएँ",
"components:optInFlyout:cancel": "कैंसल करें",
"components:optInFlyout:close": "यह संवाद बंद करें",
"components:optInFlyout:done": "पूरा हो गया",
diff --git a/src/lang/ja.js b/src/lang/ja.js
index 71d4ef4c..ba74b261 100644
--- a/src/lang/ja.js
+++ b/src/lang/ja.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "戻る",
"components:navigation:next": "次へ",
"components:navigation:previous": "前へ",
- "components:navigation:skipNav": "メインコンテンツへスキップ",
"components:optInFlyout:cancel": "キャンセル",
"components:optInFlyout:close": "このダイアログを閉じる",
"components:optInFlyout:done": "終了",
diff --git a/src/lang/ko.js b/src/lang/ko.js
index b204fb72..e23d7f3e 100644
--- a/src/lang/ko.js
+++ b/src/lang/ko.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "뒤로",
"components:navigation:next": "다음",
"components:navigation:previous": "이전",
- "components:navigation:skipNav": "기본 콘텐츠로 건너뛰기",
"components:optInFlyout:cancel": "취소",
"components:optInFlyout:close": "이 대화 상자 닫기",
"components:optInFlyout:done": "완료",
diff --git a/src/lang/mi.js b/src/lang/mi.js
index b473f7b4..510c2bef 100644
--- a/src/lang/mi.js
+++ b/src/lang/mi.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Hoki Whakamuri",
"components:navigation:next": "Whai Ake",
"components:navigation:previous": "Mua",
- "components:navigation:skipNav": "whakarereke ki te ihirangi matua",
"components:optInFlyout:cancel": "Whakakore",
"components:optInFlyout:close": "Katia tēnei kōrero",
"components:optInFlyout:done": "Kua oti",
diff --git a/src/lang/nl.js b/src/lang/nl.js
index 6804bdaa..c519ed96 100644
--- a/src/lang/nl.js
+++ b/src/lang/nl.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Terug",
"components:navigation:next": "Volgende",
"components:navigation:previous": "Vorige",
- "components:navigation:skipNav": "meteen naar hoofdinhoud gaan",
"components:optInFlyout:cancel": "Annuleren",
"components:optInFlyout:close": "Dit dialoogvenster sluiten",
"components:optInFlyout:done": "Gereed",
diff --git a/src/lang/pt.js b/src/lang/pt.js
index 4defadf3..59672d12 100644
--- a/src/lang/pt.js
+++ b/src/lang/pt.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Voltar",
"components:navigation:next": "Avançar",
"components:navigation:previous": "Anterior",
- "components:navigation:skipNav": "passar para conteúdo principal",
"components:optInFlyout:cancel": "Cancelar",
"components:optInFlyout:close": "Fechar esta caixa de diálogo",
"components:optInFlyout:done": "Concluído",
diff --git a/src/lang/sv.js b/src/lang/sv.js
index 313d1735..6680c10a 100644
--- a/src/lang/sv.js
+++ b/src/lang/sv.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Tillbaka",
"components:navigation:next": "Nästa",
"components:navigation:previous": "Föregående",
- "components:navigation:skipNav": "fortsätt till huvudinnehåll",
"components:optInFlyout:cancel": "Avbryt",
"components:optInFlyout:close": "Stäng dialogrutan",
"components:optInFlyout:done": "Klar",
diff --git a/src/lang/th.js b/src/lang/th.js
index 44f3cf3e..2da73f3e 100644
--- a/src/lang/th.js
+++ b/src/lang/th.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "กลับ",
"components:navigation:next": "ถัดไป",
"components:navigation:previous": "ก่อนหน้า",
- "components:navigation:skipNav": "ข้ามไปยังเนื้อหาหลัก",
"components:optInFlyout:cancel": "ยกเลิก",
"components:optInFlyout:close": "ปิดกล่องโต้ตอบนี้",
"components:optInFlyout:done": "เสร็จสิ้น",
diff --git a/src/lang/tr.js b/src/lang/tr.js
index 3e1b4739..47e024b7 100644
--- a/src/lang/tr.js
+++ b/src/lang/tr.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Geri",
"components:navigation:next": "İleri",
"components:navigation:previous": "Önceki",
- "components:navigation:skipNav": "ana içeriğe atla",
"components:optInFlyout:cancel": "İptal et",
"components:optInFlyout:close": "Bu iletişim kutusunu kapat",
"components:optInFlyout:done": "Bitti",
diff --git a/src/lang/vi.js b/src/lang/vi.js
index 9f75ce6c..6618730c 100644
--- a/src/lang/vi.js
+++ b/src/lang/vi.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "Quay lại",
"components:navigation:next": "Tiếp theo",
"components:navigation:previous": "Trước",
- "components:navigation:skipNav": "chuyển sang đến nội dung chính",
"components:optInFlyout:cancel": "Hủy",
"components:optInFlyout:close": "Đóng hộp thoại này",
"components:optInFlyout:done": "Hoàn tất",
diff --git a/src/lang/zh-cn.js b/src/lang/zh-cn.js
index 6e333a0f..8e843b19 100644
--- a/src/lang/zh-cn.js
+++ b/src/lang/zh-cn.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "返回",
"components:navigation:next": "下一个",
"components:navigation:previous": "上一个",
- "components:navigation:skipNav": "跳到主目录",
"components:optInFlyout:cancel": "取消",
"components:optInFlyout:close": "关闭此对话框",
"components:optInFlyout:done": "完成",
diff --git a/src/lang/zh-tw.js b/src/lang/zh-tw.js
index 831ec7d1..71b97e27 100644
--- a/src/lang/zh-tw.js
+++ b/src/lang/zh-tw.js
@@ -61,7 +61,6 @@ export default {
"components:navigation:back": "返回",
"components:navigation:next": "下一個",
"components:navigation:previous": "上一個",
- "components:navigation:skipNav": "跳至主要內容",
"components:optInFlyout:cancel": "取消",
"components:optInFlyout:close": "關閉此對話方塊",
"components:optInFlyout:done": "完成",
diff --git a/test/components/navigation/golden/labs-navigation-skip-main/chromium/ar.png b/test/components/navigation/golden/labs-navigation-skip-main/chromium/ar.png
deleted file mode 100644
index f5e403d3..00000000
Binary files a/test/components/navigation/golden/labs-navigation-skip-main/chromium/ar.png and /dev/null differ
diff --git a/test/components/navigation/golden/labs-navigation-skip-main/chromium/en.png b/test/components/navigation/golden/labs-navigation-skip-main/chromium/en.png
deleted file mode 100644
index d1f27ace..00000000
Binary files a/test/components/navigation/golden/labs-navigation-skip-main/chromium/en.png and /dev/null differ
diff --git a/test/components/navigation/golden/labs-navigation-skip/chromium/focus.png b/test/components/navigation/golden/labs-navigation-skip/chromium/focus.png
deleted file mode 100644
index d8338230..00000000
Binary files a/test/components/navigation/golden/labs-navigation-skip/chromium/focus.png and /dev/null differ
diff --git a/test/components/navigation/golden/labs-navigation/chromium/separator.png b/test/components/navigation/golden/labs-navigation/chromium/separator.png
deleted file mode 100644
index b1eb0d80..00000000
Binary files a/test/components/navigation/golden/labs-navigation/chromium/separator.png and /dev/null differ
diff --git a/test/components/navigation/navigation.axe.js b/test/components/navigation/navigation.axe.js
index a1528b20..798a5699 100644
--- a/test/components/navigation/navigation.axe.js
+++ b/test/components/navigation/navigation.axe.js
@@ -2,7 +2,6 @@ import '../../../src/components/navigation/navigation.js';
import '../../../src/components/navigation/navigation-band.js';
import '../../../src/components/navigation/navigation-main-header.js';
import '../../../src/components/navigation/navigation-main-footer.js';
-import '../../../src/components/navigation/navigation-separator.js';
import { expect, fixture, html } from '@brightspace-ui/testing';
describe('d2l-labs-navigation', () => {
@@ -53,14 +52,3 @@ describe('d2l-labs-navigation-main-footer', () => {
});
});
-
-describe('d2l-labs-navigation-separator', () => {
-
- describe('accessibility', () => {
- it('should pass all aXe tests', async() => {
- const el = await fixture(html``);
- await expect(el).to.be.accessible();
- });
- });
-
-});
diff --git a/test/components/navigation/navigation.test.js b/test/components/navigation/navigation.test.js
index aaf02bc1..d496593a 100644
--- a/test/components/navigation/navigation.test.js
+++ b/test/components/navigation/navigation.test.js
@@ -2,7 +2,6 @@ import '../../../src/components/navigation/navigation.js';
import '../../../src/components/navigation/navigation-band.js';
import '../../../src/components/navigation/navigation-main-header.js';
import '../../../src/components/navigation/navigation-main-footer.js';
-import '../../../src/components/navigation/navigation-separator.js';
import { expect, fixture, html, runConstructor } from '@brightspace-ui/testing';
describe('d2l-labs-navigation', () => {
@@ -71,13 +70,3 @@ describe('d2l-labs-navigation-main-footer', () => {
});
});
-
-describe('d2l-labs-navigation-separator', () => {
-
- describe('constructor', () => {
- it('should construct', () => {
- runConstructor('d2l-labs-navigation-separator');
- });
- });
-
-});
diff --git a/test/components/navigation/navigation.vdiff.js b/test/components/navigation/navigation.vdiff.js
index bdeb7987..ea8bfe28 100644
--- a/test/components/navigation/navigation.vdiff.js
+++ b/test/components/navigation/navigation.vdiff.js
@@ -1,6 +1,5 @@
import '../../../src/components/navigation/navigation.js';
import '../../../src/components/navigation/navigation-band.js';
-import '../../../src/components/navigation/navigation-separator.js';
import '../../../src/components/navigation/navigation-main-header.js';
import '../../../src/components/navigation/navigation-main-footer.js';
import { expect, fixture, focusElem, html } from '@brightspace-ui/testing';
@@ -12,7 +11,6 @@ describe('d2l-labs-navigation', () => {
[
{ name: 'band-default', template: html`` },
{ name: 'band-custom-color', template: html`` },
- { name: 'separator', template: html`` },
{ name: 'main-footer', template: html`Footer
` },
{ name: 'navigation-default', template: navigationDefaultFixture },
{
@@ -49,7 +47,7 @@ describe('d2l-labs-navigation', () => {
it('skip-nav', async() => {
const elem = await fixture(navigationDefaultFixture);
- await focusElem(elem.shadowRoot.querySelector('d2l-labs-navigation-skip-main'));
+ await focusElem(elem.shadowRoot.querySelector('d2l-skip-nav-main'));
await expect(elem).to.be.golden();
});
diff --git a/test/components/navigation/skip-main.axe.js b/test/components/navigation/skip-main.axe.js
deleted file mode 100644
index 885a04b2..00000000
--- a/test/components/navigation/skip-main.axe.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import '../../../src/components/navigation/navigation-skip-main.js';
-import { expect, fixture, html } from '@brightspace-ui/testing';
-
-describe('d2l-labs-navigation-skip-main', () => {
-
- describe('accessibility', () => {
- it('should pass all aXe tests', async() => {
- const el = await fixture(html``);
- await expect(el).to.be.accessible();
- });
- });;
-});
diff --git a/test/components/navigation/skip-main.test.js b/test/components/navigation/skip-main.test.js
deleted file mode 100644
index dc6aec54..00000000
--- a/test/components/navigation/skip-main.test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import '../../../src/components/navigation/navigation-skip-main.js';
-import { clickElem, expect, fixture, focusElem, html, oneEvent, sendKeysElem } from '@brightspace-ui/testing';
-import { getComposedActiveElement } from '@brightspace-ui/core/helpers/focus.js';
-
-const mainFixture = html``;
-
-function getAnchor(elem) {
- return elem.shadowRoot.querySelector('d2l-labs-navigation-skip').shadowRoot.querySelector('a');
-}
-
-describe('d2l-labs-navigation-skip-main', () => {
-
- describe('events', () => {
-
- let elem, anchor;
- beforeEach(async() => {
- elem = await fixture(mainFixture);
- anchor = getAnchor(elem);
- });
-
- it('should fire click event when clicked with mouse', async() => {
- const p = oneEvent(elem, 'click');
- await focusElem(anchor);
- clickElem(anchor);
- await p;
- });
-
- it('should fire click event when ENTER is pressed', async() => {
- const p = oneEvent(elem, 'click');
- sendKeysElem(anchor, 'press', 'Enter');
- await p;
- });
-
- it('should delegate focus to anchor', async() => {
- await focusElem(elem);
- expect(getComposedActiveElement()).to.equal(anchor);
- });
-
- });
-
- describe('skip logic', () => {
-
- it('should focus on main element if present', async() => {
- const elem = await fixture(html`
-
- ${mainFixture}
-
main1
-
main2
-
heading
-
- `);
- const anchor = getAnchor(elem.querySelector('d2l-labs-navigation-skip-main'));
- await sendKeysElem(anchor, 'press', 'Enter');
- expect(getComposedActiveElement()).to.equal(elem.querySelector('main'));
- });
-
- it('should focus on role="main" element if no main', async() => {
- const elem = await fixture(html`
-
- ${mainFixture}
-
main2
-
heading
-
- `);
- const anchor = getAnchor(elem.querySelector('d2l-labs-navigation-skip-main'));
- await sendKeysElem(anchor, 'press', 'Enter');
- expect(getComposedActiveElement()).to.equal(elem.querySelector('[role="main"]'));
- });
-
- it('should focus on h1 element if no main or role="main"', async() => {
- const elem = await fixture(html`
-
- ${mainFixture}
-
heading
-
- `);
- const anchor = getAnchor(elem.querySelector('d2l-labs-navigation-skip-main'));
- await sendKeysElem(anchor, 'press', 'Enter');
- expect(getComposedActiveElement()).to.equal(elem.querySelector('h1'));
- });
-
- it('should dispatch "d2l-labs-navigation-skip-fail" event if no focus targets are found', async() => {
- const elem = await fixture(mainFixture);
- const anchor = getAnchor(elem);
- sendKeysElem(anchor, 'press', 'Enter');
- await oneEvent(elem, 'd2l-labs-navigation-skip-fail');
- });
-
- });
-
-});
diff --git a/test/components/navigation/skip-main.vdiff.js b/test/components/navigation/skip-main.vdiff.js
deleted file mode 100644
index af12da0e..00000000
--- a/test/components/navigation/skip-main.vdiff.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import '../../../src/components/navigation/navigation-skip-main.js';
-import { expect, fixture, focusElem, html } from '@brightspace-ui/testing';
-
-const mainFixture = html`
-
-
-
- Heading
- Some content
-
-
-`;
-
-describe('d2l-labs-navigation-skip-main', () => {
-
- ['en', 'ar'].forEach(lang => {
- it(lang, async() => {
- const elem = await fixture(mainFixture, { lang });
- await focusElem(elem.querySelector('d2l-labs-navigation-skip-main'));
- await expect(elem).to.be.golden();
- });
- });
-
-});
diff --git a/test/components/navigation/skip.axe.js b/test/components/navigation/skip.axe.js
deleted file mode 100644
index 4e930a8a..00000000
--- a/test/components/navigation/skip.axe.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import '../../../src/components/navigation/navigation-skip.js';
-import { expect, fixture, focusElem, html } from '@brightspace-ui/testing';const customFixture = html``;
-
-describe('d2l-labs-navigation-skip', () => {
-
- describe('accessibility', () => {
-
- it('should pass all aXe tests', async() => {
- const elem = await fixture(customFixture);
- await focusElem(elem);
- await expect(elem).to.be.accessible();
- });
-
- });
-
-});
diff --git a/test/components/navigation/skip.test.js b/test/components/navigation/skip.test.js
deleted file mode 100644
index 7fba9e67..00000000
--- a/test/components/navigation/skip.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import '../../../src/components/navigation/navigation-skip.js';
-import { clickElem, expect, fixture, focusElem, html, oneEvent, sendKeysElem } from '@brightspace-ui/testing';
-import { createMessage } from '@brightspace-ui/core/mixins/property-required/property-required-mixin.js';
-import { getComposedActiveElement } from '@brightspace-ui/core/helpers/focus.js';
-
-const customFixture = html``;
-
-describe('d2l-labs-navigation-skip', () => {
-
- it('should throw if text is not provided', async() => {
- const elem = await fixture(html``);
- expect(() => elem.flushRequiredPropertyErrors())
- .to.throw(TypeError, createMessage(elem, 'text'));
- });
-
- describe('events', () => {
-
- let elem, anchor;
- beforeEach(async() => {
- elem = await fixture(customFixture);
- anchor = elem.shadowRoot.querySelector('a');
- });
-
- it('should fire click event when clicked with mouse', async() => {
- const p = oneEvent(elem, 'click');
- await focusElem(anchor);
- clickElem(anchor);
- await p;
- });
-
- it('should fire click event when ENTER is pressed', async() => {
- const p = oneEvent(elem, 'click');
- sendKeysElem(anchor, 'press', 'Enter');
- await p;
- });
-
- it('should delegate focus to anchor', async() => {
- await focusElem(elem);
- expect(getComposedActiveElement()).to.equal(anchor);
- });
-
- });
-
-});
diff --git a/test/components/navigation/skip.vdiff.js b/test/components/navigation/skip.vdiff.js
deleted file mode 100644
index 4ae830b2..00000000
--- a/test/components/navigation/skip.vdiff.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import '../../../src/components/navigation/navigation-skip.js';
-import { expect, fixture, focusElem, html } from '@brightspace-ui/testing';
-
-describe('d2l-labs-navigation-skip', () => {
-
- it('focus', async() => {
- const elem = await fixture(html`
-
- `);
- await focusElem(elem.querySelector('d2l-labs-navigation-skip'));
- await expect(elem).to.be.golden();
- });
-
-});