postcss-calc 7.0.3 → 7.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 7.0.4
2
+
3
+ - Fixed: strips away important factors from multiplications in calc() ([#107](https://github.com/postcss/postcss-calc/issues/107))
4
+
1
5
  # 7.0.3
2
6
 
3
7
  - Fixed: substracted css-variable from zero ([#111](https://github.com/postcss/postcss-calc/issues/111))
@@ -61,7 +65,7 @@
61
65
  # 5.2.1 - 2016-04-10
62
66
 
63
67
  - Fixed: support for multiline value
64
- ([#27](https://github.com/postcss/postcss-calc/pull/27))
68
+ ([#27](https://github.com/postcss/postcss-calc/pull/27))
65
69
 
66
70
  # 5.2.0 - 2016-01-08
67
71
 
@@ -195,19 +195,45 @@ function reduceAddSubExpression(node, precision) {
195
195
 
196
196
 
197
197
  if (node.right.type === 'MathExpression' && node.left.type === 'MathExpression') {
198
- if (isEqual(node.left.right, node.right.right)) {
199
- var newNodes = covertNodesUnits(node.left.left, node.right.left, precision);
200
- node.left = newNodes.left;
201
- node.right = newNodes.right;
202
- return reduce(node);
203
- }
198
+ if (node.left.operator === "-" && node.right.operator === "+" || node.right.operator === "-" && node.left.operator === "+") {
199
+ // (expr1 - something) + (expr2 + something) => expr1 + expr2
200
+ // (expr1 + something) + (expr2 - something) => expr1 + expr2
201
+ // (expr1 - something) - (expr2 + something) => expr1 + expr2
202
+ // (expr1 + something) - (expr2 - something) => expr1 + expr2
203
+ if (isEqual(node.left.right, node.right.right)) {
204
+ var newNodes = covertNodesUnits(node.left.left, node.right.left, precision);
205
+ node.left = newNodes.left;
206
+ node.right = newNodes.right;
207
+ return reduce(node, precision);
208
+ } // (expr1 - something) + (something + expr2) => expr1 + expr2
209
+ // (expr1 + something) + (something - expr2) => expr1 + expr2
210
+ // (expr1 - something) - (something + expr2) => expr1 + expr2
211
+ // (expr1 + something) - (something - expr2) => expr1 + expr2
212
+
204
213
 
205
- if (isEqual(node.left.right, node.right.left)) {
206
- var _newNodes = covertNodesUnits(node.left.left, node.right.right, precision);
214
+ if (isEqual(node.left.right, node.right.left)) {
215
+ var _newNodes = covertNodesUnits(node.left.left, node.right.right, precision);
207
216
 
208
- node.left = _newNodes.left;
209
- node.right = _newNodes.right;
210
- return reduce(node);
217
+ node.left = _newNodes.left;
218
+ node.right = _newNodes.right;
219
+ return reduce(node, precision);
220
+ } // (expr1 / something) + (expr2 / something) => (expr1 + expr2) / something
221
+ // (expr1 * something) + (expr2 * something) => (expr1 + expr2) * something
222
+ // (expr1 / something) - (expr2 / something) => (expr1 - expr2) / something
223
+ // (expr1 * something) - (expr2 * something) => (expr1 - expr2) * something
224
+
225
+ } else if ((node.left.operator === "/" || node.left.operator === "*") && node.left.operator === node.right.operator && isEqual(node.left.right, node.right.right)) {
226
+ return reduce({
227
+ type: "MathExpression",
228
+ operator: node.left.operator,
229
+ left: {
230
+ type: "MathExpression",
231
+ operator: node.operator,
232
+ left: node.left.left,
233
+ right: node.right.left
234
+ },
235
+ right: node.left.right
236
+ }, precision);
211
237
  }
212
238
  }
213
239
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "postcss-calc",
3
- "version": "7.0.3",
3
+ "version": "7.0.4",
4
4
  "description": "PostCSS plugin to reduce calc()",
5
5
  "keywords": [
6
6
  "css",