Merge branch 'main' into fix/12716

SAP · Jan 8, 2025 · 78f9e00 · 78f9e00
2 parents 74d27db + 76897fc
commit 78f9e00
Show file tree

Hide file tree

Showing 28 changed files with 248 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+
+### Bug Fixes
+
+* **core,platform:** add input to list item to prevent click selection. fix issue with toggling column on p13 dialog ([#12878](https://github.com/SAP/fundamental-ngx/issues/12878)) ([b908419](https://github.com/SAP/fundamental-ngx/commit/b908419673a8422c1140e3d0110a176a1a1985db))
+* **core:** combobox communicateByObject bugs ([#12815](https://github.com/SAP/fundamental-ngx/issues/12815)) ([26fd691](https://github.com/SAP/fundamental-ngx/commit/26fd691e14e8b8e609cd2e554074fdb4c195a537))
+* **platform:** add configuration options to truncate titles and descriptions in the settings generator ([#12811](https://github.com/SAP/fundamental-ngx/issues/12811)) ([3152649](https://github.com/SAP/fundamental-ngx/commit/31526492811f383425dc3cde9c31de4625dd34c3))
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+
+### Features
+
+* **platform:** fdp table - make responsive pop-in areas navigable ([#12673](https://github.com/SAP/fundamental-ngx/issues/12673)) ([38cf776](https://github.com/SAP/fundamental-ngx/commit/38cf776b498e1b4facffeb96ddd014f05536d549)), closes [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004) [#11004](https://github.com/SAP/fundamental-ngx/issues/11004)
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 

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

diff --git a/libs/btp/CHANGELOG.md b/libs/btp/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/btp
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/btp
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **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.54.2-rc.1",
+    "version": "0.54.2-rc.3",
     "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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/cdk
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/cdk
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **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.54.2-rc.1",
+  "version": "0.54.2-rc.3",
   "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,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+
+### Bug Fixes
+
+* **core,platform:** add input to list item to prevent click selection. fix issue with toggling column on p13 dialog ([#12878](https://github.com/SAP/fundamental-ngx/issues/12878)) ([b908419](https://github.com/SAP/fundamental-ngx/commit/b908419673a8422c1140e3d0110a176a1a1985db))
+* **core:** combobox communicateByObject bugs ([#12815](https://github.com/SAP/fundamental-ngx/issues/12815)) ([26fd691](https://github.com/SAP/fundamental-ngx/commit/26fd691e14e8b8e609cd2e554074fdb4c195a537))
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/core
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 

diff --git a/libs/core/combobox/combobox.component.spec.ts b/libs/core/combobox/combobox.component.spec.ts
@@ -79,7 +79,6 @@ describe('ComboboxComponent', () => {
 
     it('should handle wrong input entry on dropdown mode', () => {
         jest.spyOn(component, 'onChange');
-        component.communicateByObject = true;
         component.displayFn = (item: any): string => {
             if (item) {
                 return item.displayedValue;
@@ -91,6 +90,20 @@ describe('ComboboxComponent', () => {
         expect(component.onChange).toHaveBeenCalledWith('otherDisplayedValue');
     });
 
+    it('should not call onChange when using wrong input entry on dropdown mode with communicateByObject', () => {
+        jest.spyOn(component, 'onChange');
+        component.communicateByObject = true;
+        component.displayFn = (item: any): string => {
+            if (item) {
+                return item.displayedValue;
+            } else {
+                return '';
+            }
+        };
+        component.inputText = 'otherDisplayedValue';
+        expect(component.onChange).not.toHaveBeenCalled();
+    });
+
     it('should handle write value from outside on dropdown mode', () => {
         component.communicateByObject = true;
         component.displayFn = (item: any): string => item.displayedValue;
@@ -342,8 +355,6 @@ describe('ComboboxComponent', () => {
 
             component.displayFn = (product: Product): string => product?.name ?? '';
 
-            component.communicateByObject = true;
-
             component.dropdownValues = allProducts;
 
             component.groupFn = (products: Product[]) => {
@@ -369,8 +380,6 @@ describe('ComboboxComponent', () => {
 
             component.displayFn = (product: Product): string => product?.name ?? '';
 
-            component.communicateByObject = true;
-
             component.dropdownValues = allProducts;
 
             component.groupFn = (products: Product[]) => {

diff --git a/libs/core/combobox/combobox.component.ts b/libs/core/combobox/combobox.component.ts
@@ -829,7 +829,10 @@ export class ComboboxComponent<T = any>
             } else if (values.length === 0) {
                 this.setValue(this.inputText);
             }
-            this.onChange(this.getValue());
+            const thisValue = this.getValue();
+            if (typeof thisValue === 'object') {
+                this.onChange(thisValue);
+            }
         } else {
             this.onChange(this.inputText);
         }

diff --git a/libs/core/list/list-item/list-item.component.ts b/libs/core/list/list-item/list-item.component.ts
@@ -113,6 +113,11 @@ export class ListItemComponent<T = any> extends ListFocusItem<T> implements Afte
     @Input()
     id: Nullable<string> = 'fd-list-item-' + ++listItemUniqueId;
 
+    /** Whether to prevent built-in click event logic on the list item.
+     * Helpful when using lists with checkboxes or radio buttons when the list item should be clickable, but should not select/deselect the list item. */
+    @Input()
+    preventClick = false;
+
     /** @hidden Implementation of KeyboardSupportItemInterface | TODO Revisit KeyboardSupportItemInterface*/
     @Output()
     keyDown: EventEmitter<KeyboardEvent> = new EventEmitter<KeyboardEvent>();
@@ -229,16 +234,18 @@ export class ListItemComponent<T = any> extends ListFocusItem<T> implements Afte
     /** Handler for mouse events */
     @HostListener('click', ['$event'])
     onClick(event: MouseEvent): void {
-        this._clicked$.next(event);
-        if (this.checkbox && !this.link) {
-            if (!this.checkbox.elementRef.nativeElement.contains(event.target as Node)) {
-                // clicking on the checkbox is not suppressed
-                // so we should only process clicks if clicked on the list-item, not checkbox itself
-                this.checkbox.nextValue();
+        if (!this.preventClick) {
+            this._clicked$.next(event);
+            if (this.checkbox && !this.link) {
+                if (!this.checkbox.elementRef.nativeElement.contains(event.target as Node)) {
+                    // clicking on the checkbox is not suppressed
+                    // so we should only process clicks if clicked on the list-item, not checkbox itself
+                    this.checkbox.nextValue();
+                }
+            }
+            if (this.radio && !this.link) {
+                this.radio.labelClicked(event, false);
             }
-        }
-        if (this.radio && !this.link) {
-            this.radio.labelClicked(event, false);
         }
     }
 

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

diff --git a/libs/cx/CHANGELOG.md b/libs/cx/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/cx
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/cx
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **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.54.2-rc.1",
+  "version": "0.54.2-rc.3",
   "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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **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.54.2-rc.1",
+    "version": "0.54.2-rc.3",
     "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/...-generator/examples/custom-control/settings-generator-custom-control-example.component.ts b/...-generator/examples/custom-control/settings-generator-custom-control-example.component.ts
@@ -82,10 +82,18 @@ export class SettingsGeneratorCustomControlExampleComponent {
         this._formGeneratorService.addComponent(PlatformFormGeneratorCustomSliderElementComponent, ['slider']);
         this.schema = {
             appearance: 'sidebar',
-            sidebarWidth: '20rem',
+            sidebarWidth: {
+                minWidth: '20rem',
+                width: '20rem',
+                maxWidth: '20rem',
+                wrapSidebarTitle: true,
+                wrapSidebarDescription: true
+            },
             items: [
                 {
-                    title: 'First list item',
+                    title: 'First list item with long title text that wraps rather than truncates at certain screen sizes due to custom properties in the sidebar configuration',
+                    description:
+                        'This is an example of a description with long text that wraps rather than truncates due to custom properties in the sidebar width configuration',
                     id: 'sliderExample',
                     thumbnail: {
                         icon: {
@@ -111,7 +119,8 @@ export class SettingsGeneratorCustomControlExampleComponent {
                                 showTicksLabels: true
                             }
                         }
-                    ]
+                    ],
+                    wrapSectionTitle: true
                 }
             ]
         };

diff --git a/libs/i18n/CHANGELOG.md b/libs/i18n/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/i18n
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/i18n
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **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.54.2-rc.1",
+    "version": "0.54.2-rc.3",
     "peerDependencies": {
         "@angular/common": "ANGULAR_VER_PLACEHOLDER",
         "@angular/core": "ANGULAR_VER_PLACEHOLDER",

diff --git a/libs/moment-adapter/CHANGELOG.md b/libs/moment-adapter/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.54.2-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.2...v0.54.2-rc.3) (2025-01-08)
+
+**Note:** Version bump only for package @fundamental-ngx/moment-adapter
+
+
+
+
+
+## [0.54.2-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.1...v0.54.2-rc.2) (2025-01-07)
+
+**Note:** Version bump only for package @fundamental-ngx/moment-adapter
+
+
+
+
+
 ## [0.54.2-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.0...v0.54.2-rc.1) (2024-12-30)
 
 **Note:** Version bump only for package @fundamental-ngx/moment-adapter

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