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

refactor(ui5-popover): improve layouting, styling and positioning #779

Merged
merged 11 commits into from
Oct 1, 2019
Merged

refactor(ui5-popover): improve layouting, styling and positioning #779

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
48748b4
wip: ui5-popover refactoring
MapTo0 Sep 17, 2019
28d700b
trying to fix the tests to run headless
MapTo0 Sep 18, 2019
5010b0b
fix tests
MapTo0 Sep 18, 2019
9c72daa
- upgrade chromedriver to 77
MapTo0 Sep 19, 2019
c31e689
add acc attributes
MapTo0 Sep 26, 2019
9360de2
Merge remote-tracking branch 'origin/master' into popover-refactoring
vladitasev Sep 30, 2019
5e31b84
fix test page for IE
vladitasev Sep 30, 2019
8969b99
Merge remote-tracking branch 'origin/master' into popover-refactoring
MapTo0 Sep 30, 2019
8cd9cdb
focus fix for IE
vladitasev Sep 30, 2019
26de084
fix some IE issues
MapTo0 Oct 1, 2019
090441e
fix some comments
MapTo0 Oct 1, 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
4 changes: 2 additions & 2 deletions packages/main/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"@wdio/sync": "^5.12.1",
"@webcomponents/webcomponentsjs": "^2.2.7",
"chai": "^4.2.0",
"chromedriver": "^76.0.0",
"chromedriver": "^77.0.0",
"clean-css": "^4.2.1",
"copy-and-watch": "^0.1.2",
"cpx": "^1.5.0",
Expand Down Expand Up @@ -153,6 +153,6 @@
"resolutions": {
"abstract-syntax-tree": "1.0.3",
"dir-glob": "2.0.0",
"wdio-chromedriver-service/chromedriver": "^76.0.0"
"wdio-chromedriver-service/chromedriver": "^77.0.0"
}
}
40 changes: 25 additions & 15 deletions packages/main/src/Popover.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
{{>include "./Popup.hbs"}}
<div class="ui5-popover-root" role="dialog" aria-modal="true" aria-labelledby="ui5-popover-header">

<span class="ui5-popup-frame" @focusin="{{onfocusin}}">
<span id="{{_id}}-firstfe" tabindex="0" @focusin={{focusHelper.forwardToLast}}></span>
<div style="{{styles.main}}" role="dialog" aria-modal="true" aria-labelledby="{{headerId}}" tabindex="-1" class="ui5-popup-root ui5-popover-root">
{{> header}}
<div id="{{_id}}-content" style="{{styles.content}}" class="ui5-popup-content">
<div class="ui5-popup-scroll">
<slot></slot>
</div>
</div>
{{> footer}}
<span id="{{_id}}-arrow" style="{{styles.arrow}}" class="ui5-popover-arr"></span>
<span class="ui5-popover-arr" style="{{styles.arrow}}"></span>

{{#if header.length }}
<div class="ui5-popover-header-root" id="ui5-popover-header" role="toolbar">
<slot name="header"></slot>
</div>
<span id="{{_id}}-lastfe" tabindex="0" @focusin={{focusHelper.forwardToFirst}}></span>
<div tabindex="0" id="{{_id}}-blocklayer" style="{{styles.blockLayer}}" class="{{classes.blockLayer}}"></div>
</span>
{{else}}
<h2 class="ui5-popup-header-text" id="ui5-popover-header">{{headerText}}</h2>
{{/if}}

<span class="first-fe" tabindex="0" @focusin={{forwardToLast}}></span>

<div class="ui5-popover-content">
<slot></slot>
</div>

<span class="last-fe" tabindex="0" @focusin={{forwardToFirst}}></span>

{{#if footer.length }}
<div class="ui5-popover-footer-root" role="toolbar">
<slot name="footer"></slot>
</div>
{{/if}}

</div>
Loading