Skip to content

Feed Example: Convert images to inline SVG #2729

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 24, 2023
Merged

Feed Example: Convert images to inline SVG #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdb627c
Correct comments re: treegrid test
frozenzia Jun 20, 2023
cc73afe
Correct comment re: datagrid test
frozenzia Jun 20, 2023
d3e34d3
Correct comment re: layoutgrid test
frozenzia Jun 21, 2023
a8d41f9
Fix commit mistake - return line to original state
frozenzia Jun 22, 2023
1bb1cbc
Add `Key.COMMAND` for macOS
frozenzia Jun 22, 2023
496abc1
Remove previously added `Key.COMMAND`
frozenzia Jun 22, 2023
2084eab
Replace <img> with inline SVG
frozenzia Jun 22, 2023
42f3173
Fix aria-label for rating image
frozenzia Jun 26, 2023
ca0e576
Add support for forced-colors mode
frozenzia Jun 28, 2023
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
45 changes: 45 additions & 0 deletions content/patterns/feed/examples/css/feedDisplay.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,48 @@ body {
padding: 10px;
width: 100%;
}

.restaurant-rating svg g {
color: #ffde00;
}

.restaurant-rating svg .star {
stroke-width: 2px;
stroke: #f8951d;
fill-opacity: 0;
}

.restaurant-rating[data-rating-value="1"] svg .star-1 .star {
fill: currentcolor;
fill-opacity: 1;
}

.restaurant-rating[data-rating-value="2"] svg .star-2 .star {
fill: currentcolor;
fill-opacity: 1;
}

.restaurant-rating[data-rating-value="3"] svg .star-3 .star {
fill: currentcolor;
fill-opacity: 1;
}

.restaurant-rating[data-rating-value="4"] svg .star-4 .star {
fill: currentcolor;
fill-opacity: 1;
}

.restaurant-rating[data-rating-value="5"] svg .star-5 .star {
fill: currentcolor;
fill-opacity: 1;
}

@media (forced-colors: active) {
.restaurant-rating svg g {
color: currentcolor;
}

.restaurant-rating svg .star {
stroke: currentcolor;
}
}
36 changes: 29 additions & 7 deletions content/patterns/feed/examples/js/feedDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,40 @@ aria.FeedDisplay.prototype.renderItemData = function (itemData) {
'</div>';

if (itemData.rating) {
const starText = `${itemData.rating} ${
itemData.rating === 1 ? 'star' : 'stars'
}`;
var ratingID = 'restaurant-rating-' + this.feedSize;
itemContent +=
'<div class="restaurant-rating" id="' +
ratingID +
'">' +
'<img class="restaurant-star-img" ' +
'alt="' +
itemData.rating +
' stars" ' +
'src="imgs/rating-' +
'" data-rating-value="' +
itemData.rating +
'.png">' +
'">' +
'<svg aria-label="' +
starText +
'" xmlns="http://www.w3.org/2000/svg" viewBox="38 -5 100 48" width="90" height="25">' +
'<defs>' +
'<g id="star">' +
'<polygon points="2.0,13.4 11.7,20.5 8.0,31.1 17.7,24.8 27.4,31.9 23.7,20.5 33.4,13.4 21.4,13.4 17.7,2.0 14.0,13.4" />' +
'</g>' +
'</defs>' +
'<g class="star-1 star-2 star-3 star-4 star-5">' +
'<use class="star" xlink:href="#star" x="0" y="0" />' +
'</g>' +
'<g class="star-2 star-3 star-4 star-5">' +
'<use class="star" xlink:href="#star" x="35" y="0" />' +
'</g>' +
'<g class="star-3 star-4 star-5">' +
'<use class="star" xlink:href="#star" x="70" y="0" />' +
'</g>' +
'<g class="star-4 star-5">' +
'<use class="star" xlink:href="#star" x="105" y="0" />' +
'</g>' +
'<g class="star-5">' +
'<use class="star" xlink:href="#star" x="140" y="0" />' +
'</g>' +
'</svg>' +
'</div>';
describedbyIDs.push(ratingID);
}
Expand Down
2 changes: 1 addition & 1 deletion test/tests/grid_data_grids.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ ariaTest(
}
}

// Test focus moves down
// Test focus moves up
await sendKeyToGridcell(
t,
gridSelector,
Expand Down
2 changes: 1 addition & 1 deletion test/tests/grid_layout_grids.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ ariaTest(
return document.activeElement;
});

// Test focus to last element in row using key chord CONTROL+HOME
// Test focus to first element in row using key chord CONTROL+HOME
await activeElement.sendKeys(Key.chord(Key.CONTROL, Key.HOME));
activeElement = await t.context.session.executeScript(() => {
return document.activeElement;
Expand Down
4 changes: 2 additions & 2 deletions test/tests/treegrid_treegrid-1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,12 +722,12 @@ ariaTest('END moves focus', exampleFile, 'key-end', async (t) => {
'Sending END to first row should result on focus on last row'
);

// Send HOME to first gridcell
// Send END to first gridcell
await putFocusOnRow1Gridcell(t, 0);
await sendKeyToGridcellAndWait(t, 0, 0, Key.END);
t.true(
await checkFocusOnGridcell(t, 0, 2),
"Sending HOME to first row's first gridcell should move focus to first row's last gridcell"
"Sending END to first row's first gridcell should move focus to first row's last gridcell"
);
});

Expand Down