diff options
| author |   Aijana Schumann <aijana.schumann@highstreet-technologies.com> | 2020-09-04 14:11:52 +0200 |
|---|---|---|
| committer | Aijana Schumann <aijana.schumann@highstreet-technologies.com> | 2020-09-04 14:12:54 +0200 |
| commit | b5a51b4fceace211d10d6dd4accd5545e48824f1 (patch) | |
| tree | a2bcf81f3ef16df766887406885fb42605e2c6d3 /sdnr/wt/odlux/framework/src | |
| parent | b439e2b7bda158837ad6da8253f8ba1b97d397ec (diff) | |
odlux bugfixes
fix info, guiguttrough not working
fix aria-labels placed wrong
Issue-ID: CCSDK-2732
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: Ic2aafa796fd2471160fa269974aef7767dad6a5c
Diffstat (limited to 'sdnr/wt/odlux/framework/src')
| -rw-r--r-- | sdnr/wt/odlux/framework/src/assets/version.json | 4 | ||||
| -rw-r--r-- | sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sdnr/wt/odlux/framework/src/assets/version.json b/sdnr/wt/odlux/framework/src/assets/version.json new file mode 100644 index 000000000..6311e1094 --- /dev/null +++ b/sdnr/wt/odlux/framework/src/assets/version.json @@ -0,0 +1,4 @@ +{ + "version":"68.d7886ce(20/09/04)", + "build":"2020-09-04T12:31:19Z" +}
\ No newline at end of file diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx index 23bad66ea..8c4b740a0 100644 --- a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx +++ b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx @@ -42,15 +42,16 @@ export const ListItemLink = withStyles(styles)((props: IListItemLinkProps) => { const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false } = props;
const renderLink = (itemProps: any): JSX.Element => (<NavLink exact={ exact } to={ to } activeClassName={ classes.active } { ...itemProps } />);
+ const ariaLabel = typeof Primary === 'string' ? "link-to-"+Primary.toLowerCase().replace(/\s/g, "-") : "link-to-"+Primary.displayName?.toLowerCase();
return (
<>
- <ListItem button component={ renderLink }>
+ <ListItem button component={ renderLink } aria-label={ariaLabel}>
{ icon
? <ListItemIcon>{ icon }</ListItemIcon>
: null
}
{ typeof Primary === 'string'
- ? <ListItemText aria-label={"link-to-"+Primary.toLowerCase()} primary={ Primary } style={{ padding: 0 }} />
+ ? <ListItemText primary={ Primary } style={{ padding: 0 }} />
: <Primary />
}
</ListItem>
|