🐛 Fix Components are not dragged from the group to the assets tab

This commit is contained in:
Pablo Alba 2024-07-22 13:36:15 +02:00
parent e5daa00d73
commit 50fe715fba
3 changed files with 22 additions and 8 deletions

View file

@ -15,6 +15,7 @@
### :bug: Bugs fixed ### :bug: Bugs fixed
- Fix pencil loader [Taiga #8348](https://tree.taiga.io/project/penpot/issue/8348) - Fix pencil loader [Taiga #8348](https://tree.taiga.io/project/penpot/issue/8348)
- Fix components are not dragged from the group to the assets tab [Taiga #8273](https://tree.taiga.io/project/penpot/issue/8273)
## 2.1.0 - Things can only get better! ## 2.1.0 - Things can only get better!

View file

@ -241,14 +241,9 @@
(when group-open? (when group-open?
[:* [:*
(when-let [components (not-empty (get groups "" []))] (let [components (not-empty (get groups "" []))]
[:div {:class-name (stl/css-case :asset-grid listing-thumbs? [:div {:class-name (stl/css-case :asset-grid listing-thumbs?
:asset-enum (not listing-thumbs?) :asset-enum (not listing-thumbs?))
:drop-space (and
(empty? components)
(some? groups)
(not dragging?)
local))
:on-drag-enter on-drag-enter :on-drag-enter on-drag-enter
:on-drag-leave on-drag-leave :on-drag-leave on-drag-leave
:on-drag-over dom/prevent-default :on-drag-over dom/prevent-default
@ -261,7 +256,8 @@
(when (and (empty? components) (when (and (empty? components)
(some? groups) (some? groups)
local) local)
[:div {:class (stl/css :drop-space)}]) [:div {:class (stl/css-case :drop-space true
:drop-space-small (not dragging?))}])
(for [component components] (for [component components]
[:& components-item [:& components-item

View file

@ -10,6 +10,10 @@
height: $s-12; height: $s-12;
} }
.drop-space-small {
height: $s-2;
}
.asset-grid { .asset-grid {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax($s-96, 1fr)); grid-template-columns: repeat(auto-fill, minmax($s-96, 1fr));
@ -43,6 +47,7 @@
background-color: var(--assets-item-name-background-color); background-color: var(--assets-item-name-background-color);
border: $s-1 solid transparent; border: $s-1 solid transparent;
color: var(--assets-item-name-foreground-color); color: var(--assets-item-name-foreground-color);
input { input {
@include textEllipsis; @include textEllipsis;
@include bodySmallTypography; @include bodySmallTypography;
@ -50,11 +55,13 @@
height: auto; height: auto;
padding: 0; padding: 0;
} }
span { span {
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
} }
&.editing { &.editing {
border-color: var(--input-border-color-focus); border-color: var(--input-border-color-focus);
border-radius: $br-4; border-radius: $br-4;
@ -72,6 +79,7 @@
&.selected { &.selected {
border: $s-2 solid var(--assets-item-border-color); border: $s-2 solid var(--assets-item-border-color);
&::before { &::before {
content: " "; content: " ";
position: absolute; position: absolute;
@ -123,21 +131,27 @@
&:not(:last-child) { &:not(:last-child) {
margin-bottom: $s-4; margin-bottom: $s-4;
} }
&:hover { &:hover {
background-color: var(--assets-item-background-color-hover); background-color: var(--assets-item-background-color-hover);
.item-name { .item-name {
color: var(--assets-item-name-foreground-color-hover); color: var(--assets-item-name-foreground-color-hover);
&.editing { &.editing {
background: var(--input-background-color); background: var(--input-background-color);
input { input {
color: var(--input-foreground-color-active); color: var(--input-foreground-color-active);
} }
span svg { span svg {
stroke: var(--input-foreground-color-active); stroke: var(--input-foreground-color-active);
} }
} }
} }
} }
&.selected { &.selected {
border: $s-1 solid var(--assets-item-border-color); border: $s-1 solid var(--assets-item-border-color);
} }
@ -148,6 +162,7 @@
@include textEllipsis; @include textEllipsis;
order: 2; order: 2;
color: var(--assets-item-name-foreground-color); color: var(--assets-item-name-foreground-color);
input { input {
@include textEllipsis; @include textEllipsis;
@include bodySmallTypography; @include bodySmallTypography;
@ -155,6 +170,7 @@
height: $s-32; height: $s-32;
padding: $s-4; padding: $s-4;
} }
span { span {
display: flex; display: flex;
place-items: center; place-items: center;
@ -199,6 +215,7 @@
width: $s-28; width: $s-28;
margin-left: $s-2; margin-left: $s-2;
border-radius: $br-8; border-radius: $br-8;
svg { svg {
@extend .button-icon; @extend .button-icon;
stroke: var(--icon-foreground); stroke: var(--icon-foreground);