Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: switch back link to use link icon #156

Merged
merged 2 commits into from
Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions d2l-navigation-immersive.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ class D2LNavigationImmsersive extends DirMixin(PolymerElement) {
visibility: hidden;
}

d2l-navigation-link-back {
--d2l-navigation-link-back-left-padding: 12px;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only place overriding this padding value -- I checked with Jeff and he saw no need to do this.

}

.d2l-navigation-immersive-spacing {
height: calc(var(--d2l-navigation-immersive-height-main) + 5px);
position: unset;
Expand Down Expand Up @@ -179,10 +175,6 @@ class D2LNavigationImmsersive extends DirMixin(PolymerElement) {
margin: 0 18px;
padding: 0 18px;
}
d2l-navigation-link-back {
--d2l-navigation-link-back-left-padding: 6px;
margin: 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No margin was set, so this was doing nothing.

}
}

</style>
Expand Down
89 changes: 23 additions & 66 deletions d2l-navigation-link-back.js
Original file line number Diff line number Diff line change
@@ -1,82 +1,39 @@
import './d2l-navigation-link.js';
import '@brightspace-ui/core/components/icons/icon.js';
import '@brightspace-ui/polymer-behaviors/d2l-focusable-behavior.js';
import '@brightspace-ui/localize-behavior/d2l-localize-behavior.js';
import './d2l-navigation-link-icon.js';
import { css, html, LitElement } from 'lit';
import { FocusMixin } from '@brightspace-ui/core/mixins/focus-mixin.js';
import { LocalizeNavigationElement } from './components/localize-navigation-element.js';

import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
/**
`d2l-navigation-link-back`
Polymer-based web component for the back button used in the navigational header.

@demo demo/d2l-navigation-button.html d2l-navigation-link-back
*/
class D2LNavigationLinkBack extends mixinBehaviors([D2L.PolymerBehaviors.FocusableBehavior,
D2L.PolymerBehaviors.LocalizeBehavior], PolymerElement) {
class NavigationLinkBack extends LocalizeNavigationElement(FocusMixin(LitElement)) {

static get properties() {
return {
text: {
type: String,
value: null
},
href: {
type: String
},
resources: {
value: function() {
return {
'ar': { 'back': 'العودة' },
'de': { 'back': 'Zurück' },
'en': { 'back': 'Back' },
'es': { 'back': 'Volver' },
'fr': { 'back': 'Précédent' },
'ja': { 'back': '戻る' },
'ko': { 'back': '뒤로' },
'nl': { 'back': 'Terug' },
'pt': { 'back': 'Voltar' },
'sv': { 'back': 'Tillbaka' },
'tr': { 'back': 'Geri' },
'zh': { 'back': '返回' },
'zh-TW': { 'back': '返回' }
};
}
}
text: { type: String },
href: { type: String }
};
}
static get template() {
const template = html`
<style>

static get styles() {
return css`
:host {
display: inline-block;
height: 100%;
white-space: nowrap;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nowrap is set in d2l-navigation-link-icon, so not needed.

}
d2l-icon {
color: inherit;
}
.d2l-navigation-link-back-text {
padding-left: var(--d2l-navigation-link-back-left-padding, 5px);
}
:host(:dir(rtl)) .d2l-navigation-link-back-text {
padding-left: 0;
padding-right: var(--d2l-navigation-link-back-left-padding, 5px);
:host([hidden]) {
display: none;
}
</style>
<d2l-navigation-link href="[[href]]" class="d2l-focusable" text="[[_getDisplayText(text, localize)]]">
<d2l-icon icon="tier1:chevron-left"></d2l-icon>
<span class="d2l-navigation-link-back-text">[[_getDisplayText(text, localize)]]</span>
</d2l-navigation-link>
`;
template.setAttribute('strip-whitespace', '');
return template;
}

_getDisplayText(text, localize) {
if (text === undefined || text === null) {
return localize('back');
}
return text;
static get focusElementSelector() {
return 'd2l-navigation-link-icon';
}

render() {
const href = this.href ? this.href : 'javascript:void(0);'; // backwards-compatible for uses before missing "href" threw exception
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was hoping to avoid this, but there are quite a few places (including the LMS) that are abusing it.

const text = this.text ? this.text : this.localize('back');
return html`<d2l-navigation-link-icon href="${href}" icon="tier1:chevron-left" text="${text}"></d2l-navigation-link-icon>`;
}

}
customElements.define('d2l-navigation-link-back', D2LNavigationLinkBack);

customElements.define('d2l-navigation-link-back', NavigationLinkBack);
1 change: 1 addition & 0 deletions d2l-navigation-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const highlightLinkStyles = css`
position: relative;
text-decoration: none;
vertical-align: middle;
white-space: nowrap;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have always been here, to avoid text/icon wrapping onto separate lines.

}
a:hover,
a:focus {
Expand Down
1 change: 1 addition & 0 deletions lang/ar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "العودة",
"next": "التالي",
"previous": "السابق"
};
1 change: 1 addition & 0 deletions lang/cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Back",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/da.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Back",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/de.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Zurück",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/en.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Back",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/es-es.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Volver",
"next": "Siguiente",
"previous": "Anterior"
};
1 change: 1 addition & 0 deletions lang/es.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Volver",
"next": "Siguiente",
"previous": "Anterior"
};
1 change: 1 addition & 0 deletions lang/fr-fr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Précédent",
"next": "Suivant",
"previous": "Précédent"
};
1 change: 1 addition & 0 deletions lang/fr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Précédent",
"next": "Suivant",
"previous": "Précédent"
};
1 change: 1 addition & 0 deletions lang/hi.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Back",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/ja.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "戻る",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/ko.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "뒤로",
"next": "다음",
"previous": "이전"
};
1 change: 1 addition & 0 deletions lang/nl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Terug",
"next": "Next",
"previous": "Previous"
};
1 change: 1 addition & 0 deletions lang/pt.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Voltar",
"next": "Próximo",
"previous": "Anterior"
};
1 change: 1 addition & 0 deletions lang/sv.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Tillbaka",
"next": "Nästa",
"previous": "Föregående"
};
1 change: 1 addition & 0 deletions lang/tr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "Geri",
"next": "Sonraki",
"previous": "Önceki"
};
1 change: 1 addition & 0 deletions lang/zh-cn.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "返回",
"next": "下一页",
"previous": "上一个"
};
1 change: 1 addition & 0 deletions lang/zh-tw.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint quotes: 0 */

export default {
"back": "返回",
"next": "下一個",
"previous": "上一個"
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"lint": "npm run lint:eslint && npm run lint:lit && npm run lint:style",
"lint:eslint": "eslint . --ext .js,.html",
"lint:lit": "lit-analyzer d2l-navigation.js d2l-navigation-separator.js ./components/d2l-navigation-iterator/d2l-navigation-iterator.js --strict --rules.no-unknown-tag-name off",
"lint:lit": "lit-analyzer d2l-navigation.js d2l-navigation-button-icon.js d2l-navigation-link-back.js d2l-navigation-link-icon.js d2l-navigation-separator.js ./components/d2l-navigation-iterator/d2l-navigation-iterator.js --strict --rules.no-unknown-tag-name off",
"lint:style": "stylelint \"**/*.{js,html}\"",
"start": "web-dev-server --node-resolve --watch --open --app-index demo/index.html",
"test": "npm run lint && npm run test:headless",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.