Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-18 02:41:15 +02:00
Code Issues Projects Releases Wiki Activity

[CL-243] honor initial disabled state in bitFormButton (#9510)

Browse Source 
* honor initial disabled state

* update story
This commit is contained in:
Will Martin 2024-06-05 11:39:40 -04:00 committed by GitHub
parent 1cfbcf4ee0
commit 419c107f87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/components/src/async-actions/form-button.directive.ts
View File

@ -40,13 +40,13 @@ export class BitFormButtonDirective implements OnDestroy {
if (this.type === "submit") { if (this.type === "submit") {
buttonComponent.loading = loading; buttonComponent.loading = loading;
} else { } else {
buttonComponent.disabled = loading; buttonComponent.disabled = this.disabled || loading;
} }
}); });
submitDirective.disabled$.pipe(takeUntil(this.destroy$)).subscribe((disabled) => { submitDirective.disabled$.pipe(takeUntil(this.destroy$)).subscribe((disabled) => {
if (this.disabled !== false) { if (this.disabled !== false) {
buttonComponent.disabled = disabled; buttonComponent.disabled = this.disabled || disabled;
} }
}); });
} }

1
libs/components/src/async-actions/in-forms.stories.ts
View File

@ -33,6 +33,7 @@ const template = `
<button class="tw-mr-2" type="submit" buttonType="primary" bitButton bitFormButton>Submit</button> <button class="tw-mr-2" type="submit" buttonType="primary" bitButton bitFormButton>Submit</button>
<button class="tw-mr-2" type="button" buttonType="secondary" bitButton bitFormButton>Cancel</button> <button class="tw-mr-2" type="button" buttonType="secondary" bitButton bitFormButton>Cancel</button>
<button class="tw-mr-2" type="button" buttonType="danger" bitButton bitFormButton [bitAction]="delete">Delete</button> <button class="tw-mr-2" type="button" buttonType="danger" bitButton bitFormButton [bitAction]="delete">Delete</button>
<button class="tw-mr-2" type="button" buttonType="secondary" bitButton bitFormButton [disabled]="true">Disabled</button>
<button class="tw-mr-2" type="button" buttonType="secondary" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button> <button class="tw-mr-2" type="button" buttonType="secondary" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
</form>`; </form>`;