fix: pr review - removed any typing from primaryColor logic

pull/2522/head
William Grant 3 years ago
parent 7dd85eb55e
commit 6d919c677d

@ -7,6 +7,7 @@ import { useSelector } from 'react-redux';
import { getTheme } from '../../state/selectors/theme'; import { getTheme } from '../../state/selectors/theme';
import { FixedBaseEmoji, FixedPickerProps } from '../../types/Reaction'; import { FixedBaseEmoji, FixedPickerProps } from '../../types/Reaction';
import { import {
ColorsType,
COLORS, COLORS,
PrimaryColorStateType, PrimaryColorStateType,
THEMES, THEMES,
@ -56,7 +57,7 @@ export const StyledEmojiPanel = styled.div<{
--rgb-accent: ${props => --rgb-accent: ${props =>
hexColorToRGB( hexColorToRGB(
props.primaryColor props.primaryColor
? (COLORS.PRIMARY as any)[`${props.primaryColor.toUpperCase()}`] ? COLORS.PRIMARY[`${props.primaryColor.toUpperCase() as keyof ColorsType['PRIMARY']}`]
: COLORS.PRIMARY.GREEN : COLORS.PRIMARY.GREEN
)}; )};

@ -4,7 +4,7 @@
*/ */
// Colors // Colors
type Colors = { export type ColorsType = {
PRIMARY: { PRIMARY: {
GREEN: string; GREEN: string;
BLUE: string; BLUE: string;
@ -63,7 +63,7 @@ const black = '#000000';
// Grey // Grey
const grey = '#616161'; const grey = '#616161';
const COLORS: Colors = { const COLORS: ColorsType = {
PRIMARY: { PRIMARY: {
GREEN: primaryGreen, GREEN: primaryGreen,
BLUE: primaryBlue, BLUE: primaryBlue,

@ -1,7 +1,7 @@
import { find } from 'lodash'; import { find } from 'lodash';
import { Dispatch } from '@reduxjs/toolkit'; import { Dispatch } from '@reduxjs/toolkit';
import { applyPrimaryColor } from '../state/ducks/primaryColor'; import { applyPrimaryColor } from '../state/ducks/primaryColor';
import { COLORS, getPrimaryColors, PrimaryColorStateType } from './constants/colors'; import { ColorsType, COLORS, getPrimaryColors, PrimaryColorStateType } from './constants/colors';
export function findPrimaryColorId(hexCode: string): PrimaryColorStateType | undefined { export function findPrimaryColorId(hexCode: string): PrimaryColorStateType | undefined {
const primaryColors = getPrimaryColors(); const primaryColors = getPrimaryColors();
@ -15,7 +15,7 @@ export async function switchPrimaryColorTo(color: PrimaryColorStateType, dispatc
document.documentElement.style.setProperty( document.documentElement.style.setProperty(
'--primary-color', '--primary-color',
(COLORS.PRIMARY as any)[`${color.toUpperCase()}`] COLORS.PRIMARY[`${color.toUpperCase() as keyof ColorsType['PRIMARY']}`]
); );
dispatch?.(applyPrimaryColor(color)); dispatch?.(applyPrimaryColor(color));
} }

Loading…
Cancel
Save