Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 00:40:30 -05:00
Code Issues Activity

🐛 It is possible to create empty component annotation

Browse source
This commit is contained in:
Pablo Alba 2023-06-22 12:03:51 +02:00 committed by Andrés Moya
parent 45e76bc38b
commit 776159c1e8
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/resources/styles/main/partials/sidebar-element-options.scss
View file

@ -2418,6 +2418,9 @@
.hidden { .hidden {
display: none; display: none;
svg {
display: none;
}
} }
.counter { .counter {

44
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
View file

@ -6,20 +6,21 @@
(ns app.main.ui.workspace.sidebar.options.menus.component (ns app.main.ui.workspace.sidebar.options.menus.component
(:require (:require
[app.common.pages.helpers :as cph] [app.common.pages.helpers :as cph]
[app.common.types.components-list :as ctkl] [app.common.types.components-list :as ctkl]
[app.common.types.file :as ctf] [app.common.types.file :as ctf]
[app.main.data.modal :as modal] [app.main.data.modal :as modal]
[app.main.data.workspace :as dw] [app.main.data.workspace :as dw]
[app.main.data.workspace.libraries :as dwl] [app.main.data.workspace.libraries :as dwl]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.components.context-menu :refer [context-menu]] [app.main.ui.components.context-menu :refer [context-menu]]
[app.main.ui.context :as ctx] [app.main.ui.context :as ctx]
[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]]
[rumext.v2 :as mf])) [cuerdas.core :as str]
[rumext.v2 :as mf]))
(def component-attrs [:component-id :component-file :shape-ref :main-instance? :annotation]) (def component-attrs [:component-id :component-file :shape-ref :main-instance? :annotation])
@ -30,6 +31,7 @@
component-id (:component-id values) component-id (:component-id values)
annotation (:annotation component) annotation (:annotation component)
editing? (mf/use-state false) editing? (mf/use-state false)
invalid-text? (mf/use-state (str/empty? annotation))
size (mf/use-state (count annotation)) size (mf/use-state (count annotation))
textarea-ref (mf/use-ref) textarea-ref (mf/use-ref)
@ -37,6 +39,7 @@
;; based on https://css-tricks.com/the-cleanest-trick-for-autogrowing-textareas/ ;; based on https://css-tricks.com/the-cleanest-trick-for-autogrowing-textareas/
autogrow #(let [textarea (mf/ref-val textarea-ref) autogrow #(let [textarea (mf/ref-val textarea-ref)
text (when textarea (.-value textarea))] text (when textarea (.-value textarea))]
(reset! invalid-text? (str/empty? text))
(when textarea (when textarea
(reset! size (count text)) (reset! size (count text))
(aset (.-dataset (.-parentNode textarea)) "replicatedValue" text))) (aset (.-dataset (.-parentNode textarea)) "replicatedValue" text)))
@ -55,10 +58,11 @@
(dom/stop-propagation event) (dom/stop-propagation event)
(let [textarea (mf/ref-val textarea-ref) (let [textarea (mf/ref-val textarea-ref)
text (.-value textarea)] text (.-value textarea)]
(reset! editing? false) (when-not (str/blank? text)
(st/emit! (reset! editing? false)
(dw/set-annotations-id-for-create nil) (st/emit!
(dw/update-component-annotation component-id text)))) (dw/set-annotations-id-for-create nil)
(dw/update-component-annotation component-id text)))))
workspace-annotations (mf/deref refs/workspace-annotations) workspace-annotations (mf/deref refs/workspace-annotations)
annotations-expanded? (:expanded? workspace-annotations) annotations-expanded? (:expanded? workspace-annotations)
creating? (= id (:id-for-create workspace-annotations)) creating? (= id (:id-for-create workspace-annotations))
@ -71,7 +75,6 @@
(let [textarea (mf/ref-val textarea-ref)] (let [textarea (mf/ref-val textarea-ref)]
(reset! editing? true) (reset! editing? true)
(dom/focus! textarea)))) (dom/focus! textarea))))
on-delete-annotation on-delete-annotation
(mf/use-callback (mf/use-callback
(mf/deps shape) (mf/deps shape)
@ -112,7 +115,8 @@
(if (or @editing? creating?) (if (or @editing? creating?)
[:* [:*
[:div.icon {:title (if creating? (tr "labels.create") (tr "labels.save")) [:div.icon {:title (if creating? (tr "labels.create") (tr "labels.save"))
:on-click save} i/tick] :on-click save
:class (dom/classnames :hidden @invalid-text?)} i/tick]
[:div.icon {:title (tr "labels.discard") [:div.icon {:title (tr "labels.discard")
:on-click discard} i/cross]] :on-click discard} i/cross]]
[:* [:*