Merge branch 'main' into docs/popups-open-story-args

Author: Lukas742

examples/vite-ts/cypress/support/component.tsx

@@ -17,7 +17,7 @@ import { ThemeProvider } from '@ui5/webcomponents-react';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
-import { mount } from 'cypress/react18';
+import { mount } from 'cypress/react';
 // Import commands.js using ES2015 syntax:
 import './commands';
 

examples/vite-ts/package-lock.json

@@ -27,7 +27,7 @@
     "@types/react-dom": "19.0.3",
     "@ui5/webcomponents-cypress-commands": "2.7.0",
     "@vitejs/plugin-react": "^4.3.2",
-    "cypress": "^13.0.0",
+    "cypress": "^14.0.0",
     "eslint": "^9.12.0",
     "eslint-plugin-react-hooks": "5.1.0",
     "eslint-plugin-react-refresh": "^0.4.12",

examples/vite-ts/package.json

@@ -52,6 +52,11 @@
   }
 }
 
+/*:has cannot be nested*/
+.header:has([data-component-name='ATwithImageSnappedContentContainer']) [data-component-name='ObjectPageTitle'] {
+  padding-block-end: 0;
+}
+
 .headerCollapsed {
   --_ui5wcr_ObjectPage_header_display: none;
   --_ui5wcr_ObjectPage_title_fontsize: var(--sapObjectHeader_Title_SnappedFontSize);
@@ -177,6 +182,7 @@
 
 .snappedContent {
   grid-column: 1 / span 2;
+  padding-block-end: 0.5rem;
 }
 
 .clickArea {

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

@@ -794,7 +794,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
             top:
               scrolledHeaderExpanded || headerPinned
                 ? `${topHeaderHeight + (headerCollapsed === true ? 0 : headerContentHeight)}px`
-                : `${topHeaderHeight + 5}px`
+                : `${topHeaderHeight}px`
           }}
         >
           <ObjectPageAnchorBar

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

@@ -17,7 +17,7 @@ import { ThemeProvider } from '@ui5/webcomponents-react';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
-import { mount } from 'cypress/react18';
+import { mount } from 'cypress/react';
 // Import commands.js using ES2015 syntax:
 import './commands';
 

templates/vite-ts/cypress/support/component.tsx

@@ -24,7 +24,7 @@
     "@types/react-dom": "19.0.3",
     "@vitejs/plugin-react": "^4.3.2",
     "@ui5/webcomponents-cypress-commands": "2.7.0",
-    "cypress": "^13.0.0",
+    "cypress": "^14.0.0",
     "eslint": "^9.12.0",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.12",