From dbcb867141d6c79d71f561dbe63d326718ecbabd Mon Sep 17 00:00:00 2001
From: Thomas Roberts <5656702+opr@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:55:34 +0100
Subject: [PATCH] Move `SortSelect` to components package
 (https://github.com/woocommerce/woocommerce-blocks/pull/11411)

---
 .../woocommerce-blocks/assets/js/base/components/index.ts    | 2 --
 .../components/product-list/product-sort-select/index.tsx    | 3 ++-
 .../js/base/components/reviews/review-sort-select/index.tsx  | 2 +-
 .../assets/js/blocks/reviews/test/frontend-block.test.tsx    | 4 +++-
 plugins/woocommerce-blocks/packages/components/index.ts      | 5 +++--
 .../js/base => packages}/components/sort-select/index.tsx    | 2 +-
 .../js/base => packages}/components/sort-select/style.scss   | 0
 7 files changed, 10 insertions(+), 8 deletions(-)
 rename plugins/woocommerce-blocks/{assets/js/base => packages}/components/sort-select/index.tsx (87%)
 rename plugins/woocommerce-blocks/{assets/js/base => packages}/components/sort-select/style.scss (100%)

diff --git a/plugins/woocommerce-blocks/assets/js/base/components/index.ts b/plugins/woocommerce-blocks/assets/js/base/components/index.ts
index 7b938ead9ce..bf696d64cb9 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/index.ts
+++ b/plugins/woocommerce-blocks/assets/js/base/components/index.ts
@@ -10,7 +10,6 @@ export * from './filter-reset-button';
 export * from './filter-submit-button';
 export * from './form';
 export * from './form-token-field';
-export * from './label';
 export * from './load-more-button';
 export * from './loading-mask';
 export * from './noninteractive';
@@ -26,7 +25,6 @@ export * from './read-more';
 export * from './reviews';
 export * from './sidebar-layout';
 export * from './snackbar-list';
-export * from './sort-select';
 export * from './state-input';
 export * from './summary';
 export * from './tabs';
diff --git a/plugins/woocommerce-blocks/assets/js/base/components/product-list/product-sort-select/index.tsx b/plugins/woocommerce-blocks/assets/js/base/components/product-list/product-sort-select/index.tsx
index e2ac3574b2c..2d6b9aa91bb 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/product-list/product-sort-select/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/base/components/product-list/product-sort-select/index.tsx
@@ -2,7 +2,8 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import SortSelect from '@woocommerce/base-components/sort-select';
+import { SortSelect } from '@woocommerce/blocks-components';
+
 /**
  * Internal dependencies
  */
diff --git a/plugins/woocommerce-blocks/assets/js/base/components/reviews/review-sort-select/index.tsx b/plugins/woocommerce-blocks/assets/js/base/components/reviews/review-sort-select/index.tsx
index 7a4966b5e6d..434390ebcac 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/reviews/review-sort-select/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/base/components/reviews/review-sort-select/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import SortSelect from '@woocommerce/base-components/sort-select';
+import { SortSelect } from '@woocommerce/blocks-components';
 import type { ChangeEventHandler } from 'react';
 
 /**
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/reviews/test/frontend-block.test.tsx b/plugins/woocommerce-blocks/assets/js/blocks/reviews/test/frontend-block.test.tsx
index cc84ffcb49e..68ef81127fd 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/reviews/test/frontend-block.test.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/reviews/test/frontend-block.test.tsx
@@ -7,7 +7,9 @@ jest.mock( '../utils', () => ( {
 
 jest.mock( '@woocommerce/settings', () => ( {
 	...jest.requireActual( '@woocommerce/settings' ),
-	getSetting: jest.fn().mockReturnValue( true ),
+	getSetting: jest
+		.fn()
+		.mockImplementation( ( setting, defaultValue ) => defaultValue ),
 } ) );
 
 /**
diff --git a/plugins/woocommerce-blocks/packages/components/index.ts b/plugins/woocommerce-blocks/packages/components/index.ts
index 4c6b153fc1a..f1089348f0d 100644
--- a/plugins/woocommerce-blocks/packages/components/index.ts
+++ b/plugins/woocommerce-blocks/packages/components/index.ts
@@ -1,8 +1,8 @@
 export { default as CheckboxList } from './checkbox-list';
-export { default as FormStep } from './form-step';
 export { Chip, RemovableChip } from './chip';
-export { default as Label } from './label';
+export { default as FormStep } from './form-step';
 export { default as FormattedMonetaryAmount } from './formatted-monetary-amount';
+export { default as Label } from './label';
 export {
 	default as RadioControl,
 	RadioControlOption,
@@ -10,5 +10,6 @@ export {
 } from './radio-control';
 export type { RadioControlOption as RadioControlOptionType } from './radio-control/types';
 export { default as RadioControlAccordion } from './radio-control-accordion';
+export { default as SortSelect } from './sort-select';
 export { default as Spinner } from './spinner';
 export { default as Textarea } from './textarea';
diff --git a/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.tsx b/plugins/woocommerce-blocks/packages/components/sort-select/index.tsx
similarity index 87%
rename from plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.tsx
rename to plugins/woocommerce-blocks/packages/components/sort-select/index.tsx
index f543b164d4c..2dddbb8d809 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.tsx
+++ b/plugins/woocommerce-blocks/packages/components/sort-select/index.tsx
@@ -9,7 +9,7 @@ import type { ChangeEventHandler } from 'react';
  * Internal dependencies
  */
 import './style.scss';
-import Label from '../../../../../packages/components/label'; // Imported like this because importing from the components package loads the data stores unnecessarily - not a problem in the front end but would require a lot of unit test rewrites to prevent breaking tests due to incorrect mocks.
+import Label from '../label'; // Imported like this because importing from the components package loads the data stores unnecessarily - not a problem in the front end but would require a lot of unit test rewrites to prevent breaking tests due to incorrect mocks.
 
 interface SortSelectProps {
 	/**
diff --git a/plugins/woocommerce-blocks/assets/js/base/components/sort-select/style.scss b/plugins/woocommerce-blocks/packages/components/sort-select/style.scss
similarity index 100%
rename from plugins/woocommerce-blocks/assets/js/base/components/sort-select/style.scss
rename to plugins/woocommerce-blocks/packages/components/sort-select/style.scss