Skip to content

Commit 575470f

Browse files
authored
Merge branch 'main' into users/lexitaylor/fix-stricttype
2 parents e695b2b + a67544e commit 575470f

19 files changed

Lines changed: 87 additions & 58 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
301301
- Fixed [#5520](https://github.com/microsoft/BotFramework-WebChat/issues/5520). Version information should be injected when installed via npm, in PR [#5521](https://github.com/microsoft/BotFramework-WebChat/pull/5521), by [@compulim](https://github.com/compulim)
302302
- Fixed aria-label only announcing placeholder in feedback form, in PR [#5567](https://github.com/microsoft/BotFramework-WebChat/pull/5567)
303303
- Fixed placing focus on the code block content, so it is possible to scroll code via keyboard, in PR [#5575](https://github.com/microsoft/BotFramework-WebChat/pull/5575), by [@OEvgeny](https://github.com/OEvgeny)
304+
- Fixed [#5581](https://github.com/microsoft/BotFramework-WebChat/issues/5581). Activities should be displayed after upgrading via `npm install`, in PR [#5582](https://github.com/microsoft/BotFramework-WebChat/pull/5582), by [@compulim](https://github.com/compulim)
304305

305306
### Removed
306307

biome.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/1.9.3/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",
66
"useIgnoreFile": true
77
},
88
"files": {
99
"ignoreUnknown": false,
10-
"ignore": ["**/dist"]
10+
"includes": ["**", "!**/dist"]
1111
},
1212
"formatter": {
1313
"indentStyle": "space",
1414
"indentWidth": 2
1515
},
16-
"organizeImports": {
17-
"enabled": false
18-
},
16+
"assist": { "actions": { "source": { "organizeImports": "off" } } },
1917
"javascript": {
2018
"formatter": {
2119
"enabled": false
@@ -44,5 +42,12 @@
4442
"linter": {
4543
"enabled": true
4644
}
45+
},
46+
"linter": {
47+
"rules": {
48+
"style": {
49+
"noDescendingSpecificity": "off"
50+
}
51+
}
4752
}
4853
}

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/api-middleware/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
},
9090
"dependencies": {
9191
"handler-chain": "^0.1.0",
92-
"react-chain-of-responsibility": "^0.4.0-main.c2f17da",
92+
"react-chain-of-responsibility": "0.4.0-main.c2f17da",
9393
"react-wrap-with": "0.1.0",
9494
"valibot": "1.1.0"
9595
}

packages/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"iter-fest": "0.3.0",
136136
"math-random": "2.0.1",
137137
"prop-types": "15.8.1",
138-
"react-chain-of-responsibility": "^0.4.0-main.c2f17da",
138+
"react-chain-of-responsibility": "0.4.0-main.c2f17da",
139139
"react-redux": "7.2.9",
140140
"redux": "5.0.1",
141141
"simple-update-in": "2.2.0",

packages/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"merge-refs": "2.0.0",
138138
"prop-types": "15.8.1",
139139
"punycode": "2.3.1",
140-
"react-chain-of-responsibility": "^0.4.0-main.c2f17da",
140+
"react-chain-of-responsibility": "0.4.0-main.c2f17da",
141141
"react-dictate-button": "4.0.0",
142142
"react-film": "4.0.0",
143143
"react-redux": "7.2.9",

packages/component/src/Activity/CodeBlockContent.module.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
:global(.webchat) .code-block-content {
2-
border: var(--webchat__border-width--bubble) var(--webchat__border-style--bubble)
3-
var(--webchat__border-color--bubble);
2+
border: var(--webchat__border-width--bubble) var(--webchat__border-style--bubble) var(--webchat__border-color--bubble);
43
border-radius: var(--webchat__border-radius--bubble);
54
display: block;
65
font-family: var(--webchat__font--primary);
@@ -9,8 +8,11 @@
98
font-weight: 400;
109
margin: 0 calc(var(--webchat__border-width--bubble) * -1) calc(var(--webchat__border-width--bubble) * -1);
1110
overflow: hidden;
12-
overflow: clip;
1311
position: relative;
12+
13+
@supports (overflow: clip) {
14+
overflow: clip;
15+
}
1416
}
1517

1618
:global(.webchat) .code-block-content__header {

packages/component/src/Activity/StackedLayout.module.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
color: var(--webchat__color--subtle);
107107
display: grid;
108108
font-size: 1.1em;
109-
grid-template-areas: "message-status-icon";
109+
grid-template-areas: 'message-status-icon';
110110
margin-block: calc(var(--webchat__padding--regular) + 1px);
111111
margin-inline-start: var(--webchat__padding--regular);
112112
place-self: start;
@@ -193,12 +193,12 @@
193193
.stacked-layout__bubble {
194194
grid-template: 'content' 1fr / 1fr;
195195
}
196-
196+
197197
.stacked-layout__message-status {
198198
display: none;
199199
}
200-
201-
&:has(.stacked-layout__message-status--final),
200+
201+
&:has(.stacked-layout__message-status--final),
202202
&:has(.stacked-layout__message-status--incomplete) {
203203
.stacked-layout__bubble {
204204
grid-template:

packages/component/src/Activity/private/MessageStatusLoader.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
}
99

1010
@keyframes message-status-loader__pulse {
11-
0%, 100% {
11+
0%,
12+
100% {
1213
opacity: 0.3;
1314
}
1415
50% {

packages/component/src/Attachment/Text/private/ViewCodeDialog.module.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@
5757
color: var(--webchat__color--subtle);
5858
line-height: 20px;
5959
}
60-

0 commit comments

Comments
 (0)