From 598a3115243b20b2249e49257885dc0e110aa437 Mon Sep 17 00:00:00 2001 From: evwilkin Date: Mon, 9 Mar 2020 16:23:27 -0400 Subject: [PATCH 1/3] destructure bubbleEvent from props to avoid it passing to button el --- packages/react-core/src/components/Dropdown/Toggle.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react-core/src/components/Dropdown/Toggle.tsx b/packages/react-core/src/components/Dropdown/Toggle.tsx index e79a4da8818..602a1f1d3c6 100644 --- a/packages/react-core/src/components/Dropdown/Toggle.tsx +++ b/packages/react-core/src/components/Dropdown/Toggle.tsx @@ -131,6 +131,8 @@ export class Toggle extends React.Component { isPrimary, isSplitButton, ariaHasPopup, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + bubbleEvent, onToggle, // eslint-disable-next-line @typescript-eslint/no-unused-vars onEnter, From 9fbbb3ec4560c2ad35ff90216757465462c730da Mon Sep 17 00:00:00 2001 From: evwilkin Date: Mon, 9 Mar 2020 16:39:24 -0400 Subject: [PATCH 2/3] updated snapshots --- .../ApplicationLauncher.test.tsx.snap | 6 ------ .../__tests__/__snapshots__/Dropdown.test.tsx.snap | 14 -------------- .../__snapshots__/DropdownToggle.test.tsx.snap | 5 ----- .../__tests__/__snapshots__/Toggle.test.tsx.snap | 2 -- .../__snapshots__/OptionsMenu.test.tsx.snap | 7 ------- .../__snapshots__/Pagination.test.tsx.snap | 13 ------------- 6 files changed, 47 deletions(-) diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap index 2db7e7006c6..39923fca11a 100644 --- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap +++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap @@ -508,7 +508,6 @@ exports[`ApplicationLauncher custom icon 1`] = ` aria-expanded={true} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-5" @@ -1215,7 +1214,6 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-3" @@ -1605,7 +1603,6 @@ exports[`ApplicationLauncher dropup 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-2" @@ -2155,7 +2152,6 @@ exports[`ApplicationLauncher expanded 1`] = ` aria-expanded={true} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-4" @@ -2860,7 +2856,6 @@ exports[`ApplicationLauncher regular 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-0" @@ -3250,7 +3245,6 @@ exports[`ApplicationLauncher right aligned 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Application launcher" - bubbleEvent={false} className="pf-c-app-launcher__toggle" disabled={false} id="pf-toggle-id-1" diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap index aec92979b2e..b525f18c575 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap +++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap @@ -163,7 +163,6 @@ exports[`KebabToggle basic 1`] = ` aria-expanded={true} aria-haspopup={false} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -899,7 +898,6 @@ exports[`KebabToggle dropup + right aligned 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -1610,7 +1608,6 @@ exports[`KebabToggle dropup 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -2471,7 +2468,6 @@ exports[`KebabToggle expanded 1`] = ` aria-expanded={true} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -3451,7 +3447,6 @@ exports[`KebabToggle plain 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle pf-m-plain" disabled={false} id="Dropdown Toggle" @@ -4159,7 +4154,6 @@ exports[`KebabToggle regular 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -4870,7 +4864,6 @@ exports[`KebabToggle right aligned 1`] = ` aria-expanded={false} aria-haspopup={true} aria-label="Actions" - bubbleEvent={false} className="pf-c-dropdown__toggle" disabled={false} id="Dropdown Toggle" @@ -5093,7 +5086,6 @@ exports[`dropdown basic 1`] = `