Skip to content

Commit b8bddce

Browse files
Lukas742Lukas742
authored
Merge branch 'main' into docs/storybook-v9
2 parents da437fa + adf8982 commit b8bddce

File tree

6 files changed

+48
-50
lines changed

6 files changed

+48
-50
lines changed

‎.github/renovate.json‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"baseBranches": ["main", "v1.29.x"],
43
"extends": [
54
"config:recommended",
65
":disableDependencyDashboard",
@@ -23,34 +22,25 @@
2322
"**/__fixtures__/**"
2423
],
2524
"packageRules": [
26-
{
27-
"matchBaseBranches": ["v1.29.x"],
28-
"matchPackageNames": ["*"],
29-
"enabled": false
30-
},
3125
{
3226
"groupName": "Rimraf",
3327
"extends": ["schedule:weekly"],
3428
"matchPackageNames": ["rimraf"],
35-
"semanticCommitType": "chore",
36-
"matchBaseBranches": ["main"]
29+
"semanticCommitType": "chore"
3730
},
3831
{
3932
"groupName": "UI5 Web Components",
40-
"matchBaseBranches": ["main"],
4133
"matchSourceUrls": ["https://github.com/SAP/ui5-webcomponents{/,}**"]
4234
},
4335
{
4436
"groupName": "vite & plugins",
45-
"matchBaseBranches": ["main"],
4637
"matchPackageNames": ["/vite/", "!@storybook/react-vite"]
4738
},
4839
{
4940
"extends": ["schedule:weekly"],
5041
"groupName": "storybook monorepo",
5142
"matchSourceUrls": ["https://github.com/storybookjs/storybook"],
52-
"semanticCommitType": "chore",
53-
"matchBaseBranches": ["main"]
43+
"semanticCommitType": "chore"
5444
},
5545
{
5646
"description": "root package dependencies",
@@ -60,7 +50,6 @@
6050
"groupSlug": "root-all-minor-patch",
6151
"matchFileNames": ["package.json"],
6252
"matchUpdateTypes": ["minor", "patch"],
63-
"matchBaseBranches": ["main"],
6453
"matchPackageNames": [
6554
"!react",
6655
"!react-dom",
@@ -79,7 +68,6 @@
7968
"groupName": "all non-major dependencies (examples, templates & patterns)",
8069
"groupSlug": "examples-all-minor-patch",
8170
"matchUpdateTypes": ["minor", "patch"],
82-
"matchBaseBranches": ["main"],
8371
"matchPackageNames": ["*", "!/^@ui5//"]
8472
},
8573
{
@@ -88,7 +76,6 @@
8876
"groupSlug": "examples-ui5-webcomponents-react",
8977
"matchFileNames": ["examples/**", "templates/**", "patterns/**"],
9078
"semanticCommitType": "chore",
91-
"matchBaseBranches": ["main"],
9279
"matchSourceUrls": [
9380
"https://github.com/SAP/ui5-webcomponents{/,}**",
9481
"https://github.com/SAP/ui5-webcomponents-react{/,}**"
@@ -100,23 +87,8 @@
10087
"groupSlug": "root-ui5-webcomponents",
10188
"matchFileNames": ["package.json"],
10289
"semanticCommitType": "chore",
103-
"matchBaseBranches": ["main"],
10490
"matchSourceUrls": ["https://github.com/SAP/ui5-webcomponents{/,}**"]
10591
},
106-
{
107-
"extends": ["schedule:weekly"],
108-
"description": "V1 UI5WC/R dependency updates",
109-
"matchBaseBranches": ["v1.29.x"],
110-
"groupName": "Legacy Branch Updates",
111-
"groupSlug": "legacy-branch-updates",
112-
"matchUpdateTypes": ["patch"],
113-
"semanticCommitType": "chore",
114-
"enabled": true,
115-
"matchSourceUrls": [
116-
"https://github.com/SAP/ui5-webcomponents{/,}**",
117-
"https://github.com/SAP/ui5-webcomponents-react{/,}**"
118-
]
119-
},
12092
{
12193
"groupName": "Typescript",
12294
"description": "Typescript dependency update",

‎packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,8 +1534,18 @@ describe('AnalyticalTable', () => {
15341534
cy.mount(<AnalyticalTable data={[]} columns={columns} loading loadingDelay={0} />);
15351535
cy.get('[data-component-name="AnalyticalTableLoadingPlaceholder"]').should('be.visible');
15361536
cy.get('.ui5-busy-indicator-busy-area').should('not.exist');
1537+
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class*="busyIndicator"])').should(
1538+
'not.have.css',
1539+
'opacity',
1540+
'0.4',
1541+
);
15371542
cy.mount(<AnalyticalTable data={data} columns={columns} loading />);
15381543
cy.get('.ui5-busy-indicator-busy-area', { timeout: 2000 }).should('be.visible');
1544+
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class*="busyIndicator"])').should(
1545+
'have.css',
1546+
'opacity',
1547+
'0.4',
1548+
);
15391549
cy.mount(<AnalyticalTable data={data} columns={columns} loading loadingDelay={50000} />);
15401550
cy.get('.ui5-busy-indicator-busy-area', { timeout: 2000 }).should('not.exist');
15411551
cy.mount(<AnalyticalTable data={[]} columns={columns} />);
@@ -1886,8 +1896,22 @@ describe('AnalyticalTable', () => {
18861896
});
18871897

