Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Composer/packages/client/__tests__/mocks/ResizeObserver.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

export default class ResizeObserver {
observe() {
// do nothing
}
unobserve() {
// do nothing
}
disconnect() {
// do nothing
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { undoFunctionState } from '../../../src/recoilModel/undo/history';
import mockProjectResponse from '../../../src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json';
import DesignPage from '../../../src/pages/design/DesignPage';
import { SAMPLE_DIALOG } from '../../mocks/sampleDialog';
import ResizeObserver from '../../mocks/ResizeObserver';

(global as any).ResizeObserver = ResizeObserver;

const projectId = '12345.6789';
const dialogId = SAMPLE_DIALOG.id;
Expand Down
39 changes: 39 additions & 0 deletions Composer/packages/client/src/hooks/useResizeObserver.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* eslint-disable @typescript-eslint/ban-ts-ignore */
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import React from 'react';

/*
* TODO: remove ts-ignore after updating typescript to v4.
* current typescript version does not have definitions for ResizeObserver.
*/

/**
* Observes size changes of a given element and runs the provided callback.
* @param element Element to observe size changes.
* @param resizeCallback Callback to call when resize happens.
* @param options Optional options for resize observer.
*/
export const useResizeObserver = <T extends HTMLElement>(
element: T | null,
// @ts-ignore
resizeCallback: (entries: ResizeObserverEntry[]) => void,
// @ts-ignore
options?: ResizeObserverOptions
) => {
// @ts-ignore
const resizeObserver = React.useRef(new ResizeObserver(resizeCallback));

React.useEffect(() => {
if (element) {
resizeObserver.current.observe(element, options);
}

return () => {
if (element) {
resizeObserver.current.unobserve(element);
}
};
}, [element]);
};
54 changes: 42 additions & 12 deletions Composer/packages/client/src/pages/design/VisualPanelHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import { getDialogData } from '../../utils/dialogUtil';
import { decodeDesignerPathToArrayPath } from '../../utils/convertUtils/designerPathEncoder';
import { getFocusPath } from '../../utils/navigation';
import { TreeLink } from '../../components/ProjectTree/types';
import { useResizeObserver } from '../../hooks/useResizeObserver';

import { breadcrumbClass } from './styles';
import * as pageStyles from './styles';

type BreadcrumbItem = {
key: string;
Expand Down Expand Up @@ -155,11 +156,40 @@ const useBreadcrumbs = (projectId: string, pluginConfig?: PluginConfig) => {
}, [currentDialog?.content, initialBreadcrumbArray]);
return breadcrumbArray;
};

const defaultToggleButtonWidth = 100;
const spaceBetweenContainers = 6;
const VisualPanelHeader: React.FC<VisualPanelHeaderProps> = React.memo((props) => {
const { showCode, projectId, onShowCodeClick, pluginConfig } = props;

const breadcrumbs = useBreadcrumbs(projectId, pluginConfig);

const toggleButtonContainerRef = React.useRef<HTMLDivElement>(null);
const containerRef = React.useRef<HTMLDivElement>(null);

const [toggleButtonWidth, setToggleButtonWidth] = React.useState(defaultToggleButtonWidth);
const [breadcrumbContainerWidth, setBreadcrumbContainerWidth] = React.useState<number | string>(
`calc(100% - ${toggleButtonWidth}px)`
);

// Set the width of the toggle button based on its text (locale)
React.useEffect(() => {
if (toggleButtonContainerRef.current) {
const toggleButton = toggleButtonContainerRef.current.querySelector<HTMLButtonElement>('button');
if (toggleButton) {
const { width } = toggleButton?.getBoundingClientRect();
setToggleButtonWidth(width);
}
}
}, []);

// Observe width changes of the container to re-set the available width for breadcrumb container
useResizeObserver<HTMLDivElement>(containerRef.current, (entries) => {
if (entries.length) {
const { width } = entries[0].contentRect;
setBreadcrumbContainerWidth(width - toggleButtonWidth - spaceBetweenContainers);
}
});

const createBreadcrumbItem: (breadcrumb: BreadcrumbItem) => IBreadcrumbItem = (breadcrumb: BreadcrumbItem) => {
return {
key: breadcrumb.key,
Expand All @@ -171,16 +201,16 @@ const VisualPanelHeader: React.FC<VisualPanelHeaderProps> = React.memo((props) =
const items = breadcrumbs.map(createBreadcrumbItem);

return (
<div style={{ display: 'flex', justifyContent: 'space-between', height: '65px' }}>
<Breadcrumb
ariaLabel={formatMessage('Navigation Path')}
data-testid="Breadcrumb"
items={items}
maxDisplayedItems={3}
styles={breadcrumbClass}
onReduceData={() => undefined}
/>
<div style={{ padding: '10px' }}>
<div ref={containerRef} css={pageStyles.visualPanelHeaderContainer}>
<div style={{ width: breadcrumbContainerWidth }}>
<Breadcrumb
ariaLabel={formatMessage('Navigation Path')}
data-testid="Breadcrumb"
items={items}
styles={pageStyles.breadcrumbClass}
/>
</div>
<div ref={toggleButtonContainerRef} css={pageStyles.visualPanelHeaderShowCodeButton}>
<ActionButton onClick={onShowCodeClick}>
{showCode ? formatMessage('Hide code') : formatMessage('Show code')}
</ActionButton>
Expand Down
12 changes: 11 additions & 1 deletion Composer/packages/client/src/pages/design/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,19 @@ export const formEditor = css`
min-width: 300px;
`;

export const visualPanelHeaderContainer = css`
display: flex;
align-items: center;
height: 65px;
`;

export const visualPanelHeaderShowCodeButton = css`
padding: 10px;
width: fit-content;
`;

export const breadcrumbClass = mergeStyleSets({
root: {
width: '500px',
margin: '0',
padding: '10px',
},
Expand Down