diff --git a/packages/client/src/components/dialogs/RoomLogoCoverDialog/RoomLogoCoverDialog.types.ts b/packages/client/src/components/dialogs/RoomLogoCoverDialog/RoomLogoCoverDialog.types.ts index 32d59c2062..3091842bdf 100644 --- a/packages/client/src/components/dialogs/RoomLogoCoverDialog/RoomLogoCoverDialog.types.ts +++ b/packages/client/src/components/dialogs/RoomLogoCoverDialog/RoomLogoCoverDialog.types.ts @@ -30,6 +30,7 @@ import type { TTranslation } from "@docspace/shared/types"; export interface CustomLogoProps { color?: string; icon?: string; + withoutIcon: boolean; } export interface SelectColorProps { diff --git a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/CustomLogo.tsx b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/CustomLogo.tsx index fc014c9667..7a0640da83 100644 --- a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/CustomLogo.tsx +++ b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/CustomLogo.tsx @@ -27,6 +27,7 @@ import React from "react"; import styled from "styled-components"; import { ReactSVG } from "react-svg"; +import { Text } from "@docspace/shared/components/text"; import { CustomLogoProps } from "../RoomLogoCoverDialog.types"; const StyledLogo = styled.div` @@ -47,12 +48,28 @@ const StyledLogo = styled.div` } } } + + .logo-cover-text { + color: #fff; + font-size: 41px; + } `; -export const CustomLogo = ({ color, icon }: CustomLogoProps) => { +export const CustomLogo = ({ color, icon, withoutIcon }: CustomLogoProps) => { return ( - + {withoutIcon ? ( + + Aa + + ) : ( + + )} ); }; diff --git a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/RoomLogoCover.tsx b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/RoomLogoCover.tsx index 183e0680ca..df6e2a1b0d 100644 --- a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/RoomLogoCover.tsx +++ b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/RoomLogoCover.tsx @@ -35,14 +35,11 @@ import { SelectIcon } from "./SelectIcon"; const logoColors = [ "#FF6680", "#FF8F40", - "#F2D230", "#61C059", - "#70E096", "#1FCECB", "#5CC3F7", "#6191F2", "#7757D9", - "#B679F2", "#FF7FD4", ]; @@ -80,7 +77,7 @@ const RoomLogoCover = (props) => { return (
- +
` align-items: center; `} + ${(props) => + props.isSelected && + css` + background-color: #f3f4f4; + `} + &:hover { cursor: pointer; } @@ -80,6 +89,15 @@ export const SelectColor = ({ t, onChangeColor, }: SelectColorProps) => { + const [openColorPicker, setOpenColorPicker] = useState(false); + + const onApply = (color: string) => { + setOpenColorPicker(false); + onChangeColor(color); + }; + + const isCustomColor = !logoColors.includes(selectedColor); // add usecallback + return (
{t("Common:Color")}
@@ -97,14 +115,35 @@ export const SelectColor = ({ /> ), )} - + setOpenColorPicker(true)} isFill /> + setOpenColorPicker(false)} + > + + setOpenColorPicker(false)} + onApply={onApply} + appliedColor={selectedColor} + applyButtonLabel={t("Common:ApplyButton")} + cancelButtonLabel={t("Common:CancelButton")} + /> + +
); diff --git a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/SelectIcon.tsx b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/SelectIcon.tsx index aa3f6edee4..d82aec1f92 100644 --- a/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/SelectIcon.tsx +++ b/packages/client/src/components/dialogs/RoomLogoCoverDialog/sub-components/SelectIcon.tsx @@ -78,6 +78,7 @@ const StyledIconContainer = styled.div` } .cover-icon { + overflow: visible; &:hover { cursor: pointer; }