Skip to content
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

fix(ui5-*): make ui5-content-native-scrollbar to take effect #9790

Merged
merged 2 commits into from
Sep 3, 2024
Merged

fix(ui5-*): make ui5-content-native-scrollbar to take effect #9790

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
f9208f2
chore: init
nnaydenow Sep 2, 2024
459b23e
chore: fix belize styles
nnaydenow Sep 2, 2024
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
33 changes: 32 additions & 1 deletion packages/base/src/util/getEffectiveScrollbarStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
const NO_SCROLLBAR_STYLE_CLASS = "ui5-content-native-scrollbars";
const isSSR = typeof document === "undefined";

const getEffectiveScrollbarStyle = () => document.body.classList.contains(NO_SCROLLBAR_STYLE_CLASS);
const getEffectiveScrollbarStyle = () => {
if (isSSR || document.body.classList.contains(NO_SCROLLBAR_STYLE_CLASS)) {
return "";
}

return `::-webkit-scrollbar:horizontal {
height: var(--sapScrollBar_Dimension);
}

::-webkit-scrollbar:vertical {
width: var(--sapScrollBar_Dimension);
}

::-webkit-scrollbar {
background-color: var(--sapScrollBar_TrackColor);
border-left: var(--browser_scrollbar_border, none);
}

::-webkit-scrollbar-thumb {
border-radius: var(--browser_scrollbar_border_radius, var(--sapElement_BorderCornerRadius));
background-color: var(--sapScrollBar_FaceColor);
}

::-webkit-scrollbar-thumb:hover {
background-color: var(--sapScrollBar_Hover_FaceColor);
}

::-webkit-scrollbar-corner {
background-color: var(--sapScrollBar_TrackColor);
}`;
};

export default getEffectiveScrollbarStyle;
4 changes: 2 additions & 2 deletions packages/fiori/src/Page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import slot from "@ui5/webcomponents-base/dist/decorators/slot.js";
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
import type { ResizeObserverCallback } from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js";
import MediaRange from "@ui5/webcomponents-base/dist/MediaRange.js";
import browserScrollbarCSS from "@ui5/webcomponents/dist/generated/themes/BrowserScrollbar.css.js";
import PageBackgroundDesign from "./types/PageBackgroundDesign.js";

// Template
Expand Down Expand Up @@ -50,7 +50,7 @@ import PageCss from "./generated/themes/Page.css.js";
languageAware: true,
renderer: litRender,
styles: [
browserScrollbarCSS,
getEffectiveScrollbarStyle(),
PageCss,
],
template: PageTemplate,
Expand Down
4 changes: 1 addition & 3 deletions packages/fiori/src/Wizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import debounce from "@ui5/webcomponents-base/dist/util/debounce.js";
import { getFirstFocusableElement } from "@ui5/webcomponents-base/dist/util/FocusableElements.js";
import Button from "@ui5/webcomponents/dist/Button.js";
import ResponsivePopover from "@ui5/webcomponents/dist/ResponsivePopover.js";
import browserScrollbarCSS from "@ui5/webcomponents/dist/generated/themes/BrowserScrollbar.css.js";
import WizardContentLayout from "./types/WizardContentLayout.js";

