An open source design system that's fully customizable and agent ready
TypeScript
fix(PowerSearch): prevent edit popover from closing when selecting multi-select options via Enter (#4245) (#4246)
Ahmad Saad3bb5896b82c5
diff --git a/.changeset/fix-powersearch-multiselect-enter.md b/.changeset/fix-powersearch-multiselect-enter.mdnew file mode 100644index 0000000000..57fb1a7c53--- /dev/null+++ b/.changeset/fix-powersearch-multiselect-enter.md@@ -0,0 +1,6 @@+---+'@astryxdesign/core': patch+---++[fix] Prevent PowerSearch edit popover from closing when selecting multi-select options via Enter (#4245)+@saadpocalypsediff --git a/packages/core/src/PowerSearch/PowerSearchEditPopover.test.tsx b/packages/core/src/PowerSearch/PowerSearchEditPopover.test.tsxindex 7eaa522b12..a0db192e4d 100644--- a/packages/core/src/PowerSearch/PowerSearchEditPopover.test.tsx+++ b/packages/core/src/PowerSearch/PowerSearchEditPopover.test.tsx@@ -13,6 +13,8 @@ import {import {render, screen, fireEvent, act} from '@testing-library/react';import React, {useState} from 'react';import {PowerSearch} from './PowerSearch';+import {PowerSearchEditPopover} from './PowerSearchEditPopover';+import {useInternalConfig} from './useInternalConfig';import type {PowerSearchConfig, PowerSearchFilter} from './types';// =============================================================================@@ -216,4 +218,69 @@ describe('PowerSearch', () => {expect(popoverText).toContain('Priority');expect(popoverText).toContain('equals');});++ it('does not save/close edit popover when Enter is consumed by child listbox option selection', () => {+ const multiConfig: PowerSearchConfig = {+ name: 'test-multi',+ fields: [+ {+ key: 'status',+ label: 'Status',+ operators: [+ {+ key: 'any_of',+ label: 'is any of',+ value: {+ type: 'enum_list',+ values: [+ {value: 'open', label: 'Open'},+ {value: 'closed', label: 'Closed'},+ ],+ },+ },+ ],+ },+ ],+ };++ const onSave = vi.fn();+ const onCancel = vi.fn();++ function MultiSelectHarness() {+ const internalConfig = useInternalConfig(multiConfig);+ return (+ <PowerSearchEditPopover+ config={internalConfig}+ filter={{+ field: 'status',+ operator: 'any_of',+ value: {type: 'enum_list', value: ['open']},+ }}+ mode="edit"+ onSave={onSave}+ onCancel={onCancel}+ />+ );+ }++ const {container} = render(<MultiSelectHarness />);++ const input = container.querySelector('input');+ expect(input).not.toBeNull();++ // Fire an Enter event that has been defaultPrevented (e.g. child typeahead option selection)+ const enterEvent = new KeyboardEvent('keydown', {+ key: 'Enter',+ bubbles: true,+ cancelable: true,+ });+ enterEvent.preventDefault();++ act(() => {+ input?.dispatchEvent(enterEvent);+ });++ // onSave should NOT be called because the event was already consumed (defaultPrevented)+ expect(onSave).not.toHaveBeenCalled();+ });});diff --git a/packages/core/src/PowerSearch/PowerSearchEditPopover.tsx b/packages/core/src/PowerSearch/PowerSearchEditPopover.tsxindex 073d0bf5f7..92e7af97f0 100644--- a/packages/core/src/PowerSearch/PowerSearchEditPopover.tsx+++ b/packages/core/src/PowerSearch/PowerSearchEditPopover.tsx@@ -702,7 +702,7 @@ export function PowerSearchEditPopover({// Handle Enter to save, Escape to cancelconst handleKeyDown = useCallback((e: React.KeyboardEvent) => {- if (e.key === 'Enter' && !isSaveDisabled) {+ if (e.key === 'Enter' && !isSaveDisabled && !e.defaultPrevented) {e.preventDefault();handleSave();} else if (e.key === 'Escape' && !e.defaultPrevented) {