Popover: Avoid resetting the isMobile state when not necessary

WordPress · Nov 16, 2017 · c5bc012 · c5bc012
1 parent 01378bc
commit c5bc012
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/components/popover/index.js b/components/popover/index.js
@@ -167,14 +167,19 @@ class Popover extends Component {
 			popover.style.top = 0;
 			popover.style.right = 0;
 			popover.style.bottom = 0;
+			if ( ! this.state.isMobile ) {
+				this.setState( {
+					isMobile: true,
+				} );
+			}
+			return;
+		}
+
+		if ( this.state.isMobile ) {
 			this.setState( {
-				isMobile: true,
+				isMobile: false,
 			} );
-			return;
 		}
-		this.setState( {
-			isMobile: false,
-		} );
 
 		const [ yAxis, xAxis ] = this.getPositions();
 		const isTop = 'top' === yAxis;
@@ -186,8 +191,8 @@ class Popover extends Component {
 			return;
 		}
 
-		//popover.style.bottom = 'auto';
-		//popover.style.right = 'auto';
+		popover.style.bottom = 'auto';
+		popover.style.right = 'auto';
 
 		if ( isRight ) {
 			popover.style.left = rect.left + ARROW_OFFSET + 'px';

diff --git a/components/popover/test/index.js b/components/popover/test/index.js
@@ -227,8 +227,6 @@ describe( 'Popover', () => {
 				style: {},
 			};
 
-			instance.setState = () => {};
-
 			return instance;
 		}
 
@@ -240,6 +238,8 @@ describe( 'Popover', () => {
 			expect( instance.nodes.popover.style ).toEqual( {
 				left: '225px',
 				top: '210px',
+				right: 'auto',
+				bottom: 'auto',
 			} );
 		} );
 
@@ -252,6 +252,8 @@ describe( 'Popover', () => {
 			expect( instance.nodes.popover.style ).toEqual( {
 				left: '225px',
 				top: '395px',
+				right: 'auto',
+				bottom: 'auto',
 			} );
 		} );
 	} );