Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@EugeniyKiyashko
EugeniyKiyashko committed Sep 5, 2024
1 parent f542ee9 commit 815f615
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 553 deletions.
Binary file modified ...alons/TabPanel disabled item is focused,tabsPosition=bottom (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...talons/TabPanel focus not selected item,tabsPosition=bottom (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...l item focus when clicking on multiview,tabsPosition=bottom (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions e2e/testcafe-devextreme/tests/navigation/tabPanel/focus.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test('[{0: selected}] -> click to multiView -> click to external button', async
.click(tabPanel.multiView.getItem(0).element)
.expect(tabPanel.isFocused).ok()
.expect(tabPanel.tabs.isFocused)
.notOk()
.ok()
.expect(tabPanel.tabs.getItem(0).isFocused)
.ok()
.expect(tabPanel.multiView.getItem(0).isFocused)
Expand Down Expand Up @@ -147,7 +147,7 @@ test('[{0: selected}, {1}] -> click to multiView -> navigate to tabs[1] -> click
.click(tabPanel.multiView.getItem(0).element)
.expect(tabPanel.isFocused).ok()
.expect(tabPanel.tabs.isFocused)
.notOk()
.ok()
.expect(tabPanel.tabs.getItem(0).isFocused)
.ok()
.expect(tabPanel.tabs.getItem(1).isFocused)
Expand Down Expand Up @@ -199,7 +199,7 @@ test('[{0: selected}] -> click to multiView -> press "tab" -> press "tab"', asyn
.click(tabPanel.multiView.getItem(0).element)
.expect(tabPanel.isFocused).ok()
.expect(tabPanel.tabs.isFocused)
.notOk()
.ok()
.expect(tabPanel.tabs.getItem(0).isFocused)
.ok()
.expect(tabPanel.multiView.getItem(0).isFocused)
Expand Down
6 changes: 0 additions & 6 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,4 @@
.dx-multiview-wrapper {
border: $generic-tabs-border;
}

// &.dx-state-focused {
// .dx-multiview-wrapper.dx-state-focused {
// border-color: $tabs-focused-border-color;
// }
// }
}
20 changes: 0 additions & 20 deletions ...ages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-bottom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,6 @@
}
}

// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-block-start: $generic-tabs-border;
// }

// .dx-tabs-nav-button {
// border-block-start: $generic-tabs-border;
// }
// }

// .dx-tabs-wrapper {
// border-block-start: $generic-tabs-border-focus;
// }

// .dx-tabs-nav-button {
// border-block-start: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
border-block-end: none;
Expand Down
27 changes: 0 additions & 27 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-left.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
.dx-tabs-wrapper {
border-inline-start: $generic-tabs-border;
border-inline-end: $generic-tabs-border;

// @include dx-tabs-border-mixin(
// $generic-tabs-border,
// none,
// $generic-tabs-border,
// none,
// );
}

.dx-tabs .dx-tabs-scrollable {
Expand All @@ -39,26 +32,6 @@
}
}

// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-inline-end: $generic-tabs-border;
// }

// .dx-tabs-nav-button {
// border-inline-end: $generic-tabs-border;
// }
// }

// .dx-tabs-wrapper {
// border-inline-end: $generic-tabs-border-focus;
// }

// .dx-tabs-nav-button {
// border-inline-end: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
border-inline-start: none;
Expand Down
27 changes: 0 additions & 27 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-right.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
.dx-tabs-wrapper {
border-inline-start: $generic-tabs-border;
border-inline-end: $generic-tabs-border;

// @include dx-tabs-border-mixin(
// $generic-tabs-border,
// none,
// $generic-tabs-border,
// none,
// );
}

.dx-tabs .dx-tabs-scrollable {
Expand All @@ -39,26 +32,6 @@
}
}

// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-inline-start: $generic-tabs-border;
// }

// .dx-tabs-nav-button {
// border-inline-start: $generic-tabs-border;
// }
// }

// .dx-tabs-wrapper {
// border-inline-start: $generic-tabs-border-focus;
// }

// .dx-tabs-nav-button {
// border-inline-start: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
border-inline-end: none;
Expand Down
20 changes: 0 additions & 20 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-top.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,6 @@
}
}

// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-block-end: $generic-tabs-border;
// }

// .dx-tabs-nav-button {
// border-block-end: $generic-tabs-border;
// }
// }

// .dx-tabs-wrapper {
// border-block-end: $generic-tabs-border-focus;
// }

// .dx-tabs-nav-button {
// border-block-end: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
border-block-start: none;
Expand Down
4 changes: 0 additions & 4 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
.dx-tabpanel-tab {
padding: $generic-tabpanel-tabs-item-padding;

// &.dx-state-focused::after {
// border-color: $tabs-border-color;
// }

&.dx-state-disabled {
&::after {
z-index: 3;
Expand Down
105 changes: 1 addition & 104 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab/_position-bottom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,6 @@

.dx-tabpanel-tabs-position-bottom {
.dx-tabpanel-tab {
// &:first-child:not(.dx-state-focused, .dx-tab-selected) {
// &.dx-state-hover {
// @include dx-tabs-border-mixin(
// $generic-tabpanel-tab-border-transparent,
// null,
// null,
// $generic-tabs-border-transparent,
// );
// }
// }

// &:last-child:not(.dx-state-focused, .dx-tab-selected) {
// &.dx-state-hover {
// @include dx-tabs-border-mixin(
// $generic-tabpanel-tab-border-transparent,
// $generic-tabs-border-transparent,
// null,
// null,
// );
// }
// }

// &.dx-state-hover {
// @include dx-tabs-border-mixin(
// $generic-tabpanel-tab-border-transparent,
// null,
// null,
// null,
// );
// }

&.dx-tab-selected {
@include dx-tabs-border-mixin(
$generic-tabpanel-tab-border-transparent,
Expand All @@ -56,80 +25,8 @@
border-block-start: $generic-tabpanel-tab-border-selected-bottom;
}

// &.dx-state-active {
// @include dx-tabs-border-mixin(
// $generic-tabpanel-tab-border-active-bottom,
// null,
// null,
// null,
// );
// }

// &.dx-state-focused:not(.dx-state-disabled) {
// @include dx-tabs-border-mixin(
// none,
// null,
// null,
// null,
// );

// border-block-start: $generic-tabpanel-tab-border-focused-bottom;
// }

// &.dx-state-disabled:not(.dx-state-focused) {
// @include dx-tabs-border-mixin(
// null,
// none,
// null,
// null,
// );

// border-block-start: $generic-tabs-border;
// }

// &.dx-state-disabled.dx-state-focused {
// @include dx-tabs-border-mixin(
// none,
// null,
// null,
// null,
// );

// border-block-start: $generic-tabs-border-focused-disabled-bottom;
// }

&.dx-tab-selected
// ,
// &.dx-state-focused,
// &.dx-state-disabled
{
&.dx-tab-selected {
margin-block-start: -$generic-tabs-border-width;
}
}

// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabpanel-tab.dx-state-disabled:not(.dx-state-focused) {
// @include dx-tabs-border-mixin(
// none,
// null,
// null,
// null,
// );

// border-block-start: $generic-tabs-border;
// }
// }

// .dx-tabpanel-tab.dx-state-disabled:not(.dx-state-focused) {
// @include dx-tabs-border-mixin(
// null,
// none,
// null,
// null,
// );

// border-block-start: $generic-tabs-border-focus;
// }
// }
}
Loading

0 comments on commit 815f615

Please sign in to comment.