after-merge fixes

This commit is contained in:
Mushka Nikita 2022-12-02 17:27:39 +03:00
parent 131d8bcf50
commit 51e687d8d7
5 changed files with 6 additions and 3 deletions

View File

@ -4,6 +4,7 @@ import styled from "styled-components";
import RoomType from "../RoomType";
import { Base } from "@docspace/components/themes";
import { RoomsType } from "@docspace/common/constants";
const StyledDropdownDesktop = styled.div`
max-width: 100%;
@ -41,7 +42,7 @@ const DropdownDesktop = ({ t, open, chooseRoomType }) => {
<div className="dropdown-content">
{Object.values(RoomsType).map((roomType) => (
<RoomType
id={room.id}
id={roomType}
t={t}
key={roomType}
roomType={roomType}

View File

@ -72,7 +72,7 @@ const DropdownMobile = ({ t, open, onClose, chooseRoomType }) => {
<div className="dropdown-mobile-content">
{Object.values(RoomsType).map((roomType) => (
<RoomType
id={room.id}
id={roomType}
t={t}
key={roomType}
roomType={roomType}

View File

@ -22,7 +22,7 @@ const RoomTypeList = ({ t, setRoomType }) => {
<StyledRoomTypeList>
{Object.values(RoomsType).map((roomType) => (
<RoomType
id={room.id}
id={roomType}
t={t}
key={roomType}
roomType={roomType}

View File

@ -13,6 +13,7 @@ import IsPrivateParam from "./IsPrivateParam";
import withLoader from "@docspace/client/src/HOCs/withLoader";
import Loaders from "@docspace/common/components/Loaders";
import { getRoomTypeDefaultTagTranslation } from "../data";
const StyledSetRoomParams = styled.div`
display: flex;

View File

@ -41,6 +41,7 @@ const TagDropdown = ({
};
const onClickOutside = (e) => {
if (!e) return;
if (e.target.id === "shared_tags-input") return;
document.getElementById("shared_tags-input").blur();
};