3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-15 13:05:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix issue with empty placeholder on team change

Browse source
This commit is contained in:
Andrey Antukh 2025-04-16 18:19:34 +02:00
parent 29cc6b4f9c
commit 1305ab3cc6
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/ui/dashboard/grid.cljs
View file

@ -534,6 +534,7 @@
:create-fn create-fn :create-fn create-fn
:origin origin :origin origin
:project-id project-id :project-id project-id
:team-id team-id
:on-finish-import on-finish-import}])])) :on-finish-import on-finish-import}])]))
(mf/defc line-grid-row (mf/defc line-grid-row
@ -662,4 +663,5 @@
:can-edit can-edit :can-edit can-edit
:create-fn create-fn :create-fn create-fn
:project-id project-id :project-id project-id
:team-id team-id
:on-finish-import on-finish-import}])])) :on-finish-import on-finish-import}])]))

31
frontend/src/app/main/ui/dashboard/placeholder.cljs
View file

@ -8,7 +8,6 @@
(:require-macros [app.main.style :as stl]) (:require-macros [app.main.style :as stl])
(:require (:require
[app.main.data.event :as ev] [app.main.data.event :as ev]
[app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.dashboard.import :as udi] [app.main.ui.dashboard.import :as udi]
[app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]] [app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]]
@ -16,12 +15,13 @@
[app.main.ui.icons :as i] [app.main.ui.icons :as i]
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.i18n :as i18n :refer [tr]] [app.util.i18n :as i18n :refer [tr]]
[okulary.core :as l]
[potok.v2.core :as ptk] [potok.v2.core :as ptk]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc empty-placeholder-projects* (mf/defc empty-placeholder-projects*
{::mf/wrap-props false} {::mf/wrap-props false}
[{:keys [on-create on-finish-import project-id] :as props}] [{:keys [on-create on-finish-import project-id]}]
(let [file-input (mf/use-ref nil) (let [file-input (mf/use-ref nil)
on-add-library (mf/use-fn on-add-library (mf/use-fn
(fn [_] (fn [_]
@ -48,17 +48,38 @@
:project-id project-id :project-id project-id
:on-finish-import on-finish-import}]])) :on-finish-import on-finish-import}]]))
(defn- make-has-other-files-or-projects-ref
"Return a ref that resolves to true or false if there are at least some
file or some project (a part of the default) exists; this determines
if we need to show a complete placeholder or the small one."
[team-id]
(l/derived (fn [state]
(or (let [projects (get state :projects)]
(some (fn [[_ project]]
(and (= (:team-id project) team-id)
(not (:is-default project))))
projects))
(let [files (get state :files)]
(some (fn [[_ file]]
(= (:team-id file) team-id))
files))))
st/state))
(mf/defc empty-placeholder (mf/defc empty-placeholder
[{:keys [dragging? limit origin create-fn can-edit project-id on-finish-import]}] [{:keys [dragging? limit origin create-fn can-edit team-id project-id on-finish-import]}]
(let [on-click (let [on-click
(mf/use-fn (mf/use-fn
(mf/deps create-fn) (mf/deps create-fn)
(fn [_] (fn [_]
(create-fn "dashboard:empty-folder-placeholder"))) (create-fn "dashboard:empty-folder-placeholder")))
show-text (mf/use-state nil) show-text (mf/use-state nil)
on-mouse-enter (mf/use-fn #(reset! show-text true)) on-mouse-enter (mf/use-fn #(reset! show-text true))
on-mouse-leave (mf/use-fn #(reset! show-text nil)) on-mouse-leave (mf/use-fn #(reset! show-text nil))
files (mf/deref refs/files)]
has-other* (mf/with-memo [team-id]
(make-has-other-files-or-projects-ref team-id))
has-other? (mf/deref has-other*)]
(cond (cond
(true? dragging?) (true? dragging?)
[:ul [:ul
@ -80,7 +101,7 @@
:tag-name "span"}])] :tag-name "span"}])]
:else :else
(if (= (count files) 0) (if-not has-other?
[:> empty-placeholder-projects* {:on-create on-click :on-finish-import on-finish-import :project-id project-id}] [:> empty-placeholder-projects* {:on-create on-click :on-finish-import on-finish-import :project-id project-id}]
[:div {:class (stl/css :grid-empty-placeholder)} [:div {:class (stl/css :grid-empty-placeholder)}
[:button {:class (stl/css :create-new) [:button {:class (stl/css :create-new)