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.

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

Jump to bottom

[grid-template-areas] Repetitive grid-area declarations #983

Merged
merged 2 commits into from
Feb 9, 2018
Merged

[grid-template-areas] Repetitive grid-area declarations #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ab1427
[grid-template-areas] Add test for repetitive grid-area declarations
yepninja Feb 7, 2018
65edaa4
[grid-template-areas] Fix prefixing of repetitive grid-area declarations
yepninja Feb 7, 2018
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
13 changes: 8 additions & 5 deletions lib/hacks/grid-template-areas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,20 @@ class GridTemplateAreas extends Declaration {
if (prefix !== '-ms-') return super.insert(decl, prefix, prefixes);

const areas = parseGridAreas(decl.value);
let missed = Object.keys(areas);

this.getRoot(decl.parent).walkDecls('grid-area', gridArea => {
const value = gridArea.value;
const area = areas[value];
delete areas[value];

if (gridArea.parent.some(i => i.prop === '-ms-grid-row')) {
return undefined;
}
missed = missed.filter(e => e !== value);

if (area) {
gridArea.parent
.walkDecls(/-ms-grid-(row|column)/, (d) => {
d.remove();
});

gridArea.cloneBefore({
prop: '-ms-grid-row',
value: String(area.row.start)
Expand All @@ -92,7 +96,6 @@ class GridTemplateAreas extends Declaration {
return undefined;
});

const missed = Object.keys(areas);
if (missed.length > 0) {
decl.warn(result, 'Can not find grid areas: ' + missed.join(', '));
}
Expand Down
11 changes: 10 additions & 1 deletion test/cases/grid-template-areas.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
grid-template-areas:
"head head"
"nav main"
"nav foot";
"nav foot"
"another";
}

.b {
Expand All @@ -21,6 +22,10 @@
grid-area: foot;
}

.f {
grid-area: foot;
}

@media (max-width: 1000px) {
.a {
grid-template-areas: "head main";
Expand All @@ -33,4 +38,8 @@
.c {
grid-area: main;
}

.d {
grid-area: main;
}
}
15 changes: 14 additions & 1 deletion test/cases/grid-template-areas.out.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
grid-template-areas:
"head head"
"nav main"
"nav foot";
"nav foot"
"another";
}

.b {
Expand Down Expand Up @@ -31,6 +32,12 @@
grid-area: foot;
}

.f {
-ms-grid-row: 3;
-ms-grid-column: 2;
grid-area: foot;
}

@media (max-width: 1000px) {
.a {
grid-template-areas: "head main";
Expand All @@ -47,4 +54,10 @@
-ms-grid-column: 2;
grid-area: main;
}

.d {
-ms-grid-row: 1;
-ms-grid-column: 2;
grid-area: main;
}
}