Skip to content

Commit 82e68d4

Browse files
authored
fix: rule priority for .drawer-end and .drawer-open. closes #4331
* chore(drawer): remove redundant universal selector * chore(drawer): remove redundant & in front of > and ~ * fix(drawer): move .drawer-open translate in daisyui.l1 layer to increase priority over .drawer-end close #4331
1 parent 03589b4 commit 82e68d4

1 file changed

Lines changed: 21 additions & 19 deletions

File tree

‎packages/daisyui/src/components/drawer.css‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@apply col-start-1 row-start-1;
3737
}
3838

39-
> *:not(.drawer-overlay) {
39+
> :not(.drawer-overlay) {
4040
@apply will-change-transform;
4141
transition:
4242
translate 0.3s ease-out,
@@ -73,7 +73,7 @@
7373
:where(&:checked ~ .drawer-side) {
7474
@apply pointer-events-auto visible overflow-y-auto opacity-100;
7575

76-
& > *:not(.drawer-overlay) {
76+
> :not(.drawer-overlay) {
7777
translate: 0%;
7878
}
7979
}
@@ -90,23 +90,23 @@
9090
grid-auto-columns: auto max-content;
9191

9292
> .drawer-toggle {
93-
& ~ .drawer-content {
93+
~ .drawer-content {
9494
@apply col-start-1;
9595
}
9696

97-
& ~ .drawer-side {
97+
~ .drawer-side {
9898
@apply col-start-2 justify-items-end;
9999
}
100100

101-
& ~ .drawer-side > *:not(.drawer-overlay) {
101+
~ .drawer-side > :not(.drawer-overlay) {
102102
translate: 100%;
103103

104104
[dir="rtl"] & {
105105
translate: -100%;
106106
}
107107
}
108108

109-
&:checked ~ .drawer-side > *:not(.drawer-overlay) {
109+
&:checked ~ .drawer-side > :not(.drawer-overlay) {
110110
translate: 0%;
111111
}
112112
}
@@ -115,8 +115,8 @@
115115

116116
.drawer-open {
117117
@layer daisyui.l1.l2.l3 {
118-
& > .drawer-toggle:checked {
119-
& ~ .drawer-side {
118+
> .drawer-toggle:checked {
119+
~ .drawer-side {
120120
scrollbar-color: revert-layer;
121121
}
122122

@@ -133,32 +133,34 @@
133133
}
134134

135135
@layer daisyui.l1.l2 {
136-
& > .drawer-side {
136+
> .drawer-side {
137137
@apply overflow-y-auto;
138138
}
139139

140140
> .drawer-toggle {
141141
@apply hidden;
142142

143-
& ~ .drawer-side {
143+
~ .drawer-side {
144144
@apply pointer-events-auto visible sticky block w-auto overscroll-auto opacity-100;
145145

146-
& > .drawer-overlay {
146+
> .drawer-overlay {
147147
@apply cursor-default bg-transparent;
148148
}
149-
150-
& > *:not(.drawer-overlay) {
151-
translate: 0%;
152-
153-
[dir="rtl"] & {
154-
translate: 0%;
155-
}
156-
}
157149
}
158150

159151
&:checked ~ .drawer-side {
160152
@apply pointer-events-auto visible;
161153
}
162154
}
163155
}
156+
157+
@layer daisyui.l1 {
158+
> .drawer-toggle ~ .drawer-side > :not(.drawer-overlay) {
159+
translate: 0%;
160+
161+
[dir="rtl"] & {
162+
translate: 0%;
163+
}
164+
}
165+
}
164166
}

0 commit comments

Comments
 (0)