feat: modify use-$x composable

EMP-3656
empathyco · Mar 20, 2024 · 20d2f90 · 20d2f90
1 parent 3064c83
commit 20d2f90
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/x-components/src/composables/use-$x.ts b/packages/x-components/src/composables/use-$x.ts
@@ -1,5 +1,6 @@
-import { getCurrentInstance } from 'vue';
 import { XComponentAPI } from '../plugins';
+import { useAliasApi } from './use-alias-api';
+import { useXBus } from './use-x-bus';
 
 /**
  * Function which returns the `$x` object from the current component instance.
@@ -9,5 +10,8 @@ import { XComponentAPI } from '../plugins';
  * @public
  */
 export function use$x(): XComponentAPI {
-  return (getCurrentInstance()?.proxy as unknown as { $x: XComponentAPI }).$x;
+  const xAliasAPI = useAliasApi();
+  const xBusAPI = useXBus();
+  const $x = Object.assign(xAliasAPI, xBusAPI);
+  return $x;
 }