Support default namespaces in getConfig

WordPress · Feb 9, 2024 · 34289a9 · 34289a9
1 parent eb0ea96
commit 34289a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/interactivity-router/src/index.js b/packages/interactivity-router/src/index.js
@@ -133,7 +133,7 @@ export const { state, actions } = store( 'core/router', {
 		 * @return {Promise} Promise that resolves once the navigation is completed or aborted.
 		 */
 		*navigate( href, options = {} ) {
-			const { clientNavigationDisabled } = getConfig( 'core/router' );
+			const { clientNavigationDisabled } = getConfig();
 			if ( clientNavigationDisabled ) {
 				yield forcePageReload( href );
 			}
@@ -225,7 +225,7 @@ export const { state, actions } = store( 'core/router', {
 		 *                                  fetching the requested URL.
 		 */
 		prefetch( url, options = {} ) {
-			const { clientNavigationDisabled } = getConfig( 'core/router' );
+			const { clientNavigationDisabled } = getConfig();
 			if ( clientNavigationDisabled ) return;
 
 			const pagePath = getPagePath( url );

diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
@@ -132,7 +132,7 @@ const namespaceStack: string[] = [];
  * @return The context content.
  */
 export const getContext = < T extends object >( namespace?: string ): T =>
-	getScope()?.context[ namespace || namespaceStack.slice( -1 )[ 0 ] ];
+	getScope()?.context[ namespace || getNamespace() ];
 
 /**
  * Retrieves a representation of the element where a function from the store

diff --git a/packages/interactivity/src/store.ts b/packages/interactivity/src/store.ts
@@ -11,6 +11,7 @@ import {
 	getScope,
 	setScope,
 	resetScope,
+	getNamespace,
 	setNamespace,
 	resetNamespace,
 } from './hooks';
@@ -171,7 +172,7 @@ const handlers = {
  * @return Defined config for the given namespace.
  */
 export const getConfig = ( namespace: string ) =>
-	storeConfigs.get( namespace ) || {};
+	storeConfigs.get( namespace || getNamespace() ) || {};
 
 interface StoreOptions {
 	/**