diff --git a/CHANGES.md b/CHANGES.md index 73d89e3d9..ca06d87d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -34,6 +34,8 @@ ### :bug: Bugs fixed +- Fix intro action in multi input [Taiga #3541](https://tree.taiga.io/project/penpot/issue/3541) +- Fix team default image [Taiga #3919](https://tree.taiga.io/project/penpot/issue/3919) - Fix problem with group coordinates [#2008](https://github.com/penpot/penpot/issues/2008) - Fix problem with line-height and texts [Taiga #3578](https://tree.taiga.io/project/penpot/issue/3578) - Fix moving frame-guides outside frames [Taiga #3839](https://tree.taiga.io/project/penpot/issue/3839) diff --git a/frontend/src/app/main/ui/components/forms.cljs b/frontend/src/app/main/ui/components/forms.cljs index 8b4723a28..24720a645 100644 --- a/frontend/src/app/main/ui/components/forms.cljs +++ b/frontend/src/app/main/ui/components/forms.cljs @@ -243,7 +243,7 @@ (into [] (distinct) (conj coll item))) (mf/defc multi-input - [{:keys [form label class name trim valid-item-fn] :as props}] + [{:keys [form label class name trim valid-item-fn on-submit] :as props}] (let [form (or form (mf/use-ctx form-ctx)) input-name (get props :name) touched? (get-in @form [:touched input-name]) @@ -297,8 +297,11 @@ (dom/prevent-default event) (dom/stop-propagation event) (let [val (cond-> @value trim str/trim)] - (reset! value "") - (swap! items conj-dedup {:text val :valid (valid-item-fn val)}))) + (when (and (kbd/enter? event) (str/empty? @value) (not-empty @items)) + (on-submit form)) + (when (not (str/empty? @value)) + (reset! value "") + (swap! items conj-dedup {:text val :valid (valid-item-fn val)})))) (and (kbd/backspace? event) (str/empty? @value)) diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs index 4281a8219..98c92857f 100644 --- a/frontend/src/app/main/ui/dashboard/team.cljs +++ b/frontend/src/app/main/ui/dashboard/team.cljs @@ -142,7 +142,8 @@ :auto-focus? true :trim true :valid-item-fn us/parse-email - :label (tr "modals.invite-member.emails")}] + :label (tr "modals.invite-member.emails") + :on-submit on-submit}] [:& fm/select {:name :role :options roles}]] [:div.action-buttons @@ -605,7 +606,7 @@ [:div.label (tr "dashboard.team-info")] [:div.name (:name team)] [:div.icon - [:span.update-overlay {:on-click on-image-click} i/exit] + [:span.update-overlay {:on-click on-image-click} i/image] [:img {:src (cfg/resolve-team-photo-url team)}] [:& file-uploader {:accept "image/jpeg,image/png" :multi false diff --git a/frontend/src/app/main/ui/onboarding/team_choice.cljs b/frontend/src/app/main/ui/onboarding/team_choice.cljs index 43c62616a..2247fe9e3 100644 --- a/frontend/src/app/main/ui/onboarding/team_choice.cljs +++ b/frontend/src/app/main/ui/onboarding/team_choice.cljs @@ -171,7 +171,8 @@ :auto-focus? true :trim true :valid-item-fn us/parse-email - :label (tr "modals.invite-member.emails")}] + :label (tr "modals.invite-member.emails") + :on-submit on-submit}] [:& fm/select {:name :role :options roles}]] [:div.buttons