Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: modal rendering when opened #5374

Merged
merged 4 commits into from
Nov 8, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
- Fixes [#5323](https://github.com/microsoft/BotFramework-WebChat/issues/5323). Removed unused CSS class from carousel component, eliminating unintended styling, in PR [#5325](https://github.com/microsoft/BotFramework-WebChat/pull/5325), by [@OEvgeny](https://github.com/OEvgeny)
- Resolved CSS class name conflicts between component and fluent packages to prevent styling issues, in PR [#5326](https://github.com/microsoft/BotFramework-WebChat/pull/5326), in PR [#5327](https://github.com/microsoft/BotFramework-WebChat/pull/5327), by [@OEvgeny](https://github.com/OEvgeny)
- Fixed [#5350](https://github.com/microsoft/BotFramework-WebChat/issues/pull/5350). Bundled `shiki` in component package, in PR [#5349](https://github.com/microsoft/BotFramework-WebChat/pull5349), by [@compulim](https://github.com/compulim)
- Fixed modal dialog rendering to prevent visual flicker and improve UX when opening code views, in PR [#5374](https://github.com/microsoft/BotFramework-WebChat/pull/5374), by [@OEvgeny](https://github.com/OEvgeny)

# Removed

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ const CodeContent = memo(({ children, className, code, language, title }: Props)
};
}, [code, codeBlockTheme, language]);

if (!highlightedCode) {
return null;
}

return (
<Fragment>
<div className={'webchat__view-code-dialog__header'}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const MarkdownTextContent = memo(({ activity, children, markdown }: Props) => {
</LinkDefinitions>
)}
<div className="webchat__text-content__activity-actions">
{activity.type === 'message' && isBasedOnSoftwareSourceCode(messageThing) ? (
{activity.type === 'message' && isBasedOnSoftwareSourceCode(messageThing) && messageThing.isBasedOn.text ? (
<ActivityViewCodeButton
className="webchat__text-content__activity-view-code-button"
code={messageThing.isBasedOn.text}
Expand Down
6 changes: 6 additions & 0 deletions packages/component/src/Styles/StyleSet/ModalDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ export default function createModalDialogStyleSet() {
border: 0
},

// Assume the content is being prepared, so we hide the whole dialog until content appears in the DOM.
// Use opacity to still be able to set focus on the first available control (close button).
'&:has(.webchat__modal-dialog__body:empty)': {
opacity: 0
},

'& .webchat__modal-dialog__box': {
borderRadius: 2,
overflow: 'hidden',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { hooks } from 'botframework-webchat-api';
import classNames from 'classnames';
import React, { memo, type PropsWithChildren, useCallback, useEffect, useRef } from 'react';
import React, { memo, type PropsWithChildren, useCallback, useLayoutEffect, useRef } from 'react';

import useStyleSet from '../../../hooks/useStyleSet';

Expand All @@ -25,7 +25,7 @@ const ModalDialog = memo(

const handleCloseButtonClick = useCallback(() => dialogRef.current?.close(), [dialogRef]);

useEffect(() => dialogRef.current?.showModal(), [dialogRef]);
useLayoutEffect(() => dialogRef.current?.showModal(), [dialogRef]);

return (
<dialog
Expand Down
Loading