mirror of
https://github.com/bitwarden/browser
synced 2026-02-04 18:53:20 +00:00
* adds small button size variant * makes small icon button same size as small button * testing small button for extension header * remove extension changes * update popout layout story * revert change to small icon button padding * add whitespace to see if error resolves * default buttonType to primary * default buttonType to secondary * add comment around why nonNullButtonSize value exists * add comment to property about using the non null version * Update apps/browser/src/platform/popup/layout/popup-layout.stories.ts Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com> * updated input syntax when using static values * remove nonNull value coersion * allow changing of size input in Story --------- Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com>
145 lines
4.5 KiB
TypeScript
145 lines
4.5 KiB
TypeScript
import { coerceBooleanProperty } from "@angular/cdk/coercion";
|
|
import { NgClass } from "@angular/common";
|
|
import { Input, HostBinding, Component, model, computed, input } from "@angular/core";
|
|
import { toObservable, toSignal } from "@angular/core/rxjs-interop";
|
|
import { debounce, interval } from "rxjs";
|
|
|
|
import { ButtonLikeAbstraction, ButtonType, ButtonSize } from "../shared/button-like.abstraction";
|
|
|
|
const focusRing = [
|
|
"focus-visible:tw-ring-2",
|
|
"focus-visible:tw-ring-offset-2",
|
|
"focus-visible:tw-ring-primary-600",
|
|
"focus-visible:tw-z-10",
|
|
];
|
|
|
|
const buttonSizeStyles: Record<ButtonSize, string[]> = {
|
|
small: ["tw-py-1", "tw-px-3", "tw-text-sm"],
|
|
default: ["tw-py-1.5", "tw-px-3"],
|
|
};
|
|
|
|
const buttonStyles: Record<ButtonType, string[]> = {
|
|
primary: [
|
|
"tw-border-primary-600",
|
|
"tw-bg-primary-600",
|
|
"!tw-text-contrast",
|
|
"hover:tw-bg-primary-700",
|
|
"hover:tw-border-primary-700",
|
|
...focusRing,
|
|
],
|
|
secondary: [
|
|
"tw-bg-transparent",
|
|
"tw-border-primary-600",
|
|
"!tw-text-primary-600",
|
|
"hover:tw-bg-primary-600",
|
|
"hover:tw-border-primary-600",
|
|
"hover:!tw-text-contrast",
|
|
...focusRing,
|
|
],
|
|
danger: [
|
|
"tw-bg-transparent",
|
|
"tw-border-danger-600",
|
|
"!tw-text-danger",
|
|
"hover:tw-bg-danger-600",
|
|
"hover:tw-border-danger-600",
|
|
"hover:!tw-text-contrast",
|
|
...focusRing,
|
|
],
|
|
unstyled: [],
|
|
};
|
|
|
|
@Component({
|
|
selector: "button[bitButton], a[bitButton]",
|
|
templateUrl: "button.component.html",
|
|
providers: [{ provide: ButtonLikeAbstraction, useExisting: ButtonComponent }],
|
|
standalone: true,
|
|
imports: [NgClass],
|
|
host: {
|
|
"[attr.disabled]": "disabledAttr()",
|
|
},
|
|
})
|
|
export class ButtonComponent implements ButtonLikeAbstraction {
|
|
@HostBinding("class") get classList() {
|
|
return [
|
|
"tw-font-semibold",
|
|
"tw-rounded-full",
|
|
"tw-transition",
|
|
"tw-border-2",
|
|
"tw-border-solid",
|
|
"tw-text-center",
|
|
"tw-no-underline",
|
|
"hover:tw-no-underline",
|
|
"focus:tw-outline-none",
|
|
]
|
|
.concat(this.block ? ["tw-w-full", "tw-block"] : ["tw-inline-block"])
|
|
.concat(buttonStyles[this.buttonType ?? "secondary"])
|
|
.concat(
|
|
this.showDisabledStyles() || this.disabled()
|
|
? [
|
|
"disabled:tw-bg-secondary-300",
|
|
"disabled:hover:tw-bg-secondary-300",
|
|
"disabled:tw-border-secondary-300",
|
|
"disabled:hover:tw-border-secondary-300",
|
|
"disabled:!tw-text-muted",
|
|
"disabled:hover:!tw-text-muted",
|
|
"disabled:tw-cursor-not-allowed",
|
|
"disabled:hover:tw-no-underline",
|
|
]
|
|
: [],
|
|
)
|
|
.concat(buttonSizeStyles[this.size() || "default"]);
|
|
}
|
|
|
|
protected disabledAttr = computed(() => {
|
|
const disabled = this.disabled() != null && this.disabled() !== false;
|
|
return disabled || this.loading() ? true : null;
|
|
});
|
|
|
|
/**
|
|
* Determine whether it is appropriate to display the disabled styles. We only want to show
|
|
* the disabled styles if the button is truly disabled, or if the loading styles are also
|
|
* visible.
|
|
*
|
|
* We can't use `disabledAttr` for this, because it returns `true` when `loading` is `true`.
|
|
* We only want to show disabled styles during loading if `showLoadingStyles` is `true`.
|
|
*/
|
|
protected showDisabledStyles = computed(() => {
|
|
return this.showLoadingStyle() || (this.disabledAttr() && this.loading() === false);
|
|
});
|
|
|
|
@Input() buttonType: ButtonType = "secondary";
|
|
|
|
size = input<ButtonSize>("default");
|
|
|
|
private _block = false;
|
|
|
|
@Input()
|
|
get block(): boolean {
|
|
return this._block;
|
|
}
|
|
|
|
set block(value: boolean | "") {
|
|
this._block = coerceBooleanProperty(value);
|
|
}
|
|
|
|
loading = model<boolean>(false);
|
|
|
|
/**
|
|
* Determine whether it is appropriate to display a loading spinner. We only want to show
|
|
* a spinner if it's been more than 75 ms since the `loading` state began. This prevents
|
|
* a spinner "flash" for actions that are synchronous/nearly synchronous.
|
|
*
|
|
* We can't use `loading` for this, because we still need to disable the button during
|
|
* the full `loading` state. I.e. we only want the spinner to be debounced, not the
|
|
* loading state.
|
|
*
|
|
* This pattern of converting a signal to an observable and back to a signal is not
|
|
* recommended. TODO -- find better way to use debounce with signals (CL-596)
|
|
*/
|
|
protected showLoadingStyle = toSignal(
|
|
toObservable(this.loading).pipe(debounce((isLoading) => interval(isLoading ? 75 : 0))),
|
|
);
|
|
|
|
disabled = model<boolean>(false);
|
|
}
|