Skip to content

Commit 6d0bd05

Browse files
authored
Merge branch 'main' into cnwankwo/together_ui_impl
2 parents fc01dc1 + 765d226 commit 6d0bd05

File tree

83 files changed

+1346
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1346
-663
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Hard mute",
5+
"comment": "fix media access hermetic test",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "prerelease",
3+
"area": "improvement",
4+
"workstream": "Updating test server dependencies",
5+
"comment": "updating express to 4.21.2 so we can fix a dependnecy issue with path-to-regexp",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "improvement",
4+
"workstream": "Hard mute",
5+
"comment": "Add sdk references to story book",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "A11y",
5+
"comment": "Fix keyboard navigation for message menu button",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Hard mute",
5+
"comment": "fix media access hermetic test",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "improvement",
4+
"workstream": "Hard mute",
5+
"comment": "Add sdk references to story book",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "A11y",
5+
"comment": "Fix keyboard navigation for message menu button",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}

common/config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@playwright/test": "~1.49.1",
2222
"@rollup/plugin-commonjs": "~25.0.7",
2323
"@rollup/plugin-json": "^6.0.1",
24-
"@types/node": "^22.9.0",
24+
"@types/node": "^22.10.6",
2525
"beachball": "^2.44.0",
2626
"rollup": "^4.27.2",
2727
"rollup-plugin-sourcemaps": "~0.6.3",

common/config/rush/pnpm-lock.yaml

+380-219
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/rush/variants/stable/pnpm-lock.yaml

+409-220
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/scripts/install-run.js

+59-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/calling-component-bindings/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
"devDependencies": {
4848
"@azure/communication-calling": "1.32.2-beta.1 || ^1.32.1",
49-
"@azure/communication-calling-effects": "^1.1.2",
49+
"@azure/communication-calling-effects": "^1.1.3",
5050
"@babel/cli": "^7.24.8",
5151
"@babel/core": "^7.25.2",
5252
"@types/jest": "^29.5.14",

packages/chat-stateful-client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@types/react": "18.3.12",
5151
"@typescript-eslint/eslint-plugin": "^7.14.1",
5252
"@typescript-eslint/parser": "^7.14.1",
53-
"@types/node": "^22.9.0",
53+
"@types/node": "^22.10.6",
5454
"copyfiles": "^2.4.1",
5555
"cpy-cli": "^5.0.0",
5656
"cross-env": "^7.0.3",
@@ -69,4 +69,4 @@
6969
"ts-jest": "^29.1.5",
7070
"typescript": "5.4.5"
7171
}
72-
}
72+
}

