use multiline tooltips for help as default

This commit is contained in:
Sebastian Sdorra
2020-07-31 10:48:51 +02:00
parent 28d3983aed
commit 3f1b7bbf5e
4 changed files with 77 additions and 14 deletions

View File

@@ -0,0 +1,58 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import styled from "styled-components";
import * as React from "react";
import { storiesOf } from "@storybook/react";
import Help from "./Help";
const Wrapper = styled.div`
margin: 5rem;
`;
const Spacing = styled.div`
margin-top: 1rem;
`;
const longContent =
"Cleverness nuclear genuine static irresponsibility invited President Zaphod\n" +
"Beeblebrox hyperspace ship. Another custard through computer-generated universe\n" +
"shapes field strong disaster parties Russells ancestors infinite colour\n" +
"imaginative generator sweep.";
storiesOf("Help", module)
.addDecorator(storyFn => <Wrapper>{storyFn()}</Wrapper>)
.add("Default", () => <Help message="This is a help message" />)
.add("Multiline", () => (
<>
<Spacing>
<label>With multiline (default):</label>
<Help message={longContent} />
</Spacing>
<Spacing>
<label>Without multiline:</label>
<Help message={longContent} multiline={false} />
</Spacing>
</>
));

View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React from "react";
import React, { FC } from "react";
import classNames from "classnames";
import styled from "styled-components";
import Tooltip from "./Tooltip";
@@ -29,6 +29,7 @@ import HelpIcon from "./HelpIcon";
type Props = {
message: string;
multiline?: boolean;
className?: string;
};
@@ -37,13 +38,17 @@ const HelpTooltip = styled(Tooltip)`
padding-left: 3px;
`;
export default class Help extends React.Component<Props> {
render() {
const { message, className } = this.props;
return (
<HelpTooltip className={classNames("is-inline-block", className)} message={message}>
const Help: FC<Props> = ({ message, multiline, className }) => (
<HelpTooltip
className={classNames("is-inline-block", multiline ? "has-tooltip-multiline" : undefined, className)}
message={message}
>
<HelpIcon />
</HelpTooltip>
);
}
}
);
Help.defaultProps = {
multiline: true
};
export default Help;

View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import React, { ChangeEvent } from "react";
import React from "react";
import { Help } from "../index";
import LabelWithHelpIcon from "./LabelWithHelpIcon";
import TriStateCheckbox from "./TriStateCheckbox";
@@ -47,7 +47,7 @@ export default class Checkbox extends React.Component<Props> {
renderHelp = () => {
const { title, helpText } = this.props;
if (helpText && !title) {
return <Help message={helpText} className="has-tooltip-multiline" />;
return <Help message={helpText} />;
}
};

View File

@@ -43,7 +43,7 @@ class Radio extends React.Component<Props> {
renderHelp = () => {
const helpText = this.props.helpText;
if (helpText) {
return <Help message={helpText} className="has-tooltip-multiline" />;
return <Help message={helpText} />;
}
};