Skip to content

Commit

Permalink
Remove event.stopPropagation for past WritingFlow/ObserveTyping compa…
Browse files Browse the repository at this point in the history
…tibility (#33632)
  • Loading branch information
ellatrix authored and sarayourfriend committed Jul 23, 2021
1 parent 295942b commit 3052286
Show file tree
Hide file tree
Showing 15 changed files with 3 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ function BlockAlignmentMatrixControl( props ) {
const openOnArrowDown = ( event ) => {
if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ describe( 'BlockSwitcherDropdownMenu', () => {
const onToggleStub = jest.fn();
const mockKeyDown = {
preventDefault: () => {},
stopPropagation: () => {},
keyCode: DOWN,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ const renderToggleComponent = ( { TextColor, BackgroundColor } ) => ( {
const openOnArrowDown = ( event ) => {
if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ function DuotoneControl( {
const openOnArrowDown = ( event ) => {
if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,7 @@ export function MediaPlaceholder( {
return (
<Button
variant="tertiary"
onClick={ ( event ) => {
event.stopPropagation();
onClick={ () => {
open();
} }
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ const MediaReplaceFlow = ( {
const openOnArrowDown = ( event ) => {
if ( event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
event.target.click();
}
};
Expand Down
5 changes: 0 additions & 5 deletions packages/block-editor/src/components/url-input/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ class URLInput extends Component {
// position.
case UP: {
if ( 0 !== event.target.selectionStart ) {
event.stopPropagation();
event.preventDefault();

// Set the input caret to position 0
Expand All @@ -275,7 +274,6 @@ class URLInput extends Component {
if (
this.props.value.length !== event.target.selectionStart
) {
event.stopPropagation();
event.preventDefault();

// Set the input caret to the last position
Expand Down Expand Up @@ -306,7 +304,6 @@ class URLInput extends Component {

switch ( event.keyCode ) {
case UP: {
event.stopPropagation();
event.preventDefault();
const previousIndex = ! selectedSuggestion
? suggestions.length - 1
Expand All @@ -317,7 +314,6 @@ class URLInput extends Component {
break;
}
case DOWN: {
event.stopPropagation();
event.preventDefault();
const nextIndex =
selectedSuggestion === null ||
Expand All @@ -339,7 +335,6 @@ class URLInput extends Component {
}
case ENTER: {
if ( this.state.selectedSuggestion !== null ) {
event.stopPropagation();
this.selectLink( suggestion );

if ( this.props.onSubmit ) {
Expand Down
1 change: 0 additions & 1 deletion packages/block-library/src/gallery/gallery-image.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class GalleryImage extends Component {
this.props.isSelected &&
[ BACKSPACE, DELETE ].indexOf( event.keyCode ) !== -1
) {
event.stopPropagation();
event.preventDefault();
this.props.onRemove();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default function HeadingLevelDropdown( { selectedLevel, onChange } ) {
const openOnArrowDown = ( event ) => {
if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
21 changes: 2 additions & 19 deletions packages/block-library/src/template-part/edit/selection/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,12 @@
*/
import { SearchControl } from '@wordpress/components';
import { useState } from '@wordpress/element';
import { LEFT, RIGHT, UP, DOWN, BACKSPACE, ENTER } from '@wordpress/keycodes';

/**
* Internal dependencies
*/
import TemplatePartPreviews from './template-part-previews';

const preventArrowKeysPropagation = ( event ) => {
if (
[ LEFT, DOWN, RIGHT, UP, BACKSPACE, ENTER ].includes( event.keyCode )
) {
// Stop the key event from propagating up to ObserveTyping.startTypingInTextField.
event.stopPropagation();
}
};
const stopKeyPropagation = ( event ) => event.stopPropagation();

// Disable reason (no-static-element-interactions): Navigational key-presses within
// the menu are prevented from triggering WritingFlow and ObserveTyping interactions.
/* eslint-disable jsx-a11y/no-static-element-interactions */
export default function TemplatePartSelection( {
setAttributes,
onClose,
Expand All @@ -30,10 +17,7 @@ export default function TemplatePartSelection( {
} ) {
const [ filterValue, setFilterValue ] = useState( '' );
return (
<div
onKeyPress={ stopKeyPropagation }
onKeyDown={ preventArrowKeysPropagation }
>
<div>
<SearchControl
value={ filterValue }
onChange={ setFilterValue }
Expand All @@ -51,4 +35,3 @@ export default function TemplatePartSelection( {
</div>
);
}
/* eslint-enable jsx-a11y/no-static-element-interactions */
1 change: 0 additions & 1 deletion packages/components/src/autocomplete/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ function useAutocomplete( {
// Any handled keycode should prevent original behavior. This relies on
// the early return in the default case.
event.preventDefault();
event.stopPropagation();
}

let textContent;
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/dropdown-menu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ function DropdownMenu( {

if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/dropdown-menu/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ function DropdownMenu( {
const openOnArrowDown = ( event ) => {
if ( ! isOpen && event.keyCode === DOWN ) {
event.preventDefault();
event.stopPropagation();
onToggle();
}
};
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/dropdown-menu/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ describe( 'DropdownMenu', () => {
button.focus();
fireEvent.keyDown( button, {
keyCode: DOWN,
stopPropagation: () => {},
preventDefault: () => {},
} );
const menu = getNavigableMenu( dropdownMenuContainer );
Expand All @@ -95,7 +94,6 @@ describe( 'DropdownMenu', () => {
button.focus();
fireEvent.keyDown( button, {
keyCode: DOWN,
stopPropagation: () => {},
preventDefault: () => {},
} );

Expand Down
1 change: 0 additions & 1 deletion packages/rich-text/src/component/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ export class RichText extends Component {
// Add stubs for conformance in downstream autocompleters logic
this.customEditableOnKeyDown?.( {
preventDefault: () => undefined,
stopPropagation: () => undefined,
...event,
} );

Expand Down

0 comments on commit 3052286

Please sign in to comment.