Skip to content
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
- Added target to Chrome 100 and re-enable Lightning CSS for ESM builds, by [@compulim](https://github.com/compulim) in PR [#5602](https://github.com/microsoft/BotFramework-WebChat/pull/5602)
- Relaxed `role` prop to allow any string instead of ARIA landmark roles, in PR [#5561](https://github.com/microsoft/BotFramework-WebChat/pull/5561), by [@compulim](https://github.com/compulim)
- Cleaned up `<ThemeProvider>` and various CSS related code, in PR [#5611](https://github.com/microsoft/BotFramework-WebChat/pull/5611), by [@compulim](https://github.com/compulim)
- (Experimental) Reworked the copilot variant to align with the modern Copilot UX, in PR [#5630](https://github.com/microsoft/BotFramework-WebChat/pull/5630), by [@OEvgeny](https://github.com/OEvgeny)
- The legacy design is temporarily available as `copilot-deprecated` for migration

### Changed

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Citation long ref (copilot-deprecated)</title>
<script>
location = './citation.longRef?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified __tests__/html2/activity/citation.longRef.copilot.html.snap-1.png
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
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Collapsible activity (copilot, dark)</title>
<script>
location = './collapsible?variant=copilot-deprecated&fluent-theme=dark';
</script>
</head>
<body></body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions __tests__/html2/activity/collapsible.copilot-deprecated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Collapsible activity (copilot-deprecated)</title>
<script>
location = './collapsible?variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified __tests__/html2/activity/collapsible.copilot.dark.html.snap-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-2.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-3.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-4.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-5.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-6.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-7.png
Binary file modified __tests__/html2/activity/collapsible.copilot.html.snap-8.png
2 changes: 1 addition & 1 deletion __tests__/html2/activity/collapsible.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
10 changes: 10 additions & 0 deletions __tests__/html2/activity/message-status.copilot-deprecated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Message status (copilot-deprecated)</title>
<script>
location = './message-status?variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Binary file modified __tests__/html2/activity/message-status.copilot.html.snap-1.png
4 changes: 2 additions & 2 deletions __tests__/html2/activity/message-status.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -124,7 +124,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
10 changes: 10 additions & 0 deletions __tests__/html2/basic/disableFileUpload.copilot-deprecated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Disable file upload (copilot-deprecated)</title>
<script>
location = './disableFileUpload?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Binary file modified __tests__/html2/basic/disableFileUpload.copilot.html.snap-1.png
4 changes: 2 additions & 2 deletions __tests__/html2/citation/url.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -125,7 +125,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './layout?theme=dark&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './layout?theme=light&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Binary file modified __tests__/html2/copyButton/layout.copilot.dark.html.snap-1.png
Binary file modified __tests__/html2/copyButton/layout.copilot.light.html.snap-1.png
2 changes: 1 addition & 1 deletion __tests__/html2/copyButton/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
const root = createRoot(document.getElementById('webchat'));

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ theme: fluentTheme },
Expand Down
10 changes: 10 additions & 0 deletions __tests__/html2/linkDefinition/badge.copilot-deprecated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Link Definition Badge (copilot-deprecated): Test link definition badge</title>
<script>
location = './badge?variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Binary file modified __tests__/html2/linkDefinition/badge.copilot.html.snap-1.png
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Link Definition Badge (dark, copilot): Test link definition badge</title>
<script>
location = './badge?fluent-theme=dark&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
2 changes: 1 addition & 1 deletion __tests__/html2/linkDefinition/badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
const webChatProps = { dir: searchParams.get('dir'), directLine, store };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './layout.scroll?theme=dark&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './layout.scroll?theme=light&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
4 changes: 2 additions & 2 deletions __tests__/html2/markdown/math/layout.scroll.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
const root = createRoot(document.getElementById('webchat'));

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ theme: fluentTheme },
Expand Down Expand Up @@ -115,7 +115,7 @@
document.querySelector(`#webchat [data-testid="${testIds.sendBoxTextBox}"]`).focus();

await host.sendShiftTab(
(searchParams.get('variant') === 'copilot' || searchParams.get('variant') === 'fluent') ? 2 : 3
['copilot', 'copilot-deprecated', 'fluent'].includes(searchParams.get('variant')) ? 2 : 3
);
await host.sendKeys('ENTER');

Expand Down
10 changes: 10 additions & 0 deletions __tests__/html2/part-grouping/copilot-deprecated.dark.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Part grouping (copilot dark)</title>
<script>
location = './?variant=copilot-deprecated&fluent-theme=dark';
</script>
</head>
<body></body>
</html>
10 changes: 10 additions & 0 deletions __tests__/html2/part-grouping/copilot-deprecated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Part grouping (copilot-deprecated)</title>
<script>
location = './?variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-1.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-10.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-2.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-3.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-4.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-5.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-6.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-7.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-8.png
Binary file modified __tests__/html2/part-grouping/copilot.dark.html.snap-9.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-1.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-10.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-2.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-3.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-4.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-5.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-6.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-7.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-8.png
Binary file modified __tests__/html2/part-grouping/copilot.html.snap-9.png
4 changes: 2 additions & 2 deletions __tests__/html2/part-grouping/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -133,7 +133,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
4 changes: 2 additions & 2 deletions __tests__/html2/part-grouping/keyboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -91,7 +91,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent'
variant
? React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
4 changes: 2 additions & 2 deletions __tests__/html2/part-grouping/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -89,7 +89,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent'
variant
? React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
4 changes: 2 additions & 2 deletions __tests__/html2/part-grouping/position.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -116,7 +116,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
4 changes: 2 additions & 2 deletions __tests__/html2/part-grouping/status.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
height: 100%;
}

.theme.variant-copilot {
.theme.variant-copilot-deprecated {
--webchat__color--surface: var(--colorGrey98);
}
</style>
Expand Down Expand Up @@ -114,7 +114,7 @@
const webChatProps = { directLine, store, styleOptions: { codeBlockTheme } };

root.render(
variant === 'copilot' || variant === 'fluent' ?
variant ?
React.createElement(
FluentProvider,
{ className: 'fui-FluentProvider', theme: fluentTheme },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './clearAfterSend?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './styleOptions.maxHeight?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
2 changes: 1 addition & 1 deletion __tests__/html2/side-by-side/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
const searchParams = new URLSearchParams(location.search);

const [leftTranscriptIndex = 0, rightTranscriptIndex = 1] = searchParams.getAll('transcript');
const [leftVariant = 'fluent', rightVariant = 'copilot'] = searchParams.getAll('variant');
const [leftVariant = 'fluent', rightVariant = 'copilot-deprecated'] = searchParams.getAll('variant');

const sendBoxIndexes = searchParams.getAll('focus');
const activeFocusPresets = searchParams.getAll('focus-preset');
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './typingIndicator?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<script>
location = './typingIndicator.scroll?theme=fluent&variant=copilot-deprecated';
</script>
</head>
<body></body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
var(--webchat-spacingHorizontalSNudge);
}

&.variant-copilot {
&.variant-copilot,
&.variant-copilot-deprecated {
margin: var(--webchat-spacingVerticalXS) 0 var(--webchat-spacingVerticalXS) -10px;
}
}
Loading
Loading