Client: RoomLogoCoverDialog: separated SelectColor component, fixed mobile color picker, fixed style
This commit is contained in:
parent
598e906a17
commit
19326a96e8
@ -0,0 +1,30 @@
|
||||
// (c) Copyright Ascensio System SIA 2009-2024
|
||||
//
|
||||
// This program is a free software product.
|
||||
// You can redistribute it and/or modify it under the terms
|
||||
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
|
||||
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
|
||||
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
|
||||
// any third-party rights.
|
||||
//
|
||||
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
|
||||
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
|
||||
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
//
|
||||
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
|
||||
//
|
||||
// The interactive user interfaces in modified source and object code versions of the Program must
|
||||
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
|
||||
//
|
||||
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
|
||||
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
|
||||
// trademark law for use of our trademarks.
|
||||
//
|
||||
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
|
||||
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
|
||||
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
|
||||
export interface ColorItemProps {
|
||||
isEmptyColor?: boolean;
|
||||
isSelected?: boolean;
|
||||
}
|
||||
@ -0,0 +1,190 @@
|
||||
// (c) Copyright Ascensio System SIA 2009-2024
|
||||
//
|
||||
// This program is a free software product.
|
||||
// You can redistribute it and/or modify it under the terms
|
||||
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
|
||||
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
|
||||
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
|
||||
// any third-party rights.
|
||||
//
|
||||
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
|
||||
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
|
||||
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
//
|
||||
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
|
||||
//
|
||||
// The interactive user interfaces in modified source and object code versions of the Program must
|
||||
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
|
||||
//
|
||||
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
|
||||
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
|
||||
// trademark law for use of our trademarks.
|
||||
//
|
||||
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
|
||||
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
|
||||
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
import styled, { css } from "styled-components";
|
||||
|
||||
import { mobile, tablet, isMobile } from "@docspace/shared/utils";
|
||||
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
|
||||
|
||||
import type { ColorItemProps } from "./SelecColor.types";
|
||||
|
||||
const StyledModalDialog = styled(ModalDialog)`
|
||||
.modal-close {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#modal-dialog {
|
||||
max-height: none;
|
||||
}
|
||||
|
||||
.hex-color-picker {
|
||||
padding-bottom: 0 !important;
|
||||
width: auto !important;
|
||||
|
||||
.react-colorful__saturation {
|
||||
border-bottom: none;
|
||||
|
||||
.react-colorful__interactive {
|
||||
width: calc(100% - 16px) !important;
|
||||
height: calc(100% - 16px);
|
||||
}
|
||||
}
|
||||
|
||||
.react-colorful__hue {
|
||||
.react-colorful__interactive {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const StyledColorItem = styled.div<ColorItemProps>`
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
margin-top: 8px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: ${(props) => props.color};
|
||||
|
||||
@media ${tablet} {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
/* ${(props) =>
|
||||
props.isEmptyColor &&
|
||||
css`
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
`} */
|
||||
|
||||
${(props) =>
|
||||
props.isSelected &&
|
||||
css`
|
||||
background-color: #f3f4f4;
|
||||
`}
|
||||
|
||||
&:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
`;
|
||||
|
||||
const SelectedColorItem = styled.div`
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
margin-top: 6px;
|
||||
border-radius: 50%;
|
||||
border: ${(props) => `solid 2px ${props.color}`};
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
@media ${tablet} {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
.circle {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background-color: ${(props) => props.color};
|
||||
border-radius: 50%;
|
||||
|
||||
@media ${tablet} {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const CustomSelectedColor = styled.div<ColorItemProps>`
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-top: 8px;
|
||||
|
||||
@media ${tablet} {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
.color-picker-circle {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
background-color: ${(props) => props.color};
|
||||
|
||||
@media ${tablet} {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
${(props) =>
|
||||
props.isSelected &&
|
||||
css`
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
|
||||
border: ${(props) => `solid 2px ${props.color}`};
|
||||
@media ${tablet} {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
`}
|
||||
|
||||
${(props) =>
|
||||
!props.isSelected &&
|
||||
css`
|
||||
background-color: ${(props) => props.color};
|
||||
`}
|
||||
|
||||
svg {
|
||||
path {
|
||||
fill: #fff;
|
||||
}
|
||||
&:hover {
|
||||
path {
|
||||
fill: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
export {
|
||||
StyledModalDialog,
|
||||
StyledColorItem,
|
||||
SelectedColorItem,
|
||||
CustomSelectedColor,
|
||||
};
|
||||
@ -27,127 +27,27 @@
|
||||
import React, { useState, useRef } from "react";
|
||||
import styled, { css } from "styled-components";
|
||||
|
||||
import { mobile, tablet } from "@docspace/shared/utils";
|
||||
import { mobile, tablet, isMobile } from "@docspace/shared/utils";
|
||||
|
||||
import {
|
||||
ModalDialog,
|
||||
ModalDialogType,
|
||||
} from "@docspace/shared/components/modal-dialog";
|
||||
import { IconButton } from "@docspace/shared/components/icon-button";
|
||||
|
||||
import PlusSvgUrl from "PUBLIC_DIR/images/icons/16/button.plus.react.svg?url";
|
||||
import PencilSvgUrl from "PUBLIC_DIR/images/pencil.outline.react.svg?url";
|
||||
import { DropDownItem } from "@docspace/shared/components/drop-down-item";
|
||||
import { DropDown } from "@docspace/shared/components/drop-down";
|
||||
import { ColorPicker } from "@docspace/shared/components/color-picker";
|
||||
import { SelectColorProps } from "../RoomLogoCoverDialog.types";
|
||||
import { SelectColorProps } from "../../RoomLogoCoverDialog.types";
|
||||
|
||||
interface ColorItemProps {
|
||||
isEmptyColor?: boolean;
|
||||
isSelected?: boolean;
|
||||
}
|
||||
|
||||
const StyledColorItem = styled.div<ColorItemProps>`
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
margin-top: 8px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: ${(props) => props.color};
|
||||
|
||||
@media ${tablet} {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
/* ${(props) =>
|
||||
props.isEmptyColor &&
|
||||
css`
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
`} */
|
||||
|
||||
${(props) =>
|
||||
props.isSelected &&
|
||||
css`
|
||||
background-color: #f3f4f4;
|
||||
`}
|
||||
|
||||
&:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
`;
|
||||
|
||||
const SelectedColorItem = styled.div`
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
margin-top: 6px;
|
||||
border-radius: 50%;
|
||||
border: ${(props) => `solid 2px ${props.color}`};
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
@media ${tablet} {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
.circle {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background-color: ${(props) => props.color};
|
||||
border-radius: 50%;
|
||||
|
||||
@media ${tablet} {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const CustomSelectedColor = styled.div`
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin-top: 8px;
|
||||
|
||||
.color-picker-circle {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
background-color: ${(props) => props.color};
|
||||
}
|
||||
|
||||
${(props) =>
|
||||
props.isSelected &&
|
||||
css`
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
|
||||
border: ${(props) => `solid 2px ${props.color}`};
|
||||
`}
|
||||
|
||||
${(props) =>
|
||||
!props.isSelected &&
|
||||
css`
|
||||
background-color: ${(props) => props.color};
|
||||
`}
|
||||
|
||||
svg {
|
||||
path {
|
||||
fill: #fff;
|
||||
}
|
||||
&:hover {
|
||||
path {
|
||||
fill: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
import {
|
||||
StyledModalDialog,
|
||||
StyledColorItem,
|
||||
SelectedColorItem,
|
||||
CustomSelectedColor,
|
||||
} from "./SelectColor.styled";
|
||||
|
||||
export const SelectColor = ({
|
||||
logoColors,
|
||||
@ -173,11 +73,8 @@ export const SelectColor = ({
|
||||
setOpenColorPicker(true);
|
||||
};
|
||||
|
||||
const isCustomColor = !logoColors.includes(selectedColor); // add usecallback
|
||||
const isSelectedColorPicker = pickerColor === selectedColor;
|
||||
|
||||
console.log(isSelectedColorPicker);
|
||||
|
||||
return (
|
||||
<div className="select-color-container">
|
||||
<div className="color-name">{t("Common:Color")}</div>
|
||||
@ -236,26 +133,45 @@ export const SelectColor = ({
|
||||
/>
|
||||
</StyledColorItem>
|
||||
)}
|
||||
|
||||
<DropDown
|
||||
directionX="both"
|
||||
forwardedRef={iconRef}
|
||||
withBackdrop={false}
|
||||
isDefaultMode
|
||||
open={openColorPicker}
|
||||
clickOutsideAction={() => setOpenColorPicker(false)}
|
||||
>
|
||||
<DropDownItem className="drop-down-item-hex">
|
||||
<ColorPicker
|
||||
// id="accent-hex"
|
||||
onClose={() => setOpenColorPicker(false)}
|
||||
onApply={onApply}
|
||||
appliedColor={selectedColor}
|
||||
applyButtonLabel={t("Common:ApplyButton")}
|
||||
cancelButtonLabel={t("Common:CancelButton")}
|
||||
/>
|
||||
</DropDownItem>
|
||||
</DropDown>
|
||||
{isMobile() ? (
|
||||
<StyledModalDialog
|
||||
displayType={ModalDialogType.modal}
|
||||
visible={openColorPicker}
|
||||
onClose={() => setOpenColorPicker(false)}
|
||||
blur={8}
|
||||
>
|
||||
<ModalDialog.Body>
|
||||
<ColorPicker
|
||||
id="buttons-hex"
|
||||
onClose={() => setOpenColorPicker(false)}
|
||||
onApply={onApply}
|
||||
appliedColor={selectedColor}
|
||||
applyButtonLabel={t("Common:ApplyButton")}
|
||||
cancelButtonLabel={t("Common:CancelButton")}
|
||||
/>
|
||||
</ModalDialog.Body>
|
||||
</StyledModalDialog>
|
||||
) : (
|
||||
<DropDown
|
||||
directionX="both"
|
||||
forwardedRef={iconRef}
|
||||
withBackdrop={false}
|
||||
isDefaultMode
|
||||
open={openColorPicker}
|
||||
clickOutsideAction={() => setOpenColorPicker(false)}
|
||||
>
|
||||
<DropDownItem className="drop-down-item-hex">
|
||||
<ColorPicker
|
||||
id="accent-hex"
|
||||
onClose={() => setOpenColorPicker(false)}
|
||||
onApply={onApply}
|
||||
appliedColor={selectedColor}
|
||||
applyButtonLabel={t("Common:ApplyButton")}
|
||||
cancelButtonLabel={t("Common:CancelButton")}
|
||||
/>
|
||||
</DropDownItem>
|
||||
</DropDown>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
Loading…
Reference in New Issue
Block a user