3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-12 20:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Add safety checks for node on comment-input* component

Browse source
This commit is contained in:
Andrey Antukh 2025-02-18 18:33:02 +01:00
parent 869a412c74
commit cd1eefb214
1 changed files with 63 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

129
frontend/src/app/main/ui/comments.cljs
View file

@ -103,13 +103,16 @@
(defn- current-text-node (defn- current-text-node
"Retrieves the text node and the offset that the cursor is positioned on" "Retrieves the text node and the offset that the cursor is positioned on"
([node] (current-text-node node (wapi/get-selection))) [node]
([node selection] (assert (some? node) "expected valid node")
(when (and node selection)
(let [range (wapi/get-range selection 0) (when-let [selection (wapi/get-selection)]
anchor-node (wapi/range-start-container range) (let [range (wapi/get-range selection 0)
anchor-offset (wapi/range-start-offset range)] anchor-node (wapi/range-start-container range)
[(current-text-node* node anchor-node) anchor-offset])))) offset (wapi/range-start-offset range)
span-node (current-text-node* node anchor-node)]
(when span-node
[span-node offset]))))
(defn- absolute-offset (defn- absolute-offset
[node child offset] [node child offset]
@ -285,9 +288,8 @@
(mf/use-fn (mf/use-fn
(mf/deps on-change) (mf/deps on-change)
(fn [data] (fn [data]
(let [node (mf/ref-val local-ref) (when-let [node (mf/ref-val local-ref)]
[span-node offset] (current-text-node node)] (when-let [[span-node offset] (current-text-node node)]
(when span-node
(let [node-text (let [node-text
(dom/get-text span-node) (dom/get-text span-node)
@ -320,9 +322,8 @@
handle-insert-at-symbol handle-insert-at-symbol
(mf/use-fn (mf/use-fn
(fn [] (fn []
(let [node (mf/ref-val local-ref) (when-let [node (mf/ref-val local-ref)]
[span-node] (current-text-node node)] (when-let [[span-node] (current-text-node node)]
(when span-node
(let [node-text (dom/get-text span-node) (let [node-text (dom/get-text span-node)
at-symbol (if (blank-content? node-text) "@" " @")] at-symbol (if (blank-content? node-text) "@" " @")]
@ -334,66 +335,62 @@
(mf/deps on-esc on-ctrl-enter handle-select handle-input) (mf/deps on-esc on-ctrl-enter handle-select handle-input)
(fn [event] (fn [event]
(handle-select event) (handle-select event)
(when-let [node (mf/ref-val local-ref)]
(when-let [[span-node offset] (current-text-node node)]
(cond
(and @cur-mention (kbd/enter? event))
(do (dom/prevent-default event)
(dom/stop-propagation event)
(rx/push! mentions-s {:type :insert-selected-mention}))
(let [node (mf/ref-val local-ref) (and @cur-mention (kbd/down-arrow? event))
[span-node offset] (current-text-node node)] (do (dom/prevent-default event)
(dom/stop-propagation event)
(rx/push! mentions-s {:type :insert-next-mention}))
(cond (and @cur-mention (kbd/up-arrow? event))
(and @cur-mention (kbd/enter? event)) (do (dom/prevent-default event)
(do (dom/prevent-default event) (dom/stop-propagation event)
(dom/stop-propagation event) (rx/push! mentions-s {:type :insert-prev-mention}))
(rx/push! mentions-s {:type :insert-selected-mention}))
(and @cur-mention (kbd/down-arrow? event)) (and @cur-mention (kbd/esc? event))
(do (dom/prevent-default event) (do (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(rx/push! mentions-s {:type :insert-next-mention})) (rx/push! mentions-s {:type :hide-mentions}))
(and @cur-mention (kbd/up-arrow? event)) (and (kbd/esc? event) (fn? on-esc))
(do (dom/prevent-default event) (on-esc event)
(dom/stop-propagation event)
(rx/push! mentions-s {:type :insert-prev-mention}))
(and @cur-mention (kbd/esc? event)) (and (kbd/mod? event) (kbd/enter? event) (fn? on-ctrl-enter))
(do (dom/prevent-default event) (on-ctrl-enter event)
(dom/stop-propagation event)
(rx/push! mentions-s {:type :hide-mentions}))
(and (kbd/esc? event) (fn? on-esc)) (kbd/enter? event)
(on-esc event) (let [sel (wapi/get-selection)
range (.getRangeAt sel 0)]
(and (kbd/mod? event) (kbd/enter? event) (fn? on-ctrl-enter))
(on-ctrl-enter event)
(kbd/enter? event)
(let [sel (wapi/get-selection)
range (.getRangeAt sel 0)]
(dom/prevent-default event)
(dom/stop-propagation event)
(let [[span-node offset] (current-text-node node)]
(.deleteContents range)
(handle-input)
(when span-node
(let [txt (.-textContent span-node)]
(dom/set-html! span-node (dm/str (subs txt 0 offset) "\n" zero-width-space (subs txt offset)))
(wapi/set-cursor! span-node (inc offset))
(handle-input)))))
(kbd/backspace? event)
(let [prev-node (get-prev-node node span-node)]
(when (and (some? prev-node)
(= "mention" (dom/get-data prev-node "type"))
(= offset 1))
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(.remove prev-node)))))))] (let [[span-node offset] (current-text-node node)]
(.deleteContents range)
(handle-input)
(mf/use-layout-effect (when span-node
(mf/deps autofocus) (let [txt (.-textContent span-node)]
(fn [] (dom/set-html! span-node (dm/str (subs txt 0 offset) "\n" zero-width-space (subs txt offset)))
(when autofocus (wapi/set-cursor! span-node (inc offset))
(dom/focus! (mf/ref-val local-ref))))) (handle-input)))))
(kbd/backspace? event)
(let [prev-node (get-prev-node node span-node)]
(when (and (some? prev-node)
(= "mention" (dom/get-data prev-node "type"))
(= offset 1))
(dom/prevent-default event)
(dom/stop-propagation event)
(.remove prev-node))))))))]
(mf/with-layout-effect [autofocus]
(when ^boolean autofocus
(dom/focus! (mf/ref-val local-ref))))
;; Creates the handlers for selection ;; Creates the handlers for selection
(mf/with-effect [handle-select] (mf/with-effect [handle-select]
@ -417,12 +414,12 @@
;; Auto resize input to display the comment ;; Auto resize input to display the comment
(mf/with-layout-effect nil (mf/with-layout-effect nil
(let [^js node (mf/ref-val local-ref)] (when-let [^js node (mf/ref-val local-ref)]
(set! (.-height (.-style node)) "0") (set! (.-height (.-style node)) "0")
(set! (.-height (.-style node)) (str (+ 2 (.-scrollHeight node)) "px")))) (set! (.-height (.-style node)) (str (+ 2 (.-scrollHeight node)) "px"))))
(mf/with-effect [value prev-value] (mf/with-effect [value prev-value]
(let [node (mf/ref-val local-ref)] (when-let [node (mf/ref-val local-ref)]
(cond (cond
(and (d/not-empty? prev-value) (empty? value)) (and (d/not-empty? prev-value) (empty? value))
(do (dom/set-html! node "") (do (dom/set-html! node "")