Fix circular dependency issues?

WordPress · Jan 29, 2024 · 34c2821 · 34c2821
1 parent 0ae33ce
commit 34c2821
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/packages/block-editor/src/components/global-styles/effects-panel.js b/packages/block-editor/src/components/global-styles/effects-panel.js
@@ -26,7 +26,7 @@ import { shadow as shadowIcon, Icon, check } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { mergeOrigins } from '../../store/private-selectors/get-inherited-settings';
+import { mergeOrigins } from '../../store/get-inherited-settings';
 import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
 import { setImmutably } from '../../utils/object';
 

diff --git a/packages/block-editor/src/components/global-styles/typography-panel.js b/packages/block-editor/src/components/global-styles/typography-panel.js
@@ -16,7 +16,7 @@ import { useCallback } from '@wordpress/element';
 import {
 	mergeOrigins,
 	hasMergedOrigins,
-} from '../../store/private-selectors/get-inherited-settings';
+} from '../../store/get-inherited-settings';
 import FontFamilyControl from '../font-family';
 import FontAppearanceControl from '../font-appearance-control';
 import LineHeightControl from '../line-height-control';

diff --git a/...ivate-selectors/get-inherited-settings.js → ...ditor/src/store/get-inherited-settings.js b/...ivate-selectors/get-inherited-settings.js → ...ditor/src/store/get-inherited-settings.js
@@ -10,13 +10,13 @@ import { applyFilters } from '@wordpress/hooks';
 /**
  * Internal dependencies
  */
-import { getValueFromObjectPath } from '../../utils/object';
+import { getValueFromObjectPath } from '../utils/object';
 import {
 	getBlockParents,
 	getBlockName,
 	getSettings,
 	getBlockAttributes,
-} from '../selectors';
+} from './selectors';
 
 const blockedPaths = [
 	'color',

diff --git a/packages/block-editor/src/store/index.js b/packages/block-editor/src/store/index.js
@@ -10,11 +10,17 @@ import reducer from './reducer';
 import * as selectors from './selectors';
 import * as privateActions from './private-actions';
 import * as privateSelectors from './private-selectors';
+import { getInheritedSettings } from './get-inherited-settings';
 import * as resolvers from './resolvers';
 import * as actions from './actions';
 import { STORE_NAME } from './constants';
 import { unlock } from '../lock-unlock';
 
+privateSelectors = {
+	...privateSelectors,
+	getInheritedSettings,
+};
+
 /**
  * Block editor data store configuration.
  *

diff --git a/...itor/src/store/private-selectors/index.js → ...ock-editor/src/store/private-selectors.js b/...itor/src/store/private-selectors/index.js → ...ock-editor/src/store/private-selectors.js
@@ -17,13 +17,11 @@ import {
 	getBlockEditingMode,
 	getSettings,
 	canInsertBlockType,
-} from '../selectors';
-import { checkAllowListRecursive, getAllPatternsDependants } from '../utils';
-import { INSERTER_PATTERN_TYPES } from '../../components/inserter/block-patterns-tab/utils';
-import { store } from '..';
-import { unlock } from '../../lock-unlock';
-
-export { getInheritedSettings } from './get-inherited-settings';
+} from './selectors';
+import { checkAllowListRecursive, getAllPatternsDependants } from './utils';
+import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
+import { store } from '.';
+import { unlock } from '../lock-unlock';
 
 /**
  * Returns true if the block interface is hidden, or false otherwise.
@@ -175,7 +173,7 @@ export function getStyleOverrides( state ) {
 	return state.styleOverrides;
 }
 
-/** @typedef {import('../actions').InserterMediaCategory} InserterMediaCategory */
+/** @typedef {import('./actions').InserterMediaCategory} InserterMediaCategory */
 /**
  * Returns the registered inserter media categories through the public API.
  *

diff --git a/...src/store/private-selectors/test/index.js → .../src/store/test/get-inherited-settings.js b/...src/store/private-selectors/test/index.js → .../src/store/test/get-inherited-settings.js