Merge branch 'main' into feat/ui5wc-v2.16.0

Author: Lukas742

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
           path: packages
 
       - name: Cypress run
-        uses: cypress-io/github-action@e65cba2e7319696fc0fdc4d5a319b737aec4ba1c # v6.10.3
+        uses: cypress-io/github-action@7ef72e250a9e564efb4ed4c2433971ada4cc38b4 # v6.10.4
         with:
           browser: chrome
           component: true

packages/main/src/components/AnalyticalTable/types/index.ts

@@ -93,8 +93,16 @@ export interface ColumnType extends Omit<AnalyticalTableColumnDefinition, 'id'>
 export interface CellType {
   column: ColumnType;
   row: RowType;
-  value: string | undefined;
-  getCellProps: (props?: any) => any;
+  value: string | undefined | null;
+  getCellProps: (userProps?: any) => any;
+  /**
+   * Indicates whether the cell is aggregated.
+   *
+   * __Note:__ This is a numeric flag where `1` means true and `0` means false.
+   */
+  isAggregated: 0 | 1;
+  isGrouped: boolean;
+  isPlaceholder: boolean;
   [key: string]: any;
 }
 
@@ -257,27 +265,33 @@ export interface WCRPropertiesType {
   onFilter: AnalyticalTablePropTypes['onFilter'];
 }
 
-export type CellInstance = TableInstance & { cell: CellType } & Omit<CellType, 'getCellProps'>;
+export type CellInstance = TableInstance & { cell: CellType } & Omit<
+    CellType,
+    'getCellProps' | 'isAggregated' | 'isGrouped' | 'isPlaceholder'
+  >;
 
 export interface RowType {
-  allCells: Record<string, any>[];
   canExpand: boolean;
-  cells: Record<string, any>[];
+  cells: CellType[];
+  allCells: Record<string, any>[];
   depth: number;
-  getRowProps: (props?: any) => any;
-  getToggleRowExpandedProps: (userProps?: any) => any;
-  getToggleRowSelectedProps: (userProps?: any) => any;
   id: string;
   index: number;
-  isExpanded: boolean;
+  isExpanded: boolean | undefined;
   isSelected: boolean;
   isSomeSelected: boolean;
+  getRowProps: (props?: any) => any;
   original: Record<string, any>;
   originalSubRows: Record<string, any>[];
-  subRows: Record<string, any>[];
-  toggleRowExpanded: (isExpanded?: boolean) => void;
-  toggleRowSelected: (isSelected?: boolean) => void;
+  subRows: RowType[];
   values: Record<string, any>;
+  groupByID?: string;
+  groupByVal?: string;
+  leafRows?: Omit<RowType, 'leafRows'>[];
+  getToggleRowExpandedProps?: (userProps?: any) => any;
+  getToggleRowSelectedProps?: (userProps?: any) => any;
+  toggleRowExpanded?: (isExpanded?: boolean) => void;
+  toggleRowSelected?: (isSelected?: boolean) => void;
   [key: string]: any;
 }
 

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

@@ -239,7 +239,30 @@
   }
 
   &.active:focus {
-    outline: var(--sapContent_FocusColor) var(--sapContent_FocusStyle) var(--sapContent_FocusWidth);
+    outline: none;
+    &::after {
+      outline: none;
+      content: '';
+      position: absolute;
+      box-sizing: border-box;
+      inset: calc(-1 * var(--sapButton_BorderWidth));
+      pointer-events: none;
+      box-shadow:
+        inset 0 0 0 0.125rem var(--sapContent_FocusColor),
+        inset 0 0 0 0.1875rem var(--sapContent_ContrastFocusColor);
+      border-radius: inherit;
+      height: calc(100% + 2 * var(--sapButton_BorderWidth));
+    }
+  }
+}
+
+/*deltas*/
+[data-sap-theme^='sap_'][data-sap-theme$='_hcw'] .inverted.active:focus,
+[data-sap-theme^='sap_'][data-sap-theme$='_hcb'] .inverted.active:focus {
+  outline: var(--sapContent_FocusColor) var(--sapContent_FocusStyle) var(--sapContent_FocusWidth);
+  outline-offset: var(--sapButton_BorderWidth);
+  &::after {
+    content: none;
   }
 }
 
@@ -385,7 +408,7 @@
 .objectStatus:is(.inverted):is(.negative, .critical, .positive, .information, .none) {
   color: var(--_ui5wcr-ObjectStatus-inverted-vs-text-color);
   background: var(--_ui5wcr-ObjectStatus-inverted-vs-background-color);
-  border: 0.0625rem solid var(--_ui5wcr-ObjectStatus-inverted-vs-border-color);
+  border: var(--sapButton_BorderWidth) solid var(--_ui5wcr-ObjectStatus-inverted-vs-border-color);
 
   [ui5-icon] {
     color: var(--_ui5wcr-ObjectStatus-inverted-vs-text-color);
@@ -394,7 +417,7 @@
   &.active:hover {
     color: var(--_ui5wcr-ObjectStatus-inverted-vs-hover-text-color);
     background: var(--_ui5wcr-ObjectStatus-inverted-vs-hover-background-color);
-    border: 0.0625rem solid var(--_ui5wcr-ObjectStatus-inverted-vs-hover-border-color);
+    border: var(--sapButton_BorderWidth) solid var(--_ui5wcr-ObjectStatus-inverted-vs-hover-border-color);
 
     [ui5-icon] {
       color: var(--_ui5wcr-ObjectStatus-inverted-vs-hover-text-color);
@@ -405,7 +428,7 @@
     text-shadow: var(--sapContent_TextShadow);
     color: var(--_ui5wcr-ObjectStatus-inverted-vs-active-text-color);
     background: var(--_ui5wcr-ObjectStatus-inverted-vs-active-background-color);
-    border: 0.0625rem solid var(--_ui5wcr-ObjectStatus-inverted-vs-active-border-color);
+    border: var(--sapButton_BorderWidth) solid var(--_ui5wcr-ObjectStatus-inverted-vs-active-border-color);
 
     [ui5-icon] {
       color: var(--_ui5wcr-ObjectStatus-inverted-vs-active-text-color);
@@ -685,7 +708,7 @@
   text-shadow: var(--sapContent_ContrastTextShadow);
   color: var(--_ui5wcr-ObjectStatus-inverted-indication-text-color);
   background-color: var(--_ui5wcr-ObjectStatus-inverted-indication-background-color);
-  border: 0.0625rem solid var(--_ui5wcr-ObjectStatus-inverted-indication-border-color);
+  border: var(--sapButton_BorderWidth) solid var(--_ui5wcr-ObjectStatus-inverted-indication-border-color);
 
   [ui5-icon] {
     color: var(--_ui5wcr-ObjectStatus-inverted-indication-text-color);
@@ -699,7 +722,7 @@
     text-shadow: var(--sapContent_TextShadow);
     color: var(--_ui5wcr-ObjectStatus-inverted-indication-active-text-color);
     background: var(--_ui5wcr-ObjectStatus-inverted-indication-active-background-color);
-    border: 0.0625rem solid var(--_ui5wcr-ObjectStatus-inverted-indication-active-border-color);
+    border: var(--sapButton_BorderWidth) solid var(--_ui5wcr-ObjectStatus-inverted-indication-active-border-color);
 
     [ui5-icon] {
       color: var(--_ui5wcr-ObjectStatus-inverted-indication-active-text-color);