Skip to content

[WIP] Activity middleware vNext #5505

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] Activity middleware vNext #5505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions packages/component/src/Middleware/ActivityGrouping/ui/RenderActivityGrouping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
import { hooks } from 'botframework-webchat-api';
import { type WebChatActivity } from 'botframework-webchat-core';
import { validateProps } from 'botframework-webchat-react-valibot';
import React, { Fragment, memo } from 'react';
import useGetRenderActivityCallback from '../../../providers/RenderingActivities/useGetRenderActivityCallback';
import { array, custom, object, pipe, readonly, safeParse, type InferInput } from 'valibot';

import TranscriptActivity from '../../../Transcript/TranscriptActivity';

const { useGetKeyByActivity } = hooks;

type RenderActivityGroupingProps = Readonly<{
activities: readonly WebChatActivity[];
}>;
const renderActivityGroupingPropsSchema = pipe(
object({
activities: pipe(array(custom<WebChatActivity>(value => safeParse(object({}), value).success)), readonly())
}),
readonly()
);

type RenderActivityGroupingProps = InferInput<typeof renderActivityGroupingPropsSchema>;

const RenderActivityGrouping = ({ activities }: RenderActivityGroupingProps) => {
const RenderActivityGrouping = (props: RenderActivityGroupingProps) => {
const { activities } = validateProps(renderActivityGroupingPropsSchema, props);
const getKeyByActivity = useGetKeyByActivity();
const getRenderActivityCallback = useGetRenderActivityCallback();

return (
<Fragment>
{activities.map(activity => (
<TranscriptActivity
activity={activity}
key={getKeyByActivity(activity)}
renderActivity={getRenderActivityCallback(activity)}
/>
<TranscriptActivity activity={activity} key={getKeyByActivity(activity)} />
))}
</Fragment>
);
Expand Down
23 changes: 17 additions & 6 deletions packages/component/src/Transcript/TranscriptActivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
import { hooks, type ActivityComponentFactory } from 'botframework-webchat-api';
import { hooks } from 'botframework-webchat-api';
import { type WebChatActivity } from 'botframework-webchat-core';
import { validateProps } from 'botframework-webchat-react-valibot';
import React, { memo, useCallback, useMemo } from 'react';
import { custom, object, pipe, readonly, safeParse, type InferInput } from 'valibot';

import useFirstActivityInSenderGroup from '../Middleware/ActivityGrouping/ui/SenderGrouping/useFirstActivity';
import useLastActivityInSenderGroup from '../Middleware/ActivityGrouping/ui/SenderGrouping/useLastActivity';
import useFirstActivityInStatusGroup from '../Middleware/ActivityGrouping/ui/StatusGrouping/useFirstActivity';
import useLastActivityInStatusGroup from '../Middleware/ActivityGrouping/ui/StatusGrouping/useLastActivity';
import useActivityElementMapRef from '../providers/ChatHistoryDOM/useActivityElementRef';
import useGetRenderActivityCallback from '../providers/RenderingActivities/useGetRenderActivityCallback';
import isZeroOrPositive from '../Utils/isZeroOrPositive';
import ActivityRow from './ActivityRow';

const { useCreateActivityStatusRenderer, useCreateAvatarRenderer, useGetKeyByActivity, useStyleOptions } = hooks;

type TranscriptActivityProps = Readonly<{
activity: WebChatActivity;
renderActivity: Exclude<ReturnType<ActivityComponentFactory>, false>;
}>;
const transcriptActivityPropsSchema = pipe(
object({
activity: custom<WebChatActivity>(value => safeParse(object({}), value).success)
}),
readonly()
);

const TranscriptActivity = ({ activity, renderActivity }: TranscriptActivityProps) => {
type TranscriptActivityProps = InferInput<typeof transcriptActivityPropsSchema>;

const TranscriptActivity = (props: TranscriptActivityProps) => {
const { activity } = validateProps(transcriptActivityPropsSchema, props);
const [{ bubbleFromUserNubOffset, bubbleNubOffset, groupTimestamp, showAvatarInGroup }] = useStyleOptions();
const [firstActivityInSenderGroup] = useFirstActivityInSenderGroup();
const [firstActivityInStatusGroup] = useFirstActivityInStatusGroup();
Expand All @@ -26,6 +34,7 @@ const TranscriptActivity = ({ activity, renderActivity }: TranscriptActivityProp
const activityElementMapRef = useActivityElementMapRef();
const createActivityStatusRenderer = useCreateActivityStatusRenderer();
const getKeyByActivity = useGetKeyByActivity();
const getRenderActivityCallback = useGetRenderActivityCallback();
const renderAvatar = useCreateAvatarRenderer();

const activityKey: string = useMemo(() => getKeyByActivity(activity), [activity, getKeyByActivity]);
Expand Down Expand Up @@ -83,6 +92,8 @@ const TranscriptActivity = ({ activity, renderActivity }: TranscriptActivityProp
showCallout = true;
}

const renderActivity = getRenderActivityCallback(activity);

const children = useMemo(
() =>
renderActivity({
Expand Down
Loading