Skip to content

Commit

Permalink
Merge branch 'main' into 8553-cap-additional-padding
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcconechy committed Apr 5, 2024
2 parents f5ace55 + bc4eb48 commit 9a1d73e
Show file tree
Hide file tree
Showing 56 changed files with 507 additions and 80 deletions.
68 changes: 68 additions & 0 deletions app/views/components/fileupload/example-compact.html
@@ -0,0 +1,68 @@

<div class="row">
<div class="twelve columns">

<div class="form-layout-compact">
<div class="field">
<label for="fileupload">File Upload</label>
<input type="file" class="fileupload" id="fileupload" name="fileupload" data-init="false"/>
</div>
</div>

<div class="form-layout-compact">
<div class="field">
<label for="fileupload-readonly">File Upload (Readonly)</label>
<input type="file" class="fileupload" id="fileupload-readonly" readonly="true" name="fileupload" value="Readme.txt" data-init="false"/>
</div>
</div>

<div class="form-layout-compact">
<div class="field">
<label for="fileupload-disabled">File Upload (Disabled)</label>
<input type="file" class="fileupload" id="fileupload-disabled" disabled="true" name="fileupload" value="Readme.txt"/>
</div>
</div>

</div>
</div>

<script>
$('#fileupload').fileupload({
attributes: [
{
name: 'id',
value: 'fileupload'
},
{
name: 'data-automation-id',
value: 'fileupload-automation-id'
}
]
});

$('#fileupload-readonly').fileupload({
attributes: [
{
name: 'id',
value: 'fileupload-readonly'
},
{
name: 'data-automation-id',
value: 'fileupload-readonly-automation-id'
}
]
});

$('#fileupload-disabled').fileupload({
attributes: [
{
name: 'id',
value: 'fileupload-disabled'
},
{
name: 'data-automation-id',
value: 'fileupload-disabled-automation-id'
}
]
});
</script>
126 changes: 126 additions & 0 deletions app/views/components/homepage/test-all-charts.html
@@ -0,0 +1,126 @@
<div class="homepage page-container scrollable" data-init="false" id="maincontent" data-columns="3" role="main">
<div class="content">
<div class="widget double-width">
<div class="widget-header">
<h2 class="widget-title">Chart Example</h2>
</div>
<div class="widget-content">
<div id="chart-example-bar" class="chart-container">
</div>
</div>
</div>

<div class="widget double-width">
<div class="widget-header">
<h2 class="widget-title">Chart Example</h2>
</div>
<div class="widget-content">
<div id="chart-example-column" class="chart-container">
</div>
</div>
</div>

<div class="widget double-width">
<div class="widget-header">
<h2 class="widget-title">Chart Example</h2>
</div>
<div class="widget-content">
<div id="chart-example-donut" class="chart-container">
</div>
</div>
</div>

<div class="widget double-width">
<div class="widget-header">
<h2 class="widget-title">Chart Example</h2>
</div>
<div class="widget-content">
<div id="chart-example-line" class="chart-container">
</div>
</div>
</div>
</div>
</div>

<script>
$('body').on('initialized', function() {
$('.homepage').on('resize', function (e, rows, metadata) {
console.log(this, this.offsetHeight, metadata);
});

$('.homepage').homepage();

var dataset = [{
data: [{
name: 'Automotive',
shortName: 'Auto',
abbrName: 'A',
value: 7,
tooltip: 'Custom Tooltip - {{value}}',
attributes: [
{ name: 'id', value: 'auto' },
{ name: 'data-automation-id', value: 'automation-id-auto' }
]
}, {
name: 'Distribution',
shortName: 'Dist',
abbrName: 'D',
value: 10,
attributes: [
{ name: 'id', value: 'dist' },
{ name: 'data-automation-id', value: 'automation-id-dist' }
]
}, {
name: 'Equipment',
shortName: 'Equip',
abbrName: 'E',
value: 14,
attributes: [
{ name: 'id', value: 'equip' },
{ name: 'data-automation-id', value: 'automation-id-equip' }
]
}, {
name: 'Fashion',
shortName: 'Fash',
abbrName: 'F',
value: 10,
attributes: [
{ name: 'id', value: 'fash' },
{ name: 'data-automation-id', value: 'automation-id-fash' }
]
}, {
name: 'Food',
shortName: 'Food',
abbrName: 'F',
value: 14,
attributes: [
{ name: 'id', value: 'food' },
{ name: 'data-automation-id', value: 'automation-id-food' }
]
}, {
name: 'Healthcare',
shortName: 'Health',
abbrName: 'H',
value: 8,
attributes: [
{ name: 'id', value: 'health' },
{ name: 'data-automation-id', value: 'automation-id-health' }
]
}, {
name: 'Other',
shortName: 'Other',
abbrName: 'O',
value: 7,
attributes: [
{ name: 'id', value: 'other' },
{ name: 'data-automation-id', value: 'automation-id-other' }
]
}]
}];

$('#chart-example-bar').chart({type: 'bar', dataset: dataset});
$('#chart-example-column').chart({type: 'column', dataset: dataset});
$('#chart-example-donut').chart({type: 'donut', dataset: dataset});
$('#chart-example-line').chart({type: 'line', dataset: dataset});
});
</script>
43 changes: 43 additions & 0 deletions app/views/components/modal/test-compact-fileupload.html
@@ -0,0 +1,43 @@

