Skip to content

Commit b566a2f

Browse files
LidiyaGeorgievaLidiyaGeorgieva
committed
Merge branch 'main' of github.com:UI5/webcomponents into NavigationLayoutNewResponsivness
2 parents c8c6c54 + 2f8150d commit b566a2f

67 files changed

Lines changed: 1145 additions & 375 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,44 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.18.0](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.3...v2.18.0) (2026-01-05)
7+
8+
**Note:** Version bump only for package webcomponents
9+
10+
11+
12+
13+
14+
# [2.18.0-rc.3](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.2...v2.18.0-rc.3) (2026-01-01)
15+
16+
17+
### Bug Fixes
18+
19+
* **ui5-multi-combo-box:** unskip test ([#12829](https://github.com/UI5/webcomponents/issues/12829)) ([b62c313](https://github.com/UI5/webcomponents/commit/b62c313d4ba1f2baa1feb048066eb90c5c4f7571))
20+
* **ui5-search-item:** update search item gap with design spec ([#12831](https://github.com/UI5/webcomponents/issues/12831)) ([1a65306](https://github.com/UI5/webcomponents/commit/1a653065b586817e505f03a950ae83d15ba9cf41))
21+
22+
23+
24+
25+
26+
# [2.18.0-rc.2](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.1...v2.18.0-rc.2) (2025-12-25)
27+
28+
29+
### Bug Fixes
30+
31+
* **OpenUI5Support:** stabilize popups tests ([#12830](https://github.com/UI5/webcomponents/issues/12830)) ([6bf7b05](https://github.com/UI5/webcomponents/commit/6bf7b053682d140bdaf1db45cf476e0d1e0c94aa))
32+
33+
34+
### Features
35+
36+
* **ui5-calendar:** improve header and day picker accessibility and focus behavior ([5111ce7](https://github.com/UI5/webcomponents/commit/5111ce7d4bd6436efacd0167b811623f6b8b304f))
37+
* **ui5-multi-combobox:** filtering selection enhancement ([#12799](https://github.com/UI5/webcomponents/issues/12799)) ([9eb128d](https://github.com/UI5/webcomponents/commit/9eb128d72fd963869c8dde3b7f48824df4ed8fd7))
38+
* **ui5-token:** change readonly select state visual ([#12822](https://github.com/UI5/webcomponents/issues/12822)) ([dee55cf](https://github.com/UI5/webcomponents/commit/dee55cf1147759cbfad20a72c8315664c8e95ae9))
39+
40+
41+
42+
43+
644
# [2.18.0-rc.1](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.0...v2.18.0-rc.1) (2025-12-18)
745

846

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"packages/create-package",
1515
"packages/compat"
1616
],
17-
"version": "2.18.0-rc.1",
17+
"version": "2.18.0",
1818
"command": {
1919
"publish": {
2020
"allowBranch": "*",

‎packages/ai/CHANGELOG.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.18.0](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.3...v2.18.0) (2026-01-05)
7+
8+
**Note:** Version bump only for package @ui5/webcomponents-ai
9+
10+
11+
12+
13+
14+
# [2.18.0-rc.3](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.2...v2.18.0-rc.3) (2026-01-01)
15+
16+
**Note:** Version bump only for package @ui5/webcomponents-ai
17+
18+
19+
20+
21+
22+
# [2.18.0-rc.2](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.1...v2.18.0-rc.2) (2025-12-25)
23+
24+
**Note:** Version bump only for package @ui5/webcomponents-ai
25+
26+
27+
28+
29+
630
# [2.18.0-rc.1](https://github.com/UI5/webcomponents/compare/v2.18.0-rc.0...v2.18.0-rc.1) (2025-12-18)
731

832
**Note:** Version bump only for package @ui5/webcomponents-ai

‎packages/ai/cypress/specs/TextArea.cy.tsx‎

Lines changed: 105 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ describe("Basic", () => {
111111
/>
112112
);
113113

114+
cy.get("[ui5-ai-textarea]")
115+
.shadow()
116+
.find("textarea")
117+
.focus();
118+
114119
cy.get("[ui5-ai-textarea]")
115120
.shadow()
116121
.find("[ui5-ai-writing-assistant]")
@@ -135,11 +140,17 @@ describe("Basic", () => {
135140
cy.mount(
136141
<TextArea
137142
loading={false}
143+
currentVersion={1}
138144
totalVersions={3}
139145
onVersionChange={onVersionChange}
140146
/>
141147
);
142148

149+
cy.get("[ui5-ai-textarea]")
150+
.shadow()
151+
.find("textarea")
152+
.focus();
153+
143154
cy.get("[ui5-ai-textarea]")
144155
.shadow()
145156
.find("[ui5-ai-writing-assistant]")
@@ -162,6 +173,7 @@ describe("Basic", () => {
162173
cy.mount(
163174
<TextArea
164175
loading={false}
176+
currentVersion={1}
165177
totalVersions={3}
166178
/>
167179
);
@@ -207,7 +219,7 @@ describe("Basic", () => {
207219
<TextArea
208220
value={initialValue}
209221
loading={false}
210-
currentVersion={0}
222+
currentVersion={1}
211223
totalVersions={2}
212224
/>
213225
);
@@ -216,6 +228,11 @@ describe("Basic", () => {
216228
.as("textarea")
217229
.invoke("prop", "value", newValue);
218230

231+
cy.get("@textarea")
232+
.shadow()
233+
.find("textarea")
234+
.focus();
235+
219236
cy.get("@textarea")
220237
.shadow()
221238
.find("[ui5-ai-writing-assistant]")
@@ -262,6 +279,11 @@ describe("Basic", () => {
262279
</TextArea>
263280
);
264281

282+
cy.get("[ui5-ai-textarea]")
283+
.shadow()
284+
.find("textarea")
285+
.focus();
286+
265287
cy.get("[ui5-ai-textarea]")
266288
.shadow()
267289
.find("[ui5-ai-writing-assistant]")
@@ -284,6 +306,11 @@ describe("Basic", () => {
284306
/>
285307
);
286308

309+
cy.get("[ui5-ai-textarea]")
310+
.shadow()
311+
.find("textarea")
312+
.focus();
313+
287314
cy.get("[ui5-ai-textarea]")
288315
.shadow()
289316
.find("[ui5-ai-writing-assistant]")
@@ -516,7 +543,11 @@ describe("Basic", () => {
516543
/>
517544
);
518545

519-
// Verify that the integrated WritingAssistant has translatable attributes
546+
cy.get("[ui5-ai-textarea]")
547+
.shadow()
548+
.find("textarea")
549+
.focus();
550+
520551
cy.get("[ui5-ai-textarea]")
521552
.shadow()
522553
.find("[ui5-ai-writing-assistant]")
@@ -532,15 +563,14 @@ describe("Basic", () => {
532563
.should("have.attr", "accessible-name", TextArea.i18nBundle.getText(WRITING_ASSISTANT_BUTTON_ACCESSIBLE_NAME))
533564
.should("have.attr", "tooltip", TextArea.i18nBundle.getText(WRITING_ASSISTANT_BUTTON_TOOLTIP));
534565

535-
// Verify versioning tooltips are translatable
536566
cy.get("[ui5-ai-textarea]")
537567
.shadow()
538568
.find("[ui5-ai-writing-assistant]")
539569
.shadow()
540570
.find("[ui5-ai-versioning]")
541571
.shadow()
542572
.find('[data-ui5-versioning-button="previous"]')
543-
.should("have.attr", "tooltip", "Previous Version");
573+
.should("have.attr", "tooltip", "Previous Version (Ctrl + Shift + Z)");
544574

545575
cy.get("[ui5-ai-textarea]")
546576
.shadow()
@@ -549,7 +579,76 @@ describe("Basic", () => {
549579
.find("[ui5-ai-versioning]")
550580
.shadow()
551581
.find('[data-ui5-versioning-button="next"]')
552-
.should("have.attr", "tooltip", "Next Version");
582+
.should("have.attr", "tooltip", "Next Version (Ctrl + Shift + Y)");
583+
});
584+
});
585+
586+
describe("AI Button Focus Visibility", () => {
587+
it("should show AI button only when textarea, button, or menu has focus", () => {
588+
cy.mount(
589+
<TextArea>
590+
<Menu slot="menu" id="test-menu">
591+
<MenuItem text="Generate text" />
592+
<MenuItem text="Summarize" />
593+
</Menu>
594+
</TextArea>
595+
);
596+
597+
cy.get("[ui5-ai-textarea]")
598+
.shadow()
599+
.find("[ui5-ai-writing-assistant]")
600+
.shadow()
601+
.find("#ai-menu-btn")
602+
.should("not.exist");
603+
604+
cy.get("[ui5-ai-textarea]")
605+
.shadow()
606+
.find("textarea")
607+
.focus();
608+
609+
cy.get("[ui5-ai-textarea]")
610+
.shadow()
611+
.find("[ui5-ai-writing-assistant]")
612+
.shadow()
613+
.find("#ai-menu-btn")
614+
.should("exist")
615+
.should("be.visible");
616+
617+
cy.get("[ui5-ai-textarea]")
618+
.shadow()
619+
.find("[ui5-ai-writing-assistant]")
620+
.shadow()
621+
.find("#ai-menu-btn")
622+
.should("exist")
623+
.should("be.visible");
624+
625+
cy.get("[ui5-ai-textarea]")
626+
.shadow()
627+
.find("[ui5-ai-writing-assistant]")
628+
.shadow()
629+
.find("#ai-menu-btn")
630+
.realClick();
631+
632+
cy.get("[ui5-ai-textarea]")
633+
.find("ui5-menu")
634+
.should("have.prop", "open", true);
635+
636+
cy.get("[ui5-ai-textarea]")
637+
.shadow()
638+
.find("[ui5-ai-writing-assistant]")
639+
.shadow()
640+
.find("#ai-menu-btn")
641+
.should("exist")
642+
.should("be.visible");
643+
644+
cy.get("body").click();
645+
646+
cy.get("[ui5-ai-textarea]")
647+
.shadow()
648+
.find("[ui5-ai-writing-assistant]")
649+
.shadow()
650+
.find("#ai-menu-btn")
651+
.should("not.exist");
553652
});
554653
});
555654

@@ -602,4 +701,4 @@ describe("Basic", () => {
602701
.should("not.exist");
603702
});
604703
});
605-
});
704+
});

0 commit comments

Comments
 (0)