mirror of
https://github.com/penpot/penpot.git
synced 2025-05-25 23:17:21 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
4f0cc3d0d8
22 changed files with 349 additions and 297 deletions
|
@ -7,6 +7,7 @@
|
|||
(ns app.main.ui.dashboard.import
|
||||
(:require
|
||||
[app.common.data :as d]
|
||||
[app.common.data.macros :as dm]
|
||||
[app.common.logging :as log]
|
||||
[app.main.data.dashboard :as dd]
|
||||
[app.main.data.events :as ev]
|
||||
|
@ -379,6 +380,7 @@
|
|||
(let [editing? (and (some? (:file-id file))
|
||||
(= (:file-id file) (:editing @state)))]
|
||||
[:& import-entry {:state state
|
||||
:key (dm/str (:id file))
|
||||
:file file
|
||||
:editing? editing?
|
||||
:can-be-deleted? (> (count files) 1)}]))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue