@tamagui/logo 1.0.1-rc.9 → 1.0.2

package/src/TamaguiLogo.tsx

@@ -1,40 +1,16 @@
-import { forwardRef, useEffect, useState } from 'react'
-import { Circle, ThemeName, XStack, XStackProps, YStack } from 'tamagui'
+import { forwardRef, memo, useEffect, useState } from 'react'
+import { Circle, XStack, XStackProps, YStack } from 'tamagui'
 
-export const tints: ThemeName[] = [
-  'orange',
-  'yellow',
-  'green',
-  'blue',
-  'purple',
-  'pink',
-  'red',
-]
-
-export const logoColors = tints.map((t) => `var(--${t}9)`)
+import { useTint } from './useTint'
 
 type LogoProps = {
-  onHoverLetter?: (i: number) => void
   showWords?: boolean
-  color?: string
   downscale?: number
-  pathPrefix?: string
   animated?: boolean
 } & XStackProps
 
 export const TamaguiLogo = forwardRef<any, LogoProps>(
-  (
-    {
-      showWords,
-      color,
-      downscale,
-      onHoverLetter,
-      pathPrefix,
-      animated,
-      ...props
-    }: LogoProps,
-    ref,
-  ) => {
+  ({ showWords, downscale, animated, ...props }: LogoProps, ref) => {
     return (
       <XStack
         tag="span"
@@ -44,157 +20,126 @@ export const TamaguiLogo = forwardRef<any, LogoProps>(
         space="$5"
         {...props}
       >
-        <LogoIcon
-          pathPrefix={pathPrefix}
-          downscale={(downscale ?? 1) * (showWords ? 2 : 1.5)}
-          color={color}
-        />
+        <LogoIcon downscale={(downscale ?? 1) * (showWords ? 2 : 1.5)} />
         {showWords && (
           <YStack tag="span" marginBottom={-4}>
-            <LogoWords
-              animated={animated}
-              onHoverLetter={onHoverLetter}
-              downscale={downscale ?? 2}
-              color={color}
-            />
+            <LogoWords animated={animated} downscale={downscale ?? 2} />
           </YStack>
         )}
       </XStack>
     )
-  },
-)
-
-export const LogoWords = ({
-  color,
-  downscale = 1,
-  onHoverLetter,
-  animated,
-}: {
-  color?: string
-  downscale?: number
-  onHoverLetter?: any
-  animated?: boolean
-}) => {
-  const [index, setIndex] = useState(3)
-  const [hovered, setHovered] = useState(false)
-  const [mounted, setMounted] = useState<'start' | 'animate' | 'done'>('start')
-
-  const updateHoveredLetter = (index: number) => {
-    setIndex(index)
-    setTimeout(() => {
-      onHoverLetter?.(index)
-    })
   }
+)
 
-  useEffect(() => {
-    setTimeout(() => {
-      setMounted('animate')
-    })
+export const LogoWords = memo(
+  ({ downscale = 1, animated }: { downscale?: number; animated?: boolean }) => {
+    const Tint = useTint()
+    const { tintIndex: index, tint } = Tint
+    const tints = Tint.tints.map((t) => `var(--${t}9)`)
+    const [hovered, setHovered] = useState(false)
+    const [mounted, setMounted] = useState<'start' | 'animate' | 'done'>('start')
 
-    setTimeout(() => {
-      setMounted('done')
-    }, 1500)
-  }, [])
+    useEffect(() => {
+      setTimeout(() => {
+        setMounted('animate')
+      })
 
-  useEffect(() => {
-    // temp hack
-    return globalThis['onChangeTint']?.((index) => {
-      setIndex(index)
-    })
-  }, [])
+      setTimeout(() => {
+        setMounted('done')
+      }, 1500)
+    }, [])
 
-  const getColor = (i: number) => {
-    const isActive = mounted !== 'start' && i === index
-    if (mounted !== 'done' || hovered) {
-      return isActive ? 'var(--color)' : logoColors[index]
-    }
-    if (hovered && isActive) {
-      return 'var(--color)'
+    const getColor = (i: number) => {
+      const isActive = mounted !== 'start' && i === index
+      if (mounted !== 'done' || hovered) {
+        return isActive ? 'var(--color)' : tints[index]
+      }
+      if (hovered && isActive) {
+        return 'var(--color)'
+      }
+      return tints[i]
     }
-    return logoColors[i]
-  }
 
-  const x =
-    index * 18.5 +
-    (18 / 2) * (index / logoColors.length) +
-    3 +
-    (index === 6 ? -3 : 0)
+    const x = Math.round(
+      index * 18.5 + (18 / 2) * (index / tints.length) + 3 + (index === 6 ? -3 : 0)
+    )
 
-  return (
-    <XStack
-      onHoverIn={() => setHovered(true)}
-      onHoverOut={() => setHovered(false)}
-      paddingVertical="$2"
-      marginVertical="$-2"
-      position="relative"
-    >
-      {animated && (
-        <Circle
-          animation="quick"
-          position="absolute"
-          top={0}
-          left={0}
-          y={mounted === 'start' ? -30 : -3}
-          // the last i is less wide
-          x={x}
-          size={4}
-          backgroundColor={logoColors[index]}
-        />
-      )}
-      <svg
-        width={373 * (1 / downscale) * 0.333333334}
-        height={41 * (1 / downscale) * 0.333333334}
-        viewBox="0 0 373 41"
+    return (
+      <XStack
+        onHoverIn={() => setHovered(true)}
+        onHoverOut={() => setHovered(false)}
+        paddingVertical="$2"
+        marginVertical="$-2"
+        position="relative"
       >
-        <polygon
-          shapeRendering="crispEdges"
-          fill={color || getColor(0)}
-          points="24.3870968 40.1612903 24.3870968 8.67741935 32.2580645 8.67741935 32.2580645 0.806451613 0.774193548 0.806451613 0.774193548 8.67741935 8.64516129 8.67741935 8.64516129 40.1612903"
-          onMouseEnter={() => updateHoveredLetter(0)}
-        />
-        <path
-          shapeRendering="crispEdges"
-          fill={color || getColor(1)}
-          d="M87.3548387,0.806451613 L87.3548387,8.67741935 L95.2258065,8.67741935 L95.2258065,40.1612903 L79.483871,40.1612903 L79.483871,24.4193548 L71.6129032,24.4193548 L71.6129032,40.1612903 L55.8709677,40.1612903 L55.8709677,8.67741935 L63.7419355,8.67741935 L63.7419355,0.806451613 L87.3548387,0.806451613 Z M79.483871,8.67741935 L71.6129032,8.67741935 L71.6129032,16.5483871 L79.483871,16.5483871 L79.483871,8.67741935 Z"
-          fillRule="nonzero"
-          onMouseEnter={() => updateHoveredLetter(1)}
-        />
-        <polygon
-          shapeRendering="crispEdges"
-          fill={color || getColor(2)}
-          points="130.645161 40.1612903 130.645161 22.4516129 138.516129 22.4516129 138.516129 40.1612903 154.258065 40.1612903 154.258065 0.806451613 142.451613 0.806451613 142.451613 8.67741935 126.709677 8.67741935 126.709677 0.806451613 114.903226 0.806451613 114.903226 40.1612903"
-          onMouseEnter={() => updateHoveredLetter(2)}
-        />
-        <path
-          fill={color || getColor(3)}
-          d="M205.419355,0.806451613 L205.419355,8.67741935 L213.290323,8.67741935 L213.290323,40.1612903 L197.548387,40.1612903 L197.548387,24.4193548 L189.677419,24.4193548 L189.677419,40.1612903 L173.935484,40.1612903 L173.935484,8.67741935 L181.806452,8.67741935 L181.806452,0.806451613 L205.419355,0.806451613 Z M197.548387,8.67741935 L189.677419,8.67741935 L189.677419,16.5483871 L197.548387,16.5483871 L197.548387,8.67741935 Z"
-          fillRule="nonzero"
-          onMouseEnter={() => updateHoveredLetter(3)}
-        />
-        <polygon
-          shapeRendering="crispEdges"
-          fill={color || getColor(4)}
-          points="264.451613 40.1612903 264.451613 32.2903226 272.322581 32.2903226 272.322581 16.5483871 256.580645 16.5483871 256.580645 32.2903226 248.709677 32.2903226 248.709677 8.67741935 272.322581 8.67741935 272.322581 0.806451613 240.83871 0.806451613 240.83871 8.67741935 232.967742 8.67741935 232.967742 32.2903226 240.83871 32.2903226 240.83871 40.1612903"
-          onMouseEnter={() => updateHoveredLetter(4)}
-        />
-        <polygon
-          shapeRendering="crispEdges"
-          fill={color || getColor(5)}
-          points="323.483871 40.1612903 323.483871 32.2903226 331.354839 32.2903226 331.354839 0.806451613 315.612903 0.806451613 315.612903 32.2903226 307.741935 32.2903226 307.741935 0.806451613 292 0.806451613 292 32.2903226 299.870968 32.2903226 299.870968 40.1612903"
-          onMouseEnter={() => updateHoveredLetter(5)}
-        />
-        <polygon
-          shapeRendering="crispEdges"
-          fill={color || getColor(6)}
-          points="372.677419 40.1612903 372.677419 0.806451613 356.935484 0.806451613 356.935484 40.1612903"
-          onMouseEnter={() => updateHoveredLetter(6)}
-        />
-      </svg>
-    </XStack>
-  )
-}
+        {animated && (
+          <Circle
+            animation="quick"
+            position="absolute"
+            top={0}
+            left={0}
+            y={mounted === 'start' ? -30 : -3}
+            // the last i is less wide
+            x={x}
+            size={4}
+            backgroundColor={tint}
+          />
+        )}
+        <svg
+          width={373 * (1 / downscale) * 0.333333334}
+          height={41 * (1 / downscale) * 0.333333334}
+          viewBox="0 0 373 41"
+        >
+          <polygon
+            shapeRendering="crispEdges"
+            fill={getColor(0)}
+            points="24.3870968 40.1612903 24.3870968 8.67741935 32.2580645 8.67741935 32.2580645 0.806451613 0.774193548 0.806451613 0.774193548 8.67741935 8.64516129 8.67741935 8.64516129 40.1612903"
+            onMouseEnter={() => Tint.setTintIndex(0)}
+          />
+          <path
+            shapeRendering="crispEdges"
+            fill={getColor(1)}
+            d="M87.3548387,0.806451613 L87.3548387,8.67741935 L95.2258065,8.67741935 L95.2258065,40.1612903 L79.483871,40.1612903 L79.483871,24.4193548 L71.6129032,24.4193548 L71.6129032,40.1612903 L55.8709677,40.1612903 L55.8709677,8.67741935 L63.7419355,8.67741935 L63.7419355,0.806451613 L87.3548387,0.806451613 Z M79.483871,8.67741935 L71.6129032,8.67741935 L71.6129032,16.5483871 L79.483871,16.5483871 L79.483871,8.67741935 Z"
+            fillRule="nonzero"
+            onMouseEnter={() => Tint.setTintIndex(1)}
+          />
+          <polygon
+            shapeRendering="crispEdges"
+            fill={getColor(2)}
+            points="130.645161 40.1612903 130.645161 22.4516129 138.516129 22.4516129 138.516129 40.1612903 154.258065 40.1612903 154.258065 0.806451613 142.451613 0.806451613 142.451613 8.67741935 126.709677 8.67741935 126.709677 0.806451613 114.903226 0.806451613 114.903226 40.1612903"
+            onMouseEnter={() => Tint.setTintIndex(2)}
+          />
+          <path
+            fill={getColor(3)}
+            d="M205.419355,0.806451613 L205.419355,8.67741935 L213.290323,8.67741935 L213.290323,40.1612903 L197.548387,40.1612903 L197.548387,24.4193548 L189.677419,24.4193548 L189.677419,40.1612903 L173.935484,40.1612903 L173.935484,8.67741935 L181.806452,8.67741935 L181.806452,0.806451613 L205.419355,0.806451613 Z M197.548387,8.67741935 L189.677419,8.67741935 L189.677419,16.5483871 L197.548387,16.5483871 L197.548387,8.67741935 Z"
+            fillRule="nonzero"
+            onMouseEnter={() => Tint.setTintIndex(3)}
+          />
+          <polygon
+            shapeRendering="crispEdges"
+            fill={getColor(4)}
+            points="264.451613 40.1612903 264.451613 32.2903226 272.322581 32.2903226 272.322581 16.5483871 256.580645 16.5483871 256.580645 32.2903226 248.709677 32.2903226 248.709677 8.67741935 272.322581 8.67741935 272.322581 0.806451613 240.83871 0.806451613 240.83871 8.67741935 232.967742 8.67741935 232.967742 32.2903226 240.83871 32.2903226 240.83871 40.1612903"
+            onMouseEnter={() => Tint.setTintIndex(4)}
+          />
+          <polygon
+            shapeRendering="crispEdges"
+            fill={getColor(5)}
+            points="323.483871 40.1612903 323.483871 32.2903226 331.354839 32.2903226 331.354839 0.806451613 315.612903 0.806451613 315.612903 32.2903226 307.741935 32.2903226 307.741935 0.806451613 292 0.806451613 292 32.2903226 299.870968 32.2903226 299.870968 40.1612903"
+            onMouseEnter={() => Tint.setTintIndex(5)}
+          />
+          <polygon
+            shapeRendering="crispEdges"
+            fill={getColor(6)}
+            points="372.677419 40.1612903 372.677419 0.806451613 356.935484 0.806451613 356.935484 40.1612903"
+            onMouseEnter={() => Tint.setTintIndex(6)}
+          />
+        </svg>
+      </XStack>
+    )
+  }
+)
 
-export const LogoIcon = ({ downscale = 2, pathPrefix }: any) => {
+export const LogoIcon = ({ downscale = 2 }: any) => {
   return (
     <YStack
       tag="span"
@@ -209,7 +154,7 @@ export const LogoIcon = ({ downscale = 2, pathPrefix }: any) => {
         className="tamagui-icon"
         width={450 / 8 / downscale}
         height={420 / 8 / downscale}
-        src={`${pathPrefix || ''}/tamagui-icon.svg`}
+        src={`/tamagui-icon.svg`}
       />
     </YStack>
   )

package/src/index.tsx

@@ -1 +1,3 @@
 export * from './TamaguiLogo'
+export * from './tints'
+export * from './useTint'

package/src/tints.tsx

@@ -0,0 +1,54 @@
+import { useEffect, useState } from 'react'
+import { ThemeName } from 'tamagui'
+
+const families = Object.freeze({
+  tamagui: ['orange', 'yellow', 'green', 'blue', 'purple', 'pink', 'red'],
+  xmas: ['red', 'green', 'red', 'green', 'red', 'green', 'red'],
+}) as {
+  [key in 'tamagui' | 'xmas']: ThemeName[]
+}
+
+type TintFamily = keyof typeof families
+
+let fam: TintFamily = 'tamagui'
+
+export function getTints() {
+  return {
+    name: fam || 'tamagui',
+    tints: families[fam] || families.tamagui,
+    families,
+  }
+}
+
+export function useTints() {
+  const [val, setVal] = useState(getTints())
+
+  useEffect(() => {
+    return onTintFamilyChange(() => {
+      setVal(getTints())
+    })
+  }, [])
+
+  return val
+}
+
+export const setTintFamily = (next: TintFamily) => {
+  if (!families[next]) throw `impossible`
+  fam = next
+  listeners.forEach((l) => l(next))
+}
+
+export const setNextTintFamily = () => {
+  setTintFamily(fam === 'tamagui' ? 'xmas' : 'tamagui')
+}
+
+type ChangeHandler = (next: TintFamily) => void
+
+const listeners = new Set<ChangeHandler>()
+
+export const onTintFamilyChange = (cb: ChangeHandler) => {
+  listeners.add(cb)
+  return () => {
+    listeners.delete(cb)
+  }
+}

package/src/useTint.tsx

@@ -0,0 +1,62 @@
+import { useMemo, useSyncExternalStore } from 'react'
+import { Theme, ThemeName } from 'tamagui'
+
+import { getTints, setNextTintFamily, useTints } from './tints'
+
+// TODO useSyncExternalStore
+
+// no localstorage because its not important to remember and causes a flicker
+// const tintVal = typeof localStorage !== 'undefined' ? localStorage.getItem('tint') : 0
+// const tint = tintVal ? +tintVal 0
+export const initialTint = 3
+
+let current = initialTint
+
+const listeners = new Set<Function>()
+
+export const onTintChange = (listener: (cur: number) => void) => {
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
+}
+
+const numTints = getTints().tints.length
+
+export const setTintIndex = (next: number) => {
+  const val = next % numTints
+  if (val === current) return
+  current = val
+  listeners.forEach((x) => x(val))
+}
+
+export const useTint = () => {
+  const index = useSyncExternalStore(
+    onTintChange,
+    () => current,
+    () => initialTint
+  )
+  const tintsContext = useTints()
+  const { tints } = tintsContext
+
+  return {
+    ...tintsContext,
+    tints: tintsContext.tints as ThemeName[],
+    tintIndex: index,
+    tint: tints[index] as ThemeName,
+    setTintIndex,
+    setNextTintFamily,
+    setNextTint: () => {
+      setTintIndex(index + 1)
+    },
+  } as const
+}
+
+export const ThemeTint = (props: { children: any }) => {
+  return (
+    <Theme name={useTint().tint}>
+      {/*  */}
+      {useMemo(() => props.children, [props.children])}
+    </Theme>
+  )
+}

package/types/TamaguiLogo.d.ts

@@ -1,29 +1,21 @@
 /// <reference types="react" />
-import { ThemeName } from 'tamagui';
-export declare const tints: ThemeName[];
-export declare const logoColors: string[];
 export declare const TamaguiLogo: import("react").ForwardRefExoticComponent<{
-    onHoverLetter?: ((i: number) => void) | undefined;
     showWords?: boolean | undefined;
-    color?: string | undefined;
     downscale?: number | undefined;
-    pathPrefix?: string | undefined;
     animated?: boolean | undefined;
-} & Omit<import("react-native").ViewProps, "display" | "children"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
+} & Omit<import("react-native").ViewProps, "children" | "display"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
     readonly fullscreen?: boolean | undefined;
     readonly elevation?: import("tamagui").SizeTokens | undefined;
-} & import("@tamagui/core").MediaProps<Partial<Omit<import("react-native").ViewProps, "display" | "children"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
+} & import("@tamagui/core").MediaProps<Partial<Omit<import("react-native").ViewProps, "children" | "display"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
     readonly fullscreen?: boolean | undefined;
     readonly elevation?: import("tamagui").SizeTokens | undefined;
-}>> & import("@tamagui/core").PseudoProps<Partial<Omit<import("react-native").ViewProps, "display" | "children"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
+}>> & import("@tamagui/core").PseudoProps<Partial<Omit<import("react-native").ViewProps, "children" | "display"> & import("tamagui").RNWViewProps & import("tamagui").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & Omit<{}, "elevation" | "fullscreen"> & {
     readonly fullscreen?: boolean | undefined;
     readonly elevation?: import("tamagui").SizeTokens | undefined;
 }>> & import("react").RefAttributes<any>>;