<div class="row top-padding">
<div class="twelve columns">

<button class="btn-secondary" type="button" id="show">Show Modal</button>

<div id="modal" class="modal">
<div class="modal-content">

<div class="modal-header">
<h1 class="modal-title" >Add Comment</h1>
</div>

<div class="modal-body-wrapper">
<div class="modal-body">
<div class="form-layout-compact">
<div class="field">
<label for="fileupload">Upload a File</label>
<input type="file" class="fileupload" id="fileupload" name="fileupload" />
</div>
</div>

<div class="modal-buttonset">
<button type="button" class="btn-modal">Cancel</button>
<button type="button" id="submit" class="btn-modal-primary">Submit</button>
</div>
</div>
</div>
</div>
</div>

</div>
</div>

<script>
$('#show').on('click', function () {

$('body').modal({
content: $('#modal')
});

});
</script>
11 changes: 10 additions & 1 deletion app/views/components/module-nav/example-index.html
Expand Up @@ -62,7 +62,7 @@
<aside id="nav" class="module-nav" data-options="{ 'filterable': true }">
<div class="module-nav-bar">
<!-- Module Nav's top-level navigation items are inside the accordion -->
<div class="module-nav-accordion accordion panel" data-options="{'allowOnePane': false}">
<div class="module-nav-accordion accordion panel" data-options="{'allowOnePane': false }">
<!-- Module switcher -->
<div class="module-nav-header accordion-section">
<div class="module-nav-switcher">
Expand Down Expand Up @@ -355,6 +355,10 @@ <h1>Module Nav</h1>
<input type="checkbox" class="checkbox" name="hide-completely" id="hide-completely" />
<label for="hide-completely" class="checkbox-label">Hide completely</label>
</div>
<div class="field">
<input type="checkbox" class="checkbox" name="disable-switcher" id="disable-switcher" />
<label for="disable-switcher" class="checkbox-label">Disable switcher</label>
</div>
</div>
</div>
<div class="row test-spacer">&nbsp;</div>
Expand All @@ -379,6 +383,7 @@ <h1>Module Nav</h1>
const hideCompletelyEl = $('#hide-completely');
const hamburgerBtnEl = $('#header-hamburger');
const pinSectionsCheckEl = $('#pin-sections');
const disableSwitcher = $('#disable-switcher');

displayCheckEl.on('change.test', (e) => {
navAPI.updated({ showDetailView: displayCheckEl[0].checked });
Expand All @@ -388,6 +393,10 @@ <h1>Module Nav</h1>
navAPI.updated({ pinSections: pinSectionsCheckEl[0].checked });
});

disableSwitcher.on('change.test', (e, mode) => {
navAPI.updated({ disableSwitcher: disableSwitcher[0].checked });
})

