Skip to content

Commit d831a64

Browse files
committed
Merge branch 'main' into fix/at-scale-width-smart-grow
2 parents 1d40d68 + 866d518 commit d831a64

File tree

28 files changed

+762
-690
lines changed

28 files changed

+762
-690
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
45+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
56+
uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
70+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
Lines changed: 126 additions & 126 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-4.10.0.cjs
3+
yarnPath: .yarn/releases/yarn-4.10.3.cjs

docs/knowledge-base/Styling.mdx

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,31 @@ import { MyCustomElement } from '../styling/MyCustomElement';
1111

1212
<TableOfContent />
1313

14-
## Styling UI5 Web Components for React components
15-
16-
You can change the appearance of the Web Components by using [CSS Variables](https://www.w3schools.com/Css/css3_variables.asp).
17-
Per default, we are injecting the Horizon theme parameters as CSS Variables into the `<head>`.
18-
For example, if you want to change the color of all texts that use the `--sapTextColor` variable, you can create an additional `style` tag with the following content:
19-
20-
```html
21-
<style>
22-
* {
23-
--sapTextColor: limegreen;
24-
}
25-
</style>
26-
```
27-
28-
<MessageStrip
29-
hideCloseButton
30-
design={MessageStripDesign.Critical}
31-
children="Changing the value of a CSS Variable will affect theming capabilities, as it will be changed for all themes!"
32-
/>
33-
34-
As a consequence, all HTML Elements in the subtree where this style was applied are now displaying their texts in `limegreen` instead of `#32363a` which would be the default value for Fiori 3.
35-
You can change CSS Variables on any level - in the head, or on every single element by using either CSS classes or element style.
14+
## Styling UI5 Web Components (for React) components
3615

37-
A full list of all supported CSS Variables can be found [here](https://github.com/UI5/webcomponents-react/blob/main/packages/base/src/styling/ThemingParameters.ts)
38-
or in the [theming-base-content](https://github.com/SAP/theming-base-content/tree/master/content/Base/baseLib) repo.
39-
40-
## Scrollbars
16+
UI5 Web Components for React follows the same styling approach as the core [UI5 Web Components](https://ui5.github.io/webcomponents/docs/advanced/styles/).
17+
You can apply CSS variables, use the `::part` pseudo-element selectors, or apply styles directly on selected components (e.g. `Button`, `Title`, `Input`, etc. ) as described in the linked [documentation](https://ui5.github.io/webcomponents/docs/advanced/styles/).
4118

42-
Rendering our `ThemeProvider` will apply the Fiori styles to all scrollbars on the page.
43-
If you want to opt-out of this behavior, you can add the `.ui5-content-native-scrollbars` class to the respective element to prevent the scrollbar styling from being applied.
19+
Components currently only available in the `ui5/webcomponents-react` repo, are not necessarily web components. For these kind of components you can follow the standard styling approach of React.
4420

4521
<MessageStrip
46-
design={MessageStripDesign.Information}
47-
hideCloseButton
48-
children="Due to the limited configuration options for scrollbars, you must apply this class to each scroll-container element individually."
22+
design={MessageStripDesign.Critical}
23+
hideCloseButton
24+
children="While it's easily possible targeting DOM elements and CSS classes of components without a shadow root, modifying internal structures or styles is not officially supported and may break with future updates. Use such changes carefully."
4925
/>
5026

51-
```tsx
52-
<ObjectPage className="ui5-content-native-scrollbars">{children}</ObjectPage>
53-
```
27+
## Scrollbars
28+
29+
`@ui5/webcomponents` components come with globally applied scrollbar styles.
30+
If you want to opt-out of this behavior, you can add the `.ui5-content-native-scrollbars` class to the `body` of the page. You can find out more about this in the [ui5/webcomponents documentation](https://ui5.github.io/webcomponents/docs/advanced/scrollbars-customization/).
5431

5532
## Style your own components
5633

5734
It's quite likely you have to create some custom components when you are building an app.
5835
In order to reuse our central styling approach, you can import the `ThemingParameters` that contain the various CSS variables used in our theming, or use the CSS variables directly.
5936

60-
<MessageStrip
61-
design={MessageStripDesign.Information}
62-
hideCloseButton
63-
children={
64-
<>
65-
You can find all <code>ThemingParameters</code>{' '}
66-
<ui5-link href="./?path=/docs/knowledge-base-public-utils--docs#theming-parameters">here</ui5-link>. If you don't
67-
want to use CSS-in-JS library, you can also just use the corresponding CSS variable.
68-
</>
69-
}
70-
/>
37+
A full list of all supported CSS Variables can be found [here](https://github.com/UI5/webcomponents-react/blob/main/packages/base/src/styling/ThemingParameters.ts)
38+
or in the [theming-base-content](https://github.com/SAP/theming-base-content/tree/master/content/Base/baseLib) repo.
7139

7240
You can then create a custom component by following this recipe:
7341

eslint.config.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ const config = tseslint.config(
4848
reactPlugin.configs.flat.recommended, // This is not a plugin object, but a shareable config object
4949
reactPlugin.configs.flat['jsx-runtime'], // Add this if you are using React 17+
5050
// eslint-plugin-react-hooks
51-
{
52-
plugins: {
53-
'react-hooks': reactHooksPlugin,
54-
},
55-
rules: reactHooksPlugin.configs.recommended.rules,
56-
},
51+
...reactHooksPlugin.configs.recommended,
5752
{
5853
languageOptions: {
5954
globals: {

examples/nextjs-app/package-lock.json

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/nextjs-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"@ui5/webcomponents-base": "2.15.0",
1414
"@ui5/webcomponents-fiori": "2.15.0",
1515
"@ui5/webcomponents-react": "2.15.0",
16-
"@types/node": "22.18.6",
17-
"@types/react": "19.1.15",
18-
"@types/react-dom": "19.1.9",
16+
"@types/node": "22.18.10",
17+
"@types/react": "19.1.17",
18+
"@types/react-dom": "19.1.11",
1919
"eslint": "9.36.0",
2020
"eslint-config-next": "15.5.4",
2121
"next": "15.5.4",
2222
"react": "19.1.1",
2323
"react-dom": "19.1.1",
24-
"typescript": "5.9.2"
24+
"typescript": "5.9.3"
2525
}
2626
}

examples/nextjs-pages/package-lock.json

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/nextjs-pages/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"@ui5/webcomponents-base": "2.15.0",
1414
"@ui5/webcomponents-fiori": "2.15.0",
1515
"@ui5/webcomponents-react": "2.15.0",
16-
"@types/node": "22.18.6",
17-
"@types/react": "19.1.15",
18-
"@types/react-dom": "19.1.9",
16+
"@types/node": "22.18.10",
17+
"@types/react": "19.1.17",
18+
"@types/react-dom": "19.1.11",
1919
"eslint": "9.36.0",
2020
"eslint-config-next": "15.5.4",
2121
"next": "15.5.4",
2222
"react": "19.1.1",
2323
"react-dom": "19.1.1",
24-
"typescript": "5.9.2"
24+
"typescript": "5.9.3"
2525
}
2626
}

0 commit comments

Comments
 (0)