Skip to content

[JS] Add Password support to Input.Text #6407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 28, 2021
Merged

[JS] Add Password support to Input.Text #6407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f84ddbd
Add Password to style list
almedina-ms Sep 24, 2021
3a254f5
Fix comparator
almedina-ms Sep 24, 2021
a6d760e
Merge branch 'main' into user/almedina-ms/JS_PasswordSupport
almedina-ms Sep 27, 2021
ccca5b3
Change property implementation to contain version info in new enum value
almedina-ms Sep 28, 2021
eb485ae
Merge branch 'user/almedina-ms/JS_PasswordSupport' of https://github.…
almedina-ms Sep 28, 2021
5a218b6
Merge branch 'main' into user/almedina-ms/JS_PasswordSupport
almedina-ms Sep 28, 2021
f259817
Merge branch 'main' into user/almedina-ms/JS_PasswordSupport
paulcam206 Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions source/nodejs/adaptivecards/src/card-elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,9 @@ export class TextBlock extends BaseTextBlock {

if (this.style === "heading") {
element.setAttribute("role", "heading");

let headingLevel = this.hostConfig.textBlock.headingLevel;

if (headingLevel !== undefined && headingLevel > 0) {
element.setAttribute("aria-level", headingLevel.toString());
}
Expand Down Expand Up @@ -2776,7 +2776,19 @@ export class TextInput extends Input {
static readonly maxLengthProperty = new NumProperty(Versions.v1_0, "maxLength");
static readonly isMultilineProperty = new BoolProperty(Versions.v1_0, "isMultiline", false);
static readonly placeholderProperty = new StringProperty(Versions.v1_0, "placeholder");
static readonly styleProperty = new EnumProperty(Versions.v1_0, "style", Enums.InputTextStyle, Enums.InputTextStyle.Text);
static readonly styleProperty = new EnumProperty(
Versions.v1_0,
"style",
Enums.InputTextStyle,
Enums.InputTextStyle.Text,
[
{ value: Enums.InputTextStyle.Text },
{ value: Enums.InputTextStyle.Tel },
{ value: Enums.InputTextStyle.Url },
{ value: Enums.InputTextStyle.Email },
{ value: Enums.InputTextStyle.Password, targetVersion: Versions.v1_5}
]
);
static readonly inlineActionProperty = new ActionProperty(Versions.v1_0, "inlineAction", [ "Action.ShowCard" ]);
static readonly regexProperty = new StringProperty(Versions.v1_3, "regex", true);

Expand Down Expand Up @@ -2832,7 +2844,7 @@ export class TextInput extends Input {
protected internalRender(): HTMLElement | undefined {
let result: HTMLInputElement | HTMLTextAreaElement;

if (this.isMultiline) {
if (this.isMultiline && this.style !== Enums.InputTextStyle.Password) {
result = document.createElement("textarea");
result.className = this.hostConfig.makeCssClassName("ac-input", "ac-textInput", "ac-multiline");

Expand Down Expand Up @@ -3355,7 +3367,7 @@ export class ChoiceSetInput extends Input {
this._textInput.placeholder = this.placeholder;
this._textInput.setAttribute("aria-label", this.placeholder);
}

let dataList = document.createElement("datalist");
dataList.id = Utils.generateUniqueId();

Expand Down Expand Up @@ -4001,7 +4013,7 @@ export abstract class Action extends CardObject {

setupElementForAccessibility(element: HTMLElement, promoteTooltipToLabel: boolean = false) {
element.tabIndex = this.isEnabled ? 0 : -1;

element.setAttribute("role", this.getAriaRole());

if (element instanceof HTMLButtonElement) {
Expand Down Expand Up @@ -4054,7 +4066,7 @@ export abstract class Action extends CardObject {
this.execute();
}
};

this._renderedElement = buttonElement;

this.renderButtonContent();
Expand Down Expand Up @@ -4862,7 +4874,7 @@ class ActionCollection {
if (afterSelectedAction) {
renderedAction.isFocusable = false;
}

if (renderedAction !== action) {
renderedAction.state = ActionButtonState.Subdued;
}
Expand Down
3 changes: 2 additions & 1 deletion source/nodejs/adaptivecards/src/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ export enum InputTextStyle {
Text,
Tel,
Url,
Email
Email,
Password
}

/*
Expand Down