Skip to content
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

feat(ui5-tabcontainer): update ACC of header and content #756

Merged
merged 15 commits into from
Aug 30, 2019
Merged

feat(ui5-tabcontainer): update ACC of header and content #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
767525a
feat: implement create control script
tsanislavgatev Aug 26, 2019
2f2ba11
fix: create control script pr notes fix
tsanislavgatev Aug 26, 2019
f722bb6
add console error on empty string for a name of component
tsanislavgatev Aug 28, 2019
1357c13
solve conflict
tsanislavgatev Aug 28, 2019
849e594
master update
tsanislavgatev Aug 28, 2019
bd9bf48
removed hungarian notation
tsanislavgatev Aug 28, 2019
4b82ba5
removed old component creation snippet file
tsanislavgatev Aug 28, 2019
f77bfb6
feat(ui5-tabcontainer): acc update
tsanislavgatev Aug 30, 2019
8d26917
merge conflict solve
tsanislavgatev Aug 30, 2019
a9235f7
merge conflict tags solve
tsanislavgatev Aug 30, 2019
fdd2118
feat(ui5-tabcontainer): update ACC of header and content
tsanislavgatev Aug 30, 2019
af2422c
feat(ui5-tabcontainer): update ACC of header and content
tsanislavgatev Aug 30, 2019
23be11a
Merge branch 'master' of https://github.com/tsanislavgatev/ui5-webcom…
tsanislavgatev Aug 30, 2019
4850ce6
Merge branch 'master' of https://github.com/tsanislavgatev/ui5-webcom…
tsanislavgatev Aug 30, 2019
3c71085
Merge branch 'master' of https://github.com/tsanislavgatev/ui5-webcom…
tsanislavgatev Aug 30, 2019
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
7 changes: 4 additions & 3 deletions packages/main/src/TabContainer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dir="{{rtl}}"
>
<div class="{{classes.header}}" id="{{_id}}-header">
<ui5-icon @click="{{_onHeaderBackArrowClick}}" class="{{classes.headerBackArrow}}" src="sap-icon://slim-arrow-left" tabindex="-1"></ui5-icon>
<ui5-icon @click="{{_onHeaderBackArrowClick}}" class="{{classes.headerBackArrow}}" src="sap-icon://slim-arrow-left" tabindex="-1" accessible-name="{{previousIconACCName}}" show-tooltip></ui5-icon>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

show-tooltip should be enough as it is a Boolean property, replace show-tooltip="true" with show-tooltip here and below

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<!-- tab items -->
<div class="{{classes.headerScrollContainer}}" id="{{_id}}-headerScrollContainer">
Expand Down Expand Up @@ -45,7 +45,7 @@
</ul>
</div>

<ui5-icon @click="{{_onHeaderForwardArrowClick}}" class="{{classes.headerForwardArrow}}" src="sap-icon://slim-arrow-right" tabindex="-1"></ui5-icon>
<ui5-icon @click="{{_onHeaderForwardArrowClick}}" class="{{classes.headerForwardArrow}}" src="sap-icon://slim-arrow-right" tabindex="-1" accessible-name="{{nextIconACCName}}" show-tooltip></ui5-icon>

<!-- overflow button -->
{{#if showOverflow}}
Expand All @@ -54,6 +54,7 @@
class="{{classes.overflowButton}}"
icon="sap-icon://slim-arrow-down"
type="Transparent"
title="{{overflowMenuTitle}}"
></ui5-button>
{{/if}}
</div>
Expand All @@ -62,7 +63,7 @@
<div class="{{classes.content}}">
{{#each renderItems}}
{{#unless this.isSeparator}}
<div class="{{this.contentItemClasses}}" id="ui5-tc-contentItem-{{this.position}}" ?hidden="{{this.hidden}}">
<div class="{{this.contentItemClasses}}" id="ui5-tc-contentItem-{{this.position}}" ?hidden="{{this.hidden}}" role="tabpanel" aria-labelledby="{{item._id}}">
<slot name="{{this.item._individualSlot}}"></slot>
</div>
{{/unless}}
Expand Down
17 changes: 17 additions & 0 deletions packages/main/src/TabContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import ScrollEnablement from "@ui5/webcomponents-base/dist/delegate/ScrollEnable
import ItemNavigation from "@ui5/webcomponents-base/dist/delegate/ItemNavigation.js";
import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/events/PseudoEvents.js";
import { getRTL } from "@ui5/webcomponents-base/dist/config/RTL.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import { TABCONTAINER_PREVIOUS_ICON_ACC_NAME, TABCONTAINER_NEXT_ICON_ACC_NAME, TABCONTAINER_OVERFLOW_MENU_TITLE } from "./generated/i18n/i18n-defaults.js";
import TabContainerTemplate from "./generated/templates/TabContainerTemplate.lit.js";
import Button from "./Button.js";
import CustomListItem from "./CustomListItem.js";
Expand Down Expand Up @@ -176,6 +178,8 @@ class TabContainer extends UI5Element {

// Init ItemNavigation
this._initItemNavigation();

this.i18nBundle = getI18nBundle("@ui5/webcomponents");
}

onBeforeRendering() {
Expand Down Expand Up @@ -391,6 +395,18 @@ class TabContainer extends UI5Element {
return this.items.some(item => item.icon) && this.items.some(item => item.text);
}

get previousIconACCName() {
return this.i18nBundle.getText(TABCONTAINER_PREVIOUS_ICON_ACC_NAME);
}

get nextIconACCName() {
return this.i18nBundle.getText(TABCONTAINER_NEXT_ICON_ACC_NAME);
}

get overflowMenuTitle() {
return this.i18nBundle.getText(TABCONTAINER_OVERFLOW_MENU_TITLE);
}

get rtl() {
return getRTL() ? "rtl" : undefined;
}
Expand All @@ -402,6 +418,7 @@ class TabContainer extends UI5Element {
Icon.define(),
List.define(),
Popover.define(),
fetchI18nBundle("@ui5/webcomponents"),
]);

super.define(...params);
Expand Down
9 changes: 9 additions & 0 deletions packages/main/src/i18n/messagebundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,15 @@ SWITCH_ON=On
#XACT: ARIA announcement for the switch off
SWITCH_OFF=Off

#XACT: ACC next icon name in tab container
TABCONTAINER_NEXT_ICON_ACC_NAME=Next

#XACT: ACC previous icon name in tab container
TABCONTAINER_PREVIOUS_ICON_ACC_NAME=Previous

#XACT: ACC overflow menu title in tab container
TABCONTAINER_OVERFLOW_MENU_TITLE=Overflow Menu

#XTXT: Text for characters left
TEXTAREA_CHARACTERS_LEFT={0} characters remaining

Expand Down