fix async widget mock

Author: just-boris

src/app-layout/visual-refresh-toolbar/state/props-merger.ts

@@ -70,7 +70,7 @@ export const getPropsToMerge = (props: AppLayoutInternalProps, appLayoutState: A
   return {
     breadcrumbs: props.breadcrumbs,
     ariaLabels: state ? state.ariaLabels : props.ariaLabels,
-    navigation: !props.navigationTriggerHide && (state ? state.navigation : props.navigation),
+    navigation: !props.navigationTriggerHide && !props.navigationHide,
     navigationOpen: state ? state.navigationOpen : props.navigationOpen,
     onNavigationToggle: state?.onNavigationToggle,
     navigationFocusRef: state?.navigationFocusControl.refs.toggle,

src/internal/widgets/loader-mock.tsx

@@ -16,6 +16,8 @@ const isAppLayoutDelayedWidget = () => {
 
 const enableDelayedComponents = isAppLayoutDelayedWidget();
 
+let loadPromise: Promise<void>;
+
 export function createLoadableComponent<ComponentType extends FunctionComponent<any>>(
   Component: ComponentType
 ): ComponentType | undefined {
@@ -26,8 +28,18 @@ export function createLoadableComponent<ComponentType extends FunctionComponent<
     const [mounted, setMounted] = useState(false);
 
     useEffect(() => {
-      const timeoutId = setTimeout(() => setMounted(true), 1000);
-      return () => clearTimeout(timeoutId);
+      if (!loadPromise) {
+        loadPromise = new Promise(resolve => setTimeout(() => resolve(), 1000));
+      }
+      let mounted = true;
+      loadPromise.then(() => {
+        if (mounted) {
+          setMounted(true);
+        }
+      });
+      return () => {
+        mounted = false;
+      };
     }, []);
 
     if (mounted) {