Merge branch 'main' into patch-1

Author: Jianrong-Yu

.github/workflows/release.yml

@@ -20,12 +20,12 @@ jobs:
     with:
       reportCoverage: false
 
-  check-charts-peer-deps:
+  check-charts-compat-peer-deps:
     runs-on: ubuntu-latest
     environment: charts-peer-deps-approval
     steps:
       - name: No-op
-        run: echo "Did you update the peer dependencies of the chart package?"
+        run: echo "Did you update the peer dependencies of the charts and compat package?"
 
   release-dryrun:
     runs-on: ubuntu-latest

packages/compat/package.json

@@ -42,7 +42,7 @@
     "@types/react": "*",
     "@types/react-dom": "*",
     "@ui5/webcomponents-compat": "~2.3.0",
-    "@ui5/webcomponents-react": "~2.2.0",
+    "@ui5/webcomponents-react": "~2.3.0",
     "react": "^18 || ^19",
     "react-dom": "^18 || ^19"
   },

packages/main/src/components/ObjectPage/ObjectPage.cy.tsx

@@ -259,7 +259,7 @@ describe('ObjectPage', () => {
   it('scroll to sections - default mode', () => {
     document.body.style.margin = '0px';
     cy.mount(
-      <ObjectPage titleArea={DPTitle} headerArea={DPContent}>
+      <ObjectPage titleArea={DPTitle} headerArea={DPContent} style={{ height: '100vh', scrollBehavior: 'auto' }}>
         {OPContent}
       </ObjectPage>
     );
@@ -287,7 +287,12 @@ describe('ObjectPage', () => {
     cy.findByText('Job Relationship').should('be.visible');
 
     cy.mount(
-      <ObjectPage titleArea={DPTitle} headerArea={DPContent} footerArea={Footer}>
+      <ObjectPage
+        titleArea={DPTitle}
+        headerArea={DPContent}
+        footerArea={Footer}
+        style={{ height: '100vh', scrollBehavior: 'auto' }}
+      >
         {OPContent}
       </ObjectPage>
     );
@@ -331,7 +336,7 @@ describe('ObjectPage', () => {
         titleArea={DPTitle}
         headerArea={DPContent}
         mode={ObjectPageMode.IconTabBar}
-        style={{ height: '100vh' }}
+        style={{ height: '100vh', scrollBehavior: 'auto' }}
       >
         {OPContent}
       </ObjectPage>
@@ -361,7 +366,7 @@ describe('ObjectPage', () => {
         headerArea={DPContent}
         footerArea={Footer}
         mode={ObjectPageMode.IconTabBar}
-        style={{ height: '100vh' }}
+        style={{ height: '100vh', scrollBehavior: 'auto' }}
       >
         {OPContent}
       </ObjectPage>

packages/main/src/components/ObjectPage/ObjectPage.mdx

@@ -7,11 +7,14 @@ import { ObjectPageHeader } from '../ObjectPageHeader';
 import { ObjectPageSection } from '../ObjectPageSection';
 import { ObjectPageSubSection } from '../ObjectPageSubSection';
 import { CodeBlock } from '@sb/components/DomRefTable';
+import { MessageStrip } from '@ui5/webcomponents-react';
 
 <Meta of={ComponentStories} />
 
 <DocsHeader subComponents={['ObjectPageTitle', 'ObjectPageHeader', 'ObjectPageSection', 'ObjectPageSubSection']} />
 
+<MessageStrip hideCloseButton children={'In iframes, smooth scrolling is disabled!'} />
+
 ## Example
 
 <Canvas of={ComponentStories.Default} />

packages/main/src/components/ObjectPage/ObjectPage.module.css

@@ -16,6 +16,9 @@
   overflow-x: hidden;
   overflow-y: auto;
   scroll-behavior: smooth;
+  &[data-in-iframe='true'] {
+    scroll-behavior: auto;
+  }
   section[id*='ObjectPageSection-'] > div[role='heading'] {
     display: none;
   }

packages/main/src/components/ObjectPage/index.tsx

@@ -334,8 +334,10 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
         TAB_CONTAINER_HEADER_HEIGHT +
         (headerPinned && !headerCollapsed ? headerContentHeight : 0) +
         'px';
-      section.focus();
-      section.scrollIntoView({ behavior: 'smooth' });
+      if (isSubSection) {
+        section.focus();
+      }
+      section.scrollIntoView();
       section.style.scrollMarginBlockStart = '0px';
     }
   };
@@ -345,7 +347,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
       return;
     }
     if (firstSectionId === sectionId) {
-      objectPageRef.current?.scrollTo({ top: 0, behavior: 'smooth' });
+      objectPageRef.current?.scrollTo({ top: 0 });
     } else {
       scrollToSectionById(sectionId);
     }
@@ -729,6 +731,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
       style={objectPageStyles}
       ref={componentRef}
       onScroll={onObjectPageScroll}
+      data-in-iframe={window && window.self !== window.top}
       {...propsWithoutOmitted}
     >
       <header

packages/main/src/i18n/messagebundle.properties

@@ -335,3 +335,7 @@ UP_ARROW=Up Arrow
 
 #XTXT: No-data text for filtered AnalyticalTable that returns no results
 NO_DATA_FILTERED=No data found. Try adjusting the filter settings.
+
+#XACT: Number of items in a pseudo list
+WITH_X_ITEMS=with {0} items
+