Skip to content

Commit

Permalink
Merge branch 'main' of github.com:infor-design/enterprise into preview
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcconechy committed Nov 7, 2023
2 parents bc900ca + 61529e0 commit b951b62
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 2 deletions.
11 changes: 11 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@

- `[Datagrid]` Added ability for expandable and summary rows to be updated after cell update. ([#8058](https://github.com/infor-design/enterprise/issues/8058))
- `[Tabs]` Changed all azure components like header and header tabs to be alabaster by default. ([#7861](https://github.com/infor-design/enterprise/issues/7861))
## v4.90.0

## v4.90.0 Features

## v4.90.0 Fixes

- `[Modal]` Adjusted modal title spacing to avoid icon from cropping. ([#8031](https://github.com/infor-design/enterprise/issues/8031))

## v4.89.0

Expand All @@ -30,11 +37,14 @@
- `[Datagrid]` Additional check for select row when datagrid has grouping and filter. ([NG#1549](https://github.com/infor-design/enterprise-ng/issues/1549))
- `[Datepicker]` Adjusted sizing of monthview popup to better accommodate smaller dimensions. ([#7974](https://github.com/infor-design/enterprise/issues/7974))
- `[Datepicker]` Fixed datepicker prematurely closing after selecting a date when having a time format. ([#7916](https://github.com/infor-design/enterprise/issues/7916))
- `[Dropdown]` Fixed a bug where the text and dropdown icon were overlapping on smaller viewports. ([#8000](https://github.com/infor-design/enterprise/issues/8000))
- `[EmptyMessage]` Fixed empty message card content to center position. ([#7883](https://github.com/infor-design/enterprise/issues/7883))
- `[General]` Adjusted the reset for spans. ([#1513](https://github.com/infor-design/enterprise/issues/7854))
- `[Module Nav]` Fixed a bug where the settings was behind the main module nav element. ([#8063](https://github.com/infor-design/enterprise/issues/8063))
- `[Module Nav]` Fixed a bug where the accordion in the page container inherited module nav accordion styles. ([#8040](https://github.com/infor-design/enterprise/issues/7884))
- `[Pie/Donut]` Fixed the displayed legend when selecting a different one. ([#7845](https://github.com/infor-design/enterprise/issues/7845))
- `[Pie/Donut]` Fixed a bug in clicking legends causing to change whole list to the last clicked legend name. ([#8139](https://github.com/infor-design/enterprise/issues/8139))
- `[Pie/Donut]` Fixed a bug in where legends can be clicked if selectable settings set to false. ([#8140](https://github.com/infor-design/enterprise/issues/8140))
- `[Popupmenu]` Fixed shared menu not closing and opening correctly. ([NG#1552](https://github.com/infor-design/enterprise-ng/issues/1552))
- `[ProcessIndicator]` Adjusted icon sizing to remove gaps between separators. ([#7982](https://github.com/infor-design/enterprise/issues/7982))
- `[Radios]` Adjusted styling of checked disabled radio button. ([#8082](https://github.com/infor-design/enterprise/issues/8082))
Expand All @@ -46,6 +56,7 @@
- `[Tabs]` Adjusted placement of icons in tab list spillover. ([#7970](https://github.com/infor-design/enterprise/issues/7970))
- `[Tabs]` Fixed the focus state of radio button not fully shown in tabs. ([#7955](https://github.com/infor-design/enterprise/issues/7955))
- `[Targeted-Achievement]` Fixed waring color not displaying properly. ([#7891](https://github.com/infor-design/enterprise/issues/7891))
- `[Treemap]` Adjusted label styling in RTL. ([#6891](https://github.com/infor-design/enterprise/issues/6891))
- `[Validation]` Fixed the position of exclamation points of validation in non english localization. ([#5119](https://github.com/infor-design/enterprise/issues/5119))
- `[Weekview]` Added overnight event view when end time goes to next day. ([#7840](https://github.com/infor-design/enterprise/issues/7840))
- `[Weekview]` Fixed an issue with the week change when clicking the `Today` button. ([#7792](https://github.com/infor-design/enterprise/issues/7792))
Expand Down
9 changes: 8 additions & 1 deletion src/components/charts/charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ charts.addLegend = function (series, chartType, settings, container) {
let currentWidth;
let totalWidth = 0;
let maxLength;
this.hasLegendPopup = false;

let currentTotalWidthPercent;
for (i = 0; i < series.length; i++) {
Expand Down Expand Up @@ -501,6 +502,8 @@ charts.addLegend = function (series, chartType, settings, container) {
</button>
`);

this.hasLegendPopup = true;

const popupList = $('<ul class="popupmenu"></ul>');

for (let j = 0; j < series.length; j++) {
Expand Down Expand Up @@ -561,6 +564,10 @@ charts.addLegend = function (series, chartType, settings, container) {
* @param {object} container The dom container.
*/
charts.handleElementClick = function (idx, line, series, settings, container) {
if (!settings.selectable) {
return;
}

const api = $(settings?.svg?.node()).closest('.chart-container').data('chart');
const noTrigger = api?.initialSelectCall;
const elem = series[idx];
Expand Down Expand Up @@ -607,7 +614,7 @@ charts.handleElementClick = function (idx, line, series, settings, container) {
charts.selectElement(d3.select(elem.selectionObj.nodes()[idx]), elem.selectionInverse, elem.data, undefined, settings.dataset, noTrigger); // eslint-disable-line
}

if (isTwoColumn) {
if (isTwoColumn && this.hasLegendPopup) {
const chartType = settings.type === 'donut' ? 'pie' : settings.type;
const hexColor = charts.chartColor(idx, chartType || (series.length === 1 ? 'bar-single' : 'bar'), elem);
const colorName = charts.chartColorName(idx, chartType || (series.length === 1 ? 'bar-single' : 'bar'), elem);
Expand Down
4 changes: 4 additions & 0 deletions src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ div.multiselect {
color: $input-placeholder-color;
content: attr(data-placeholder-text);
}

@media (max-width: $breakpoint-phone) {
display: inline;
}
}

> .listoption-icon {
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ body.modal-engaged {
&.has-status {
.icon {
left: -6px;
margin-left: 5px;
margin-left: 8px;
margin-right: 4px;
top: 9px;
}
Expand Down
12 changes: 12 additions & 0 deletions src/components/treemap/_treemap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,15 @@
line-height: 1em;
}
}

html[dir='rtl'] {
.chart-treemap {
.chart-treemap-text {
right: 8px;
}

.chart-treemap-percent {
right: 8px;
}
}
}

0 comments on commit b951b62

Please sign in to comment.