Merge remote-tracking branch 'origin/main' into popover_resize

Author: TeodorTaushanov

packages/ai/.ui5-cem-aliases.json

@@ -0,0 +1,4 @@
+{
+	"BaseTextArea": "TextArea",
+	"BaseInput": "Input"
+}

packages/fiori/cypress/specs/Wizard.cy.tsx

@@ -633,4 +633,76 @@ describe("Wizard inside Dialog", () => {
             .find("[ui5-responsive-popover]")
             .should("be.visible");
     });
+});
+
+describe("Wizard - getFocusDomRef Method", () => {
+    it("should focus the last focused wizard tab on wizard focus", () => {
+        const onButtonClick = () => {
+            document.getElementById("wizard").focus();
+        }
+        cy.mount(
+            <>
+                <Wizard id="wizard">
+                    <WizardStep icon="sap-icon://product" titleText="Product type">
+                        <MessageStrip>
+                            The Wizard control is supposed to break down large tasks.
+                        </MessageStrip>
+                    </WizardStep>
+                    <WizardStep titleText="Product Information" selected />
+                    <WizardStep titleText="Product Text" />
+                </Wizard>
+                <Button>Dummy Btn</Button>
+                <Button onClick={onButtonClick}>Focus Wizard</Button>
+            </>
+        );
+
+        cy.get("[ui5-wizard]")
+            .shadow()
+            .find("[ui5-wizard-tab]")
+            .eq(2)
+            .realClick();
+
+        cy.get("[ui5-button]")
+            .eq(0)
+            .realClick();
+
+        cy.get("[ui5-button]")
+            .eq(1)
+            .realClick();
+
+        cy.get("[ui5-wizard]")
+            .shadow()
+            .find("[ui5-wizard-tab]")
+            .eq(2)
+            .shadow()
+            .find(".ui5-wiz-step-root")
+            .should("be.focused");
+    });
+
+    it("should focus the first wizard tab if no tab was focused before ", () => {
+        const onButtonClick = () => {
+            document.getElementById("wizard").focus();
+        }
+        cy.mount(
+            <>
+                <Wizard id="wizard">
+                    <WizardStep icon="sap-icon://product" titleText="Product type"></WizardStep>
+                    <WizardStep titleText="Product Information" />
+                    <WizardStep titleText="Product Text" />
+                </Wizard>
+                <Button onClick={onButtonClick}>Focus Wizard</Button>
+            </>
+        );
+
+        cy.get("[ui5-button]")
+            .realClick();
+
+        cy.get("[ui5-wizard]")
+            .shadow()
+            .find("[ui5-wizard-tab]")
+            .eq(0)
+            .shadow()
+            .find(".ui5-wiz-step-root")
+            .should("be.focused");
+    });
 });

packages/fiori/src/Wizard.ts

@@ -694,6 +694,10 @@ class Wizard extends UI5Element {
 		return contentHeight;
 	}
 
+	getFocusDomRef() {
+		return this._itemNavigation._getCurrentItem();
+	}
+
 	getStepAriaLabelText(step: WizardStep, ariaLabel: string) {
 		return Wizard.i18nBundle.getText(WIZARD_STEP_ARIA_LABEL, ariaLabel);
 	}

packages/tools/lib/cem/custom-elements-manifest.config.mjs

@@ -27,7 +27,17 @@ import { generateCustomData } from "cem-plugin-vs-code-custom-data-generator";
 import { customElementJetBrainsPlugin } from "custom-element-jet-brains-integration";
 
 const packageJSON = JSON.parse(fs.readFileSync("./package.json"));
+let aliasMap = {};
+
 const devMode = process.env.UI5_CEM_MODE === "dev";
+try {
+	aliasMap = JSON.parse(fs.readFileSync("./.ui5-cem-aliases.json"));
+} catch (e) {
+	if (devMode) {
+		console.warn("No .ui5-cem-aliases.json file found. Continuing without aliases.");
+	}
+}
+
 
 const extractClassNodeJSDoc = node => {
 	const fileContent = node.getFullText();
@@ -486,6 +496,12 @@ export default {
 						}
 					}
 
+					moduleDoc.declarations.forEach(declaration => {
+						if (declaration.superclass?.name && aliasMap[declaration.superclass.name]) {
+							declaration.superclass.name = aliasMap[declaration.superclass.name];
+						}
+					})
+
 					const typeReferences = new Set();
 					const registerTypeReference = reference => typeReferences.add(JSON.stringify(reference))