-export declare const LogoWords: ({ color, downscale, onHoverLetter, animated, }: {
-    color?: string | undefined;
+export declare const LogoWords: import("react").MemoExoticComponent<({ downscale, animated }: {
     downscale?: number | undefined;
-    onHoverLetter?: any;
     animated?: boolean | undefined;
-}) => JSX.Element;
-export declare const LogoIcon: ({ downscale, pathPrefix }: any) => JSX.Element;
+}) => JSX.Element>;
+export declare const LogoIcon: ({ downscale }: any) => JSX.Element;
 //# sourceMappingURL=TamaguiLogo.d.ts.map

package/types/index.d.ts

@@ -1,2 +1,4 @@
 export * from './TamaguiLogo';
+export * from './tints';
+export * from './useTint';
 //# sourceMappingURL=index.d.ts.map

package/types/tints.d.ts

@@ -0,0 +1,27 @@
+declare const families: {
+    tamagui: string[];
+    xmas: string[];
+};
+type TintFamily = keyof typeof families;
+export declare function getTints(): {
+    name: "tamagui" | "xmas";
+    tints: string[];
+    families: {
+        tamagui: string[];
+        xmas: string[];
+    };
+};
+export declare function useTints(): {
+    name: "tamagui" | "xmas";
+    tints: string[];
+    families: {
+        tamagui: string[];
+        xmas: string[];
+    };
+};
+export declare const setTintFamily: (next: TintFamily) => void;
+export declare const setNextTintFamily: () => void;
+type ChangeHandler = (next: TintFamily) => void;
+export declare const onTintFamilyChange: (cb: ChangeHandler) => () => void;
+export {};
+//# sourceMappingURL=tints.d.ts.map

package/types/useTint.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="react" />
+export declare const initialTint = 3;
+export declare const onTintChange: (listener: (cur: number) => void) => () => void;
+export declare const setTintIndex: (next: number) => void;
+export declare const useTint: () => {
+    readonly tints: string[];
+    readonly tintIndex: number;
+    readonly tint: string;
+    readonly setTintIndex: (next: number) => void;
+    readonly setNextTintFamily: () => void;
+    readonly setNextTint: () => void;
+    readonly name: "tamagui" | "xmas";
+    readonly families: {
+        tamagui: string[];
+        xmas: string[];
+    };
+};
+export declare const ThemeTint: (props: {
+    children: any;
+}) => JSX.Element;
+//# sourceMappingURL=useTint.d.ts.map