@tamagui/calc 3.0.0-beta.831.1 → 3.0.0-beta.889.1
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/dist/cjs/index.cjs +1 -1
- package/dist/cjs/index.native.cjs +1 -1
- package/dist/cjs/index.native.js +1 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +2 -2
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -2
- package/dist/esm/index.native.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +2 -2
- package/types/index.d.ts.map +1 -1
package/dist/cjs/index.cjs
CHANGED
|
@@ -57,7 +57,7 @@ const calc = (...valuesAndOperators) => {
|
|
|
57
57
|
return res;
|
|
58
58
|
};
|
|
59
59
|
const convertToVariableOrNumber = (v) => {
|
|
60
|
-
const varOrVal = (0, import_core.
|
|
60
|
+
const varOrVal = (0, import_core.isVariable)(v) ? v.variable : v;
|
|
61
61
|
if (typeof varOrVal === "number") {
|
|
62
62
|
return `${varOrVal}px`;
|
|
63
63
|
}
|
|
@@ -104,7 +104,7 @@ var calc = function() {
|
|
|
104
104
|
return res1;
|
|
105
105
|
};
|
|
106
106
|
var convertToVariableOrNumber = function(v) {
|
|
107
|
-
var varOrVal = (0, import_core.
|
|
107
|
+
var varOrVal = (0, import_core.isVariable)(v) ? v.variable : v;
|
|
108
108
|
if (typeof varOrVal === "number") {
|
|
109
109
|
return `${varOrVal}px`;
|
|
110
110
|
}
|
package/dist/cjs/index.native.js
CHANGED
|
@@ -104,7 +104,7 @@ var calc = function() {
|
|
|
104
104
|
return res1;
|
|
105
105
|
};
|
|
106
106
|
var convertToVariableOrNumber = function(v) {
|
|
107
|
-
var varOrVal = (0, import_core.
|
|
107
|
+
var varOrVal = (0, import_core.isVariable)(v) ? v.variable : v;
|
|
108
108
|
if (typeof varOrVal === "number") {
|
|
109
109
|
return `${varOrVal}px`;
|
|
110
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n calc: () => calc\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_core = require(\"@tamagui/core\");\nvar operators = {\n \"+\": function(a, b) {\n return a + b;\n },\n \"-\": function(a, b) {\n return a - b;\n },\n \"/\": function(a, b) {\n return a / b;\n },\n \"*\": function(a, b) {\n return a * b;\n }\n};\nvar calc = function() {\n for (var _len = arguments.length, valuesAndOperators = new Array(_len), _key = 0; _key < _len; _key++) {\n valuesAndOperators[_key] = arguments[_key];\n }\n if (import_core.isWeb) {\n var res = \"calc(\";\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = valuesAndOperators[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var cur = _step.value;\n if (operators[cur]) {\n res += ` ${cur} `;\n } else {\n res += convertToVariableOrNumber(cur);\n }\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n return `${res})`;\n }\n var res1 = 0;\n var nextOp = null;\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = valuesAndOperators[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var cur1 = _step1.value;\n if (operators[cur1]) {\n nextOp = operators[cur1];\n } else {\n if (nextOp) {\n res1 = nextOp(res1, cur1);\n nextOp = null;\n } else {\n res1 = +cur1;\n }\n }\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n return res1;\n};\nvar convertToVariableOrNumber = function(v) {\n var varOrVal = (0, import_core.
|
|
1
|
+
{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n calc: () => calc\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_core = require(\"@tamagui/core\");\nvar operators = {\n \"+\": function(a, b) {\n return a + b;\n },\n \"-\": function(a, b) {\n return a - b;\n },\n \"/\": function(a, b) {\n return a / b;\n },\n \"*\": function(a, b) {\n return a * b;\n }\n};\nvar calc = function() {\n for (var _len = arguments.length, valuesAndOperators = new Array(_len), _key = 0; _key < _len; _key++) {\n valuesAndOperators[_key] = arguments[_key];\n }\n if (import_core.isWeb) {\n var res = \"calc(\";\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = valuesAndOperators[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var cur = _step.value;\n if (operators[cur]) {\n res += ` ${cur} `;\n } else {\n res += convertToVariableOrNumber(cur);\n }\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n return `${res})`;\n }\n var res1 = 0;\n var nextOp = null;\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = valuesAndOperators[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var cur1 = _step1.value;\n if (operators[cur1]) {\n nextOp = operators[cur1];\n } else {\n if (nextOp) {\n res1 = nextOp(res1, cur1);\n nextOp = null;\n } else {\n res1 = +cur1;\n }\n }\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n return res1;\n};\nvar convertToVariableOrNumber = function(v) {\n var varOrVal = (0, import_core.isVariable)(v) ? v.variable : v;\n if (typeof varOrVal === \"number\") {\n return `${varOrVal}px`;\n }\n return varOrVal;\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":"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"}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVariable, isWeb } from "@tamagui/core";
|
|
2
2
|
|
|
3
3
|
const operators = {
|
|
4
4
|
"+": (a, b) => a + b,
|
|
@@ -35,7 +35,7 @@ const calc = (...valuesAndOperators) => {
|
|
|
35
35
|
return res;
|
|
36
36
|
};
|
|
37
37
|
const convertToVariableOrNumber = (v) => {
|
|
38
|
-
const varOrVal =
|
|
38
|
+
const varOrVal = isVariable(v) ? v.variable : v;
|
|
39
39
|
if (typeof varOrVal === "number") {
|
|
40
40
|
return `${varOrVal}px`;
|
|
41
41
|
}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { isVariable, isWeb } from \"@tamagui/core\";\nconst operators = {\n \"+\": (a, b) => a + b,\n \"-\": (a, b) => a - b,\n \"/\": (a, b) => a / b,\n \"*\": (a, b) => a * b\n};\nconst calc = (...valuesAndOperators) => {\n if (isWeb) {\n let res2 = \"calc(\";\n for (const cur of valuesAndOperators) {\n if (operators[cur]) {\n res2 += ` ${cur} `;\n } else {\n res2 += convertToVariableOrNumber(cur);\n }\n }\n return `${res2})`;\n }\n let res = 0;\n let nextOp = null;\n for (const cur of valuesAndOperators) {\n if (operators[cur]) {\n nextOp = operators[cur];\n } else {\n if (nextOp) {\n res = nextOp(res, cur);\n nextOp = null;\n } else {\n res = +cur;\n }\n }\n }\n return res;\n};\nconst convertToVariableOrNumber = (v) => {\n const varOrVal = isVariable(v) ? v.variable : v;\n if (typeof varOrVal === \"number\") {\n return `${varOrVal}px`;\n }\n return varOrVal;\n};\nexport {\n calc\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,MAAM,YAAY;CAChB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;AACrB;AACA,MAAM,QAAQ,GAAG,uBAAuB;CACtC,IAAI,OAAO;EACT,IAAI,OAAO;EACX,KAAK,MAAM,OAAO,oBAAoB;GACpC,IAAI,UAAU,MAAM;IAClB,QAAQ,IAAI,IAAI;GAClB,OAAO;IACL,QAAQ,0BAA0B,GAAG;GACvC;EACF;EACA,OAAO,GAAG,KAAK;CACjB;CACA,IAAI,MAAM;CACV,IAAI,SAAS;CACb,KAAK,MAAM,OAAO,oBAAoB;EACpC,IAAI,UAAU,MAAM;GAClB,SAAS,UAAU;EACrB,OAAO;GACL,IAAI,QAAQ;IACV,MAAM,OAAO,KAAK,GAAG;IACrB,SAAS;GACX,OAAO;IACL,MAAM,CAAC;GACT;EACF;CACF;CACA,OAAO;AACT;AACA,MAAM,6BAA6B,MAAM;CACvC,MAAM,WAAW,WAAW,CAAC,IAAI,EAAE,WAAW;CAC9C,IAAI,OAAO,aAAa,UAAU;EAChC,OAAO,GAAG,SAAS;CACrB;CACA,OAAO;AACT"}
|
package/dist/esm/index.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVariable, isWeb } from "@tamagui/core";
|
|
2
2
|
|
|
3
3
|
const operators = {
|
|
4
4
|
"+": (a, b) => a + b,
|
|
@@ -35,7 +35,7 @@ const calc = (...valuesAndOperators) => {
|
|
|
35
35
|
return res;
|
|
36
36
|
};
|
|
37
37
|
const convertToVariableOrNumber = (v) => {
|
|
38
|
-
const varOrVal =
|
|
38
|
+
const varOrVal = isVariable(v) ? v.variable : v;
|
|
39
39
|
if (typeof varOrVal === "number") {
|
|
40
40
|
return `${varOrVal}px`;
|
|
41
41
|
}
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { isVariable, isWeb } from \"@tamagui/core\";\nconst operators = {\n \"+\": (a, b) => a + b,\n \"-\": (a, b) => a - b,\n \"/\": (a, b) => a / b,\n \"*\": (a, b) => a * b\n};\nconst calc = (...valuesAndOperators) => {\n if (isWeb) {\n let res2 = \"calc(\";\n for (const cur of valuesAndOperators) {\n if (operators[cur]) {\n res2 += ` ${cur} `;\n } else {\n res2 += convertToVariableOrNumber(cur);\n }\n }\n return `${res2})`;\n }\n let res = 0;\n let nextOp = null;\n for (const cur of valuesAndOperators) {\n if (operators[cur]) {\n nextOp = operators[cur];\n } else {\n if (nextOp) {\n res = nextOp(res, cur);\n nextOp = null;\n } else {\n res = +cur;\n }\n }\n }\n return res;\n};\nconst convertToVariableOrNumber = (v) => {\n const varOrVal = isVariable(v) ? v.variable : v;\n if (typeof varOrVal === \"number\") {\n return `${varOrVal}px`;\n }\n return varOrVal;\n};\nexport {\n calc\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,MAAM,YAAY;CAChB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;CACnB,MAAM,GAAG,MAAM,IAAI;AACrB;AACA,MAAM,QAAQ,GAAG,uBAAuB;CACtC,IAAI,OAAO;EACT,IAAI,OAAO;EACX,KAAK,MAAM,OAAO,oBAAoB;GACpC,IAAI,UAAU,MAAM;IAClB,QAAQ,IAAI,IAAI;GAClB,OAAO;IACL,QAAQ,0BAA0B,GAAG;GACvC;EACF;EACA,OAAO,GAAG,KAAK;CACjB;CACA,IAAI,MAAM;CACV,IAAI,SAAS;CACb,KAAK,MAAM,OAAO,oBAAoB;EACpC,IAAI,UAAU,MAAM;GAClB,SAAS,UAAU;EACrB,OAAO;GACL,IAAI,QAAQ;IACV,MAAM,OAAO,KAAK,GAAG;IACrB,SAAS;GACX,OAAO;IACL,MAAM,CAAC;GACT;EACF;CACF;CACA,OAAO;AACT;AACA,MAAM,6BAA6B,MAAM;CACvC,MAAM,WAAW,WAAW,CAAC,IAAI,EAAE,WAAW;CAC9C,IAAI,OAAO,aAAa,UAAU;EAChC,OAAO,GAAG,SAAS;CACrB;CACA,OAAO;AACT"}
|
package/dist/esm/index.native.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVariable, isWeb } from "@tamagui/core";
|
|
2
2
|
|
|
3
3
|
var operators = {
|
|
4
4
|
"+": function(a, b) {
|
|
@@ -80,7 +80,7 @@ var calc = function() {
|
|
|
80
80
|
return res1;
|
|
81
81
|
};
|
|
82
82
|
var convertToVariableOrNumber = function(v) {
|
|
83
|
-
var varOrVal =
|
|
83
|
+
var varOrVal = isVariable(v) ? v.variable : v;
|
|
84
84
|
if (typeof varOrVal === "number") {
|
|
85
85
|
return `${varOrVal}px`;
|
|
86
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.native.js","names":[],"sources":["esm/index.native.js"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"index.native.js","names":[],"sources":["esm/index.native.js"],"sourcesContent":["import { isVariable, isWeb } from \"@tamagui/core\";\nvar operators = {\n \"+\": function(a, b) {\n return a + b;\n },\n \"-\": function(a, b) {\n return a - b;\n },\n \"/\": function(a, b) {\n return a / b;\n },\n \"*\": function(a, b) {\n return a * b;\n }\n};\nvar calc = function() {\n for (var _len = arguments.length, valuesAndOperators = new Array(_len), _key = 0; _key < _len; _key++) {\n valuesAndOperators[_key] = arguments[_key];\n }\n if (isWeb) {\n var res = \"calc(\";\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = valuesAndOperators[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var cur = _step.value;\n if (operators[cur]) {\n res += ` ${cur} `;\n } else {\n res += convertToVariableOrNumber(cur);\n }\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n return `${res})`;\n }\n var res1 = 0;\n var nextOp = null;\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = valuesAndOperators[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var cur1 = _step1.value;\n if (operators[cur1]) {\n nextOp = operators[cur1];\n } else {\n if (nextOp) {\n res1 = nextOp(res1, cur1);\n nextOp = null;\n } else {\n res1 = +cur1;\n }\n }\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n return res1;\n};\nvar convertToVariableOrNumber = function(v) {\n var varOrVal = isVariable(v) ? v.variable : v;\n if (typeof varOrVal === \"number\") {\n return `${varOrVal}px`;\n }\n return varOrVal;\n};\nexport {\n calc\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,IAAI,YAAY;CACd,KAAK,SAAS,GAAG,GAAG;EAClB,OAAO,IAAI;CACb;CACA,KAAK,SAAS,GAAG,GAAG;EAClB,OAAO,IAAI;CACb;CACA,KAAK,SAAS,GAAG,GAAG;EAClB,OAAO,IAAI;CACb;CACA,KAAK,SAAS,GAAG,GAAG;EAClB,OAAO,IAAI;CACb;AACF;AACA,IAAI,OAAO,WAAW;CACpB,KAAK,IAAI,OAAO,UAAU,QAAQ,qBAAqB,IAAI,MAAM,IAAI,GAAG,OAAO,GAAG,OAAO,MAAM,QAAQ;EACrG,mBAAmB,QAAQ,UAAU;CACvC;CACA,IAAI,OAAO;EACT,IAAI,MAAM;EACV,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;EACvF,IAAI;GACF,KAAK,IAAI,YAAY,mBAAmB,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;IACnK,IAAI,MAAM,MAAM;IAChB,IAAI,UAAU,MAAM;KAClB,OAAO,IAAI,IAAI;IACjB,OAAO;KACL,OAAO,0BAA0B,GAAG;IACtC;GACF;EACF,SAAS,KAAK;GACZ,oBAAoB;GACpB,iBAAiB;EACnB,UAAU;GACR,IAAI;IACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;KAC1D,UAAU,OAAO;IACnB;GACF,UAAU;IACR,IAAI,mBAAmB;KACrB,MAAM;IACR;GACF;EACF;EACA,OAAO,GAAG,IAAI;CAChB;CACA,IAAI,OAAO;CACX,IAAI,SAAS;CACb,IAAI,6BAA6B,MAAM,qBAAqB,OAAO,kBAAkB,KAAK;CAC1F,IAAI;EACF,KAAK,IAAI,aAAa,mBAAmB,OAAO,SAAS,CAAC,GAAG,QAAQ,EAAE,8BAA8B,SAAS,WAAW,KAAK,EAAC,CAAE,OAAO,6BAA6B,MAAM;GACzK,IAAI,OAAO,OAAO;GAClB,IAAI,UAAU,OAAO;IACnB,SAAS,UAAU;GACrB,OAAO;IACL,IAAI,QAAQ;KACV,OAAO,OAAO,MAAM,IAAI;KACxB,SAAS;IACX,OAAO;KACL,OAAO,CAAC;IACV;GACF;EACF;CACF,SAAS,KAAK;EACZ,qBAAqB;EACrB,kBAAkB;CACpB,UAAU;EACR,IAAI;GACF,IAAI,CAAC,8BAA8B,WAAW,UAAU,MAAM;IAC5D,WAAW,OAAO;GACpB;EACF,UAAU;GACR,IAAI,oBAAoB;IACtB,MAAM;GACR;EACF;CACF;CACA,OAAO;AACT;AACA,IAAI,4BAA4B,SAAS,GAAG;CAC1C,IAAI,WAAW,WAAW,CAAC,IAAI,EAAE,WAAW;CAC5C,IAAI,OAAO,aAAa,UAAU;EAChC,OAAO,GAAG,SAAS;CACrB;CACA,OAAO;AACT"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/calc",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.889.1",
|
|
4
4
|
"files": [
|
|
5
5
|
"src",
|
|
6
6
|
"types",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"clean:build": "tamagui-build clean:build"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@tamagui/core": "3.0.0-beta.
|
|
36
|
+
"@tamagui/core": "3.0.0-beta.889.1"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@tamagui/build": "3.0.0-beta.
|
|
39
|
+
"@tamagui/build": "3.0.0-beta.889.1"
|
|
40
40
|
},
|
|
41
41
|
"repository": {
|
|
42
42
|
"type": "git",
|
package/src/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVariable, isWeb } from '@tamagui/core'
|
|
2
2
|
import type {
|
|
3
3
|
FontLineHeightTokens,
|
|
4
4
|
FontSizeTokens,
|
|
@@ -64,7 +64,7 @@ export const calc = (...valuesAndOperators: (CalcVal | Operator)[]): string | nu
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
const convertToVariableOrNumber = (v: any): string => {
|
|
67
|
-
const varOrVal =
|
|
67
|
+
const varOrVal = isVariable(v) ? v.variable : v
|
|
68
68
|
if (typeof varOrVal === 'number') {
|
|
69
69
|
return `${varOrVal}px`
|
|
70
70
|
}
|
package/types/index.d.ts.map
CHANGED
|
@@ -6,6 +6,6 @@
|
|
|
6
6
|
],
|
|
7
7
|
"version": 3,
|
|
8
8
|
"sourcesContent": [
|
|
9
|
-
"import {
|
|
9
|
+
"import { isVariable, isWeb } from '@tamagui/core'\nimport type {\n FontLineHeightTokens,\n FontSizeTokens,\n SizeTokens,\n SpaceTokens,\n} from '@tamagui/core'\n\n// unused code - not exported could be used for cross compat calc() functions\n\n/**\n * Simple calc() that handles native + web\n * on web: outputs a calc() string\n * on native: outputs a plain number\n */\n\nexport type CalcVal =\n | string\n | number\n | SizeTokens\n | SpaceTokens\n | FontSizeTokens\n | FontLineHeightTokens\n\nconst operators = {\n '+': (a: number, b: number): number => a + b,\n '-': (a: number, b: number): number => a - b,\n '/': (a: number, b: number): number => a / b,\n '*': (a: number, b: number): number => a * b,\n}\n\ntype Operator = keyof typeof operators\n\nexport const calc = (...valuesAndOperators: (CalcVal | Operator)[]): string | number => {\n if (isWeb) {\n let res = 'calc('\n for (const cur of valuesAndOperators) {\n if (operators[cur as any]) {\n // spaces are significant\n res += ` ${cur} `\n } else {\n res += convertToVariableOrNumber(cur)\n }\n }\n return `${res})`\n }\n\n let res = 0\n let nextOp: any = null\n for (const cur of valuesAndOperators) {\n if (operators[cur as any]) {\n nextOp = operators[cur as any]\n } else {\n if (nextOp) {\n res = nextOp(res, cur)\n nextOp = null\n } else {\n res = +cur\n }\n }\n }\n\n return res\n}\n\nconst convertToVariableOrNumber = (v: any): string => {\n const varOrVal = isVariable(v) ? v.variable : v\n if (typeof varOrVal === 'number') {\n return `${varOrVal}px`\n }\n return varOrVal\n}\n"
|
|
10
10
|
]
|
|
11
11
|
}
|