Skip to content
Draft
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
6 changes: 5 additions & 1 deletion __tests__/html2/part-grouping/folded.skip.html
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,14 @@
// 2nd is sent with status not set to show the work is in
directLine.emulateIncomingActivity(withCreativeWorkStatus(activities.at(1), undefined));

await pageConditions.numActivitiesShown(3);

// When (copilot): opening the group
await host.click(document.querySelector('.collapsible-grouping__toggle'));

// Then: show both activities in the list:
// 1st with the loading indicator
// 2nd with an empty status indicator
await pageConditions.numActivitiesShown(3);
await host.snapshot('local');

// When folding the list:
Expand Down
6 changes: 6 additions & 0 deletions __tests__/html2/part-grouping/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,12 @@
// 1st with the loading indicator
// 2nd with an empty status indicator
await pageConditions.numActivitiesShown(3);

// When (copilot): opening the group
if (variant === 'copilot') {
await host.click(document.querySelector('.collapsible-grouping__toggle'));
}

await host.snapshot('local');

// When marking the 1st activity as 'Published':
Expand Down
7 changes: 7 additions & 0 deletions packages/api/src/StyleOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,13 @@ type StyleOptions = {
*/
speechRecognitionContinuous?: boolean | undefined;

/**
* Whether collapsible activity groupings ("part" groups) are open by default.
*
* @default true
*/
collapsibleGroupingDefaultOpen?: boolean | undefined;

/**
* Defines how activities are being grouped by (in the order of appearance in the array). Default to `['sender', 'status', 'part']` or `sender,status` in CSS.
*
Expand Down
1 change: 1 addition & 0 deletions packages/api/src/defaultStyleOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ const DEFAULT_OPTIONS: Required<StyleOptions> = {
// Speech recognition
speechRecognitionContinuous: false,

collapsibleGroupingDefaultOpen: true,
groupActivitiesBy: ['sender', 'status', 'part'],

// Send box attachment bar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ function PartGroupingActivity(props: PartGroupingActivityProps) {

const classNames = useStyles(styles);
const getKeyByActivity = useGetKeyByActivity();
const [isGroupOpen, setIsGroupOpen] = useState(true);
const [{ collapsibleGroupingDefaultOpen }] = useStyleOptions();
const [isGroupOpen, setIsGroupOpen] = useState(collapsibleGroupingDefaultOpen);

const messages = useMemo(
() => activities.map(activity => getOrgSchemaMessage(activity.entities)).filter(message => !!message),
Expand Down
3 changes: 2 additions & 1 deletion packages/fluent-theme/src/private/FluentThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,11 @@ function FluentThemeProvider(props: FluentThemeProviderProps) {
const fluentStyleOptions = useMemo(
() =>
Object.freeze({
...(variant === 'copilot' && { collapsibleGroupingDefaultOpen: false }),
feedbackActionsPlacement: 'activity-actions',
stylesRoot
}),
[stylesRoot]
[stylesRoot, variant]
);

return (
Expand Down
Loading