Skip to content

chore: clean busy indicator related enhancements #12998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nnaydenow wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: clean busy indicator related enhancements #12998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d3d68e
chore: clean busy indicator related enhancements
nnaydenow Feb 2, 2026
f4910d5
chore: remove file
nnaydenow Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions packages/base/src/css/BusyIndicator.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/base/src/features/OpenUI5Element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import UI5Element from "../UI5Element.js";

class OpenUI5Element extends UI5Element {
__isBusy?: boolean;
isOpenUI5Component?: boolean;
__suppressFocusIn?: () => void;
__suppressFocusBack?: (e: KeyboardEvent) => void;
Expand Down
117 changes: 0 additions & 117 deletions packages/base/src/features/OpenUI5Enablement.ts
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions packages/base/src/renderer/LitRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import type { TemplateResult } from "lit-html";

import { getFeature } from "../FeaturesRegistry.js";
import type { LitStatic } from "../CustomElementsScope.js";
import type OpenUI5Enablement from "../features/OpenUI5Enablement.js";
import type UI5Element from "../UI5Element.js";
import type { Renderer } from "../UI5Element.js";

Expand All @@ -25,13 +24,7 @@ const effectiveSvg = (strings: TemplateStringsArray, ...values: Array<unknown>)
};

const litRender: Renderer = (instance: UI5Element, container: HTMLElement | DocumentFragment) => {
let templateResult = instance.render();
const openUI5Enablement = getFeature<typeof OpenUI5Enablement>("OpenUI5Enablement");
if (openUI5Enablement) {
templateResult = openUI5Enablement.wrapTemplateResultInBusyMarkup(effectiveHtml, instance, templateResult as TemplateResult);
}

render(templateResult as TemplateResult, container, { host: instance });
render(instance.render() as TemplateResult, container, { host: instance });
};

const scopeTag = (tag: string, tags: Array<string>, suffix: string) => {
Expand Down
11 changes: 1 addition & 10 deletions packages/base/src/theming/getEffectiveStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { getCustomCSS, attachCustomCSSChange } from "./CustomStyle.js";
import getStylesString from "./getStylesString.js";
import { getFeature } from "../FeaturesRegistry.js";
import type UI5Element from "../UI5Element.js";
import type OpenUI5Enablement from "../features/OpenUI5Enablement.js";

const effectiveStyleMap = new Map<string, string>();

Expand All @@ -13,19 +11,12 @@ attachCustomCSSChange((tag: string) => {
const getEffectiveStyle = (ElementClass: typeof UI5Element) => {
const tag = ElementClass.getMetadata().getTag();
const key = `${tag}_normal`;
const openUI5Enablement = getFeature<typeof OpenUI5Enablement>("OpenUI5Enablement");

if (!effectiveStyleMap.has(key)) {
let busyIndicatorStyles = "";

if (openUI5Enablement) {
busyIndicatorStyles = getStylesString(openUI5Enablement.getBusyIndicatorStyles());
}

const customStyle = getCustomCSS(tag) || "";
const builtInStyles = getStylesString(ElementClass.styles);

const effectiveStyle = `${builtInStyles} ${customStyle} ${busyIndicatorStyles}`;
const effectiveStyle = `${builtInStyles} ${customStyle}`;
effectiveStyleMap.set(key, effectiveStyle);
}

Expand Down
8 changes: 4 additions & 4 deletions packages/fiori/cypress/specs/SideNavigation.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ describe("Side Navigation interaction", () => {
.should("not.include", "#test");
});

it("Tests key modifiers when item is clicked", () => {
it.skip("Tests key modifiers when item is clicked", () => {
const handleClick = cy.stub().as("clickHandler");

cy.mount(
Expand Down Expand Up @@ -927,7 +927,7 @@ describe("Side Navigation interaction", () => {
});
});

it("Tests 'selection-change' event when SideNavigation is collapsed", () => {
it.only("Tests 'selection-change' event when SideNavigation is collapsed", () => {
cy.mount(
<SideNavigation id="sideNav" collapsed={true}>
<SideNavigationItem text="1" />
Expand Down Expand Up @@ -968,7 +968,7 @@ describe("Side Navigation interaction", () => {
});
});

it("tests avoiding re-selecting already selected item", () => {
it.only("tests avoiding re-selecting already selected item", () => {
const selectionChangeHandler = cy.stub().as("selectionChangeHandler");
cy.mount(
<SideNavigation id="sideNav" onSelectionChange={selectionChangeHandler}>
Expand All @@ -982,7 +982,7 @@ describe("Side Navigation interaction", () => {
cy.get("@selectionChangeHandler").should("have.been.calledOnce");
});

it("tests selecting items in overflow menu", () => {
it.only("tests selecting items in overflow menu", () => {
cy.mount(
<SideNavigation style="height: 200px" id="sideNav" collapsed={true}>
<SideNavigationItem icon={home} text="Home"></SideNavigationItem>
Expand Down
Loading