Skip to content

Commit

Permalink
Merge branch 'main' into fix/10805
Browse files Browse the repository at this point in the history
  • Loading branch information
mikerodonnell89 authored Nov 22, 2023
2 parents b9c9819 + 94e0829 commit 7ef94a4
Show file tree
Hide file tree
Showing 25 changed files with 192 additions and 16 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)


### Bug Fixes

* **core:** select disabled state ([#10994](https://github.com/SAP/fundamental-ngx/issues/10994)) ([e41be1a](https://github.com/SAP/fundamental-ngx/commit/e41be1a672307019fcbf4c7abdbcde255ece699b))





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package fundamental-ngx





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"packages": ["libs/*/src/lib", "libs/*"],
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"conventionalCommits": true,
"tagVersionPrefix": "v",
"message": "chore(release): publish %v",
Expand Down
16 changes: 16 additions & 0 deletions libs/btp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/btp
Expand Down
2 changes: 1 addition & 1 deletion libs/btp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/btp",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"peerDependencies": {
"@angular/common": "ANGULAR_VER_PLACEHOLDER",
"@angular/core": "ANGULAR_VER_PLACEHOLDER",
Expand Down
16 changes: 16 additions & 0 deletions libs/cdk/src/lib/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/cdk





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/cdk
Expand Down
2 changes: 1 addition & 1 deletion libs/cdk/src/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/cdk",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - CDK",
"license": "Apache-2.0",
Expand Down
19 changes: 19 additions & 0 deletions libs/core/src/lib/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)


### Bug Fixes

* **core:** select disabled state ([#10994](https://github.com/SAP/fundamental-ngx/issues/10994)) ([e41be1a](https://github.com/SAP/fundamental-ngx/commit/e41be1a672307019fcbf4c7abdbcde255ece699b))





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/core





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/core
Expand Down
2 changes: 1 addition & 1 deletion libs/core/src/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/core",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"schematics": "./schematics/collection.json",
"ng-update": {
"migrations": "./schematics/migrations.json"
Expand Down
1 change: 1 addition & 0 deletions libs/core/src/lib/select/select.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ export class SelectComponent<T = any>
setDisabledState(isDisabled: boolean): void {
this.disabled = isDisabled;
this._tabIndex = this.disabled ? -1 : 0;
this._changeDetectorRef.markForCheck();
}

/** Selected option. */
Expand Down
16 changes: 16 additions & 0 deletions libs/cx/src/lib/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/cx





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/cx





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/cx
Expand Down
2 changes: 1 addition & 1 deletion libs/cx/src/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/cx",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - cx",
"license": "Apache-2.0",
Expand Down
16 changes: 16 additions & 0 deletions libs/datetime-adapter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/datetime-adapter





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/datetime-adapter





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/datetime-adapter
Expand Down
2 changes: 1 addition & 1 deletion libs/datetime-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/datetime-adapter",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"description": "Datetime adapter for SAP Fundamentals, based on Day.js package",
"license": "Apache-2.0",
"homepage": "https://sap.github.io/fundamental-ngx/home",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ <h4>Disabled select</h4>
</form>
<small style="display: block">Value: {{ disabledForm.controls.disabledControl.value }}</small>
<small style="display: block">Status: {{ disabledForm.status }}</small>

<button fd-button (click)="toggleDisabledState()">Toggle disabled state</button>
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { NgFor } from '@angular/common';
import { Component } from '@angular/core';
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
import { ButtonComponent } from '@fundamental-ngx/core/button';
import { SelectModule } from '@fundamental-ngx/core/select';

@Component({
selector: 'fd-select-forms',
templateUrl: './select-forms.component.html',
styleUrls: ['select-forms.component.scss'],
standalone: true,
imports: [FormsModule, ReactiveFormsModule, SelectModule, NgFor]
imports: [FormsModule, ReactiveFormsModule, SelectModule, NgFor, ButtonComponent]
})
export class SelectFormsComponent {
options: string[] = ['Apple', 'Pineapple', 'Tomato', 'Strawberry'];
Expand All @@ -20,4 +21,10 @@ export class SelectFormsComponent {
disabledForm = new FormGroup({
disabledControl: new FormControl({ value: 'Apple', disabled: true }, Validators.required)
});

toggleDisabledState(): void {
this.disabledForm.controls.disabledControl.enabled
? this.disabledForm.controls.disabledControl.disable()
: this.disabledForm.controls.disabledControl.enable();
}
}
16 changes: 16 additions & 0 deletions libs/i18n/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/i18n





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/i18n





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/i18n
Expand Down
2 changes: 1 addition & 1 deletion libs/i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/i18n",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"peerDependencies": {
"@angular/common": "ANGULAR_VER_PLACEHOLDER",
"@angular/core": "ANGULAR_VER_PLACEHOLDER",
Expand Down
16 changes: 16 additions & 0 deletions libs/moment-adapter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/moment-adapter





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/moment-adapter





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/moment-adapter
Expand Down
2 changes: 1 addition & 1 deletion libs/moment-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/moment-adapter",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"schematics": "./schematics/collection.json",
"description": "Datetime adapter for SAP Fundamentals, based on Moment.js package",
"license": "Apache-2.0",
Expand Down
16 changes: 16 additions & 0 deletions libs/nx-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/nx-plugin





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/nx-plugin





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)

**Note:** Version bump only for package @fundamental-ngx/nx-plugin
Expand Down
2 changes: 1 addition & 1 deletion libs/nx-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/nx-plugin",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"main": "src/index.js",
"generators": "./generators.json",
"executors": "./executors.json"
Expand Down
16 changes: 16 additions & 0 deletions libs/platform/src/lib/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.47.4-rc.5](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.4...v0.47.4-rc.5) (2023-11-22)

**Note:** Version bump only for package @fundamental-ngx/platform





## [0.47.4-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.3...v0.47.4-rc.4) (2023-11-20)

**Note:** Version bump only for package @fundamental-ngx/platform





## [0.47.4-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.47.4-rc.2...v0.47.4-rc.3) (2023-11-17)


Expand Down
2 changes: 1 addition & 1 deletion libs/platform/src/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/platform",
"version": "0.47.4-rc.3",
"version": "0.47.4-rc.5",
"schematics": "./schematics/collection.json",
"description": "Fundamental Library for Angular - platform",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"postcss-preset-env": "9.0.0",
"postcss-url": "10.1.3",
"prettier": "2.8.7",
"prettier-plugin-organize-imports": "3.2.3",
"prettier-plugin-organize-imports": "3.2.4",
"rollup": "3.26.3",
"semver": "7.5.4",
"standard-version": "9.5.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14857,10 +14857,10 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==

[email protected].3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.3.tgz#6b0141ac71f7ee9a673ce83e95456319e3a7cf0d"
integrity sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==
[email protected].4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz#77967f69d335e9c8e6e5d224074609309c62845e"
integrity sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==

[email protected]:
version "2.8.7"
Expand Down

0 comments on commit 7ef94a4

Please sign in to comment.