Merge branch 'main' into fix/toolbar-spacer

SAP · Oct 7, 2024 · 7274a94 · 7274a94
2 parents fefc012 + b795ba6
commit 7274a94
Show file tree

Hide file tree

Showing 37 changed files with 177 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+
+### Bug Fixes
+
+* **core,platform:** make headingLevel a shared type, use for table toolbar ([#12500](https://github.com/SAP/fundamental-ngx/issues/12500)) ([08f5984](https://github.com/SAP/fundamental-ngx/commit/08f5984a67e226039544897f8aac3bb746fd3e09))
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
     "packages": ["libs/*"],
-    "version": "0.53.1-rc.0",
+    "version": "0.53.1-rc.1",
     "conventionalCommits": true,
     "tagVersionPrefix": "v",
     "message": "chore(release): publish %v",

diff --git a/libs/btp/CHANGELOG.md b/libs/btp/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+**Note:** Version bump only for package @fundamental-ngx/btp
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/btp

diff --git a/libs/btp/package.json b/libs/btp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/btp",
-    "version": "0.53.1-rc.0",
+    "version": "0.53.1-rc.1",
     "peerDependencies": {
         "@angular/common": "ANGULAR_VER_PLACEHOLDER",
         "@angular/core": "ANGULAR_VER_PLACEHOLDER",

diff --git a/libs/cdk/CHANGELOG.md b/libs/cdk/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+**Note:** Version bump only for package @fundamental-ngx/cdk
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/cdk

diff --git a/libs/cdk/package.json b/libs/cdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/cdk",
-  "version": "0.53.1-rc.0",
+  "version": "0.53.1-rc.1",
   "schematics": "./schematics/collection.json",
   "description": "Fundamental Library for Angular - CDK",
   "license": "Apache-2.0",

diff --git a/libs/core/CHANGELOG.md b/libs/core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+
+### Bug Fixes
+
+* **core,platform:** make headingLevel a shared type, use for table toolbar ([#12500](https://github.com/SAP/fundamental-ngx/issues/12500)) ([08f5984](https://github.com/SAP/fundamental-ngx/commit/08f5984a67e226039544897f8aac3bb746fd3e09))
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/core

diff --git a/libs/core/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.html b/libs/core/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.html
@@ -26,7 +26,7 @@
                     <span
                         role="heading"
                         class="fd-dynamic-page__title"
-                        [attr.aria-level]="headingLevel()"
+                        [attr.aria-level]="_headingLevel()"
                         [id]="titleId()"
                         [class.fd-dynamic-page__title--wrap]="titleWrap"
                         fdkIgnoreClickOnSelection

diff --git a/libs/core/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts b/libs/core/dynamic-page/dynamic-page-header/header/dynamic-page-header.component.ts
@@ -21,6 +21,7 @@ import { DYNAMIC_PAGE_HEADER_TOKEN, DynamicPageHeader } from '@fundamental-ngx/c
 
 import { NgTemplateOutlet } from '@angular/common';
 import { IgnoreClickOnSelectionDirective, Nullable } from '@fundamental-ngx/cdk/utils';
+import { HeadingLevel } from '@fundamental-ngx/core/shared';
 import { DYNAMIC_PAGE_CLASS_NAME, DynamicPageResponsiveSize } from '../../constants';
 import { DynamicPageHeaderSubtitleDirective } from '../../directives/dynamic-page-header-subtitle.directive';
 import { DynamicPageHeaderTitleDirective } from '../../directives/dynamic-page-header-title.directive';
@@ -34,8 +35,6 @@ import { DynamicPageBreadcrumbComponent } from '../breadcrumb/dynamic-page-bread
 
 export const ActionSquashBreakpointPx = 1280;
 
-export type HeadingLevel = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
-
 let dynamicPageTitleId = 0;
 
 @Component({
@@ -111,11 +110,14 @@ export class DynamicPageHeaderComponent implements OnInit, AfterViewInit, OnDest
     _size: DynamicPageResponsiveSize;
 
     /**
-     * The level of the Dynamic Page title
-     * Possible options: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
-     * Default: 'h2'
+     * Heading level of the dynamic page header title.
      */
-    headingLevel = input<HeadingLevel>('h2');
+    headingLevel = input<HeadingLevel>(2);
+
+    /** @hidden */
+    _headingLevel = computed(() =>
+        this.headingLevel() ? Number.parseInt(`${this.headingLevel()}`.replace(/\D/g, ''), 10) : undefined
+    );
 
     /** Dynamic page title id, it has some default value if not set,  */
     titleId = input('fd-dynamic-page-title-id-' + dynamicPageTitleId++);

diff --git a/libs/core/facets/facet/facet.component.html b/libs/core/facets/facet/facet.component.html
@@ -3,8 +3,8 @@
 } @else {
     @if (facetTitle) {
         <div
-            [attr.role]="!!headingLevel ? 'heading' : null"
-            [attr.aria-level]="headingLevel"
+            [attr.role]="!!_headingLevel ? 'heading' : null"
+            [attr.aria-level]="_headingLevel"
             fd-title
             [headerSize]="5"
             class="fd-margin-bottom--sm"

diff --git a/libs/core/facets/facet/facet.component.ts b/libs/core/facets/facet/facet.component.ts
@@ -11,6 +11,7 @@ import {
 } from '@angular/core';
 import { Nullable } from '@fundamental-ngx/cdk/utils';
 import { FormLabelComponent } from '@fundamental-ngx/core/form';
+import { HeadingLevel } from '@fundamental-ngx/core/shared';
 import { TitleComponent } from '@fundamental-ngx/core/title';
 import { FACET_CLASS_NAME, FacetType } from '../constants';
 import { addClassNameToFacetElement } from '../utils';
@@ -47,10 +48,16 @@ export class FacetComponent implements AfterViewInit {
     subtitle: string;
 
     /**
-     * Heading level (i.e. <h1>, <h2>, etc.) of the facet title.
+     * Heading level of the facet title.
      */
     @Input()
-    headingLevel: Nullable<1 | 2 | 3 | 4 | 5 | 6>;
+    set headingLevel(level: Nullable<HeadingLevel>) {
+        if (typeof level === 'number') {
+            this._headingLevel = level;
+        } else if (typeof level === 'string') {
+            this._headingLevel = Number.parseInt(level.replace(/\D/g, ''), 10);
+        }
+    }
 
     /**
      * id for the facet
@@ -81,6 +88,9 @@ export class FacetComponent implements AfterViewInit {
         return this.type !== 'image' ? this.titleId : '';
     }
 
+    /** @hidden */
+    _headingLevel: number;
+
     /** @hidden
      * the internal id for the title to be associated with the aria-labelledby
      */

diff --git a/libs/core/package.json b/libs/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/core",
-  "version": "0.53.1-rc.0",
+  "version": "0.53.1-rc.1",
   "schematics": "./schematics/collection.json",
   "ng-update": {
     "migrations": "./schematics/migrations.json"

diff --git a/libs/core/shared/index.ts b/libs/core/shared/index.ts
@@ -9,3 +9,4 @@ export * from './interfaces/tablist.interface';
 export * from './services/value-state-message.service';
 export * from './tokens/dynamic-page-header.token';
 export * from './tokens/tabs.token';
+export * from './types/heading-level';
diff --git a/libs/core/shared/types/heading-level.ts b/libs/core/shared/types/heading-level.ts
@@ -0,0 +1,19 @@
+export type HeadingLevel =
+    | 1
+    | 2
+    | 3
+    | 4
+    | 5
+    | 6
+    | '1'
+    | '2'
+    | '3'
+    | '4'
+    | '5'
+    | '6'
+    | 'h1'
+    | 'h2'
+    | 'h3'
+    | 'h4'
+    | 'h5'
+    | 'h6';
diff --git a/libs/core/toolbar/toolbar.component.html b/libs/core/toolbar/toolbar.component.html
@@ -1,5 +1,7 @@
 @if (title) {
-    <h4 fd-title class="fd-toolbar__title" [id]="titleId" #titleElement>{{ title }}</h4>
+    <span [attr.aria-level]="_headingLevel" fd-title class="fd-toolbar__title" [id]="titleId" #titleElement>{{
+        title
+    }}</span>
 }
 <ng-content></ng-content>
 @if (overflownItems.length > 0) {

diff --git a/libs/core/toolbar/toolbar.component.ts b/libs/core/toolbar/toolbar.component.ts
@@ -29,6 +29,7 @@ import {
     applyCssClass,
     CssClassBuilder,
     DynamicPortalComponent,
+    Nullable,
     OVERFLOW_PRIORITY_SCORE,
     OverflowPriority,
     ResizeObserverService
@@ -40,6 +41,7 @@ import {
     contentDensityObserverProviders
 } from '@fundamental-ngx/core/content-density';
 import { PopoverModule } from '@fundamental-ngx/core/popover';
+import { HeadingLevel } from '@fundamental-ngx/core/shared';
 import { TitleComponent, TitleToken } from '@fundamental-ngx/core/title';
 import { BehaviorSubject, combineLatest, map, Observable, startWith } from 'rxjs';
 import { ToolbarItem } from './abstract-toolbar-item.class';
@@ -143,6 +145,18 @@ export class ToolbarComponent implements AfterViewInit, AfterViewChecked, CssCla
     @Input()
     tabindex = -1;
 
+    /**
+     * Heading level of the toolbar title.
+     */
+    @Input()
+    set headingLevel(level: Nullable<HeadingLevel>) {
+        if (typeof level === 'number') {
+            this._headingLevel = level;
+        } else if (typeof level === 'string') {
+            this._headingLevel = Number.parseInt(level.replace(/\D/g, ''), 10);
+        }
+    }
+
     /** Toolbar Aria-label attribute. */
     @Input()
     @HostBinding('attr.aria-label')
@@ -187,6 +201,9 @@ export class ToolbarComponent implements AfterViewInit, AfterViewChecked, CssCla
     /** @hidden */
     spacerDirectives = contentChildren(ToolbarSpacerDirective);
 
+    /** @hidden */
+    _headingLevel = 2;
+
     /** HTML Element Reference. */
     readonly elementRef = inject(ElementRef);
 

diff --git a/libs/cx/CHANGELOG.md b/libs/cx/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+**Note:** Version bump only for package @fundamental-ngx/cx
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/cx

diff --git a/libs/cx/package.json b/libs/cx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fundamental-ngx/cx",
-  "version": "0.53.1-rc.0",
+  "version": "0.53.1-rc.1",
   "schematics": "./schematics/collection.json",
   "description": "Fundamental Library for Angular - cx",
   "license": "Apache-2.0",

diff --git a/libs/datetime-adapter/CHANGELOG.md b/libs/datetime-adapter/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/datetime-adapter

diff --git a/libs/datetime-adapter/package.json b/libs/datetime-adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/datetime-adapter",
-    "version": "0.53.1-rc.0",
+    "version": "0.53.1-rc.1",
     "description": "Datetime adapter for SAP Fundamentals, based on Day.js package",
     "license": "Apache-2.0",
     "homepage": "https://sap.github.io/fundamental-ngx/home",

diff --git a/...ples/dynamic-page-column-layout-example/dynamic-page-column-layout-example.component.html b/...ples/dynamic-page-column-layout-example/dynamic-page-column-layout-example.component.html
@@ -11,6 +11,7 @@
             <ng-template #startColumn>
                 <fd-dynamic-page [autoResponsive]="true" ariaLabel="Example Dynamic Page" [positionRelative]="true">
                     <fd-dynamic-page-header
+                        headingLevel="2"
                         title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                         subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
                     >

diff --git a/...mic-container-height-example/dynamic-page-dynamic-container-height-example.component.html b/...mic-container-height-example/dynamic-page-dynamic-container-height-example.component.html
@@ -6,6 +6,7 @@
         }
         <fd-dynamic-page size="large" ariaLabel="Example Dynamic Page" [autoResponsive]="false">
             <fd-dynamic-page-header
+                headingLevel="2"
                 title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                 subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
             >

diff --git a/libs/docs/core/dynamic-page/examples/dynamic-page-example.component.html b/libs/docs/core/dynamic-page/examples/dynamic-page-example.component.html
@@ -3,6 +3,7 @@
     <div class="overlay">
         <fd-dynamic-page size="large" ariaLabel="Example Dynamic Page" [autoResponsive]="false">
             <fd-dynamic-page-header
+                headingLevel="2"
                 title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                 subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
             >

diff --git a/...amic-page/examples/dynamic-page-facets-example/dynamic-page-facets-example.component.html b/...amic-page/examples/dynamic-page-facets-example/dynamic-page-facets-example.component.html
@@ -2,7 +2,7 @@
 @if (visible) {
     <div class="overlay">
         <fd-dynamic-page size="large" ariaLabel="Example Dynamic Page">
-            <fd-dynamic-page-header title="Lorem ipsum dolor sit amet, consectetur adipiscing elit">
+            <fd-dynamic-page-header headingLevel="2" title="Lorem ipsum dolor sit amet, consectetur adipiscing elit">
                 <span *fdDynamicPageHeaderTitle="let collapsed">
                     Lorem ipsum dolor sit amet, consectetur adipiscing elit ({{
                         collapsed ? 'collapsed' : 'not collapsed'

diff --git a/...e/examples/dynamic-page-responsive-example/dynamic-page-responsive-example.component.html b/...e/examples/dynamic-page-responsive-example/dynamic-page-responsive-example.component.html
@@ -3,6 +3,7 @@
     <div class="overlay">
         <fd-dynamic-page ariaLabel="Example Dynamic Page">
             <fd-dynamic-page-header
+                headingLevel="2"
                 title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                 subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
             >

diff --git a/...re/dynamic-page/examples/dynamic-page-routing/dynamic-page-routing-example.component.html b/...re/dynamic-page/examples/dynamic-page-routing/dynamic-page-routing-example.component.html
@@ -3,6 +3,7 @@
     <div class="overlay">
         <fd-dynamic-page size="large" ariaLabel="Example Dynamic Page" [autoResponsive]="false">
             <fd-dynamic-page-header
+                headingLevel="2"
                 title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                 subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
             >

diff --git a/.../dynamic-page/examples/dynamic-page-tabs-example/dynamic-page-tabs-example.component.html b/.../dynamic-page/examples/dynamic-page-tabs-example/dynamic-page-tabs-example.component.html
@@ -6,6 +6,7 @@
     <div class="overlay">
         <fd-dynamic-page size="large" ariaLabel="Example Dynamic Page" [autoResponsive]="false">
             <fd-dynamic-page-header
+                headingLevel="2"
                 title="Lorem ipsum dolor sit amet, consectetur adipiscing elit"
                 subtitle="sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
             >

diff --git a/libs/i18n/CHANGELOG.md b/libs/i18n/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.1-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.53.1-rc.0...v0.53.1-rc.1) (2024-10-07)
+
+**Note:** Version bump only for package @fundamental-ngx/i18n
+
+
+
+
+
 ## [0.53.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.53.0...v0.53.1-rc.0) (2024-10-03)
 
 **Note:** Version bump only for package @fundamental-ngx/i18n

diff --git a/libs/i18n/package.json b/libs/i18n/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fundamental-ngx/i18n",
-    "version": "0.53.1-rc.0",
+    "version": "0.53.1-rc.1",
     "peerDependencies": {
         "@angular/common": "ANGULAR_VER_PLACEHOLDER",
         "@angular/core": "ANGULAR_VER_PLACEHOLDER",