Apply suggestions from code review

Co-authored-by: Weston Ruter <[email protected]>

Author: joedolson

src/wp-includes/widgets/class-wp-widget-archives.php

@@ -116,6 +116,8 @@ function onSelectChange(e) {
 			const lastKey = dropdown.getAttribute( 'data-lastkey' );
 			if ( 'change' === e.type && 'escape' === lastKey ) {
 				return;
+			if ( 'change' === e.type && 'escape' === dropdown.dataset.lastkey ) {
+				return;
 			}
 			if ( dropdown.value ) {
 				document.location.href = dropdown.value;
@@ -124,13 +126,13 @@ function onSelectChange(e) {
 	}
 	dropdown.addEventListener( 'keyup', function(e) {
 		if ( 'Escape' === e.key ) {
-			dropdown.setAttribute( 'data-lastkey', 'escape' ); 
+			dropdown.dataset.lastkey = 'escape';
 		} else {
-			dropdown.removeAttribute( 'data-lastkey' ); 
+			delete dropdown.dataset.lastkey;
 		}
 	});
 	dropdown.addEventListener( 'click', function() {
-		dropdown.removeAttribute( 'data-lastkey' );
+		delete dropdown.dataset.lastkey;
 	});
 	dropdown.addEventListener( 'change', onSelectChange );
 })( <?php echo wp_json_encode( $dropdown_id, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES ); ?> );

src/wp-includes/widgets/class-wp-widget-categories.php

@@ -100,8 +100,7 @@ public function widget( $args, $instance ) {
 	var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' ), lastkey;
 	function onCatChange(e) {
 		setTimeout(function() {
-			lastKey = dropdown.getAttribute( 'data-lastkey' );
-			if ( 'change' === e.type && 'escape' === lastKey ) {
+			if ( 'change' === e.type && 'escape' === dropdown.dataset.lastkey ) {
 				return;
 			}
 			if ( dropdown.value && parseInt( dropdown.value ) > 0 ) {
@@ -111,13 +110,13 @@ function onCatChange(e) {
 	}
 	dropdown.addEventListener( 'keyup', function(e) {
 		if ( 'Escape' === e.key ) {
-			dropdown.setAttribute( 'data-lastkey', 'escape' ); 
+			dropdown.dataset.lastkey = 'escape';
 		} else {
-			dropdown.removeAttribute( 'data-lastkey' ); 
+			delete dropdown.dataset.lastkey;
 		}
 	});
 	dropdown.addEventListener( 'click', function() {
-		dropdown.removeAttribute( 'data-lastkey' );
+		delete dropdown.dataset.lastkey;
 	});
 	dropdown.addEventListener( 'change', onCatChange );
 })();