@openmrs/esm-styleguide 10.0.1-pre.5717 → 10.0.1-pre.5723

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 117 files, copied 171 files with swc (249.35ms)
+[0] Successfully compiled: 117 files, copied 171 files with swc (176.65ms)
 [0] swc --strip-leading-paths --copy-files src -d dist && svgo -rf dist --quiet exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/workspaces2/active-workspace-window.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"active-workspace-window.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/active-workspace-window.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAM5E,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGzE,UAAU,oBAAoB;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,OAAO,EAAE,sBAAsB,CAAC;IAChC;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB;AAKD;;;GAGG;AACH,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA4DzD,CAAC;AAoRF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"active-workspace-window.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/active-workspace-window.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAM5E,OAAO,EACL,KAAK,YAAY,EAKlB,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGzE,UAAU,oBAAoB;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,OAAO,EAAE,sBAAsB,CAAC;IAChC;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB;AAKD;;;GAGG;AACH,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA4DzD,CAAC;AAqRF,eAAe,qBAAqB,CAAC"}

package/dist/workspaces2/active-workspace-window.component.js

@@ -9,7 +9,7 @@ import { isDesktop, useLayoutType, useStore } from "@openmrs/esm-react-utils";
 import { loadLifeCycles } from "@openmrs/esm-routes";
 import { getCoreTranslation } from "@openmrs/esm-translations";
 import { ArrowRightIcon, CloseIcon } from "../icons/index.js";
-import { closeWorkspaceGroup2, useWorkspace2Store } from "./workspace2.js";
+import { closeWorkspaceGroup2, getOpenedWindowWidth, useWorkspace2Store } from "./workspace2.js";
 import styles from "./workspace2.module.scss";
 // module-level so the store subscription's snapshot getter stays stable across renders
 const selectRegisteredWorkspacesByName = (state)=>state.registeredWorkspacesByName;
