diff --git a/web/ASC.Web.Components/src/components/calendar/sub-components/day.js b/web/ASC.Web.Components/src/components/calendar/sub-components/day.js index 0a8f735c68..9468b975f0 100644 --- a/web/ASC.Web.Components/src/components/calendar/sub-components/day.js +++ b/web/ASC.Web.Components/src/components/calendar/sub-components/day.js @@ -8,7 +8,7 @@ const StyledDay = styled.div` display: flex; flex-basis: 14.2857%; /*(1/7*100%)*/ text-align: center; - line-height: 33px + line-height: 33px; user-select: none; ${props => props.size === "base" ? "margin-top: 3px;" : "margin-top: 7.5px;"} diff --git a/web/ASC.Web.Components/src/components/tooltip/README.md b/web/ASC.Web.Components/src/components/tooltip/README.md index 07b07152f3..e17168e495 100644 --- a/web/ASC.Web.Components/src/components/tooltip/README.md +++ b/web/ASC.Web.Components/src/components/tooltip/README.md @@ -24,9 +24,9 @@ import { Tooltip, IconButton, Text } from "asc-web-components"; {dataTip}} - effect={select("effect", arrayEffects, "float")} - place={select("place", arrayPlaces, "top")} - maxWidth={number("maxWidth", 320)} + effect="float" + place="top" + maxWidth={320} /> ``` diff --git a/web/ASC.Web.Components/src/components/tooltip/index.js b/web/ASC.Web.Components/src/components/tooltip/index.js index 937424f9d7..b6a3ad8666 100644 --- a/web/ASC.Web.Components/src/components/tooltip/index.js +++ b/web/ASC.Web.Components/src/components/tooltip/index.js @@ -13,6 +13,7 @@ const TooltipStyle = styled.div` -webkit-box-shadow: 0px 5px 20px rgba(0, 0, 0, 0.13); opacity: 1; padding: 16px; + pointer-events: auto; max-width: ${props => (props.maxWidth ? props.maxWidth + "px" : `340px`)}; @@ -60,7 +61,7 @@ class Tooltip extends Component { bottom: offsetBottom, left: offsetLeft }} - wrapper="span" + wrapper="div" /> );