Skip to content

2-nd lost-waffle's argument's adding feature #423

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

Closed
art-kan wants to merge 11 commits into from
Closed

2-nd lost-waffle's argument's adding feature #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
42da015
2-nd argument's adding feature
art-kan Oct 14, 2018
a1fc3fb
Update lost-waffle.js
art-kan Oct 14, 2018
c170fd0
Update lost-waffle.js
art-kan Oct 14, 2018
91aa594
Update lost-waffle.js
art-kan Oct 14, 2018
a6ff620
Update lost-waffle.js
art-kan Oct 14, 2018
a40577c
Update lost-waffle.js
art-kan Oct 14, 2018
4e266a2
Update lost-waffle.js
art-kan Oct 14, 2018
efcba5e
Update lost-waffle.js
art-kan Oct 14, 2018
5f71f25
Update lost-waffle.js
art-kan Oct 14, 2018
701f9d6
Update lost-waffle.js
art-kan Oct 15, 2018
046094c
Update lost-waffle.js
art-kan Oct 15, 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
87 changes: 40 additions & 47 deletions lib/lost-waffle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var newBlock = require('./new-block.js');

var lgLogic = require('./_lg-logic');

module.exports = function lostWaffleDecl(css, settings) {
Expand All @@ -9,6 +8,7 @@ module.exports = function lostWaffleDecl(css, settings) {
var lostWaffle;
var floatRight;
var lostWaffleCycle;
var lostWaffleStart = 0;
var unit = settings.gridUnit;
var lostWaffleRounder = settings.rounder;
var lostWaffleGutter = settings.gutter;
Expand All @@ -33,6 +33,10 @@ module.exports = function lostWaffleDecl(css, settings) {
declArr = decl.value.split(' ');
lostWaffle = declArr[0];

if (declArr[1] !== undefined && declArr[1].indexOf('/') !== -1) {
lostWaffleStart = declArr[1].split('/')[1];
}

if (declArr[1] !== undefined && declArr[1].search(/^\d/) !== -1) {
lostWaffleCycle = declArr[1];
}
Expand Down Expand Up @@ -116,6 +120,30 @@ module.exports = function lostWaffleDecl(css, settings) {
}
});

var selectors = {
lastChild: '',
firstChild: '',
lastRow: ':nth-last-child(-n + ' + lostWaffleCycle + ')'
};

if (lostWaffleStart === 0) {
selectors.lastChild = ':nth-child(' + lostWaffleCycle + 'n)';
selectors.firstChild = ':nth-child(' + lostWaffleCycle + 'n + 1)';
} else {
selectors.lastChild =
':nth-child(' + lostWaffleCycle + 'n + ' + lostWaffleStart + ')';
selectors.firstChild =
':nth-child(' +
lostWaffleCycle +
'n + ' +
((1 + lostWaffleStart) % lostWaffleCycle) +
')';
}

if ((lostWaffleStart + 1) % lostWaffleCycle === 0) {
selectors.firstChild = ':nth-child(' + lostWaffleCycle + 'n)';
}

if (lostWaffleFlexbox === 'flex') {
decl.cloneBefore({
prop: 'flex-grow',
Expand All @@ -127,24 +155,19 @@ module.exports = function lostWaffleDecl(css, settings) {
});

if (lostWaffleCycle !== 0) {
newBlock(
decl,
':nth-last-child(-n + ' + lostWaffleCycle + ')',
['margin-bottom'],
[0]
);
newBlock(decl, selectors.lastRow, ['margin-bottom'], [0]);

if (gridDirection === 'rtl') {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
selectors.lastChild,
['margin-left', 'margin-right'],
[0, 'auto']
);
} else {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
selectors.lastChild,
['margin-right', 'margin-left'],
[0, 'auto']
);
Expand Down Expand Up @@ -186,72 +209,42 @@ module.exports = function lostWaffleDecl(css, settings) {
}
} else {
if (lostWaffleCycle !== 0) {
newBlock(
decl,
':nth-last-child(-n + ' + lostWaffleCycle + ')',
['margin-bottom'],
[0]
);
newBlock(decl, selectors.lastRow, ['margin-bottom'], [0]);

if (settings.clearing === 'left') {
// FIXME: this doesn't make sense w/ rtl
/* istanbul ignore if */
if (gridDirection === 'rtl') {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n + 1)',
['clear'],
['right']
);
newBlock(decl, selectors.firstChild, ['clear'], ['right']);
} else {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n + 1)',
['clear'],
['left']
);
newBlock(decl, selectors.firstChild, ['clear'], ['left']);
}
} else {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n + 1)',
['clear'],
['both']
);
newBlock(decl, selectors.firstChild, ['clear'], ['both']);
}
/* istanbul ignore if */
if (gridDirection === 'rtl') {
// FIXME: this doesn't make sense w/ rtl
if (floatRight === true) {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
selectors.lastChild,
['margin-left', 'float'],
[0, 'left']
);
} else {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
['margin-left'],
[0]
);
newBlock(decl, selectors.lastChild, ['margin-left'], [0]);
}
} else {
if (floatRight === true) {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
selectors.lastChild,
['margin-right', 'float'],
[0, 'right']
);
} else {
newBlock(
decl,
':nth-child(' + lostWaffleCycle + 'n)',
['margin-right'],
[0]
);
newBlock(decl, selectors.lastChild, ['margin-right'], [0]);
}
}
}
Expand Down
35 changes: 35 additions & 0 deletions test/lost-waffle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,39 @@ describe('lost-waffle', function() {
);
});
});

describe('supports start-indication', () => {
it('supports start-indication', () => {
check(
'div { lost-waffle: 1/3 3/1 }',
'div { width: calc(99.9% * 1/3 - (30px - 30px * 1/3));\n' +
'max-width: calc(99.9% * 1/3 - (30px - 30px * 1/3));\n' +
'height: calc(99.9% * 1/3 - (30px - 30px * 1/3)) }' +
'div:nth-child(1n) { float:left;\n' +
'margin-right: 30px;\n' +
'margin-bottom: 30px;\n' +
'clear: none }\n' +
'div:last-child { margin-right: 0;\n' +
'margin-bottom: 0 }\n' +
'div:nth-child(3n+1) { margin-right: 0 }\n' +
'div:nth-child(3n+2) { clear:both }\n' +
'div:nth-last-child(-n+3){ margin-bottom:0 }'
);
check(
'div { lost-waffle: 1/3 3/2 }',
'div { width: calc(99.9% * 1/3 - (30px - 30px * 1/3));\n' +
'max-width: calc(99.9% * 1/3 - (30px - 30px * 1/3));\n' +
'height: calc(99.9% * 1/3 - (30px - 30px * 1/3)) }' +
'div:nth-child(1n) { float:left;\n' +
'margin-right: 30px;\n' +
'margin-bottom: 30px;\n' +
'clear: none }\n' +
'div:last-child { margin-right: 0;\n' +
'margin-bottom: 0 }\n' +
'div:nth-child(3n+2) { margin-right: 0 }\n' +
'div:nth-child(3n) { clear:both }\n' +
'div:nth-last-child(-n+3){ margin-bottom:0 }'
);
});
});
});