diff --git a/CHANGELOG.md b/CHANGELOG.md index acfc209136..d5e38e798d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -207,7 +207,8 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/ - Fixed copy button screen reader announcement - Added proper ARIA attributes to link definitions component - Improved focus management for scroll to end button -- Fixed [#5439](https://github.com/microsoft/BotFramework-WebChat/issues/5439). Fixed batched livestream activities are not recognized in the same session, in PR [#XXX](https://github.com/microsoft/BotFramework-WebChat/pull/XXX) +- Fixed [#5439](https://github.com/microsoft/BotFramework-WebChat/issues/5439). Fixed batched livestream activities are not recognized in the same session, in PR [#5440](https://github.com/microsoft/BotFramework-WebChat/pull/5440), by [@compulim](https://github.com/compulim) +- Fixed [#5452](https://github.com/microsoft/BotFramework-WebChat/issues/5452). With Fluent/Copilot theme, the typing indicator padding should not be squashed, in PR [#5453](https://github.com/microsoft/BotFramework-WebChat/pull/5453), by [@compulim](https://github.com/compulim) # Removed diff --git a/__tests__/html2/basic/sendBox.trimOutgoing.html b/__tests__/html2/basic/sendBox.trimOutgoing.html new file mode 100644 index 0000000000..ebc5112c4a --- /dev/null +++ b/__tests__/html2/basic/sendBox.trimOutgoing.html @@ -0,0 +1,55 @@ + + + + + + + + + + + +
+ + + diff --git a/__tests__/html2/fluentTheme/typingIndicator.html b/__tests__/html2/fluentTheme/typingIndicator.html index 9193facc36..6c0ce776ba 100644 --- a/__tests__/html2/fluentTheme/typingIndicator.html +++ b/__tests__/html2/fluentTheme/typingIndicator.html @@ -49,7 +49,28 @@ await directLine.emulateIncomingActivity({ from: { id: 'u-00001', name: 'Bot', role: 'bot' }, id: 'a-00001', - text: 'Hello, World!', + text: 'In minim amet culpa adipisicing aliqua culpa minim culpa officia culpa laboris non commodo. Velit nisi ut sit amet in sunt eu voluptate Lorem eu do sint proident aute. Nulla nisi commodo consectetur anim id non ut est anim veniam occaecat excepteur dolor nulla. Adipisicing et dolor ex cillum sit ipsum amet labore officia dolor non ad aliquip officia. Irure quis occaecat cupidatat ut commodo culpa eiusmod ipsum pariatur. Excepteur aliqua consectetur anim laborum enim ipsum tempor occaecat voluptate.', + type: 'message' + }); + + await directLine.emulateIncomingActivity({ + from: { id: 'u-00001', name: 'Bot', role: 'bot' }, + id: 'a-00002', + text: 'Excepteur enim tempor ex do magna elit consectetur elit incididunt. Amet reprehenderit cupidatat amet velit nostrud esse est dolor proident ex ut deserunt. Velit veniam minim esse laboris irure esse duis dolor sint culpa. Sit ullamco eiusmod consectetur enim elit cillum sit elit irure ut commodo ad. Cillum ad mollit est labore culpa proident sunt tempor culpa pariatur elit laborum.', + type: 'message' + }); + + await directLine.emulateIncomingActivity({ + from: { id: 'u-00001', name: 'Bot', role: 'bot' }, + id: 'a-00003', + text: 'Ad minim fugiat sint et laboris consectetur eu ut in nisi fugiat cillum est labore. Et proident tempor veniam ex est incididunt Lorem. Culpa sit id eu voluptate.', + type: 'message' + }); + + await directLine.emulateIncomingActivity({ + from: { id: 'u-00001', name: 'Bot', role: 'bot' }, + id: 'a-00004', + text: 'Est voluptate eiusmod ad Lorem irure amet sint ea aliqua labore eu do nostrud exercitation. Non adipisicing non amet laborum. Anim fugiat minim cupidatat consequat ipsum minim ex mollit commodo ut aliqua quis consequat dolore. Cupidatat tempor laborum consectetur eiusmod cillum do consequat ad pariatur amet magna aliquip occaecat officia.', type: 'message' }); diff --git a/__tests__/html2/fluentTheme/typingIndicator.html.snap-1.png b/__tests__/html2/fluentTheme/typingIndicator.html.snap-1.png index 71c8265dc5..48fb0829ed 100644 Binary files a/__tests__/html2/fluentTheme/typingIndicator.html.snap-1.png and b/__tests__/html2/fluentTheme/typingIndicator.html.snap-1.png differ diff --git a/__tests__/html2/fluentTheme/typingIndicator.html.snap-2.png b/__tests__/html2/fluentTheme/typingIndicator.html.snap-2.png index b4218ef33f..ab7c0801c8 100644 Binary files a/__tests__/html2/fluentTheme/typingIndicator.html.snap-2.png and b/__tests__/html2/fluentTheme/typingIndicator.html.snap-2.png differ diff --git a/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-1.png b/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-1.png index 71c8265dc5..48fb0829ed 100644 Binary files a/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-1.png and b/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-1.png differ diff --git a/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-2.png b/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-2.png index b4218ef33f..ab7c0801c8 100644 Binary files a/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-2.png and b/__tests__/html2/fluentTheme/typingIndicator.livestream.html.snap-2.png differ diff --git a/__tests__/sendBox.js b/__tests__/sendBox.js index 744c159b43..0621131c9f 100644 --- a/__tests__/sendBox.js +++ b/__tests__/sendBox.js @@ -32,23 +32,3 @@ test('should focus send box when message is being sent', async () => { expect(base64PNG).toMatchImageSnapshot(imageSnapshotOptions); }); - -test('should trim outgoing message when being sent', async () => { - const { driver, pageObjects } = await setupWebDriver(); - - await driver.wait(uiConnected(), timeouts.directLine); - await pageObjects.sendMessageViaSendBox( - '\u00A0\u00A0There should be no space before and after this message.\u00A0\u00A0', - { waitForSend: false } - ); - await driver.wait( - actionDispatched( - ({ payload: { activity } = {}, type }) => - type === 'DIRECT_LINE/INCOMING_ACTIVITY' && - activity.from.role === 'user' && - activity.text === 'There should be no space before and after this message.' - ), - timeouts.directLine - ); - await driver.wait(minNumActivitiesShown(2), timeouts.directLine); -}); diff --git a/__tests__/setup/web/index.html b/__tests__/setup/web/index.html index 42ba45e31b..29a2557d80 100644 --- a/__tests__/setup/web/index.html +++ b/__tests__/setup/web/index.html @@ -73,7 +73,7 @@ crossorigin="anonymous" src="https://unpkg.com/event-target-shim@5.0.1/dist/event-target-shim.umd.js" > - + diff --git a/packages/fluent-theme/src/components/typingIndicator/SlidingDotsTypingIndicator.module.css b/packages/fluent-theme/src/components/typingIndicator/SlidingDotsTypingIndicator.module.css index 116ac40a3c..a7f00a3a37 100644 --- a/packages/fluent-theme/src/components/typingIndicator/SlidingDotsTypingIndicator.module.css +++ b/packages/fluent-theme/src/components/typingIndicator/SlidingDotsTypingIndicator.module.css @@ -1,6 +1,7 @@ :global(.webchat-fluent) .sliding-dots-typing-indicator { align-self: start; display: flex; + flex: none; height: 16px; margin: auto var(--webchat-spacingHorizontalMNudge); }