Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EuiBasicTable] Pass click events to actions onClick #7667

Merged
merged 4 commits into from
Apr 10, 2024
+103 −37
Merged

[EuiBasicTable] Pass click events to actions onClick #7667

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
435dae1
Pass back the originating click `event` to actions
cee-chen Apr 9, 2024
9eef965
Pass back the originating click `event` to collapsed actions
cee-chen Apr 9, 2024
c3bd4c1
[misc cleanup] Remove manual conditions in favor of `callWithItemIfFu…
cee-chen Apr 9, 2024
184d6bf
changelog
cee-chen Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
[misc cleanup] Remove manual conditions in favor of `callWithItemIfFu… 
…nction` util
  • Loading branch information
@cee-chen
cee-chen committed Apr 9, 2024

Verified

This commit was signed with the committer’s verified signature.
rouault Even Rouault
GPG key ID: 33EBBFC47B3DD87D
Verified
Learn about vigilant mode
commit c3bd4c1fa46d34ade20b7084dc6b79ce42c5155e
10 changes: 3 additions & 7 deletions src/components/basic_table/collapsed_item_actions.tsx
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ import React, {
ReactElement,
} from 'react';

import { isString } from '../../services/predicate';
import { EuiContextMenuItem, EuiContextMenuPanel } from '../context_menu';
import { EuiPopover } from '../popover';
import { EuiButtonIcon } from '../button';
@@ -69,12 +68,9 @@ export const CollapsedItemActions = <T extends {}>({
</EuiContextMenuItem>
);
} else {
const buttonIcon = action.icon;
let icon;
if (buttonIcon) {
icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
}

const icon = action.icon
? callWithItemIfFunction(item)(action.icon)
: undefined;
const buttonContent = callWithItemIfFunction(item)(action.name);
const toolTipContent = callWithItemIfFunction(item)(action.description);
const href = callWithItemIfFunction(item)(action.href);
21 changes: 7 additions & 14 deletions src/components/basic_table/default_item_action.tsx
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@

import React, { ReactElement, ReactNode, MouseEvent, useCallback } from 'react';

import { isString } from '../../services/predicate';
import {
EuiButtonEmpty,
EuiButtonIcon,
@@ -51,26 +50,20 @@ export const DefaultItemAction = <T extends object>({
[action.onClick, item]
);

const buttonColor = action.color;
let color: EuiButtonIconProps['color'] = 'primary';
if (buttonColor) {
color = isString(buttonColor) ? buttonColor : buttonColor(item);
}

const buttonIcon = action.icon;
let icon;
if (buttonIcon) {
icon = isString(buttonIcon) ? buttonIcon : buttonIcon(item);
}

let button;
const color: EuiButtonIconProps['color'] = action.color
? callWithItemIfFunction(item)(action.color)
: 'primary';
const icon = action.icon
? callWithItemIfFunction(item)(action.icon)
: undefined;
const actionContent = callWithItemIfFunction(item)(action.name);
const tooltipContent = callWithItemIfFunction(item)(action.description);
const href = callWithItemIfFunction(item)(action.href);
const dataTestSubj = callWithItemIfFunction(item)(action['data-test-subj']);

const ariaLabelId = useGeneratedHtmlId();
let ariaLabelledBy: ReactNode;
let button;

if (action.type === 'icon') {
if (!icon) {