From bb330e351adb68bd84fc27a2cd0e3badf597d5d8 Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Thu, 22 Apr 2021 12:23:03 +0300 Subject: [PATCH] fix(core-dialogs): CB-875 toolTip -> tooltip --- .../core-dialogs/src/Menu/ContextMenu/ContextMenu.ts | 8 ++++---- webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts | 2 +- .../src/Menu/models/ComputedMenuItemModel.ts | 10 +++++----- .../core-dialogs/src/Menu/models/MenuOptionsStore.ts | 4 ++-- .../plugin-data-export/src/DataExportMenuService.ts | 2 +- .../TableFooterMenu/TableFooterMenuItem.tsx | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts index 1fc06fe624..406eb7f6a0 100644 --- a/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts +++ b/webapp/packages/core-dialogs/src/Menu/ContextMenu/ContextMenu.ts @@ -85,8 +85,8 @@ class ComputedMenuItemOptionsWithContext implements IComputedMenuItemOptions // set title or getter title?: TLocalizationToken; titleGetter?: () => TLocalizationToken | undefined; - toolTip?: TLocalizationToken; - toolTipGetter?: () => TLocalizationToken | undefined; + tooltip?: TLocalizationToken; + tooltipGetter?: () => TLocalizationToken | undefined; isDisabled?: () => boolean; isHidden?: () => boolean; // set icon or getter @@ -101,8 +101,8 @@ class ComputedMenuItemOptionsWithContext implements IComputedMenuItemOptions // doesn't depend on context this.title = options.title; this.titleGetter = options.titleGetter; - this.toolTip = options.toolTip; - this.toolTipGetter = options.toolTipGetter; + this.tooltip = options.tooltip; + this.tooltipGetter = options.tooltipGetter; this.icon = options.icon; this.type = options.type; this.separator = options.separator; diff --git a/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts b/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts index e333af6407..bc51fdbdbb 100644 --- a/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts +++ b/webapp/packages/core-dialogs/src/Menu/IMenuPanel.ts @@ -29,7 +29,7 @@ export interface IMenuItem { isDisabled?: boolean; isHidden?: boolean; icon?: string; // path to icon or svg icon name - toolTip?: string; + tooltip?: string; panel?: IMenuPanel; // if menu has sub-items type?: MenuItemType; separator?: boolean; diff --git a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts index bb620bdf9a..334813b673 100644 --- a/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts +++ b/webapp/packages/core-dialogs/src/Menu/models/ComputedMenuItemModel.ts @@ -35,11 +35,11 @@ export class ComputedMenuItemModel implements IMenuItem { return this.options.titleGetter ? this.options.titleGetter() || '' : ''; } - get toolTip() { - if (this.options.toolTip) { - return this.options.toolTip; + get tooltip() { + if (this.options.tooltip) { + return this.options.tooltip; } - return this.options.toolTipGetter ? this.options.toolTipGetter() : undefined; + return this.options.tooltipGetter ? this.options.tooltipGetter() : undefined; } get isDisabled() { @@ -64,7 +64,7 @@ export class ComputedMenuItemModel implements IMenuItem { constructor(private options: IComputedMenuItemOptions) { makeObservable(this, { title: computed, - toolTip: computed, + tooltip: computed, isDisabled: computed, icon: computed, isHidden: computed, diff --git a/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts b/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts index edcbee812e..9149336837 100644 --- a/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts +++ b/webapp/packages/core-dialogs/src/Menu/models/MenuOptionsStore.ts @@ -22,8 +22,8 @@ export interface IMenuItemOptions { // set icon or getter icon?: string; iconGetter?: () => string | undefined; - toolTip?: string; - toolTipGetter?: () => TLocalizationToken | undefined; + tooltip?: string; + tooltipGetter?: () => TLocalizationToken | undefined; order?: number; isPanel?: boolean; panel?: IMenuPanel; diff --git a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts index ada70e7196..fb6eb2ade0 100644 --- a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts +++ b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts @@ -35,7 +35,7 @@ export class DataExportMenuService { }, order: 5, title: 'data_transfer_dialog_export', - toolTip: 'data_transfer_dialog_export_tooltip', + tooltip: 'data_transfer_dialog_export_tooltip', icon: 'table-export', onClick: this.exportData.bind(this), }); diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx index bd5ca9afe0..cbdf76ce49 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx @@ -70,7 +70,7 @@ export const TableFooterMenuItem = observer(function TableFooterMenuItem({ as="button" {...props} disabled={menuItem.isDisabled} - title={translate(menuItem.toolTip || '')} + title={menuItem.tooltip ? translate(menuItem.tooltip) : ''} onClick={() => menuItem.onClick?.()} > {menuItem.icon && (