Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore(Types): move duplicate types to theme [WUI-110] #2684

Merged
merged 11 commits into from
Feb 20, 2025
Merged

Chore(Types): move duplicate types to theme [WUI-110] #2684

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
329a307
chore: add string union ts utils
Isaacmaamouche Feb 13, 2025
b021683
chore: move avatar types to theme
Isaacmaamouche Feb 13, 2025
4449bfc
chore: use ThemeColorTokens for Breadcrumb type
Isaacmaamouche Feb 14, 2025
fb6f0af
chore: use move Icon Size type to theme
Isaacmaamouche Feb 14, 2025
021430c
chore: use Literal union and move Loader Size type to theme
Isaacmaamouche Feb 14, 2025
4eacd31
chore: move Modal Size type to theme
Isaacmaamouche Feb 14, 2025
58077c2
chore: move Taost Variant type to theme
Isaacmaamouche Feb 14, 2025
638b756
chore: move Toggle Size type to theme
Isaacmaamouche Feb 14, 2025
d61f64e
chore: update ThemeColorTokens import path
Isaacmaamouche Feb 14, 2025
d497524
chore: remove Loader name typo
Isaacmaamouche Feb 18, 2025
fa141a1
chore: split sizes from state type for toogle css
Isaacmaamouche Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
353 changes: 352 additions & 1 deletion lib/src/components/Avatar/docs/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,358 @@
],
"required": false,
"type": {
"name": "any"
"name": "enum",
"raw": "AvatarColors",
"value": [
{
"value": "\"yellow-10\""
},
{
"value": "\"yellow-20\""
},
{
"value": "\"yellow-30\""
},
{
"value": "\"yellow-40\""
},
{
"value": "\"yellow-50\""
},
{
"value": "\"yellow-60\""
},
{
"value": "\"yellow-70\""
},
{
"value": "\"yellow-80\""
},
{
"value": "\"yellow-90\""
},
{
"value": "\"blue-40\""
},
{
"value": "\"green-30\""
},
{
"value": "\"red-orange-40\""
},
{
"value": "\"pink-40\""
},
{
"value": "\"teal-40\""
},
{
"value": "\"violet-40\""
},
{
"value": "\"primary-10\""
},
{
"value": "\"primary-20\""
},
{
"value": "\"primary-30\""
},
{
"value": "\"primary-40\""
},
{
"value": "\"primary-50\""
},
{
"value": "\"primary-60\""
},
{
"value": "\"primary-70\""
},
{
"value": "\"primary-80\""
},
{
"value": "\"primary-90\""
},
{
"value": "\"secondary-blue\""
},
{
"value": "\"secondary-green\""
},
{
"value": "\"secondary-orange\""
},
{
"value": "\"secondary-pink\""
},
{
"value": "\"secondary-teal\""
},
{
"value": "\"secondary-violet\""
},
{
"value": "\"overlay\""
},
{
"value": "\"beige-10\""
},
{
"value": "\"beige-20\""
},
{
"value": "\"beige-30\""
},
{
"value": "\"beige-40\""
},
{
"value": "\"beige-50\""
},
{
"value": "\"beige-60\""
},
{
"value": "\"beige-70\""
},
{
"value": "\"beige-80\""
},
{
"value": "\"beige-90\""
},
{
"value": "\"blue-10\""
},
{
"value": "\"blue-20\""
},
{
"value": "\"blue-30\""
},
{
"value": "\"blue-50\""
},
{
"value": "\"blue-60\""
},
{
"value": "\"blue-70\""
},
{
"value": "\"blue-80\""
},
{
"value": "\"blue-90\""
},
{
"value": "\"green-10\""
},
{
"value": "\"green-20\""
},
{
"value": "\"green-40\""
},
{
"value": "\"green-50\""
},
{
"value": "\"green-60\""
},
{
"value": "\"green-70\""
},
{
"value": "\"green-80\""
},
{
"value": "\"green-90\""
},
{
"value": "\"neutral-10\""
},
{
"value": "\"neutral-20\""
},
{
"value": "\"neutral-30\""
},
{
"value": "\"neutral-40\""
},
{
"value": "\"neutral-50\""
},
{
"value": "\"neutral-60\""
},
{
"value": "\"neutral-70\""
},
{
"value": "\"neutral-80\""
},
{
"value": "\"neutral-90\""
},
{
"value": "\"orange-10\""
},
{
"value": "\"orange-20\""
},
{
"value": "\"orange-30\""
},
{
"value": "\"orange-40\""
},
{
"value": "\"orange-50\""
},
{
"value": "\"orange-60\""
},
{
"value": "\"orange-70\""
},
{
"value": "\"orange-80\""
},
{
"value": "\"orange-90\""
},
{
"value": "\"pink-10\""
},
{
"value": "\"pink-20\""
},
{
"value": "\"pink-30\""
},
{
"value": "\"pink-50\""
},
{
"value": "\"pink-60\""
},
{
"value": "\"pink-70\""
},
{
"value": "\"pink-80\""
},
{
"value": "\"pink-90\""
},
{
"value": "\"red-10\""
},
{
"value": "\"red-20\""
},
{
"value": "\"red-30\""
},
{
"value": "\"red-40\""
},
{
"value": "\"red-50\""
},
{
"value": "\"red-60\""
},
{
"value": "\"red-70\""
},
{
"value": "\"red-80\""
},
{
"value": "\"red-90\""
},
{
"value": "\"red-orange-10\""
},
{
"value": "\"red-orange-20\""
},
{
"value": "\"red-orange-30\""
},
{
"value": "\"red-orange-50\""
},
{
"value": "\"red-orange-60\""
},
{
"value": "\"red-orange-70\""
},
{
"value": "\"red-orange-80\""
},
{
"value": "\"red-orange-90\""
},
{
"value": "\"teal-10\""
},
{
"value": "\"teal-20\""
},
{
"value": "\"teal-30\""
},
{
"value": "\"teal-50\""
},
{
"value": "\"teal-60\""
},
{
"value": "\"teal-70\""
},
{
"value": "\"teal-80\""
},
{
"value": "\"teal-90\""
},
{
"value": "\"violet-10\""
},
{
"value": "\"violet-20\""
},
{
"value": "\"violet-30\""
},
{
"value": "\"violet-50\""
},
{
"value": "\"violet-60\""
},
{
"value": "\"violet-70\""
},
{
"value": "\"violet-80\""
},
{
"value": "\"violet-90\""
},
{
"value": "string & Record<never, never>"
}
]
}
},
"getInitials": {
Expand Down
13 changes: 6 additions & 7 deletions lib/src/components/Avatar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import React, { memo } from 'react'
import { Theme, useTheme } from '@xstyled/styled-components'
import { useTheme } from '@xstyled/styled-components'

import { getInitials as defaultGetInitials, getColorByLength } from './utils'
import * as S from './styles'
import type { AvatarColors, Size } from './theme'

import { ShapeOptions } from '@/Shape'
import { CreateWuiProps, forwardRef } from '@/System'
import type { ShapeOptions } from '@/Shape'
import type { CreateWuiProps } from '@/System'
import { forwardRef } from '@/System'
import { Box } from '@/Box'

type SubColor = Theme['colors']
type Size = 'sm' | 'md' | 'lg' | 'xl' | 'xxl'

export interface AvatarOptions {
color?: string | SubColor
color?: AvatarColors
getInitials?: (name: string) => string
name: string
size?: Size
Expand Down
8 changes: 5 additions & 3 deletions lib/src/components/Avatar/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { CSSObject } from '@xstyled/styled-components'
import type { CSSObject } from '@xstyled/styled-components'

import { ThemeValues } from '@/theme'
import type { ThemeColorTokens, ThemeValues } from '@/theme'
import type { LiteralUnion } from '@/utils'

type Size = 'sm' | 'md' | 'lg' | 'xl' | 'xxl'
export type Size = 'sm' | 'md' | 'lg' | 'xl' | 'xxl'
export type AvatarColors = LiteralUnion<ThemeColorTokens>

export type ThemeAvatars = {
sizes: Record<Size, string>
Expand Down
Loading