diff --git a/CHANGELOG.md b/CHANGELOG.md index cac56b2a5e..fac30bd809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -205,6 +205,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/ - Fixed [#5446](https://github.com/microsoft/BotFramework-WebChat/issues/5446). Embedded `uuid` so `microsoft-cognitiveservices-speech-sdk` do not need to use dynamic loading, as this could fail in Webpack 4 environment, in PR [#5445](https://github.com/microsoft/BotFramework-WebChat/pull/5445), by [@compulim](https://github.com/compulim) - Fixed [#5476](https://github.com/microsoft/BotFramework-WebChat/issues/5476). Modernizing components through memoization and use [`valibot`](https://npmjs.com/package/valibot) for props validation, by [@compulim](https://github.com/compulim) - Ported `useSuggestedActions` to use React hooks as backend instead of Redux store, in PR [#5489](https://github.com/microsoft/BotFramework-WebChat/pull/5489), by [@compulim](https://github.com/compulim) +- Removed `StarterPromptsCardAction` during `blueprint` ui state in PR [#5477](https://github.com/microsoft/BotFramework-WebChat/pull/5477), by [@jcheung824](https://github.com/jcheung824) ### Fixed diff --git a/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html b/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html new file mode 100644 index 0000000000..e4924db81a --- /dev/null +++ b/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html.snap-1.png b/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html.snap-1.png new file mode 100644 index 0000000000..3a6ea2f351 Binary files /dev/null and b/__tests__/html2/fluentTheme/preChatMessageActivity/default.blue.print.state.html.snap-1.png differ diff --git a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.dark.html.snap-2.png b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.dark.html.snap-2.png index c8700cebf8..e45ef5073d 100644 Binary files a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.dark.html.snap-2.png and b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.dark.html.snap-2.png differ diff --git a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html index e8714e4f44..6c2df2dba1 100644 --- a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html +++ b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html @@ -184,12 +184,7 @@ document.querySelectorAll( `[data-testid="${WebChat.testIds.preChatMessageActivityStarterPromptsCardAction}"]:not(button)` ) - ).toHaveLength(3); - - // THEN: Card action height should kept the same. - expect( - document.querySelector(`[data-testid="${WebChat.testIds.preChatMessageActivityStarterPromptsCardAction}"]`) - ).toHaveProperty('clientHeight', cardActionClientHeight); + ).toHaveLength(0); // THEN: Send box container height should kept the same. expect(document.querySelector(`[data-testid="${WebChat.testIds.sendBoxContainer}"]`)).toHaveProperty( diff --git a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html.snap-2.png b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html.snap-2.png index f8c0c3e770..3e9f8471e2 100644 Binary files a/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html.snap-2.png and b/__tests__/html2/fluentTheme/uiState.blueprint.nonEnglish.html.snap-2.png differ diff --git a/__tests__/html2/fluentTheme/uiState.dark.html.snap-2.png b/__tests__/html2/fluentTheme/uiState.dark.html.snap-2.png index 0847cdd81d..f24d809a5f 100644 Binary files a/__tests__/html2/fluentTheme/uiState.dark.html.snap-2.png and b/__tests__/html2/fluentTheme/uiState.dark.html.snap-2.png differ diff --git a/__tests__/html2/fluentTheme/uiState.dark.html.snap-6.png b/__tests__/html2/fluentTheme/uiState.dark.html.snap-6.png index f08983c835..d7ac2bcf01 100644 Binary files a/__tests__/html2/fluentTheme/uiState.dark.html.snap-6.png and b/__tests__/html2/fluentTheme/uiState.dark.html.snap-6.png differ diff --git a/__tests__/html2/fluentTheme/uiState.html b/__tests__/html2/fluentTheme/uiState.html index f4f78f04d9..06d0224490 100644 --- a/__tests__/html2/fluentTheme/uiState.html +++ b/__tests__/html2/fluentTheme/uiState.html @@ -207,7 +207,7 @@ document.querySelectorAll( `[data-testid="${WebChat.testIds.preChatMessageActivityStarterPromptsCardAction}"]:not(button)` ) - ).toHaveLength(3); + ).toHaveLength(0); // THEN: Should match screenshot. await host.snapshot('local'); diff --git a/__tests__/html2/fluentTheme/uiState.html.snap-2.png b/__tests__/html2/fluentTheme/uiState.html.snap-2.png index a6b6f7146e..a21423e7cc 100644 Binary files a/__tests__/html2/fluentTheme/uiState.html.snap-2.png and b/__tests__/html2/fluentTheme/uiState.html.snap-2.png differ diff --git a/__tests__/html2/fluentTheme/uiState.html.snap-6.png b/__tests__/html2/fluentTheme/uiState.html.snap-6.png index 203f0ca85b..da8532ee31 100644 Binary files a/__tests__/html2/fluentTheme/uiState.html.snap-6.png and b/__tests__/html2/fluentTheme/uiState.html.snap-6.png differ diff --git a/packages/fluent-theme/src/components/preChatActivity/PreChatMessageActivity.module.css b/packages/fluent-theme/src/components/preChatActivity/PreChatMessageActivity.module.css index 25fccf68c1..0625107c10 100644 --- a/packages/fluent-theme/src/components/preChatActivity/PreChatMessageActivity.module.css +++ b/packages/fluent-theme/src/components/preChatActivity/PreChatMessageActivity.module.css @@ -22,7 +22,7 @@ } :global(.webchat-fluent) .pre-chat-message-activity__body--blueprint { - opacity: 60%; + opacity: 65%; .pre-chat-message-activity__body-avatar { filter: grayscale(1); diff --git a/packages/fluent-theme/src/components/preChatActivity/StarterPromptsToolbar.tsx b/packages/fluent-theme/src/components/preChatActivity/StarterPromptsToolbar.tsx index 1be4928919..1e69f4c7a5 100644 --- a/packages/fluent-theme/src/components/preChatActivity/StarterPromptsToolbar.tsx +++ b/packages/fluent-theme/src/components/preChatActivity/StarterPromptsToolbar.tsx @@ -1,7 +1,7 @@ import { hooks } from 'botframework-webchat-api'; import { type DirectLineCardAction } from 'botframework-webchat-core'; import cx from 'classnames'; -import React, { Fragment, memo } from 'react'; +import React, { memo } from 'react'; import { useStyles } from '../../styles/index.js'; import StarterPromptsCardAction from './StarterPromptsCardAction.js'; import styles from './StarterPromptsToolbar.module.css'; @@ -21,13 +21,7 @@ const StarterPromptsToolbar = ({ cardActions, className }: Props) => { // TODO: Accessibility-wise, this should be role="toolbar" with keyboard navigation.
- {uiState === 'blueprint' ? ( - - - - - - ) : ( + {uiState !== 'blueprint' && cardActions .filter( (card: DirectLineCardAction): card is DirectLineCardAction & { type: 'messageBack' } => @@ -35,8 +29,7 @@ const StarterPromptsToolbar = ({ cardActions, className }: Props) => { ) // There is no other usable keys in card actions. // eslint-disable-next-line react/no-array-index-key - .map((cardAction, index) => ) - )} + .map((cardAction, index) => )}
);