@tamagui/core 1.0.7 → 1.0.9

package/src/helpers/normalizeColor.ts

@@ -1,54 +1,30 @@
 import { isWeb } from '@tamagui/constants'
-import normalizeCSSColor from 'normalize-css-color'
+import normalizeCSSColor, { rgba } from '@tamagui/normalize-css-color'
 
-export const normalizeColor = (color?: number | string | null, opacity?: number) => {
-  if (color == null || color === undefined) {
+export { rgba } from '@tamagui/normalize-css-color'
+
+export const normalizeColor = (color?: string | null, opacity?: number) => {
+  if (color === null || color === undefined) {
     return
   }
+  if (color === 'transparent') {
+    return `rgba(0,0,0,0)`
+  }
   if (
     color[0] === '$' ||
-    (isWeb &&
-      typeof color === 'string' &&
-      (webColors[color] || color[0] === '_' || color.startsWith('var(')))
+    (isWeb && (webColors[color] || color[0] === '_' || color.startsWith('var(')))
   ) {
     return color
-  } else {
-    const rgba = colorToRGBA(color)
-    if (rgba != null) {
-      const [r, g, b, a] = rgba
-      const alpha = (opacity ?? a).toFixed(2)
-      return `rgba(${r},${g},${b},${alpha})`
-    }
   }
-  return color
+  const colorProcessed = normalizeCSSColor(color)
+  if (colorProcessed !== null) {
+    const { r, g, b, a } = rgba(colorProcessed)
+    return `rgba(${r},${g},${b},${a.toFixed(2)})`
+  }
 }
 
 const webColors = {
   currentColor: true,
   currentcolor: true,
-  transparent: true,
   inherit: true,
 }
-
-export function colorToRGBA(color: string | number) {
-  const ci = processColor(color)
-  if (ci != null) {
-    const r = (ci >> 16) & 255
-    const g = (ci >> 8) & 255
-    const b = ci & 255
-    const a = ((ci >> 24) & 255) / 255
-    return [r, g, b, a] as const
-  }
-  return null
-}
-
-const processColor = (color?: number | string) => {
-  if (color === undefined || color === null) {
-    return null
-  }
-  const intColor = normalizeCSSColor(color)
-  if (intColor === undefined || intColor === null) {
-    return null
-  }
-  return ((+intColor << 24) | (+intColor >>> 8)) >>> 0
-}

package/src/helpers/normalizeValueWithProperty.ts

@@ -27,7 +27,7 @@ export function normalizeValueWithProperty(value: any, property?: string): any {
     res = `${value}px`
   } else if (isWeb && property !== undefined && stringNumbers[property]) {
     res = `${res}`
-  } else if (property && colorProps[property]) {
+  } else if (property && property in colorProps) {
     res = normalizeColor(value)
     cache[value] = res
   }

package/types/config.d.ts

@@ -43,4 +43,5 @@ export declare const getThemes: () => {
 export declare const configListeners: Set<ConfigListener>;
 export declare const onConfiguredOnce: (cb: ConfigListener) => void;
 export declare const updateConfig: (key: string, value: any) => void;
+export declare const getFont: (name: string) => import("./types").GenericFont<string | number>;
 //# sourceMappingURL=config.d.ts.map

package/types/helpers/normalizeColor.d.ts

@@ -1,3 +1,3 @@
-export declare const normalizeColor: (color?: number | string | null, opacity?: number) => string | number | undefined;
-export declare function colorToRGBA(color: string | number): readonly [number, number, number, number] | null;
+export { rgba } from '@tamagui/normalize-css-color';
+export declare const normalizeColor: (color?: string | null, opacity?: number) => string | undefined;
 //# sourceMappingURL=normalizeColor.d.ts.map