if (hamburgerBtnEl.length) {
hamburgerBtnEl.on('click.test', (e) => {
navAPI.handleHamburgerClick();
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/tabs-header/test-max-width.html
Expand Up @@ -20,7 +20,7 @@ <h1>Header Tabs</h1>
<li class="tab"><a id="tabs-2" data-automation-id="tabs-2-a" href="#header-tabs-2">Example with Long Name Header Tabs #2 </a></li>
<li class="tab"><a id="tabs-3" data-automation-id="tabs-3-a" href="#header-tabs-3">Long Header Tabs #3</a></li>
<li class="tab is-disabled"><a id="tabs-4" data-automation-id="tabs-4-a" href="#header-tabs-4">Long Header Tabs 4</a></li>
<li class="tab"><a id="tabs-5" data-automation-id="tabs-5-a" href="#header-tabs-5">Long Header Tabs 5</a></li>
<li class="tab"><a id="tabs-5" data-automation-id="tabs-5-a" href="#header-tabs-5">Header Tabs 5</a></li>
<li class="tab"><a id="tabs-6" data-automation-id="tabs-6-a" href="#header-tabs-6">Long Header Tabs 6</a></li>
<li class="tab"><a id="tabs-7" data-automation-id="tabs-7-a" href="#header-tabs-7">Long Header Tabs 7</a></li>
<li class="tab"><a id="tabs-8" data-automation-id="tabs-8-a" href="#header-tabs-8">Example with Long Name Header Tabs 8</a></li>
Expand Down
15 changes: 11 additions & 4 deletions docs/CHANGELOG.md
Expand Up @@ -2,9 +2,14 @@

## v4.95.0

## v4.95.0 Features

- `[Module Nav]` Added setting `disableSwitcher` to disable nav switcher. ([#8381](https://github.com/infor-design/enterprise/issues/8381))

## v4.95.0 Fixes

- `[Contextual Action Panel]` Fixed added padding on contextual action panel. ([#8553](https://github.com/infor-design/enterprise/issues/8553))
- `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))

## v4.94.0

Expand All @@ -24,22 +29,24 @@
- `[Calendar]` Fixed event icon not properly rendered across week view mode. ([#8456](https://github.com/infor-design/enterprise/issues/8456))
- `[Calendar]` Fixed inconsistencies in border colors of events in calendar. ([#8452](https://github.com/infor-design/enterprise/issues/8452))
- `[Calendar]` Fixed height calculation of homepage. ([NG#1478](https://github.com/infor-design/enterprise-ng/issues/1478))
- `[Count]` Fixed misalignment in card header icon. ([#8448](https://github.com/infor-design/enterprise/issues/8448))
- `[Datagrid]` Fixed datagrid unable to have resize handle when using different column structure such as single lines. ([#8417](https://github.com/infor-design/enterprise/issues/8417))
- `[Datagrid]` Removed escaping HTML for cell nodes. ([#8516](https://github.com/infor-design/enterprise/issues/8516))
- `[Datagrid]` Fixed missing headers in frozen columns. ([NG#1590](https://github.com/infor-design/enterprise-ng/issues/1590))
- `[Datagrid]` Select event is not triggered when clicking a hyperlink. ([#8498](https://github.com/infor-design/enterprise/issues/8498))
- `[Datagrid]` Fixed searchfield icon alignment in filter. ([#8504](https://github.com/infor-design/enterprise/issues/8504))
- `[Datagrid/Card]` When in a card/widget the size of the datagrid would be incorrect and the pager would be moved to the wrong place. Now on default widget size the widget will contain the pager correctly. You may need css for custom sized widgets or non default widget sizes. ([#8496](https://github.com/infor-design/enterprise/issues/8372))
- `[Datepicker]` Added action in args passed on selected event. ([#8433](https://github.com/infor-design/enterprise/issues/8433))
- `[Calendar]` Fixed inconsistencies in border colors of events in calendar. ([#8452](https://github.com/infor-design/enterprise/issues/8452))
- `[Calendar]` Fixed height calculation of homepage. ([NG#1478](https://github.com/infor-design/enterprise-ng/issues/1478))
- `[Calendar]` Fixed event icon not properly rendered across week view mode. ([#8456](https://github.com/infor-design/enterprise/issues/8456))
- `[Count]` Fixed misalignment in card header icon. ([#8448](https://github.com/infor-design/enterprise/issues/8448))
- `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
- `[Homepage]` Fixed the resize issues of bar, column, donut and line when using in homepage. ([#8410](https://github.com/infor-design/enterprise/issues/8410))
- `[ModuleNav]` Fixed 6th level header accordion alignment. ([#8460](https://github.com/infor-design/enterprise/issues/8460))
- `[Radio]` Fixed alignment in short form of radio button. ([#8193](https://github.com/infor-design/enterprise/issues/8193))
- `[Radio]` Fixed alignment in datagrid radio button. ([#8349](https://github.com/infor-design/enterprise/issues/8349))
- `[Searchfield]` Fixed cut-off searchfield button. ([#8333](https://github.com/infor-design/enterprise/issues/8333))
- `[Searchfield]` Fixed clear button misalignment in RTL. ([#8342](https://github.com/infor-design/enterprise/issues/8342))
- `[Tabs]` Added guards on possible undefined objects. ([#8419](https://github.com/infor-design/enterprise/issues/8419))
- `[Tabs]` Fixed `beforeactivated` event not cancelling activation of tabs properly. ([NG#1578](https://github.com/infor-design/enterprise-ng/issues/1578))
- `[TabsHeader]` Fixed tooltip not showing properly when there is an ellipsis in tabs. ([#8446](https://github.com/infor-design/enterprise/issues/8446))
- `[Textarea]` Fixed the character count message in textarea.([#8449](https://github.com/infor-design/enterprise/issues/8449))
- `[Timeline]` Fixed alignment in widget.([#8524](https://github.com/infor-design/enterprise/issues/8524))
- `[Toolbar]` Fixed button shapes in toolbar. ([#8523](https://github.com/infor-design/enterprise/issues/8523))
Expand Down
25 changes: 15 additions & 10 deletions src/components/column/column.js
Expand Up @@ -1638,17 +1638,22 @@ Column.prototype = {
* @returns {void}
*/
handleResize() {
if (this.width === this.element.width()) {
return;
}

this.width = this.element.width();

if (!this.element.is(':visible')) {
return;
const resize = () => {
if (this.width === this.element.width()) {
return;
}
this.width = this.element.width();
if (!this.element.is(':visible')) {
return;
}
this.updated();
};
// Waiting to complete the animatin on widget
if (this.element.closest('.homepage').length) {
setTimeout(() => resize(), 300);
} else {
resize();
}

this.updated();
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/datagrid/_datagrid-new.scss
Expand Up @@ -958,7 +958,7 @@

.datagrid-container.extra-small-rowheight.has-filterable-columns .is-filterable .datagrid-filter-wrapper {
.lookup-wrapper .trigger {
margin-top: 1px;
margin-top: 2px;
}

.has-close-icon-button .icon {
Expand Down

0 comments on commit 9a1d73e

Please sign in to comment.