// Texts
Expand Down Expand Up @@ -190,7 +189,7 @@ type StepInfo = {
fastNavigation: true,
renderer: litRender,
styles: [
browserScrollbarCSS,
getEffectiveScrollbarStyle(),
WizardCss,
],
staticAreaStyles: WizardPopoverCss,
Expand Down Expand Up @@ -345,7 +344,6 @@ class Wizard extends UI5Element {
return {
root: {
"ui5-wiz-root": true,
"ui5-content-native-scrollbars": getEffectiveScrollbarStyle(),
},
popover: {
"ui5-wizard-responsive-popover": true,
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/Dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from "@ui5/webcomponents-base/dist/Keys.js";
import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js";
import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js";
import Popup from "./Popup.js";
import type { PopupBeforeCloseEventDetail as DialogBeforeCloseEventDetail } from "./Popup.js";
Expand All @@ -29,7 +30,6 @@ import {
// Template
import DialogTemplate from "./generated/templates/DialogTemplate.lit.js";
// Styles
import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";
import PopupsCommonCss from "./generated/themes/PopupsCommon.css.js";
import dialogCSS from "./generated/themes/Dialog.css.js";
import PopupAccessibleRole from "./types/PopupAccessibleRole.js";
Expand Down Expand Up @@ -116,7 +116,7 @@ const ICON_PER_STATE: Record<ValueStateWithIcon, string> = {
tag: "ui5-dialog",
template: DialogTemplate,
styles: [
browserScrollbarCSS,
getEffectiveScrollbarStyle(),
PopupsCommonCss,
dialogCSS,
],
Expand Down
4 changes: 1 addition & 3 deletions packages/main/src/List.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import ListTemplate from "./generated/templates/ListTemplate.lit.js";

// Styles
import listCss from "./generated/themes/List.css.js";
import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";

// Texts
import {
Expand Down Expand Up @@ -160,7 +159,7 @@ type ListItemClickEventDetail = {
fastNavigation: true,
renderer: litRender,
template: ListTemplate,
styles: [browserScrollbarCSS, listCss],
styles: [getEffectiveScrollbarStyle(), listCss],
dependencies: [BusyIndicator, DropIndicator],
})
/**
Expand Down Expand Up @@ -645,7 +644,6 @@ class List extends UI5Element {
return {
root: {
"ui5-list-root": true,
"ui5-content-native-scrollbars": getEffectiveScrollbarStyle(),
},
};
}
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/Popover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
import { isIOS } from "@ui5/webcomponents-base/dist/Device.js";
import DOMReference from "@ui5/webcomponents-base/dist/types/DOMReference.js";
import { getClosedPopupParent } from "@ui5/webcomponents-base/dist/util/PopupUtils.js";
import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js";
import clamp from "@ui5/webcomponents-base/dist/util/clamp.js";
import isElementContainingBlock from "@ui5/webcomponents-base/dist/util/isElementContainingBlock.js";
import getParentElement from "@ui5/webcomponents-base/dist/util/getParentElement.js";
Expand All @@ -19,7 +20,6 @@ import { addOpenedPopover, removeOpenedPopover } from "./popup-utils/PopoverRegi
// Template
import PopoverTemplate from "./generated/templates/PopoverTemplate.lit.js";
// Styles
import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";
import PopupsCommonCss from "./generated/themes/PopupsCommon.css.js";
import PopoverCss from "./generated/themes/Popover.css.js";

Expand Down Expand Up @@ -86,7 +86,7 @@ type CalculatedPlacement = {
@customElement({
tag: "ui5-popover",
styles: [
browserScrollbarCSS,
getEffectiveScrollbarStyle(),
PopupsCommonCss,
PopoverCss,
],
Expand Down
2 changes: 0 additions & 2 deletions packages/main/src/Popup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
import { isChrome, isSafari } from "@ui5/webcomponents-base/dist/Device.js";
import { getFirstFocusableElement, getLastFocusableElement } from "@ui5/webcomponents-base/dist/util/FocusableElements.js";
import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/AriaLabelHelper.js";
import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js";
import { hasStyle, createStyle } from "@ui5/webcomponents-base/dist/ManagedStyles.js";
import { isEnter, isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js";
import { getNextZIndex, getFocusedElement, isFocusedElementWithinNode } from "@ui5/webcomponents-base/dist/util/PopupUtils.js";
Expand Down Expand Up @@ -603,7 +602,6 @@ abstract class Popup extends UI5Element {
return {
root: {
"ui5-popup-root": true,
"ui5-content-native-scrollbars": getEffectiveScrollbarStyle(),
},
content: {
"ui5-popup-content": true,
Expand Down
5 changes: 2 additions & 3 deletions packages/main/src/TextArea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import {
// Styles
import styles from "./generated/themes/TextArea.css.js";
import valueStateMessageStyles from "./generated/themes/ValueStateMessage.css.js";
import browserScrollbarCSS from "./generated/themes/BrowserScrollbar.css.js";

type TokenizedText = Array<string>;
type IndexedTokenizedText = Array<{
Expand Down Expand Up @@ -77,7 +76,7 @@ type ExceededText = {
@customElement({
tag: "ui5-textarea",
languageAware: true,
styles: [browserScrollbarCSS, styles],
styles: [getEffectiveScrollbarStyle(), styles],
renderer: litRender,
template: TextAreaTemplate,
staticAreaTemplate: TextAreaPopoverTemplate,
Expand Down Expand Up @@ -529,7 +528,7 @@ class TextArea extends UI5Element implements IFormElement {
return {
root: {
"ui5-textarea-root": true,
"ui5-content-native-scrollbars": getEffectiveScrollbarStyle(),
"ui5-content-custom-scrollbars": !!getEffectiveScrollbarStyle(),
},
valueStateMsg: {
"ui5-valuestatemessage-header": true,
Expand Down
25 changes: 0 additions & 25 deletions packages/main/src/themes/BrowserScrollbar.css
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions packages/main/src/themes/TextArea.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,27 +430,27 @@
display: none;
}

:host :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host .ui5-content-custom-scrollbars ::-webkit-scrollbar {
border-top-right-radius: var(--sapField_BorderCornerRadius);
border-bottom-right-radius: var(--sapField_BorderCornerRadius);
}

:host([value-state="Error"]) :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host([value-state="Error"]) .ui5-content-custom-scrollbars ::-webkit-scrollbar {
background-color: var(--sapScrollBar_TrackColor);
}

:host([value-state="Warning"]) :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host([value-state="Warning"]) .ui5-content-custom-scrollbars ::-webkit-scrollbar {
background-color: var(--sapScrollBar_TrackColor);
}

:host([value-state="Information"]) :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host([value-state="Information"]) .ui5-content-custom-scrollbars ::-webkit-scrollbar {
background-color: var(--sapScrollBar_TrackColor);
}

:host([value-state="Success"]) :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host([value-state="Success"]) .ui5-content-custom-scrollbars ::-webkit-scrollbar {
background-color: var(--sapScrollBar_TrackColor);
}

:host([focused]) :not(.ui5-content-native-scrollbars) ::-webkit-scrollbar {
:host([focused]) .ui5-content-custom-scrollbars ::-webkit-scrollbar {
background-image: none;
}
4 changes: 0 additions & 4 deletions packages/main/src/themes/base/BrowserScrollbar-parameters.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/main/src/themes/sap_fiori_3/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "../base/Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "../base/BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/Card-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "../base/BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "./AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "./Breadcrumbs-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "../sap_horizon/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "./Breadcrumbs-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "../sap_horizon/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "./Breadcrumbs-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "./AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "./Breadcrumbs-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_hcb_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_hcw_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "./Avatar-parameters.css";
@import "../base/AvatarGroup-parameters.css";
@import "./Badge-parameters.css";
@import "../base/BrowserScrollbar-parameters.css";
@import "./BusyIndicator-parameters.css";
@import "./Button-parameters.css";
@import "../base/CalendarLegend-parameters.css";
Expand Down