diff --git a/packages/main/cypress/specs/Carousel.cy.tsx b/packages/main/cypress/specs/Carousel.cy.tsx
index 5c11860f0c9e..eb24ce8eb908 100644
--- a/packages/main/cypress/specs/Carousel.cy.tsx
+++ b/packages/main/cypress/specs/Carousel.cy.tsx
@@ -777,4 +777,26 @@ describe("Carousel general interaction", () => {
cy.get("#outsideButton").should("be.focused");
});
+
+ it("visibleItemsIndices should not contain negative values when initial items < itemsPerPage", () => {
+ cy.mount(
+
+ Card 1
+ Card 2
+
+ );
+
+ cy.viewport(1200, 500);
+
+ cy.get("#dynamicCarousel")
+ .shadow()
+ .find(".ui5-carousel-item:not(.ui5-carousel-item--hidden)")
+ .should("have.length", 2);
+
+ cy.get("#dynamicCarousel")
+ .then($carousel => {
+ const indices = $carousel[0].visibleItemsIndices;
+ expect(indices.every(i => i >= 0), "visibleItemsIndices should not contain negative values").to.be.true;
+ });
+ });
});
\ No newline at end of file
diff --git a/packages/main/src/Carousel.ts b/packages/main/src/Carousel.ts
index 84af5494439a..58369c005288 100644
--- a/packages/main/src/Carousel.ts
+++ b/packages/main/src/Carousel.ts
@@ -785,7 +785,7 @@ class Carousel extends UI5Element {
}
if (newItemIndex > items.length - effectiveItemsPerPage) {
- newItemIndex = items.length - effectiveItemsPerPage;
+ newItemIndex = Math.max(0, items.length - effectiveItemsPerPage);
}
const lastItemIndex = newItemIndex + effectiveItemsPerPage;
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/BusyIndicator-parameters.css b/packages/main/src/themes/sap_fiori_3_hcb/BusyIndicator-parameters.css
deleted file mode 100644
index a51bc0ac2874..000000000000
--- a/packages/main/src/themes/sap_fiori_3_hcb/BusyIndicator-parameters.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../base/BusyIndicator-parameters.css";
-
-:host {
- --_ui5_busy_indicator_color: var(--sapContent_BusyColor);
-}
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
index 6902bd6a7029..f63a75a0f133 100644
--- a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
+++ b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
@@ -5,7 +5,6 @@
@import "../base/Breadcrumbs-parameters.css";
@import "./Button-parameters.css";
@import "../base/ButtonBadge-parameters.css";
-@import "./BusyIndicator-parameters.css";
@import "../base/CalendarLegend-parameters.css";
@import "../base/CalendarLegendItem-parameters.css";
@import "./CalendarHeader-parameters.css";
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/BusyIndicator-parameters.css b/packages/main/src/themes/sap_fiori_3_hcw/BusyIndicator-parameters.css
deleted file mode 100644
index a51bc0ac2874..000000000000
--- a/packages/main/src/themes/sap_fiori_3_hcw/BusyIndicator-parameters.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../base/BusyIndicator-parameters.css";
-
-:host {
- --_ui5_busy_indicator_color: var(--sapContent_BusyColor);
-}
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
index 94fcb7f6324c..b8569d2894a8 100644
--- a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
+++ b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
@@ -4,7 +4,6 @@
@import "../base/Breadcrumbs-parameters.css";
@import "./Button-parameters.css";
@import "../base/ButtonBadge-parameters.css";
-@import "./BusyIndicator-parameters.css";
@import "../base/CalendarLegend-parameters.css";
@import "../base/CalendarLegendItem-parameters.css";
@import "./CalendarHeader-parameters.css";