Make ReviewSortSelect controlled

assets/js/base/components/reviews/review-sort-select/index.js

@@ -10,11 +10,10 @@ import SortSelect from '@woocommerce/base-components/sort-select';
  */
 import './style.scss';
 
-const ReviewSortSelect = ( { defaultValue, onChange, readOnly, value } ) => {
+const ReviewSortSelect = ( { onChange, readOnly, value } ) => {
 	return (
 		<SortSelect
 			className="wc-block-review-sort-select wc-block-components-review-sort-select"
-			defaultValue={ defaultValue }
 			label={ __( 'Order by', 'woo-gutenberg-products-block' ) }
 			onChange={ onChange }
 			options={ [
@@ -48,11 +47,6 @@ const ReviewSortSelect = ( { defaultValue, onChange, readOnly, value } ) => {
 };
 
 ReviewSortSelect.propTypes = {
-	defaultValue: PropTypes.oneOf( [
-		'most-recent',
-		'highest-rating',
-		'lowest-rating',
-	] ),
 	onChange: PropTypes.func,
 	readOnly: PropTypes.bool,
 	value: PropTypes.oneOf( [

assets/js/blocks/reviews/frontend-block.js

@@ -19,17 +19,17 @@ import withReviews from '@woocommerce/base-hocs/with-reviews';
  * @param {function(any):any} props.onAppendReviews Function called when appending review.
  * @param {function(any):any} props.onChangeOrderby
  * @param {Array} props.reviews
+ * @param {string} props.sortSelectValue
  * @param {number} props.totalReviews
  */
 const FrontendBlock = ( {
 	attributes,
 	onAppendReviews,
 	onChangeOrderby,
 	reviews,
+	sortSelectValue,
 	totalReviews,
 } ) => {
-	const { orderby } = attributes;
-
 	if ( reviews.length === 0 ) {
 		return null;
 	}
@@ -40,7 +40,7 @@ const FrontendBlock = ( {
 		<>
 			{ attributes.showOrderby !== 'false' && reviewRatingsEnabled && (
 				<ReviewSortSelect
-					defaultValue={ orderby }
+					value={ sortSelectValue }
 					onChange={ onChangeOrderby }
 				/>
 			) }

assets/js/blocks/reviews/frontend-container-block.js

@@ -95,6 +95,7 @@ class FrontendContainerBlock extends Component {
 				orderby={ orderby }
 				productId={ productId }
 				reviewsToDisplay={ reviewsToDisplay }
+				sortSelectValue={ this.state.orderby }
 			/>
 		);
 	}