packages/communication-react/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
"@azure/logger": "^1.0.4",
2929
"@fluentui/react-components": "^9.56.1",
3030
"@fluentui/react": "^8.121.11",
31-
"@fluentui/react-file-type-icons": "8.12.4",
31+
"@fluentui/react-file-type-icons": "8.12.7",
3232
"@fluentui/react-hooks": "^8.8.16",
33-
"@fluentui/react-icons": "^2.0.266",
33+
"@fluentui/react-icons": "^2.0.270",
3434
"@fluentui/react-window-provider": "^2.2.27",
3535
"@fluentui-contrib/react-chat": "0.1.10",
3636
"@griffel/react": "^1.5.27",
3737
"@types/events": "^3.0.3",
3838
"copy-to-clipboard": "^3.3.1",
39-
"dompurify": "^3.1.7",
39+
"dompurify": "^3.2.3",
4040
"events": "^3.3.0",
41-
"html-react-parser": "^5.1.18",
41+
"html-react-parser": "^5.2.2",
4242
"immer": "10.1.1",
4343
"memoize-one": "^5.2.1",
4444
"nanoid": "3.3.8",
@@ -112,7 +112,7 @@
112112
},
113113
"devDependencies": {
114114
"@azure/communication-calling": "1.32.2-beta.1 || ^1.32.1",
115-
"@azure/communication-calling-effects": "^1.1.2",
115+
"@azure/communication-calling-effects": "^1.1.3",
116116
"@azure/core-auth": "^1.7.2",
117117
"@babel/cli": "^7.24.8",
118118
"@babel/core": "^7.25.2",
@@ -124,15 +124,15 @@
124124
"@internal/react-components": "1.23.0-beta.0",
125125
"@internal/react-composites": "1.23.0-beta.0",
126126
"@internal/acs-ui-javascript-loaders": "1.23.0-beta.0",
127-
"@microsoft/api-documenter": "~7.26.0",
127+
"@microsoft/api-documenter": "~7.26.5",
128128
"@microsoft/api-extractor": "~7.48.0",
129129
"@rollup/plugin-json": "^6.0.1",
130130
"@testing-library/jest-dom": "^6.4.8",
131131
"@testing-library/react": "^16.0.0",
132132
"@types/dompurify": "^3.0.5",
133133
"@types/jest": "^29.5.14",
134134
"@types/json-stringify-safe": "^5.0.3",
135-
"@types/node": "^22.9.0",
135+
"@types/node": "^22.10.6",
136136
"@types/react-dom": "18.3.1",
137137
"@types/react-linkify": "^1.0.4",
138138
"@types/react": "18.3.12",
@@ -172,7 +172,7 @@
172172
"ts-patch": "^3.1.2",
173173
"type-fest": "^4.14.0",
174174
"typescript": "5.4.5",
175-
"typescript-transform-paths": "^3.5.2"
175+
"typescript-transform-paths": "^3.5.3"
176176
},
177177
"beachball": {
178178
"shouldPublish": false

packages/react-components/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
"@azure/logger": "^1.0.4",
4040
"@fluentui/react": "^8.121.11",
4141
"@fluentui/react-components": "^9.56.1",
42-
"@fluentui/react-file-type-icons": "8.12.4",
42+
"@fluentui/react-file-type-icons": "8.12.7",
4343
"@fluentui/react-hooks": "^8.8.16",
44-
"@fluentui/react-icons": "^2.0.266",
44+
"@fluentui/react-icons": "^2.0.270",
4545
"@fluentui/react-window-provider": "^2.2.27",
4646
"@fluentui-contrib/react-chat": "0.1.10",
4747
"@internal/acs-ui-common": "1.23.0-beta.0",
4848
"@griffel/react": "^1.5.27",
4949
"copy-to-clipboard": "^3.3.1",
50-
"dompurify": "^3.1.7",
51-
"html-react-parser": "^5.1.18",
50+
"dompurify": "^3.2.3",
51+
"html-react-parser": "^5.2.2",
5252
"react-linkify": "^1.0.0-alpha",
5353
"react-use-draggable-scroll": "^0.4.7",
5454
"roosterjs-content-model-api": "^9.16.0",
@@ -80,7 +80,7 @@
8080
"@types/dompurify": "^3.0.5",
8181
"@types/jest": "^29.5.14",
8282
"@types/json-stringify-safe": "^5.0.3",
83-
"@types/node": "^22.9.0",
83+
"@types/node": "^22.10.6",
8484
"@types/react-dom": "18.3.1",
8585
"@types/react-linkify": "^1.0.4",
8686
"@types/react": "18.3.12",

packages/react-components/src/components/ChatMessage/MessageComponents/FluentChatMessageComponent.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import { IPersona, PersonaSize, mergeStyles, Persona } from '@fluentui/react';
1313
import { mergeClasses } from '@fluentui/react-components';
1414
import { createStyleFromV8Style } from '../../styles/v8StyleShim';
1515
import { ChatMessage as FluentChatMessage } from '@fluentui-contrib/react-chat';
16-
import { getFluentUIAttachedValue } from '../../utils/ChatMessageComponentUtils';
16+
import {
17+
getFluentUIAttachedValue,
18+
removeFluentUIKeyboardNavigationStyles
19+
} from '../../utils/ChatMessageComponentUtils';
1720
import { ChatMessageComponentWrapperProps } from '../ChatMessageComponentWrapper';
1821
/* @conditional-compile-remove(data-loss-prevention) */
1922
import { BlockedMessage } from '../../../types/ChatMessage';
@@ -140,8 +143,13 @@ export const FluentChatMessageComponent = (props: FluentChatMessageComponentWrap
140143
);
141144
}, [message.senderDisplayName, message.senderId, onRenderAvatar, shouldShowAvatar]);
142145

146+
const setMessageContainerRef = useCallback((node: HTMLDivElement | null) => {
147+
removeFluentUIKeyboardNavigationStyles(node);
148+
}, []);
149+
143150
const messageBodyProps = useMemo(() => {
144151
return {
152+
ref: setMessageContainerRef,
145153
// chatItemMessageContainer used in className and style prop as style prop can't handle CSS selectors
146154
className: mergeClasses(
147155
chatMessageRenderStyles.bodyCommon,
@@ -157,6 +165,7 @@ export const FluentChatMessageComponent = (props: FluentChatMessageComponentWrap
157165
styles?.chatItemMessageContainer !== undefined ? createStyleFromV8Style(styles?.chatItemMessageContainer) : {}
158166
};
159167
}, [
168+
setMessageContainerRef,
160169
chatMessageRenderStyles.bodyCommon,
161170
chatMessageRenderStyles.bodyWithoutAvatar,
162171
chatMessageRenderStyles.bodyHiddenAvatar,

0 commit comments

Comments
 (0)