18881898
it('overlay', (done) => {
1899+
cy.mount(<AnalyticalTable data={data} columns={columns} />);
1900+
cy.findByRole('region').should('not.exist');
1901+
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class^="overlay"])').should(
1902+
'not.have.css',
1903+
'opacity',
1904+
'0.4',
1905+
);
1906+
cy.findByText('A').click();
1907+
18891908
cy.mount(<AnalyticalTable data={data} columns={columns} showOverlay />);
1890-
cy.findByRole('region').should('be.visible').should('have.css', 'opacity', '0.8');
1909+
cy.findByRole('region').should('be.visible');
1910+
cy.get('[data-component-name="AnalyticalTableContainerWithScrollbar"] > :not([class^="overlay"])').should(
1911+
'have.css',
1912+
'opacity',
1913+
'0.4',
1914+
);
18911915
cy.findByText('A').shouldNotBeClickable(done);
18921916
});
18931917

‎packages/main/src/components/AnalyticalTable/AnalyticalTable.module.css‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@
1212
}
1313
}
1414

15+
.tableContainerWithScrollBar {
16+
position: relative;
17+
18+
&:has(> .overlay) {
19+
> :not(.overlay) {
20+
opacity: var(--sapContent_DisabledOpacity);
21+
}
22+
}
23+
24+
&:has(> .busyIndicator) {
25+
> :not(.busyIndicator) {
26+
opacity: var(--sapContent_DisabledOpacity);
27+
}
28+
}
29+
}
30+
1531
.table {
1632
position: relative;
1733
width: 100%;
@@ -37,10 +53,6 @@
3753
}
3854
}
3955

40-
.tableContainerWithScrollBar {
41-
position: relative;
42-
}
43-
4456
.busyIndicator {
4557
position: absolute;
4658
z-index: 1;
@@ -52,8 +64,6 @@
5264
position: absolute;
5365
z-index: 1;
5466
inset: 0;
55-
background: var(--sapGroup_ContentBackground);
56-
opacity: 0.8;
5767

5868
&:focus {
5969
outline-offset: calc(-1 * var(--sapContent_FocusWidth));
@@ -63,10 +73,6 @@
6373

6474
.tableHeaderRow {
6575
height: var(--_ui5wcr-AnalyticalTableHeaderRowHeight);
66-
67-
div:first-child .th {
68-
border-inline-start: 1px solid var(--_ui5wcr-AnalyticalTable-OuterBorderInline);
69-
}
7076
}
7177

7278
.hasNavigationIndicator {
@@ -347,7 +353,7 @@
347353
========================================================================== */
348354

349355
.thContainer {
350-
&:first-child > [role='columnheader'] {
356+
& > [role='columnheader'][data-column-index='0'] {
351357
border-inline-start: var(--_ui5wcr-AnalyticalTable-OuterCellBorder);
352358
}
353359

‎packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ const kitchenSinkArgs = {
109109
// console.log('This is your row data', row.original);
110110
return (
111111
<FlexBox>
112-
<Button icon="edit" disabled={disabled} />
113-
<Button icon="delete" disabled={disabled} />
112+
<Button icon="edit" disabled={disabled} accessibleName="Edit" />
113+
<Button icon="delete" disabled={disabled} accessibleName="Delete" />
114114
</FlexBox>
115115
);
116116
},

‎packages/main/src/components/AnalyticalTable/index.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -755,12 +755,8 @@ const AnalyticalTable = forwardRef<AnalyticalTableDomRef, AnalyticalTablePropTyp
755755
active={true}
756756
delay={loadingDelay}
757757
data-component-name="AnalyticalTableBusyIndicator"
758-
>
759-
{/*todo: This is necessary; otherwise, the overlay bg color will not be applied. https://github.com/SAP/ui5-webcomponents/issues/9723 */}
760-
<span />
761-
</BusyIndicator>
758+
/>
762759
)}
763-
{/*todo: use global CSS once --sapBlockLayer_Opacity is available*/}
764760
{showOverlay && (
765761
<>
766762
<span id={invalidTableTextId} className={classNames.hiddenA11yText} aria-hidden="true">

‎packages/main/src/components/MessageView/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ const MessageView = forwardRef<MessageViewDomRef, MessageViewPropTypes>((props,
225225
icon={getIconNameForType(valueState)}
226226
className={classNames.button}
227227
tooltip={getValueStateMap(i18nBundle)[valueState]}
228-
accessibleName={getValueStateMap(i18nBundle)[valueState]}
228+
accessibleName={`${count} ${getValueStateMap(i18nBundle)[valueState]}`}
229229
>
230230
{count}
231231
</SegmentedButtonItem>

0 commit comments

Comments
 (0)