Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions admin-ui/app/components/GluuButton/GluuButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { fontFamily } from '@/styles/fonts'
import { useTheme } from '@/context/theme/themeContext'
import getThemeColor from '@/context/theme/config'
import { THEME_DARK } from '@/context/theme/constants'
import { OPACITY } from '@/constants'
import { resolveBackgroundColor } from '@/utils/buttonUtils'
import type { GluuButtonProps } from './types'

Expand All @@ -20,7 +21,7 @@ const GluuButton: React.FC<GluuButtonProps> = (props) => {
disabled = false,
loading = false,
block = false,
theme: themeProp,
'theme': themeProp,
backgroundColor,
textColor,
borderColor,
Expand All @@ -37,6 +38,8 @@ const GluuButton: React.FC<GluuButtonProps> = (props) => {
onClick,
type = 'button',
title,
'aria-expanded': ariaExpanded,
'aria-label': ariaLabel,
} = props

const [isHovered, setIsHovered] = useState(false)
Expand All @@ -53,7 +56,7 @@ const GluuButton: React.FC<GluuButtonProps> = (props) => {
const border = borderColor ?? (isDark ? 'transparent' : themeColors.borderColor)
const hoverBg = isDark ? themeColors.lightBackground : themeColors.borderColor
const keepBgOnHover = !disableHoverStyles && useOpacityOnHover && isHovered && !isDisabled
const opacityOnHover = hoverOpacity ?? 0.5
const opacityOnHover = hoverOpacity ?? OPACITY.DIMMED

return {
display: 'inline-flex',
Expand All @@ -79,7 +82,7 @@ const GluuButton: React.FC<GluuButtonProps> = (props) => {
),
color: outlined ? themeColors.fontColor : text,
cursor: isDisabled ? 'not-allowed' : 'pointer',
opacity: isDisabled ? 0.65 : keepBgOnHover ? opacityOnHover : 1,
opacity: isDisabled ? OPACITY.DIMMED : keepBgOnHover ? opacityOnHover : 1,
width: block ? '100%' : 'auto',
transition: 'background-color 0.15s ease-in-out, opacity 0.15s ease-in-out',
...style,
Expand Down Expand Up @@ -117,6 +120,8 @@ const GluuButton: React.FC<GluuButtonProps> = (props) => {
onClick={handleClick}
disabled={isDisabled}
title={title}
aria-expanded={ariaExpanded}
aria-label={ariaLabel}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
>
Expand Down
48 changes: 25 additions & 23 deletions admin-ui/app/components/GluuButton/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,29 @@ export type ButtonSize = 'sm' | 'md' | 'lg'
export type ButtonTheme = 'light' | 'dark'

export interface GluuButtonProps {
children: ReactNode
size?: ButtonSize
outlined?: boolean
disabled?: boolean
loading?: boolean
block?: boolean
theme?: ButtonTheme
backgroundColor?: string
textColor?: string
borderColor?: string
borderRadius?: string | number
fontSize?: string | number
fontWeight?: number
padding?: string
minHeight?: string | number
style?: CSSProperties
className?: string
useOpacityOnHover?: boolean
hoverOpacity?: number
disableHoverStyles?: boolean
onClick?: () => void
type?: 'button' | 'submit' | 'reset'
title?: string
'children': ReactNode
'size'?: ButtonSize
'outlined'?: boolean
'disabled'?: boolean
'loading'?: boolean
'block'?: boolean
'theme'?: ButtonTheme
'backgroundColor'?: string
'textColor'?: string
'borderColor'?: string
'borderRadius'?: string | number
'fontSize'?: string | number
'fontWeight'?: number
'padding'?: string
'minHeight'?: string | number
'style'?: CSSProperties
'className'?: string
'useOpacityOnHover'?: boolean
'hoverOpacity'?: number
'disableHoverStyles'?: boolean
'onClick'?: () => void
'type'?: 'button' | 'submit' | 'reset'
'title'?: string
'aria-expanded'?: boolean
'aria-label'?: string
}
232 changes: 232 additions & 0 deletions admin-ui/app/components/GluuDatePicker/GluuDatePicker.style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
import { useMemo } from 'react'
import { makeStyles } from 'tss-react/mui'
import type { SxProps, Theme } from '@mui/material/styles'
import type { ThemeConfig } from '@/context/theme/config'
import { hexToRgb } from '@/customColors'
import { fontFamily, fontSizes, fontWeights, letterSpacing } from '@/styles/fonts'

const TEXT_FIELD_SIZE = 'small' as const

interface PickerThemeColors {
labelBackground: string
inputBackground: string
inputTextColor: string
labelColor: string
borderColor: string
popupBg: string
selectedBg: string
selectedText: string
hoverBg: string
placeholderColor: string
iconColor: string
}

interface GluuDatePickerStyleParams {
themeColors: ThemeConfig
isDark: boolean
textColor?: string
backgroundColor?: string
inputHeight?: number
labelShrink?: boolean
}

const buildPickerThemeColors = (
themeConfig: ThemeConfig,
isDark: boolean,
textColor?: string,
backgroundColor?: string,
): PickerThemeColors => {
const inputText = textColor || themeConfig.fontColor
const borderColor = isDark ? 'transparent' : themeConfig.borderColor
const hoverBg = `rgba(${hexToRgb(themeConfig.fontColor)}, ${isDark ? 0.08 : 0.04})`
return {
labelBackground: backgroundColor || themeConfig.background,
inputBackground: themeConfig.inputBackground,
inputTextColor: inputText,
labelColor: inputText,
borderColor,
popupBg: themeConfig.dashboard.supportCard,
selectedBg: themeConfig.background,
selectedText: themeConfig.fontColor,
hoverBg,
placeholderColor: themeConfig.fontColor,
iconColor: themeConfig.fontColor,
}
}

const useLayoutStyles = makeStyles<{ labelColor: string }>()((_, { labelColor }) => {
const titleLabelBase = {
fontFamily,
fontSize: fontSizes.base,
fontWeight: fontWeights.semiBold,
color: labelColor,
letterSpacing: letterSpacing.normal,
display: 'block' as const,
}
return {
pickerWrapper: {
display: 'flex',
flexDirection: 'column',
gap: '6px',
minWidth: 0,
flex: '1 1 0',
},
rangeRowContainer: {
'display': 'flex',
'gap': 16,
'width': '100%',
'minWidth': 0,
'& > *': { flex: '1 1 0', minWidth: 0 },
},
rangeGridContainer: {
width: '100%',
},
titleLabel: { ...titleLabelBase, marginBottom: 0 },
titleLabelGrid: { ...titleLabelBase, marginBottom: '6px' },
}
})

/** Plain object sx so it can be safely spread (SxProps can be array/callback/false). */
type PickerSxObject = Record<string, unknown>

const buildCommonInputStyles = (tc: PickerThemeColors): PickerSxObject => ({
'& .MuiInputLabel-root': {
'color': tc.labelColor,
'&.Mui-focused': { color: tc.labelColor },
},
'& .MuiIconButton-root': {
'color': tc.iconColor,
'&:hover': {
backgroundColor: tc.hoverBg,
color: tc.inputTextColor,
},
'& .MuiSvgIcon-root': { color: tc.iconColor },
},
'& .MuiSvgIcon-root': { color: tc.iconColor },
})

const buildTextFieldSx = (
tc: PickerThemeColors,
common: PickerSxObject,
inputHeight?: number,
): SxProps<Theme> => ({
'width': '100%',
'maxWidth': '100%',
'boxSizing': 'border-box',
...(common as SxProps<Theme>),
'& .MuiInputBase-root': {
color: tc.inputTextColor,
backgroundColor: tc.inputBackground,
...(inputHeight != null ? { height: inputHeight, minHeight: inputHeight } : {}),
},
'& .MuiInputBase-input': {
fontFamily,
'fontSize': fontSizes.base,
'color': tc.inputTextColor,
'&::placeholder': { color: tc.placeholderColor, opacity: 1 },
},
'& .MuiOutlinedInput-root': {
'& fieldset': { borderColor: tc.borderColor },
'&:hover fieldset': { borderColor: tc.borderColor },
'&.Mui-focused fieldset': { borderColor: tc.borderColor },
},
})

const buildPopperSx = (tc: PickerThemeColors): SxProps<Theme> => ({
'& .MuiPaper-root': {
'backgroundColor': tc.popupBg,
'color': tc.inputTextColor,
'& .MuiOutlinedInput-root': {
'& fieldset': { borderColor: tc.borderColor },
'&:hover fieldset': { borderColor: tc.borderColor },
'&.Mui-focused fieldset': { borderColor: tc.borderColor },
},
'& .MuiPickersCalendarHeader-root': {
'color': tc.inputTextColor,
'& .MuiPickersCalendarHeader-switchViewButton': { color: tc.inputTextColor },
'& .MuiPickersCalendarHeader-switchViewIcon': { color: tc.inputTextColor },
},
'& .MuiPickersDay-root': {
'color': tc.inputTextColor,
'&.Mui-selected': {
'backgroundColor': tc.selectedBg,
'color': tc.selectedText,
'&:hover': { backgroundColor: tc.selectedBg },
},
'&:hover': { backgroundColor: tc.hoverBg },
},
'& .MuiDayCalendar-weekContainer': {
'& .MuiTypography-root': { color: tc.inputTextColor },
},
'& .MuiDayCalendar-header': {
'& .MuiDayCalendar-weekDayLabel': { color: tc.inputTextColor },
},
'& .MuiPickersArrowSwitcher-root': {
'& .MuiIconButton-root': {
'color': tc.inputTextColor,
'&:hover': { backgroundColor: tc.hoverBg },
},
},
},
})

const buildDatePickerRootSx = (tc: PickerThemeColors, common: PickerSxObject): SxProps<Theme> => ({
'width': '100%',
'maxWidth': '100%',
'minWidth': 0,
'flex': '1 1 auto',
'boxSizing': 'border-box',
...(common as SxProps<Theme>),
'& .MuiInputLabel-sizeSmall': {
fontFamily,
'padding': '0px 2px',
'background': tc.labelBackground,
'color': tc.labelColor,
'fontSize': fontSizes.base,
'fontWeight': fontWeights.medium,
'marginTop': '-2px',
'&.Mui-focused': { color: tc.labelColor },
},
})

export const useDatePickerStyles = (params: GluuDatePickerStyleParams) => {
const {
themeColors,
isDark,
textColor,
backgroundColor,
inputHeight,
labelShrink = true,
} = params
const pickerTheme = useMemo(
() => buildPickerThemeColors(themeColors, isDark, textColor, backgroundColor),
[themeColors, isDark, textColor, backgroundColor],
)
const { classes } = useLayoutStyles({ labelColor: pickerTheme.labelColor })

const sx = useMemo(() => {
const common = buildCommonInputStyles(pickerTheme)
const textFieldSx = buildTextFieldSx(pickerTheme, common, inputHeight)
const popperSx = buildPopperSx(pickerTheme)
const datePickerSx = buildDatePickerRootSx(pickerTheme, common)
const slotProps = {
textField: {
size: TEXT_FIELD_SIZE,
InputLabelProps: { shrink: labelShrink },
sx: textFieldSx,
},
popper: { sx: popperSx },
}
return {
textFieldSx,
popperSx,
datePickerSx,
slotProps,
}
}, [pickerTheme, inputHeight, labelShrink])

return {
classes,
...sx,
}
}
Loading
Loading