Skip to content

Commit

Permalink
LPS-128506 - Remove unnecessary ClayTooltipProvider uses
Browse files Browse the repository at this point in the history
  • Loading branch information
bryceosterhaus committed Mar 2, 2021
1 parent 019589a commit cf865a3
Show file tree
Hide file tree
Showing 53 changed files with 1,720 additions and 1,972 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import {ClayButtonWithIcon} from '@clayui/button';
import ClayForm, {ClayRadio, ClayRadioGroup, ClayToggle} from '@clayui/form';
import ClayPopover from '@clayui/popover';
import {ClayTooltipProvider} from '@clayui/tooltip';
import {DataLayoutBuilderActions} from 'data-engine-taglib';
import React, {useContext, useEffect, useRef, useState} from 'react';

Expand Down Expand Up @@ -236,18 +235,16 @@ export default ({AppContext, dataLayoutBuilder}) => {
/>
</ClayForm.Group>

<ClayTooltipProvider>
<ClayButtonWithIcon
borderless
disabled={!toggled}
displayType="secondary"
onClick={() => setShowPopover(!showPopover)}
ref={triggerRef}
small
symbol="ellipsis-v"
title={Liferay.Language.get('required-options')}
/>
</ClayTooltipProvider>
<ClayButtonWithIcon
borderless
disabled={!toggled}
displayType="secondary"
onClick={() => setShowPopover(!showPopover)}
ref={triggerRef}
small
symbol="ellipsis-v"
title={Liferay.Language.get('required-options')}
/>

<ClayPopover
alignPosition="bottom-right"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import ClayButton, {ClayButtonWithIcon} from '@clayui/button';
import ClayIcon from '@clayui/icon';
import ClayLabel from '@clayui/label';
import {ClayTooltipProvider} from '@clayui/tooltip';
import {getItem} from 'data-engine-js-components-web/js/utils/client.es';
import {getLocalizedValue} from 'data-engine-js-components-web/js/utils/lang.es';
import React, {useEffect, useState} from 'react';
Expand Down Expand Up @@ -158,17 +157,15 @@ export default function SelectObjects({
<DropDownWithSearch
{...state}
addButton={
<ClayTooltipProvider>
<ClayButtonWithIcon
className="btn btn-monospaced btn-secondary mr-2 nav-btn nav-btn-monospaced"
data-tooltip-align="bottom-right"
data-tooltip-delay="0"
displayType="secondary"
onClick={() => setModalVisible(true)}
symbol="plus"
title={Liferay.Language.get('new-custom-object')}
/>
</ClayTooltipProvider>
<ClayButtonWithIcon
className="btn btn-monospaced btn-secondary mr-2 nav-btn nav-btn-monospaced"
data-tooltip-align="bottom-right"
data-tooltip-delay="0"
displayType="secondary"
onClick={() => setModalVisible(true)}
symbol="plus"
title={Liferay.Language.get('new-custom-object')}
/>
}
isEmpty={items.length === 0}
label={label}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,34 @@
* details.
*/

import {ClayTooltipProvider} from '@clayui/tooltip';
import React, {useState} from 'react';

export default ({checked = false, onChange}) => {
const [isChecked, setChecked] = useState(checked);

return (
<ClayTooltipProvider>
<label className="toggle-switch">
<input
checked={isChecked}
className="toggle-switch-check"
data-tooltip-align="top"
data-tooltip-delay="0"
onChange={() => {
const newChecked = !isChecked;
setChecked(newChecked);
onChange(newChecked);
}}
title={
isChecked
? Liferay.Language.get('turn-off')
: Liferay.Language.get('turn-on')
}
type="checkbox"
/>
<label className="toggle-switch">
<input
checked={isChecked}
className="toggle-switch-check"
data-tooltip-align="top"
data-tooltip-delay="0"
onChange={() => {
const newChecked = !isChecked;
setChecked(newChecked);
onChange(newChecked);
}}
title={
isChecked
? Liferay.Language.get('turn-off')
: Liferay.Language.get('turn-on')
}
type="checkbox"
/>

<span aria-hidden="true" className="toggle-switch-bar">
<span className="toggle-switch-handle"></span>
</span>
</label>
</ClayTooltipProvider>
<span aria-hidden="true" className="toggle-switch-bar">
<span className="toggle-switch-handle"></span>
</span>
</label>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button';
import ClayIcon from '@clayui/icon';
import {SheetSection} from '@clayui/layout';
import ClayPanel from '@clayui/panel';
import {ClayTooltipProvider} from '@clayui/tooltip';
import {DataDefinitionUtils} from 'data-engine-taglib';
import React, {useContext, useEffect, useState} from 'react';

Expand Down Expand Up @@ -124,31 +123,29 @@ const DocumentRenderer = ({displayType, value = {}}) => {
{displayType === 'list' ? (
<StringRenderer value={title} />
) : fileEntryId ? (
<ClayTooltipProvider>
<ClayButton.Group className="data-record-document-field mb-2">
<ClayButton
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onClickPreview}
title={Liferay.Language.get('file-preview')}
>
<ClayIcon
className="mr-2"
symbol={getDocumentIcon(title)}
/>
{title}
</ClayButton>
<ClayButtonWithIcon
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onClickDownload}
symbol="download"
title={Liferay.Language.get('download')}
<ClayButton.Group className="data-record-document-field mb-2">
<ClayButton
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onClickPreview}
title={Liferay.Language.get('file-preview')}
>
<ClayIcon
className="mr-2"
symbol={getDocumentIcon(title)}
/>
</ClayButton.Group>
</ClayTooltipProvider>
{title}
</ClayButton>
<ClayButtonWithIcon
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onClickDownload}
symbol="download"
title={Liferay.Language.get('download')}
/>
</ClayButton.Group>
) : (
<StringRenderer />
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import {ClayButtonWithIcon} from '@clayui/button';
import ClayButtonGroup from '@clayui/button/lib/Group';
import {ClayTooltipProvider} from '@clayui/tooltip';
import {confirmDelete} from 'data-engine-js-components-web/js/utils/client.es';
import {sub} from 'data-engine-js-components-web/js/utils/lang.es';
import React, {useContext} from 'react';
Expand Down Expand Up @@ -100,63 +99,57 @@ function ViewEntryUpperToolbar({
<UpperToolbar.Item expand>{children}</UpperToolbar.Item>

<UpperToolbar.Group>
<ClayTooltipProvider>
<ClayButtonGroup>
<ClayButtonGroup>
<ClayButtonWithIcon
data-tooltip-align="bottom"
data-tooltip-delay="200"
disabled={page === 1}
displayType="secondary"
onClick={onPrev}
small
symbol="angle-left"
title={Liferay.Language.get('previous-entry')}
/>

<ClayButtonWithIcon
data-tooltip-align="bottom"
data-tooltip-delay="200"
disabled={page === totalCount}
displayType="secondary"
onClick={onNext}
small
symbol="angle-right"
title={Liferay.Language.get('next-entry')}
/>
</ClayButtonGroup>
</UpperToolbar.Group>

{showFormView && (
<UpperToolbar.Group>
{permissions.delete && showDeleteButton && (
<ClayButtonWithIcon
className="mr-2"
data-tooltip-align="bottom"
data-tooltip-delay="200"
disabled={page === 1}
displayType="secondary"
onClick={onPrev}
onClick={onDelete}
small
symbol="angle-left"
title={Liferay.Language.get('previous-entry')}
symbol="trash"
title={Liferay.Language.get('delete')}
/>
)}

{permissions.update && showUpdateButton && (
<ClayButtonWithIcon
className="mr-2"
data-tooltip-align="bottom"
data-tooltip-delay="200"
disabled={page === totalCount}
displayType="secondary"
onClick={onNext}
onClick={onEdit}
small
symbol="angle-right"
title={Liferay.Language.get('next-entry')}
symbol="pencil"
title={Liferay.Language.get('edit')}
/>
</ClayButtonGroup>
</ClayTooltipProvider>
</UpperToolbar.Group>

{showFormView && (
<UpperToolbar.Group>
{permissions.delete && showDeleteButton && (
<ClayTooltipProvider>
<ClayButtonWithIcon
className="mr-2"
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onDelete}
small
symbol="trash"
title={Liferay.Language.get('delete')}
/>
</ClayTooltipProvider>
)}

{permissions.update && showUpdateButton && (
<ClayTooltipProvider>
<ClayButtonWithIcon
className="mr-2"
data-tooltip-align="bottom"
data-tooltip-delay="200"
displayType="secondary"
onClick={onEdit}
small
symbol="pencil"
title={Liferay.Language.get('edit')}
/>
</ClayTooltipProvider>
)}

{additionalButtons}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import ClayIcon from '@clayui/icon';
import ClayLayout from '@clayui/layout';
import {ClayTooltipProvider} from '@clayui/tooltip';
import classNames from 'classnames';
import Table from 'data-engine-js-components-web/js/components/table/Table.es';
import {DragTypes} from 'data-engine-taglib';
Expand Down Expand Up @@ -116,18 +115,16 @@ const DropZone = ({fields, onAddFieldName, onRemoveFieldName}) => {
appliedFilters,
name
) && (
<ClayTooltipProvider>
<ClayLayout.ContentCol>
<ClayIcon
data-tooltip-align="top"
data-tooltip-delay="200"
symbol="filter"
title={Liferay.Language.get(
'this-column-has-applied-filters'
)}
/>
</ClayLayout.ContentCol>
</ClayTooltipProvider>
<ClayLayout.ContentCol>
<ClayIcon
data-tooltip-align="top"
data-tooltip-delay="200"
symbol="filter"
title={Liferay.Language.get(
'this-column-has-applied-filters'
)}
/>
</ClayLayout.ContentCol>
)}
</ClayLayout.ContentRow>
</ClayLayout.ContainerFluid>
Expand Down
Loading

0 comments on commit cf865a3

Please sign in to comment.