Upgrade Reakit to stable v1.0.0 (#22352)

WordPress · May 14, 2020 · 196d8ce · 196d8ce
1 parent ead98ed
commit 196d8ce
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -53,7 +53,7 @@
 		"re-resizable": "^6.0.0",
 		"react-dates": "^17.1.1",
 		"react-spring": "^8.0.20",
-		"reakit": "^1.0.0-rc.2",
+		"reakit": "^1.0.2",
 		"rememo": "^3.0.0",
 		"tinycolor2": "^1.4.1",
 		"uuid": "^7.0.2"

diff --git a/packages/components/src/alignment-matrix-control/index.js b/packages/components/src/alignment-matrix-control/index.js
@@ -99,10 +99,6 @@ export default function AlignmentMatrixControl( {
 								key={ cell }
 								value={ cell }
 								onFocus={ () => handleOnChange( cell ) }
-								onClick={ () =>
-									// VoiceOver doesn't focus elements on click
-									composite.move( cellId )
-								}
 							/>
 						);
 					} ) }

diff --git a/packages/components/src/alignment-matrix-control/test/index.js b/packages/components/src/alignment-matrix-control/test/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, unmountComponentAtNode } from 'react-dom';
-import { act, Simulate } from 'react-dom/test-utils';
+import { act } from 'react-dom/test-utils';
 
 /**
  * Internal dependencies
@@ -69,15 +69,21 @@ describe( 'AlignmentMatrixControl', () => {
 
 			const cells = getCells();
 
-			act( () => Simulate.click( cells[ 3 ] ) );
+			act( () => {
+				cells[ 3 ].focus();
+			} );
 
 			expect( spy.mock.calls[ 0 ][ 0 ] ).toBe( 'center left' );
 
-			act( () => Simulate.click( cells[ 4 ] ) );
+			act( () => {
+				cells[ 4 ].focus();
+			} );
 
 			expect( spy.mock.calls[ 1 ][ 0 ] ).toBe( 'center center' );
 
-			act( () => Simulate.click( cells[ 7 ] ) );
+			act( () => {
+				cells[ 7 ].focus();
+			} );
 
 			expect( spy.mock.calls[ 2 ][ 0 ] ).toBe( 'bottom center' );
 		} );

diff --git a/packages/components/src/toolbar-item/index.js b/packages/components/src/toolbar-item/index.js
@@ -32,11 +32,7 @@ function ToolbarItem( { children, ...props }, ref ) {
 
 	return (
 		<BaseToolbarItem { ...accessibleToolbarState } { ...allProps }>
-			{ ( htmlProps ) =>
-				// Overwriting BaseToolbarItem's onMouseDown since it disables drag
-				// and drop
-				children( { ...htmlProps, onMouseDown: allProps.onMouseDown } )
-			}
+			{ children }
 		</BaseToolbarItem>
 	);
 }