Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(blocks): links made clickable, z-index clean up #772 #778

Merged
merged 2 commits into from
Mar 11, 2021
Merged

fix(blocks): links made clickable, z-index clean up #772 #778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84978fc
fix(blocks): links made clickable #772
arkRedM Mar 8, 2021
974baa6
Merge branch 'master' into fix/block-embed-z-index-issue
arkRedM Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 26 additions & 42 deletions src/cljs/athens/views/blocks.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@
:opacity "1"}]
[:span
{:grid-area "main"}
[:span
:a {:position "relative"
:z-index 2}]]
[:>span
:>a {:position "relative"
:z-index 2}]]
;; May want to refactor specific component styles to somewhere else.
;; Closer to the component perhaps?
;; Code
Expand Down Expand Up @@ -613,44 +613,28 @@
The CSS class is-editing is used for many things, such as block selection.
Opacity is 0 when block is selected, so that the block is entirely blue, rather than darkened like normal editing.
is-editing can be used for shift up/down, so it is used in both editing and selection."
[block _ _]
(let [{:block/keys [uid original-uid]} block
editing? (subscribe [:editing/is-editing uid])
selected-items (subscribe [:selected/items])]
(fn [_block state {:keys [block-embed?]}]
(let [{:string/keys [local]} @state]
[:div {:class "block-content"}
[autosize/textarea {:value (:string/local @state)
;; todo(abhinav)
;; events are not getting captured when z-index given through class(specificity checked)
:style (cond
;; if editing always show original block
@editing?
{:z-index "3"}

;; decrease z-index for embed textarea so click is taken by embed block
(and local (re-matches #"\{\{\[\[embed\]\]: \(\(.+\)\)\}\}" local))
{:z-index "1"}

;; embed items
block-embed?
{:z-index "3"})

:class ["textarea" (when (and (empty? @selected-items)
@editing?)
"is-editing")]
;;:auto-focus true
:id (str "editable-uid-" uid)
:on-change (fn [e] (textarea-change e uid state))
:on-paste (fn [e] (textarea-paste e uid state))
:on-key-down (fn [e] (textarea-key-down e uid state))
:on-blur (fn [_] (db/transact-state-for-uid (or original-uid uid) state))
:on-click (fn [e] (textarea-click e uid state))
:on-mouse-enter (fn [e] (textarea-mouse-enter e uid state))
:on-mouse-down (fn [e] (textarea-mouse-down e uid state))}]
[parse-and-render local uid]
[:div (use-style (merge drop-area-indicator (when (= :child (:drag-target @state)) {;;:color "green"
:opacity 1})))]]))))
[_ _]
(fn [block state]
(let [{:block/keys [uid original-uid]} block
{:string/keys [local]} @state
is-editing @(subscribe [:editing/is-editing uid])
selected-items @(subscribe [:selected/items])]
[:div {:class "block-content"}
[autosize/textarea {:value (:string/local @state)
:class ["textarea" (when (and (empty? selected-items) is-editing) "is-editing")]
;;:auto-focus true
:id (str "editable-uid-" uid)
:on-change (fn [e] (textarea-change e uid state))
:on-paste (fn [e] (textarea-paste e uid state))
:on-key-down (fn [e] (textarea-key-down e uid state))
:on-blur (fn [_] (db/transact-state-for-uid (or original-uid uid) state))
:on-click (fn [e] (textarea-click e uid state))
:on-mouse-enter (fn [e] (textarea-mouse-enter e uid state))
:on-mouse-down (fn [e] (textarea-mouse-down e uid state))}]
[parse-and-render local uid]
[:div (use-style (merge drop-area-indicator
(when (= :child (:drag-target @state)) {;;:color "green"
:opacity 1})))]])))


(defn bullet-mouse-out
Expand Down Expand Up @@ -901,7 +885,7 @@
[context-menu-el uid-sanitized-block state]
[bullet-el block state linked-ref]
[tooltip-el uid-sanitized-block state]
[block-content-el block state opts]
[block-content-el block state]
(when-not (:block-embed? opts)
[block-refs-count-el (count _refs) uid])]

Expand Down