@@ -171,12 +171,12 @@ const ActiveWorkspace = ({ lifeCycle, openedWorkspace, openedWindow, groupProps,
  * window system.
  */ const WorkspaceChrome = ({ openedWorkspace, openedWindow, isRootWorkspace, showActionMenu, closeWindow, children })=>{
     const layout = useLayoutType();
-    const { openedGroup, openedWindows, registeredWindowsByName, registeredGroupsByName, isMostRecentlyOpenedWindowHidden, setWindowMaximized, hideWindow } = useWorkspace2Store();
+    const { openedGroup, openedWindows, registeredWindowsByName, registeredWorkspacesByName, registeredGroupsByName, isMostRecentlyOpenedWindowHidden, setWindowMaximized, hideWindow } = useWorkspace2Store();
     const windowName = openedWindow.windowName;
     const { maximized } = openedWindow;
     const title = openedWorkspace.title ?? '';
     const windowDef = registeredWindowsByName[windowName];
-    const width = windowDef?.width ?? 'narrow';
+    const width = getOpenedWindowWidth(openedWindow, registeredWorkspacesByName, registeredWindowsByName);
     const icon = windowDef?.icon;
     const canMaximize = windowDef?.canMaximize;
     const canCloseGroup = openedGroup ? registeredGroupsByName[openedGroup.groupName]?.persistence === 'closable' : false;

package/dist/workspaces2/workspace2.component.d.ts

@@ -36,15 +36,16 @@ export interface Workspace2DefinitionProps<WorkspaceProps extends object = objec
     windowName: string;
     isRootWorkspace: boolean;
     showActionMenu: boolean;
-    /**
-     * Records the title of this workspace, for display in the workspace window header.
-     * @internal Called by `<Workspace2>`; use its `title` prop instead.
-     */
+}
+/**
+ * The props the framework actually passes to a workspace: the public `Workspace2DefinitionProps` plus
+ * the setters `<Workspace2>` uses to report its `title` and `hasUnsavedChanges` to the workspace window.
+ * Not part of the public API.
+ */
+export interface Workspace2InternalProps<WorkspaceProps extends object = object, WindowProps extends object = object, GroupProps extends object = object> extends Workspace2DefinitionProps<WorkspaceProps, WindowProps, GroupProps> {
+    /** Records the title of this workspace, for display in the workspace window header. */
     setWorkspaceTitle(title: string): void;
-    /**
-     * Records whether this workspace has unsaved changes.
-     * @internal Called by `<Workspace2>`; use its `hasUnsavedChanges` prop instead.
-     */
+    /** Records whether this workspace has unsaved changes. */
     setHasUnsavedChanges(hasUnsavedChanges: boolean): void;
 }
 export type Workspace2Definition<WorkspaceProps extends object, WindowProps extends object, GroupProps extends object> = React.FC<Workspace2DefinitionProps<WorkspaceProps, WindowProps, GroupProps>>;

package/dist/workspaces2/workspace2.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace2.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/workspace2.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzD,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,yBAAyB,CACxC,cAAc,SAAS,MAAM,GAAG,MAAM,EACtC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,UAAU,SAAS,MAAM,GAAG,MAAM;IAElC;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,SAAS,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzG;;;;;;OAMG;IACH,cAAc,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvG,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B;;;OAGG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,MAAM,oBAAoB,CAC9B,cAAc,SAAS,MAAM,EAC7B,WAAW,SAAS,MAAM,EAC1B,UAAU,SAAS,MAAM,IACvB,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;AAEjF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiBhD,CAAC"}
+{"version":3,"file":"workspace2.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/workspace2.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzD,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,yBAAyB,CACxC,cAAc,SAAS,MAAM,GAAG,MAAM,EACtC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,UAAU,SAAS,MAAM,GAAG,MAAM;IAElC;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,SAAS,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzG;;;;;;OAMG;IACH,cAAc,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvG,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B;;;OAGG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,MAAM,WAAW,uBAAuB,CACtC,cAAc,SAAS,MAAM,GAAG,MAAM,EACtC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,UAAU,SAAS,MAAM,GAAG,MAAM,CAClC,SAAQ,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC;IAC1E,uFAAuF;IACvF,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC,0DAA0D;IAC1D,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,MAAM,oBAAoB,CAC9B,cAAc,SAAS,MAAM,EAC7B,WAAW,SAAS,MAAM,EAC1B,UAAU,SAAS,MAAM,IACvB,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;AAEjF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiBhD,CAAC"}

package/dist/workspaces2/workspace2.d.ts

@@ -1,4 +1,5 @@
 import { type OpenedWindow, type OpenedWorkspace, type WorkspaceStoreState2 } from '@openmrs/esm-extensions';
+import { type WorkspaceDefinition2 } from '@openmrs/esm-globals';
 import { type Workspace2DefinitionProps } from './workspace2.component';
 /**
  * Attempts to launch the specified workspace group with the given group props. Note that only one workspace group
@@ -127,7 +128,7 @@ export declare const workspace2StoreActions: {
         registeredWindowsByName: Record<string, import("@openmrs/esm-globals").WorkspaceWindowDefinition2 & {
             moduleName: string;
         }>;
-        registeredWorkspacesByName: Record<string, import("@openmrs/esm-globals").WorkspaceDefinition2 & {
+        registeredWorkspacesByName: Record<string, WorkspaceDefinition2 & {
             moduleName: string;
         }>;
         openedGroup: import("@openmrs/esm-extensions").OpenedGroup | null;
@@ -141,7 +142,7 @@ export declare const workspace2StoreActions: {
         registeredWindowsByName: Record<string, import("@openmrs/esm-globals").WorkspaceWindowDefinition2 & {
             moduleName: string;
         }>;
-        registeredWorkspacesByName: Record<string, import("@openmrs/esm-globals").WorkspaceDefinition2 & {
+        registeredWorkspacesByName: Record<string, WorkspaceDefinition2 & {
             moduleName: string;
         }>;
         openedGroup: import("@openmrs/esm-extensions").OpenedGroup | null;
@@ -156,7 +157,7 @@ export declare const workspace2StoreActions: {
         registeredWindowsByName: Record<string, import("@openmrs/esm-globals").WorkspaceWindowDefinition2 & {
             moduleName: string;
         }>;
-        registeredWorkspacesByName: Record<string, import("@openmrs/esm-globals").WorkspaceDefinition2 & {
+        registeredWorkspacesByName: Record<string, WorkspaceDefinition2 & {
             moduleName: string;
         }>;
         openedGroup: import("@openmrs/esm-extensions").OpenedGroup | null;
@@ -170,7 +171,7 @@ export declare const workspace2StoreActions: {
         registeredWindowsByName: Record<string, import("@openmrs/esm-globals").WorkspaceWindowDefinition2 & {
             moduleName: string;
         }>;
-        registeredWorkspacesByName: Record<string, import("@openmrs/esm-globals").WorkspaceDefinition2 & {
+        registeredWorkspacesByName: Record<string, WorkspaceDefinition2 & {
             moduleName: string;
         }>;
         openedGroup: import("@openmrs/esm-extensions").OpenedGroup | null;
@@ -197,6 +198,12 @@ export declare const useWorkspace2Context: () => Workspace2DefinitionProps<objec
  * @returns a list of registered workspaces.
  */
 export declare const getRegisteredWorkspace2Names: () => string[];
+/**
+ * Returns the width an opened window renders at: its leaf workspace's `width`, falling back to the
+ * window's `width`, then `'narrow'`. Every workspace in the window uses this width so that a wider
+ * workspace lower in the stack doesn't show behind a narrower one.
+ */
+export declare function getOpenedWindowWidth(openedWindow: OpenedWindow, registeredWorkspacesByName: WorkspaceStoreState2['registeredWorkspacesByName'], registeredWindowsByName: WorkspaceStoreState2['registeredWindowsByName']): NonNullable<WorkspaceDefinition2['width']>;
 /**
  * Builds the window an `<ExportedWorkspace>` starts with: the workspace's real registered window
  * (so `launchChildWorkspace` keeps working), containing just the requested workspace.

package/dist/workspaces2/workspace2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace2.d.ts","sourceRoot":"","sources":["../../src/workspaces2/workspace2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace2.d.ts","sourceRoot":"","sources":["../../src/workspaces2/workspace2.ts"],"names":[],"mappings":"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"}

package/dist/workspaces2/workspace2.js

@@ -606,6 +606,15 @@ export function useWorkspace2Store() {
  */ export const getRegisteredWorkspace2Names = ()=>{
     return Object.keys(workspace2Store.getState().registeredWorkspacesByName);
 };
+/**
+ * Returns the width an opened window renders at: its leaf workspace's `width`, falling back to the
+ * window's `width`, then `'narrow'`. Every workspace in the window uses this width so that a wider
+ * workspace lower in the stack doesn't show behind a narrower one.
+ */ export function getOpenedWindowWidth(openedWindow, registeredWorkspacesByName, registeredWindowsByName) {
+    const leaf = openedWindow.openedWorkspaces[openedWindow.openedWorkspaces.length - 1];
+    const leafWidth = leaf ? registeredWorkspacesByName[leaf.workspaceName]?.width : undefined;
+    return leafWidth ?? registeredWindowsByName[openedWindow.windowName]?.width ?? 'narrow';
+}
 function newOpenedWorkspace(workspaceName, workspaceProps) {
     return {
         workspaceName,

package/dist/workspaces2/workspace2.module.scss

@@ -61,12 +61,9 @@ $extraWideWorkspaceWidth: 48.25rem;
     width: var(--workspaceWidth);
     border-inline-start: 1px solid $text-03;
     background-color: #fff;
-    will-change: width;
-    transition: width 0.5s ease-in-out;
 
     &.maximized {
       width: 100%;
-      transition: none !important;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-styleguide",
-  "version": "10.0.1-pre.5717",
+  "version": "10.0.1-pre.5723",
   "license": "MPL-2.0",
   "description": "The styleguide for OpenMRS SPA",
   "module": "dist/internal.js",
@@ -79,18 +79,18 @@
     "uuid": "^11.1.1"
   },
   "peerDependencies": {
-    "@openmrs/esm-api": "^10.0.1-pre.5717",
-    "@openmrs/esm-config": "^10.0.1-pre.5717",
-    "@openmrs/esm-emr-api": "^10.0.1-pre.5717",
-    "@openmrs/esm-error-handling": "^10.0.1-pre.5717",
-    "@openmrs/esm-extensions": "^10.0.1-pre.5717",
-    "@openmrs/esm-globals": "^10.0.1-pre.5717",
-    "@openmrs/esm-navigation": "^10.0.1-pre.5717",
-    "@openmrs/esm-react-utils": "^10.0.1-pre.5717",
-    "@openmrs/esm-routes": "^10.0.1-pre.5717",
-    "@openmrs/esm-state": "^10.0.1-pre.5717",
-    "@openmrs/esm-translations": "^10.0.1-pre.5717",
-    "@openmrs/esm-utils": "^10.0.1-pre.5717",
+    "@openmrs/esm-api": "^10.0.1-pre.5723",
+    "@openmrs/esm-config": "^10.0.1-pre.5723",
+    "@openmrs/esm-emr-api": "^10.0.1-pre.5723",
+    "@openmrs/esm-error-handling": "^10.0.1-pre.5723",
+    "@openmrs/esm-extensions": "^10.0.1-pre.5723",
+    "@openmrs/esm-globals": "^10.0.1-pre.5723",
+    "@openmrs/esm-navigation": "^10.0.1-pre.5723",
+    "@openmrs/esm-react-utils": "^10.0.1-pre.5723",
+    "@openmrs/esm-routes": "^10.0.1-pre.5723",
+    "@openmrs/esm-state": "^10.0.1-pre.5723",
+    "@openmrs/esm-translations": "^10.0.1-pre.5723",
+    "@openmrs/esm-utils": "^10.0.1-pre.5723",
     "dayjs": "1.x",
     "i18next": "25.x",
     "react": "18.x",
@@ -99,18 +99,18 @@
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "10.0.1-pre.5717",
-    "@openmrs/esm-config": "10.0.1-pre.5717",
-    "@openmrs/esm-emr-api": "10.0.1-pre.5717",
-    "@openmrs/esm-error-handling": "10.0.1-pre.5717",
-    "@openmrs/esm-extensions": "10.0.1-pre.5717",
-    "@openmrs/esm-globals": "10.0.1-pre.5717",
-    "@openmrs/esm-navigation": "10.0.1-pre.5717",
-    "@openmrs/esm-react-utils": "10.0.1-pre.5717",
-    "@openmrs/esm-routes": "10.0.1-pre.5717",
-    "@openmrs/esm-state": "10.0.1-pre.5717",
-    "@openmrs/esm-translations": "10.0.1-pre.5717",
-    "@openmrs/esm-utils": "10.0.1-pre.5717",
+    "@openmrs/esm-api": "10.0.1-pre.5723",
+    "@openmrs/esm-config": "10.0.1-pre.5723",
+    "@openmrs/esm-emr-api": "10.0.1-pre.5723",
+    "@openmrs/esm-error-handling": "10.0.1-pre.5723",
+    "@openmrs/esm-extensions": "10.0.1-pre.5723",
+    "@openmrs/esm-globals": "10.0.1-pre.5723",
+    "@openmrs/esm-navigation": "10.0.1-pre.5723",
+    "@openmrs/esm-react-utils": "10.0.1-pre.5723",
+    "@openmrs/esm-routes": "10.0.1-pre.5723",
+    "@openmrs/esm-state": "10.0.1-pre.5723",
+    "@openmrs/esm-translations": "10.0.1-pre.5723",
+    "@openmrs/esm-utils": "10.0.1-pre.5723",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@types/geopattern": "^1.2.9",

package/src/workspaces2/active-workspace-window.component.tsx

@@ -15,8 +15,8 @@ import { isDesktop, useLayoutType, useStore } from '@openmrs/esm-react-utils';
 import { loadLifeCycles } from '@openmrs/esm-routes';
 import { getCoreTranslation } from '@openmrs/esm-translations';
 import { ArrowRightIcon, CloseIcon } from '../icons';
-import { closeWorkspaceGroup2, useWorkspace2Store } from './workspace2';
-import { type Workspace2DefinitionProps } from './workspace2.component';
+import { closeWorkspaceGroup2, getOpenedWindowWidth, useWorkspace2Store } from './workspace2';
+import { type Workspace2InternalProps } from './workspace2.component';
 import { type WorkspaceWindowActions } from './workspace-window-actions';
 import styles from './workspace2.module.scss';
 
@@ -127,7 +127,7 @@ const ActiveWorkspace: React.FC<ActiveWorkspaceProps> = ({
   isLeafWorkspace,
   showActionMenu,
 }) => {
-  const props: Workspace2DefinitionProps = useMemo(
+  const props: Workspace2InternalProps = useMemo(
     () =>
       openedWorkspace && {
         closeWorkspace: async (options = {}) => {
@@ -262,6 +262,7 @@ const WorkspaceChrome: React.FC<WorkspaceChromeProps> = ({
     openedGroup,
     openedWindows,
     registeredWindowsByName,
+    registeredWorkspacesByName,
     registeredGroupsByName,
     isMostRecentlyOpenedWindowHidden,
     setWindowMaximized,
@@ -273,7 +274,7 @@ const WorkspaceChrome: React.FC<WorkspaceChromeProps> = ({
   const title = openedWorkspace.title ?? '';
 
   const windowDef = registeredWindowsByName[windowName];
-  const width = windowDef?.width ?? 'narrow';
+  const width = getOpenedWindowWidth(openedWindow, registeredWorkspacesByName, registeredWindowsByName);
   const icon = windowDef?.icon;
   const canMaximize = windowDef?.canMaximize;
   const canCloseGroup = openedGroup ? registeredGroupsByName[openedGroup.groupName]?.persistence === 'closable' : false;

package/src/workspaces2/active-workspace-window.test.tsx

@@ -4,7 +4,8 @@ import { act, render, screen } from '@testing-library/react';
 import { workspace2Store, type OpenedWindow, type OpenedWorkspace } from '@openmrs/esm-extensions';
 import { loadLifeCycles } from '@openmrs/esm-routes';
 import ActiveWorkspaceWindow from './active-workspace-window.component';
-import { type Workspace2DefinitionProps } from './workspace2.component';
+import styles from './workspace2.module.scss';
+import { type Workspace2InternalProps } from './workspace2.component';
 import { type WorkspaceWindowActions } from './workspace-window-actions';
 
 vi.mock('@openmrs/esm-routes', () => ({
@@ -13,13 +14,13 @@ vi.mock('@openmrs/esm-routes', () => ({
 
 // Records the props each parcel was handed, keyed by workspace name, so tests can call them the way
 // the workspace component would.
-const { parcelProps } = vi.hoisted(() => ({ parcelProps: {} as Record<string, Workspace2DefinitionProps> }));
+const { parcelProps } = vi.hoisted(() => ({ parcelProps: {} as Record<string, Workspace2InternalProps> }));
 vi.mock('single-spa-react/parcel', () => ({
   default: ({
     config,
     wrapClassName,
     ...props
-  }: { config: { name: string }; wrapClassName?: string } & Workspace2DefinitionProps) => {
+  }: { config: { name: string }; wrapClassName?: string } & Workspace2InternalProps) => {
     parcelProps[props.workspaceName] = props;
     // Surface the wrapper class the real Parcel would apply, so tests can assert stacking/visibility.
     return (
@@ -106,6 +107,48 @@ describe('ActiveWorkspaceWindow', () => {
     }
   });
 
+  it('applies the leaf width to loading and mounted chrome, and restores it when the child closes', async () => {
+    const state = workspace2Store.getState();
+    workspace2Store.setState({
+      registeredWorkspacesByName: {
+        ...state.registeredWorkspacesByName,
+        'form-workspace': { ...state.registeredWorkspacesByName['form-workspace'], width: 'extra-wide' },
+        'admit-workspace': { ...state.registeredWorkspacesByName['admit-workspace'], width: 'narrow' },
+      },
+    });
+    const parent = makeOpenedWorkspace('form-workspace', 'parent');
+    const child = makeOpenedWorkspace('admit-workspace', 'child');
+    const actions = makeActions();
+    let resolveChild: (config: { name: string }) => void;
+    mockLoadLifeCycles.mockImplementation((_, component) =>
+      component === 'form'
+        ? Promise.resolve({ name: 'form' } as never)
+        : (new Promise((resolve) => {
+            resolveChild = resolve as never;
+          }) as never),
+    );
+    const { container, rerender } = render(renderWindow(makeOpenedWindow([parent]), actions, true));
+    await flushLifeCycles();
+    // Width classes live on the chrome containers, including the loading state with no title bar.
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelectorAll(`.${styles.extraWideWorkspace}`)).toHaveLength(1);
+    rerender(renderWindow(makeOpenedWindow([parent, child]), actions, true));
+    // Width classes live on the chrome containers, including the loading state with no title bar.
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelectorAll(`.${styles.narrowWorkspace}`)).toHaveLength(2);
+    await act(async () => {
+      resolveChild({ name: 'admit' });
+    });
+    expect(screen.getAllByTestId('parcel')).toHaveLength(2);
+    // Width classes live on the chrome containers, including the loading state with no title bar.
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelectorAll(`.${styles.narrowWorkspace}`)).toHaveLength(2);
+    rerender(renderWindow(makeOpenedWindow([parent]), actions, true));
+    // Width classes live on the chrome containers, including the loading state with no title bar.
+    // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+    expect(container.querySelectorAll(`.${styles.extraWideWorkspace}`)).toHaveLength(1);
+  });
+
   it('does not render a replaced workspace with the previous workspace lifecycle at the same stack position', async () => {
     // The form lifecycle resolves immediately. The admit lifecycle resolves only
     // when we release it, keeping the reload from the stack change pending, which

package/src/workspaces2/exported-workspace.test.tsx

@@ -5,7 +5,7 @@ import { workspace2Store } from '@openmrs/esm-extensions';
 import { loadLifeCycles } from '@openmrs/esm-routes';
 import { showModal } from '../modals';
 import { ExportedWorkspace, type ExportedWorkspaceWindowInfo } from './exported-workspace.component';
-import { type Workspace2DefinitionProps } from './workspace2.component';
+import { type Workspace2InternalProps } from './workspace2.component';
 
 vi.mock('@openmrs/esm-routes', () => ({
   loadLifeCycles: vi.fn(),
@@ -18,9 +18,9 @@ vi.mock('../modals', () => ({
 // The parcel is where the workspace component (and its <Workspace2>) would mount. We stub it out,
 // surface the workspace name it was handed, and record its props (keyed by workspace name) so tests
 // can call them the way the workspace component would.
-const { parcelProps } = vi.hoisted(() => ({ parcelProps: {} as Record<string, Workspace2DefinitionProps> }));
+const { parcelProps } = vi.hoisted(() => ({ parcelProps: {} as Record<string, Workspace2InternalProps> }));
 vi.mock('single-spa-react/parcel', () => ({
-  default: (props: Workspace2DefinitionProps) => {
+  default: (props: Workspace2InternalProps) => {
     parcelProps[props.workspaceName] = props;
     return <div data-testid="parcel">{props.workspaceName}</div>;
   },

package/src/workspaces2/workspace2.component.tsx

@@ -42,17 +42,22 @@ export interface Workspace2DefinitionProps<
   windowName: string;
   isRootWorkspace: boolean;
   showActionMenu: boolean;
+}
 
-  /**
-   * Records the title of this workspace, for display in the workspace window header.
-   * @internal Called by `<Workspace2>`; use its `title` prop instead.
-   */
+/**
+ * The props the framework actually passes to a workspace: the public `Workspace2DefinitionProps` plus
+ * the setters `<Workspace2>` uses to report its `title` and `hasUnsavedChanges` to the workspace window.
+ * Not part of the public API.
+ */
+export interface Workspace2InternalProps<
+  WorkspaceProps extends object = object,
+  WindowProps extends object = object,
+  GroupProps extends object = object,
+> extends Workspace2DefinitionProps<WorkspaceProps, WindowProps, GroupProps> {
+  /** Records the title of this workspace, for display in the workspace window header. */
   setWorkspaceTitle(title: string): void;
 
-  /**
-   * Records whether this workspace has unsaved changes.
-   * @internal Called by `<Workspace2>`; use its `hasUnsavedChanges` prop instead.
-   */
+  /** Records whether this workspace has unsaved changes. */
   setHasUnsavedChanges(hasUnsavedChanges: boolean): void;
 }
 
@@ -71,7 +76,7 @@ export type Workspace2Definition<
 export const Workspace2: React.FC<Workspace2Props> = ({ title, children, hasUnsavedChanges = false }) => {
   // These are bound to this workspace instance, in whichever store holds it (the global store, or an
   // `<ExportedWorkspace>`'s local store). They skip writes that change nothing.
-  const { setHasUnsavedChanges, setWorkspaceTitle } = useWorkspace2Context();
+  const { setHasUnsavedChanges, setWorkspaceTitle } = useWorkspace2Context() as Workspace2InternalProps;
 
   useEffect(() => {
     setHasUnsavedChanges(hasUnsavedChanges ?? false);

package/src/workspaces2/workspace2.module.scss

@@ -61,12 +61,9 @@ $extraWideWorkspaceWidth: 48.25rem;
     width: var(--workspaceWidth);
     border-inline-start: 1px solid $text-03;
     background-color: #fff;
-    will-change: width;
-    transition: width 0.5s ease-in-out;
 
     &.maximized {
       width: 100%;
-      transition: none !important;
     }
   }
 

package/src/workspaces2/workspace2.test.ts

@@ -9,6 +9,7 @@ import {
   closeWorkspaceInWindow,
   openChildWorkspaceInWindow,
   updateOpenedWorkspaceInWindow,
+  getOpenedWindowWidth,
   workspace2StoreActions,
 } from './workspace2';
 
@@ -268,3 +269,70 @@ describe('updateOpenedWorkspaceInWindow', () => {
     expect(updateOpenedWorkspaceInWindow(window, 'uuid-parent-workspace', { hasUnsavedChanges: false })).toBe(window);
   });
 });
+
+describe('getOpenedWindowWidth', () => {
+  const registeredWindowsByName = {
+    'test-window': { name: 'test-window', group: 'test-group', width: 'wider' as const, moduleName: 'test' },
+    'plain-window': { name: 'plain-window', group: 'test-group', moduleName: 'test' },
+  };
+  const registeredWorkspacesByName = {
+    'inherits-width': { name: 'inherits-width', component: 'a', window: 'test-window', moduleName: 'test' },
+    'extra-wide': {
+      name: 'extra-wide',
+      component: 'b',
+      window: 'test-window',
+      width: 'extra-wide' as const,
+      moduleName: 'test',
+    },
+    'narrow-on-plain': { name: 'narrow-on-plain', component: 'c', window: 'plain-window', moduleName: 'test' },
+  };
+
+  function makeWindow(windowName: string, workspaceNames: Array<string>) {
+    return {
+      windowName,
+      openedWorkspaces: workspaceNames.map((n) => makeOpenedWorkspace(n)),
+      props: null,
+      maximized: false,
+    };
+  }
+
+  it("uses the window's width when the leaf workspace declares none", () => {
+    expect(
+      getOpenedWindowWidth(
+        makeWindow('test-window', ['inherits-width']),
+        registeredWorkspacesByName,
+        registeredWindowsByName,
+      ),
+    ).toBe('wider');
+  });
+
+  it("uses the leaf workspace's width over the window's width", () => {
+    expect(
+      getOpenedWindowWidth(
+        makeWindow('test-window', ['inherits-width', 'extra-wide']),
+        registeredWorkspacesByName,
+        registeredWindowsByName,
+      ),
+    ).toBe('extra-wide');
+  });
+
+  it('ignores the width of non-leaf workspaces', () => {
+    expect(
+      getOpenedWindowWidth(
+        makeWindow('test-window', ['extra-wide', 'inherits-width']),
+        registeredWorkspacesByName,
+        registeredWindowsByName,
+      ),
+    ).toBe('wider');
+  });
+
+  it("defaults to 'narrow' when neither the workspace nor the window declares a width", () => {
+    expect(
+      getOpenedWindowWidth(
+        makeWindow('plain-window', ['narrow-on-plain']),
+        registeredWorkspacesByName,
+        registeredWindowsByName,
+      ),
+    ).toBe('narrow');
+  });
+});

package/src/workspaces2/workspace2.ts

@@ -10,6 +10,7 @@ import {
   workspace2Store,
   type WorkspaceStoreState2,
 } from '@openmrs/esm-extensions';
+import { type WorkspaceDefinition2 } from '@openmrs/esm-globals';
 import { useStoreWithActions, type Actions } from '@openmrs/esm-react-utils';
 import { shallowEqual } from '@openmrs/esm-utils';
 import { showModal } from '../modals';
@@ -683,6 +684,21 @@ export const getRegisteredWorkspace2Names = () => {
   return Object.keys(workspace2Store.getState().registeredWorkspacesByName);
 };
 
+/**
+ * Returns the width an opened window renders at: its leaf workspace's `width`, falling back to the
+ * window's `width`, then `'narrow'`. Every workspace in the window uses this width so that a wider
+ * workspace lower in the stack doesn't show behind a narrower one.
+ */
+export function getOpenedWindowWidth(
+  openedWindow: OpenedWindow,
+  registeredWorkspacesByName: WorkspaceStoreState2['registeredWorkspacesByName'],
+  registeredWindowsByName: WorkspaceStoreState2['registeredWindowsByName'],
+): NonNullable<WorkspaceDefinition2['width']> {
+  const leaf = openedWindow.openedWorkspaces[openedWindow.openedWorkspaces.length - 1];
+  const leafWidth = leaf ? registeredWorkspacesByName[leaf.workspaceName]?.width : undefined;
+  return leafWidth ?? registeredWindowsByName[openedWindow.windowName]?.width ?? 'narrow';
+}
+
 function newOpenedWorkspace(workspaceName: string, workspaceProps: Record<string, any> | null): OpenedWorkspace {
   return {
     workspaceName,