@tamagui/core 1.0.1-beta.151 → 1.0.1-beta.152

package/src/createVariable.ts

@@ -36,9 +36,10 @@ export const createVariable = <A extends string | number = any>(props: VariableI
 }
 
 // on the client maybe we can change the prototype of variable object toString to keep backwards compat
-export function variableToString(vrble?: any) {
+export function variableToString(vrble?: any, getValue = false) {
   if (!vrble) return ''
   if (isVariable(vrble)) {
+    if (getValue) return `${vrble.val}`
     return `${isWeb ? vrble.variable : vrble.val}`
   }
   return `${vrble}`

package/src/helpers/createMediaStyle.ts

@@ -27,9 +27,9 @@ export const createMediaStyle = (
     ogPrefix,
     `${ogPrefix}${MEDIA_SEP}${mediaKey}${negKey}${MEDIA_SEP}`
   )}`
-  const screenStr = negate ? 'not all' : 'screen'
+  const screenStr = negate ? 'not all and' : ''
   const mediaSelector = mediaObjectToString(mediaQueries[mediaKey])
-  const mediaQuery = `${screenStr} and ${mediaSelector}`
+  const mediaQuery = `${screenStr} ${mediaSelector}`
   const styleInner = rules.map((rule) => rule.replace(identifier, nextIdentifier)).join(';')
   // combines media queries if they already exist
   let styleRule = ''

package/src/insertFont.ts

@@ -48,6 +48,7 @@ export function registerFontVariables(parsedFont: any) {
   const response: string[] = []
 
   for (const fkey in parsedFont) {
+    if (fkey === 'face') continue
     if (fkey === 'family') {
       const val = parsedFont[fkey] as Variable
       registerCSSVariable(val)

package/types/createVariable.d.ts

@@ -18,7 +18,7 @@ export declare const createVariable: <A extends string | number = any>(props: Va
     isFloating?: boolean | undefined;
     __isVar__: boolean;
 };
-export declare function variableToString(vrble?: any): string;
+export declare function variableToString(vrble?: any, getValue?: boolean): string;
 export declare function isVariable(v: Variable | any): v is Variable;
 export declare function getVariableValue(v: Variable | any): any;
 export declare function getVariableName(v: Variable | any): any;

package/src/helpers/cssHash.ts

@@ -1,28 +0,0 @@
-import { simpleHash } from '@tamagui/helpers'
-
-// not sure it's worth the extra weight, could be dev time though
-// affordances for simple values
-export function cssHash(val: string, maxLen = 10) {
-  if (val.length < maxLen) {
-    let res = ''
-    for (let i = 0; i < val.length; i++) {
-      const char = val[i]
-      if (specials[char]) {
-        res += specials[char]
-      } else {
-        res += validCSS.test(char) ? char : '_' + char.charCodeAt(0).toString()
-      }
-    }
-    return res
-  }
-  return simpleHash(val)
-}
-
-const validCSS = /[a-z0-9]/i
-
-const specials = {
-  '.': 'dot',
-  ',': '_',
-  '%': 'pct',
-  '-': 'neg',
-}