Skip to content

Commit

Permalink
PLATUI-2644: Hide when printing for language select and report techni… (
Browse files Browse the repository at this point in the history
#331)

PLATUI-2644: Hide when printing for language select and report technical issue
  • Loading branch information
JoPintoPaul committed Nov 20, 2023
1 parent 2f77ba3 commit ae70af4
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 126 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [5.58.0] - 2023-11-20

### Changed

- Added `govuk-!-display-none-print` styling to `report-technical-issue` and `language-select`

## [5.57.0] - 2023-11-15

### Changed
Expand Down
219 changes: 98 additions & 121 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hmrc-frontend",
"version": "5.57.0",
"version": "5.58.0",
"description": "Design patterns for HMRC frontends",
"scripts": {
"start": "gulp dev",
Expand Down
4 changes: 2 additions & 2 deletions src/components/language-select/template.njk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if params.language === 'en' %}
<nav class="hmrc-language-select" aria-label="Language switcher">
<nav class="hmrc-language-select govuk-!-display-none-print" aria-label="Language switcher">
<ul class="hmrc-language-select__list">
<li class="hmrc-language-select__list-item">
<span aria-current="true">English</span>
Expand All @@ -20,7 +20,7 @@
{% endif %}

{% if params.language === 'cy' %}
<nav class="hmrc-language-select" aria-label="Switcher iaith">
<nav class="hmrc-language-select govuk-!-display-none-print" aria-label="Switcher iaith">
<ul class="hmrc-language-select__list">
<li class="hmrc-language-select__list-item">
<a href="{{ params.en.href }}"
Expand Down
4 changes: 4 additions & 0 deletions src/components/language-select/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ describe('New Tab Link', () => {
expect($.text().trim().replace(/[\s,\n]+/g, ' ')).toEqual('English Newid yr iaith ir Gymraeg Cymraeg');

expect($('.hmrc-language-select__list-item').find('[aria-current="true"]').eq(0).text()).toEqual('English');

expect($('.hmrc-language-select').attr('class')).toEqual('hmrc-language-select govuk-!-display-none-print');
});

it('renders a Welsh element as text and English as a link', () => {
Expand All @@ -51,6 +53,8 @@ describe('New Tab Link', () => {
expect($.text().trim().replace(/[\s,\n]+/g, ' ')).toEqual('Change the language to English English Cymraeg');

expect($('.hmrc-language-select__list-item').find('[aria-current="true"]').eq(0).text()).toEqual('Cymraeg');

expect($('.hmrc-language-select').attr('class')).toEqual('hmrc-language-select govuk-!-display-none-print');
});
});
});
2 changes: 1 addition & 1 deletion src/components/report-technical-issue/template.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set language %}{% if params.language == 'cy' %}cy{% else %}en{% endif %}{% endset %}
{% set serviceId = params.serviceId or params.serviceCode %}
<a lang="{{ language }}" hreflang="{{ language }}"
class="govuk-link hmrc-report-technical-issue {{ params.classes }}"
class="govuk-link hmrc-report-technical-issue govuk-!-display-none-print {{ params.classes }}"
{% if params.referrerUrl %} rel="noreferrer noopener"{% endif %}
target="_blank"
href="{{ params.baseUrl }}/contact/report-technical-problem?newTab=true{% if serviceId %}&amp;service={{ serviceId | urlencode }}{% endif %}{% if params.referrerUrl %}&amp;referrerUrl={{ params.referrerUrl | urlencode }}{% endif %}"
Expand Down
10 changes: 9 additions & 1 deletion src/components/report-technical-issue/template.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,20 @@ describe('Report Technical Issue', () => {
expect($component.attr('href')).toEqual('/contact/report-technical-problem?newTab=true&service=the-url-safe-service-id');
});

it('renders link with fixed classes', () => {
const $ = render('report-technical-issue', {});

const $component = $('.govuk-link');

expect($component.attr('class')).toEqual('govuk-link hmrc-report-technical-issue govuk-!-display-none-print ');
});

it('renders link with custom classes', () => {
const $ = render('report-technical-issue', examples['with-classes']);

const $component = $('.govuk-link');

expect($component.attr('class')).toEqual('govuk-link hmrc-report-technical-issue govuk-!-font-weight-bold my-custom-class');
expect($component.attr('class')).toEqual('govuk-link hmrc-report-technical-issue govuk-!-display-none-print govuk-!-font-weight-bold my-custom-class');
});

it('should display in welsh', () => {
Expand Down

0 comments on commit ae70af4

Please sign in to comment.