Skip to content

Commit

Permalink
fix: crate LinkAccessibleRole enum
Browse files Browse the repository at this point in the history
  • Loading branch information
unazko committed May 11, 2024
1 parent aacb453 commit 52c48c7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 27 deletions.
7 changes: 6 additions & 1 deletion packages/main/src/Button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import {
isDesktop,
isSafari,
} from "@ui5/webcomponents-base/dist/Device.js";
import AriaRole from "@ui5/webcomponents-base/dist/types/AriaRole.js";
import willShowContent from "@ui5/webcomponents-base/dist/util/willShowContent.js";
import type { IFormElement } from "./features/InputElementsFormSupport.js";
import ButtonDesign from "./types/ButtonDesign.js";
import ButtonType from "./types/ButtonType.js";
import ButtonAccessibleRole from "./types/ButtonAccessibleRole.js";
import ButtonTemplate from "./generated/templates/ButtonTemplate.lit.js";
import Icon from "./Icon.js";
import IconMode from "./types/IconMode.js";
Expand All @@ -47,6 +47,11 @@ let activeButton: Button | null = null;

type ButtonAccessibilityAttributes = Pick<AccessibilityAttributes, "expanded" | "hasPopup" | "controls">;

enum ButtonAccessibleRole {
Button = AriaRole.Button,
Link = AriaRole.Link
}

/**
* @class
*
Expand Down
13 changes: 9 additions & 4 deletions packages/main/src/Link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js";
import type { ITabbable } from "@ui5/webcomponents-base/dist/delegate/ItemNavigation.js";
import { markEvent } from "@ui5/webcomponents-base/dist/MarkedEvents.js";
import ButtonAccessibleRole from "./types/ButtonAccessibleRole.js";
import AriaRole from "@ui5/webcomponents-base/dist/types/AriaRole.js";
import LinkDesign from "./types/LinkDesign.js";
import WrappingType from "./types/WrappingType.js";
// Template
Expand All @@ -31,6 +31,11 @@ type LinkClickEventDetail = {

type LinkAccessibilityAttributes = Pick<AccessibilityAttributes, "expanded" | "hasPopup">;

enum LinkAccessibleRole {
Button = AriaRole.Button,
Link = AriaRole.Link
}

/**
* @class
*
Expand Down Expand Up @@ -195,13 +200,13 @@ class Link extends UI5Element implements ITabbable {
/**
* Defines the ARIA role of the component.
*
* **Note:** Use the <code>ButtonAccessibleRole.Button</code> role in cases when navigation is not expected to occur and the href property is not defined.
* **Note:** Use the <code>LinkAccessibleRole.Button</code> role in cases when navigation is not expected to occur and the href property is not defined.
* @default "link"
* @public
* @since 1.9.0
*/
@property({ type: ButtonAccessibleRole, defaultValue: ButtonAccessibleRole.Link })
accessibleRole!: `${ButtonAccessibleRole}`;
@property({ type: LinkAccessibleRole, defaultValue: LinkAccessibleRole.Link })
accessibleRole!: `${LinkAccessibleRole}`;

/**
* Defines the additional accessibility attributes that will be applied to the component.
Expand Down
22 changes: 0 additions & 22 deletions packages/main/src/types/ButtonAccessibleRole.ts

This file was deleted.

0 comments on commit 52c48c7

Please sign in to comment.