@tamagui/core 1.1.1 → 1.1.2

package/dist/cjs/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number | Variable = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,qBAA2B;AAE3B,oBAA0B;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAC5B,UACgB;AAChB,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,UAAM,2BAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,yBAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,0BAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,aAAS,yBAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,WAAO,2BAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/dist/esm/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number | Variable = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
   "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAE3B,SAAS,iBAAiB;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAC5B,UACgB;AAChB,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,MAAM,WAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,QAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,SAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,SAAS,UAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,OAAO,WAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -30,22 +30,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "^1.1.1",
-    "@tamagui/constants": "^1.1.1",
-    "@tamagui/helpers": "^1.1.1",
-    "@tamagui/normalize-css-color": "^1.1.1",
-    "@tamagui/react-native-use-pressable": "^1.1.1",
-    "@tamagui/react-native-use-responder-events": "^1.1.1",
-    "@tamagui/use-did-finish-ssr": "^1.1.1",
-    "@tamagui/use-event": "^1.1.1",
-    "@tamagui/use-force-update": "^1.1.1"
+    "@tamagui/compose-refs": "^1.1.2",
+    "@tamagui/constants": "^1.1.2",
+    "@tamagui/helpers": "^1.1.2",
+    "@tamagui/normalize-css-color": "^1.1.2",
+    "@tamagui/react-native-use-pressable": "^1.1.2",
+    "@tamagui/react-native-use-responder-events": "^1.1.2",
+    "@tamagui/use-did-finish-ssr": "^1.1.2",
+    "@tamagui/use-event": "^1.1.2",
+    "@tamagui/use-force-update": "^1.1.2"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.1.1",
+    "@tamagui/build": "^1.1.2",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/createVariable.ts

@@ -21,7 +21,7 @@ export interface Variable<A = any> {
 export type MakeVariable<A = any> = A extends string | number ? Variable<A> : A
 
 type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>
-export const createVariable = <A extends string | number = any>(
+export const createVariable = <A extends string | number | Variable = any>(
   props: VariableIn<A>
 ): Variable<A> => {
   if (isVariable(props)) return props

package/types/createVariable.d.ts

@@ -12,7 +12,7 @@ export interface Variable<A = any> {
 }
 export type MakeVariable<A = any> = A extends string | number ? Variable<A> : A;
 type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>;
-export declare const createVariable: <A extends string | number = any>(props: VariableIn<A>) => Variable<A>;
+export declare const createVariable: <A extends string | number | Variable<any> = any>(props: VariableIn<A>) => Variable<A>;
 export declare function variableToString(vrble?: any, getValue?: boolean): string;
 export declare function isVariable(v: Variable | any): v is Variable;
 export declare function getVariable(nameOrVariable: Variable | string): string;