@tamagui/calc 1.122.5 → 1.122.7
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.js.map +1 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js.map +1 -1
- package/package.json +3 -3
- package/src/index.ts +6 -6
- package/types/index.d.ts +10 -9
- package/types/index.d.ts.map +14 -1
package/dist/cjs/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2C;AAwB3C,MAAM,YAAY;AAAA,EAChB,KAAK,CAAC,GAAW,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2C;AAwB3C,MAAM,YAAY;AAAA,EAChB,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAC7C,GAIa,OAAO,IAAI,uBAAgE;AACtF,MAAI,mBAAO;AACT,QAAIA,OAAM;AACV,eAAW,OAAO;AAChB,MAAI,UAAU,GAAU,IAEtBA,QAAO,IAAI,GAAG,MAEdA,QAAO,0BAA0B,GAAG;AAGxC,WAAO,GAAGA,IAAG;AAAA,EACf;AAEA,MAAI,MAAM,GACN,SAAc;AAClB,aAAW,OAAO;AAChB,IAAI,UAAU,GAAU,IACtB,SAAS,UAAU,GAAU,IAEzB,UACF,MAAM,OAAO,KAAK,GAAG,GACrB,SAAS,QAET,MAAM,CAAC;AAKb,SAAO;AACT,GAEM,4BAA4B,CAAC,MAAmB;AACpD,QAAM,eAAW,iCAAoB,CAAC;AACtC,SAAI,OAAO,YAAa,WACf,GAAG,QAAQ,OAEb;AACT;",
|
|
5
5
|
"names": ["res"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/tamagui/code/core/calc/src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;kBAA2C,0BAwBrCA,YAAY;EAChB,KAAK,SAACC,GAAWC,GAAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;kBAA2C,0BAwBrCA,YAAY;EAChB,KAAK,SAACC,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;AAC7C,GAIaC,OAAO,WAAA;oCAAIC,qBAAAA,IAAAA,MAAAA,IAAAA,GAAAA,OAAAA,GAAAA,OAAAA,MAAAA;AAAAA,uBAAAA,IAAAA,IAAAA,UAAAA,IAAAA;AACtB,MAAIC,mBAAO;AACT,QAAIC,MAAM,SACL,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,eAAK,YAAaF,mBAAAA,OAAAA,QAAAA,EAAAA,GAAb,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAAiC;AAAjC,YAAMG,MAAN,MAAA;AACH,QAAIP,UAAUO,GAAAA,IAEZD,OAAO,IAAIC,GAAAA,MAEXD,OAAOE,0BAA0BD,GAAAA;MAErC;;AAPK,0BAAA,IAAA,iBAAA;;;SAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;YAAA;gBAAA;;;AAQL,WAAO,GAAGD,GAAAA;EACZ;AAEA,MAAIA,OAAM,GACNG,SAAc,MACb,6BAAA,IAAA,qBAAA,IAAA,kBAAA;;AAAL,aAAK,aAAaL,mBAAAA,OAAAA,QAAAA,EAAAA,GAAb,QAAA,EAAA,8BAAA,SAAA,WAAA,KAAA,GAAA,OAAA,6BAAA,IAAiC;AAAjC,UAAMG,OAAN,OAAA;AACH,MAAIP,UAAUO,IAAAA,IACZE,SAAST,UAAUO,IAAAA,IAEfE,UACFH,OAAMG,OAAOH,MAAKC,IAAAA,GAClBE,SAAS,QAETH,OAAM,CAACC;IAGb;;AAXK,yBAAA,IAAA,kBAAA;;;OAAA,8BAAA,WAAA,UAAA,QAAA,WAAA,OAAA;;UAAA;cAAA;;;AAaL,SAAOD;AACT,GAEME,4BAA4B,SAACE,GAAAA;AACjC,MAAMC,eAAWC,iCAAoBF,CAAAA;AACrC,SAAI,OAAOC,YAAa,WACf,GAAGA,QAAAA,OAELA;AACT;",
|
|
5
5
|
"names": ["operators", "a", "b", "calc", "valuesAndOperators", "isWeb", "res", "cur", "convertToVariableOrNumber", "nextOp", "v", "varOrVal", "getVariableVariable"]
|
|
6
6
|
}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,qBAAqB,aAAa;AAwB3C,MAAM,YAAY;AAAA,EAChB,KAAK,CAAC,GAAW,
|
|
4
|
+
"mappings": "AAAA,SAAS,qBAAqB,aAAa;AAwB3C,MAAM,YAAY;AAAA,EAChB,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAAA,EAC3C,KAAK,CAAC,GAAW,MAAsB,IAAI;AAC7C,GAIa,OAAO,IAAI,uBAAgE;AACtF,MAAI,OAAO;AACT,QAAIA,OAAM;AACV,eAAW,OAAO;AAChB,MAAI,UAAU,GAAU,IAEtBA,QAAO,IAAI,GAAG,MAEdA,QAAO,0BAA0B,GAAG;AAGxC,WAAO,GAAGA,IAAG;AAAA,EACf;AAEA,MAAI,MAAM,GACN,SAAc;AAClB,aAAW,OAAO;AAChB,IAAI,UAAU,GAAU,IACtB,SAAS,UAAU,GAAU,IAEzB,UACF,MAAM,OAAO,KAAK,GAAG,GACrB,SAAS,QAET,MAAM,CAAC;AAKb,SAAO;AACT,GAEM,4BAA4B,CAAC,MAAmB;AACpD,QAAM,WAAW,oBAAoB,CAAC;AACtC,SAAI,OAAO,YAAa,WACf,GAAG,QAAQ,OAEb;AACT;",
|
|
5
5
|
"names": ["res"]
|
|
6
6
|
}
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getVariableVariable","isWeb","operators","+","a","b","-","/","*","calc","valuesAndOperators","res2","cur","convertToVariableOrNumber","res","nextOp","v","varOrVal"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,mBAAA,EAAqBC,KAAA,QAAa;AAwB3C,MAAMC,SAAA,GAAY;IAChB,KAAKC,CAACC,CAAA,EAAWC,CAAA,
|
|
1
|
+
{"version":3,"names":["getVariableVariable","isWeb","operators","+","a","b","-","/","*","calc","valuesAndOperators","res2","cur","convertToVariableOrNumber","res","nextOp","v","varOrVal"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,mBAAA,EAAqBC,KAAA,QAAa;AAwB3C,MAAMC,SAAA,GAAY;IAChB,KAAKC,CAACC,CAAA,EAAWC,CAAA,KAAsBD,CAAA,GAAIC,CAAA;IAC3C,KAAKC,CAACF,CAAA,EAAWC,CAAA,KAAsBD,CAAA,GAAIC,CAAA;IAC3C,KAAKE,CAACH,CAAA,EAAWC,CAAA,KAAsBD,CAAA,GAAIC,CAAA;IAC3C,KAAKG,CAACJ,CAAA,EAAWC,CAAA,KAAsBD,CAAA,GAAIC;EAC7C;EAIaI,IAAA,GAAOA,CAAA,GAAIC,kBAAA,KAAgE;IACtF,IAAIT,KAAA,EAAO;MACT,IAAIU,IAAA,GAAM;MACV,WAAWC,GAAA,IAAOF,kBAAA,EACZR,SAAA,CAAUU,GAAU,IAEtBD,IAAA,IAAO,IAAIC,GAAG,MAEdD,IAAA,IAAOE,yBAAA,CAA0BD,GAAG;MAGxC,OAAO,GAAGD,IAAG;IACf;IAEA,IAAIG,GAAA,GAAM;MACNC,MAAA,GAAc;IAClB,WAAWH,GAAA,IAAOF,kBAAA,EACZR,SAAA,CAAUU,GAAU,IACtBG,MAAA,GAASb,SAAA,CAAUU,GAAU,IAEzBG,MAAA,IACFD,GAAA,GAAMC,MAAA,CAAOD,GAAA,EAAKF,GAAG,GACrBG,MAAA,GAAS,QAETD,GAAA,GAAM,CAACF,GAAA;IAKb,OAAOE,GAAA;EACT;EAEMD,yBAAA,GAA6BG,CAAA,IAAmB;IACpD,MAAMC,QAAA,GAAWjB,mBAAA,CAAoBgB,CAAC;IACtC,OAAI,OAAOC,QAAA,IAAa,WACf,GAAGA,QAAQ,OAEbA,QAAA;EACT","ignoreList":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/tamagui/code/core/calc/src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,qBAAqBC,aAAa;AAwB3C,IAAMC,YAAY;EAChB,KAAK,SAACC,GAAWC,GAAAA;
|
|
4
|
+
"mappings": "AAAA,SAASA,qBAAqBC,aAAa;AAwB3C,IAAMC,YAAY;EAChB,KAAK,SAACC,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;EAC3C,KAAK,SAACD,GAAWC,GAAAA;WAAsBD,IAAIC;;AAC7C,GAIaC,OAAO,WAAA;oCAAIC,qBAAAA,IAAAA,MAAAA,IAAAA,GAAAA,OAAAA,GAAAA,OAAAA,MAAAA;AAAAA,uBAAAA,IAAAA,IAAAA,UAAAA,IAAAA;AACtB,MAAIL,OAAO;AACT,QAAIM,MAAM,SACL,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,eAAK,YAAaD,mBAAAA,OAAAA,QAAAA,EAAAA,GAAb,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAAiC;AAAjC,YAAME,MAAN,MAAA;AACH,QAAIN,UAAUM,GAAAA,IAEZD,OAAO,IAAIC,GAAAA,MAEXD,OAAOE,0BAA0BD,GAAAA;MAErC;;AAPK,0BAAA,IAAA,iBAAA;;;SAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;YAAA;gBAAA;;;AAQL,WAAO,GAAGD,GAAAA;EACZ;AAEA,MAAIA,OAAM,GACNG,SAAc,MACb,6BAAA,IAAA,qBAAA,IAAA,kBAAA;;AAAL,aAAK,aAAaJ,mBAAAA,OAAAA,QAAAA,EAAAA,GAAb,QAAA,EAAA,8BAAA,SAAA,WAAA,KAAA,GAAA,OAAA,6BAAA,IAAiC;AAAjC,UAAME,OAAN,OAAA;AACH,MAAIN,UAAUM,IAAAA,IACZE,SAASR,UAAUM,IAAAA,IAEfE,UACFH,OAAMG,OAAOH,MAAKC,IAAAA,GAClBE,SAAS,QAETH,OAAM,CAACC;IAGb;;AAXK,yBAAA,IAAA,kBAAA;;;OAAA,8BAAA,WAAA,UAAA,QAAA,WAAA,OAAA;;UAAA;cAAA;;;AAaL,SAAOD;AACT,GAEME,4BAA4B,SAACE,GAAAA;AACjC,MAAMC,WAAWZ,oBAAoBW,CAAAA;AACrC,SAAI,OAAOC,YAAa,WACf,GAAGA,QAAAA,OAELA;AACT;",
|
|
5
5
|
"names": ["getVariableVariable", "isWeb", "operators", "a", "b", "calc", "valuesAndOperators", "res", "cur", "convertToVariableOrNumber", "nextOp", "v", "varOrVal"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/calc",
|
|
3
|
-
"version": "1.122.
|
|
3
|
+
"version": "1.122.7",
|
|
4
4
|
"types": "./types/index.d.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@tamagui/core": "1.122.
|
|
34
|
+
"@tamagui/core": "1.122.7"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@tamagui/build": "1.122.
|
|
37
|
+
"@tamagui/build": "1.122.7"
|
|
38
38
|
},
|
|
39
39
|
"publishConfig": {
|
|
40
40
|
"access": "public"
|
package/src/index.ts
CHANGED
|
@@ -23,15 +23,15 @@ export type CalcVal =
|
|
|
23
23
|
| FontLineHeightTokens
|
|
24
24
|
|
|
25
25
|
const operators = {
|
|
26
|
-
'+': (a: number, b: number) => a + b,
|
|
27
|
-
'-': (a: number, b: number) => a - b,
|
|
28
|
-
'/': (a: number, b: number) => a / b,
|
|
29
|
-
'*': (a: number, b: number) => a * b,
|
|
26
|
+
'+': (a: number, b: number): number => a + b,
|
|
27
|
+
'-': (a: number, b: number): number => a - b,
|
|
28
|
+
'/': (a: number, b: number): number => a / b,
|
|
29
|
+
'*': (a: number, b: number): number => a * b,
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
type Operator = keyof typeof operators
|
|
33
33
|
|
|
34
|
-
export const calc = (...valuesAndOperators: (CalcVal | Operator)[]) => {
|
|
34
|
+
export const calc = (...valuesAndOperators: (CalcVal | Operator)[]): string | number => {
|
|
35
35
|
if (isWeb) {
|
|
36
36
|
let res = 'calc('
|
|
37
37
|
for (const cur of valuesAndOperators) {
|
|
@@ -63,7 +63,7 @@ export const calc = (...valuesAndOperators: (CalcVal | Operator)[]) => {
|
|
|
63
63
|
return res
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
const convertToVariableOrNumber = (v: any) => {
|
|
66
|
+
const convertToVariableOrNumber = (v: any): string => {
|
|
67
67
|
const varOrVal = getVariableVariable(v)
|
|
68
68
|
if (typeof varOrVal === 'number') {
|
|
69
69
|
return `${varOrVal}px`
|
package/types/index.d.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import type { FontLineHeightTokens, FontSizeTokens, SizeTokens, SpaceTokens } from
|
|
1
|
+
import type { FontLineHeightTokens, FontSizeTokens, SizeTokens, SpaceTokens } from "@tamagui/core";
|
|
2
2
|
/**
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
* Simple calc() that handles native + web
|
|
4
|
+
* on web: outputs a calc() string
|
|
5
|
+
* on native: outputs a plain number
|
|
6
|
+
*/
|
|
7
7
|
export type CalcVal = string | number | SizeTokens | SpaceTokens | FontSizeTokens | FontLineHeightTokens;
|
|
8
8
|
declare const operators: {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
"+": (a: number, b: number) => number;
|
|
10
|
+
"-": (a: number, b: number) => number;
|
|
11
|
+
"/": (a: number, b: number) => number;
|
|
12
|
+
"*": (a: number, b: number) => number;
|
|
13
13
|
};
|
|
14
14
|
type Operator = keyof typeof operators;
|
|
15
15
|
export declare const calc: (...valuesAndOperators: (CalcVal | Operator)[]) => string | number;
|
|
16
16
|
export {};
|
|
17
|
+
|
|
17
18
|
//# sourceMappingURL=index.d.ts.map
|
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1,14 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"mappings": "AACA,cACE,sBACA,gBACA,YACA,mBACK,eAAe;;;;;;AAUtB,YAAY,4BAGR,aACA,cACA,iBACA;AAEJ,cAAM;CACJ,MAAMA,WAAWC;CACjB,MAAMD,WAAWC;CACjB,MAAMD,WAAWC;CACjB,MAAMD,WAAWC;;KAGd,wBAAwB;AAE7B,OAAO,cAAM,OAAQ,GAAG,qBAAqB,UAAU",
|
|
3
|
+
"names": [
|
|
4
|
+
"a: number",
|
|
5
|
+
"b: number"
|
|
6
|
+
],
|
|
7
|
+
"sources": [
|
|
8
|
+
"src/index.ts"
|
|
9
|
+
],
|
|
10
|
+
"sourcesContent": [
|
|
11
|
+
"import { getVariableVariable, 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 = getVariableVariable(v)\n if (typeof varOrVal === 'number') {\n return `${varOrVal}px`\n }\n return varOrVal\n}\n"
|
|
12
|
+
],
|
|
13
|
+
"version": 3
|
|
14
|
+
}
|