Merge branch 'main' into fix/implementer-tools-tree-description-crash

Author: RajPrakash681

packages/framework/esm-styleguide/src/patient-banner/actions-menu/patient-banner-actions-menu.component.tsx

@@ -41,7 +41,7 @@ export function PatientBannerActionsMenu({
               </>
             }
           >
-            <ExtensionSlot name="patient-actions-slot" key="patient-actions-slot" state={patientActionsSlotState} />
+            <ExtensionSlot name={actionsSlotName} key={actionsSlotName} state={patientActionsSlotState} />
           </CustomOverflowMenu>
         </div>
       ) : null}

packages/framework/esm-styleguide/src/workspaces2/workspace2.component.tsx

@@ -76,7 +76,7 @@ export const Workspace2: React.FC<Workspace2Props> = ({ title, children, hasUnsa
     workspaceTitleByWorkspaceName,
     setWorkspaceTitle,
   } = useWorkspace2Store();
-  const { workspaceName, isRootWorkspace, isLeafWorkspace, closeWorkspace } = useContext(SingleSpaContext);
+  const { workspaceName, isRootWorkspace, closeWorkspace } = useContext(SingleSpaContext);
 
   const openedWindowIndex = getOpenedWindowIndexByWorkspace(workspaceName);
 
@@ -138,6 +138,7 @@ export const Workspace2: React.FC<Workspace2Props> = ({ title, children, hasUnsa
         className={classNames(styles.workspaceMiddleContainer, {
           [styles.maximized]: maximized,
           [styles.hidden]: openedWindow.hidden,
+          [styles.isRootWorkspace]: isRootWorkspace,
         })}
       >
         <div
@@ -147,62 +148,60 @@ export const Workspace2: React.FC<Workspace2Props> = ({ title, children, hasUnsa
             [styles.isRootWorkspace]: isRootWorkspace,
           })}
         >
-          {isLeafWorkspace && (
-            <>
-              <Header aria-label={getCoreTranslation('workspaceHeader')} className={styles.header}>
-                <HeaderName prefix="">{title}</HeaderName>
-                <div className={styles.overlayHeaderSpacer} />
-                <HeaderGlobalBar className={styles.headerButtons}>
-                  {isDesktop(layout) ? (
-                    <>
-                      {(canMaximize || maximized) && (
-                        <HeaderGlobalAction
-                          aria-label={maximized ? getCoreTranslation('minimize') : getCoreTranslation('maximize')}
-                          onClick={() => setWindowMaximized(windowName, !maximized)}
-                        >
-                          {maximized ? <Minimize /> : <Maximize />}
-                        </HeaderGlobalAction>
-                      )}
-                      {canHide ? (
-                        <HeaderGlobalAction
-                          aria-label={getCoreTranslation('hide')}
-                          onClick={() => hideWindow(windowName)}
-                        >
-                          <ArrowRightIcon />
-                        </HeaderGlobalAction>
-                      ) : (
-                        <HeaderGlobalAction
-                          aria-label={getCoreTranslation('close')}
-                          onClick={() => closeWorkspace({ closeWindow: true })}
-                        >
-                          <CloseIcon />
-                        </HeaderGlobalAction>
-                      )}
-                    </>
-                  ) : (
-                    <>
-                      {canHide && (
-                        <HeaderGlobalAction
-                          aria-label={getCoreTranslation('hide')}
-                          onClick={() => hideWindow(windowName)}
-                        >
-                          <DownToBottom />
-                        </HeaderGlobalAction>
-                      )}
-
+          <>
+            <Header aria-label={getCoreTranslation('workspaceHeader')} className={styles.header}>
+              <HeaderName prefix="">{title}</HeaderName>
+              <div className={styles.overlayHeaderSpacer} />
+              <HeaderGlobalBar className={styles.headerButtons}>
+                {isDesktop(layout) ? (
+                  <>
+                    {(canMaximize || maximized) && (
+                      <HeaderGlobalAction
+                        aria-label={maximized ? getCoreTranslation('minimize') : getCoreTranslation('maximize')}
+                        onClick={() => setWindowMaximized(windowName, !maximized)}
+                      >
+                        {maximized ? <Minimize /> : <Maximize />}
+                      </HeaderGlobalAction>
+                    )}
+                    {canHide ? (
+                      <HeaderGlobalAction
+                        aria-label={getCoreTranslation('hide')}
+                        onClick={() => hideWindow(windowName)}
+                      >
+                        <ArrowRightIcon />
+                      </HeaderGlobalAction>
+                    ) : (
                       <HeaderGlobalAction
                         aria-label={getCoreTranslation('close')}
                         onClick={() => closeWorkspace({ closeWindow: true })}
                       >
                         <CloseIcon />
                       </HeaderGlobalAction>
-                    </>
-                  )}
-                </HeaderGlobalBar>
-              </Header>
-              <div className={classNames(styles.workspaceContent)}>{children}</div>
-            </>
-          )}
+                    )}
+                  </>
+                ) : (
+                  <>
+                    {canHide && (
+                      <HeaderGlobalAction
+                        aria-label={getCoreTranslation('hide')}
+                        onClick={() => hideWindow(windowName)}
+                      >
+                        <DownToBottom />
+                      </HeaderGlobalAction>
+                    )}
+
+                    <HeaderGlobalAction
+                      aria-label={getCoreTranslation('close')}
+                      onClick={() => closeWorkspace({ closeWindow: true })}
+                    >
+                      <CloseIcon />
+                    </HeaderGlobalAction>
+                  </>
+                )}
+              </HeaderGlobalBar>
+            </Header>
+            <div className={classNames(styles.workspaceContent)}>{children}</div>
+          </>
         </div>
       </div>
     </div>

packages/framework/esm-styleguide/src/workspaces2/workspace2.module.scss

@@ -36,7 +36,10 @@ $extraWideWorkspaceWidth: 48.25rem;
     inset-inline-end: var(--actionPanelOffset);
     z-index: 100;
 
-    animation: growToWidth 0.5s ease-in-out;
+    &.isRootWorkspace {
+      animation: growToWidth 0.5s ease-in-out;
+    }
+
     transition: width 0.5s ease-in-out;
 
     &.maximized {
@@ -67,9 +70,7 @@ $extraWideWorkspaceWidth: 48.25rem;
     border-inline-start: 1px solid $text-03;
     background-color: #fff;
 
-    transition:
-      width 0.5s ease-in-out,
-      transform 0.5s ease-in-out;
+    transition: width 0.5s ease-in-out;
 
     &.maximized {
       width: calc(100vw - var(--actionPanelOffset));
@@ -176,7 +177,6 @@ $extraWideWorkspaceWidth: 48.25rem;
   .header {
     position: relative;
     background-color: var(--brand-02);
-    margin-inline-start: layout.$spacing-04;
 
     a {
       color: $ui-02;
@@ -209,10 +209,6 @@ $extraWideWorkspaceWidth: 48.25rem;
     &.isRootWorkspace {
       animation: slideFromBottom 0.5s ease-in-out;
     }
-
-    // .hidden {
-    //   width: 0 !important;
-    // }
   }
 
   .marginWorkspaceContent {