Skip to content

Commit

Permalink
fix(dropdowntree): clear button position in rtl
Browse files Browse the repository at this point in the history
  • Loading branch information
TeyaVes authored and joneff committed Jan 8, 2020
1 parent 783ef76 commit 279bdf6
Show file tree
Hide file tree
Showing 3 changed files with 222 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/default/scss/dropdownlist/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
@include border-left-radius-only();
}

.k-clear-value {
.k-dropdown-wrap .k-clear-value {
right: auto;
left: $picker-icon-offset;
}
Expand Down
219 changes: 219 additions & 0 deletions tests/visual/dropdowntree-rtl.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
<!doctype html>
<html lang="en" class="k-typography k-no-animations">
<head>
<title>DropdownTree RTL</title>
<meta charset="utf-8" />
<link rel="stylesheet" href="../../packages/default/dist/all.css" />
<link rel="stylesheet" href="assets/styles.css" />
<script src="assets/scripts.js"></script>

<style>
#test-area {
grid-template-columns: repeat(3, 1fr);
align-items: start;
}

.k-animation-container {
position: relative;
overflow: visible;
}
</style>
</head>
<body>

<div id="test-area" class="grid k-rtl" dir="rtl">

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap"><span class="k-input">DropDowntree...</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"></ul><span class="k-input" style="display: flex;">DropDownTree...</span></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap"><span class="k-input">Normal</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>Normal</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /><span class="k-icon k-clear-value k-i-close"></span></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-hover"><span class="k-input">Hover</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap k-state-hover"><ul class="k-reset"><li class="k-button k-state-hover"><span><div>Hover</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-active k-state-border-down"><span class="k-input">Open</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable k-state-border-down k-state-focused"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>Open</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-focused"><span class="k-input">Focused</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable k-state-focused"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button k-state-focused"><span><div>Focused</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-disabled"><span class="k-input">Disabled</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap k-state-disabled"><ul class="k-reset"><li class="k-button"><span><div>Disabled</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable k-state-invalid"><span class="k-dropdown-wrap"><span class="k-input">Invalid</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable k-state-invalid"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>Invalid</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable ng-invalid ng-touched"><span class="k-dropdown-wrap"><span class="k-input">NG invalid</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable ng-invalid ng-touched"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>NG invalid</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-hover"><span class="k-input">Normal</span><span class="k-select"><span class="k-icon k-i-arrow-60-down k-i-loading"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>Normal</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /><span class="k-icon k-i-loading"></span></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-hover"><span class="k-input">Clear</span><span class="k-icon k-clear-value k-i-close" style="display: inline-flex;"></span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap k-state-hover"><ul class="k-reset"><li class="k-button k-state-hover"><span><div>Clear</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /><span class="k-icon k-clear-value k-i-close"></span></div></div>
<span></span>


<section>
<div class="k-animation-container">
<div class="k-list-container k-popup k-group k-reset k-popup-dropdowntree">
<div class="k-widget k-treeview">
<ul class="k-group k-treeview-lines">
<li class="k-item k-first">
<div class="k-top">
<span class="k-icon k-i-collapse"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Furniture</span>
</div>
<ul class="k-group">
<li class="k-item">
<div class="k-top">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Tables &amp; Chairs</span>
</div>
</li>
<li class="k-item">
<div class="k-mid">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Sofas</span>
</div>
</li>
</ul>
</li>
<li class="k-item k-last">
<div class="k-bot">
<span class="k-icon k-i-expand"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Decor</span>
</div>
</li>
</ul>
</div>
</div>
</div>
</section>

<section>
<div class="k-animation-container">
<div class="k-list-container k-popup k-group k-reset k-popup-dropdowntree">
<div class="k-check-all">
<input type="checkbox" class="k-checkbox" />
<span class="k-checkbox-label">Check all</span>
</div>
<div class="k-widget k-treeview">
<ul class="k-group k-treeview-lines">
<li class="k-item k-first">
<div class="k-top">
<span class="k-icon k-i-collapse"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Furniture</span>
</div>
<ul class="k-group">
<li class="k-item">
<div class="k-top">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Tables &amp; Chairs</span>
</div>
</li>
<li class="k-item">
<div class="k-mid">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Sofas</span>
</div>
</li>
</ul>
</li>
<li class="k-item k-last">
<div class="k-bot">
<span class="k-icon k-i-expand"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Decor</span>
</div>
</li>
</ul>
</div>
</div>
</div>
</section>

<section>
<div class="k-animation-container">
<div class="k-list-container k-popup k-group k-reset k-popup-dropdowntree">
<span class="k-list-filter">
<input class="k-textbox" value="Filter text" />
<span class="k-icon k-i-zoom"></span>
</span>
<div class="k-check-all">
<input type="checkbox" class="k-checkbox" />
<span class="k-checkbox-label">Check all</span>
</div>
<div class="k-widget k-treeview" style="max-height: 100px">
<ul class="k-group k-treeview-lines">
<li class="k-item k-first">
<div class="k-top">
<span class="k-icon k-i-collapse"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Furniture</span>
</div>
<ul class="k-group">
<li class="k-item">
<div class="k-top">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Tables &amp; Chairs</span>
</div>
</li>
<li class="k-item">
<div class="k-mid">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Sofas</span>
</div>
</li>
</ul>
</li>
<li class="k-item k-last">
<div class="k-bot">
<span class="k-icon k-i-expand"></span>
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Decor</span>
</div>
<ul class="k-group">
<li class="k-item">
<div class="k-top">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Bed Linen</span>
</div>
</li>
<li class="k-item">
<div class="k-mid">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Curtains &amp; Blinds</span>
</div>
</li>
<li class="k-item k-last">
<div class="k-bot">
<span class="k-checkbox-wrapper"><input type="checkbox" class="k-checkbox" /><span class="k-checkbox-label checkbox-span"></span></span>
<span class="k-in">Carpets</span>
</div>
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</section>

</div>

</body>
</html>
4 changes: 2 additions & 2 deletions tests/visual/dropdowntree.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en" class="k-typography k-no-animations">
<head>
<title>Dropdowns</title>
<title>DropdownTree</title>
<meta charset="utf-8" />
<link rel="stylesheet" href="../../packages/default/dist/all.css" />
<link rel="stylesheet" href="assets/styles.css" />
Expand Down Expand Up @@ -59,7 +59,7 @@
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap"><ul class="k-reset"><li class="k-button"><span><div>Normal</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /><span class="k-icon k-i-loading"></span></div></div>
<span></span>

<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-hover"><span class="k-input">Clear</span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<span class="k-widget k-dropdowntree k-dropdowntree-clearable"><span class="k-dropdown-wrap k-state-hover"><span class="k-input">Clear</span><span class="k-icon k-clear-value k-i-close" style="display: inline-flex;"></span><span class="k-select"><span class="k-icon k-i-arrow-60-down"></span></span></span></span>
<div class="k-widget k-dropdowntree k-dropdowntree-clearable"><div class="k-multiselect-wrap k-floatwrap k-state-hover"><ul class="k-reset"><li class="k-button k-state-hover"><span><div>Clear</div></span><span class="k-select"><span class="k-icon k-i-close"></span></span></li></ul><input class="k-input" type="text" style="width: 25px;" /><span class="k-icon k-clear-value k-i-close"></span></div></div>
<span></span>

Expand Down

0 comments on commit 279bdf6

Please sign in to comment.