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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unlazy the menus on the frontend #7763

Merged
merged 1 commit into from
Sep 23, 2024
Merged

unlazy the menus on the frontend #7763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
236 changes: 122 additions & 114 deletions src/cljs/nr/gameboard/board.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,36 +409,38 @@
[:div.panel.blue-shade.servers-menu (when active-menu?
{:class "active-menu"
:style {:display "inline"}})
[:ul (map-indexed
(fn [_ label]
^{:key label}
[card-menu-item (label-fn label)
#(do (close-card-menu)
(if (= "Expend" label)
(send-command "expend" {:card card :server label})
(send-command "play" {:card card :server label})))])
servers)]])))
[:ul (doall
(map-indexed
(fn [_ label]
^{:key label}
[card-menu-item (label-fn label)
#(do (close-card-menu)
(if (= "Expend" label)
(send-command "expend" {:card card :server label})
(send-command "play" {:card card :server label})))])
servers))]])))

(defn list-abilities
[ab-type card abilities]
(map-indexed
(fn [i ab]
(let [command (case ab-type
:runner "runner-ability"
:corp "corp-ability"
:ability (if (:dynamic ab) "dynamic-ability" "ability"))
args (merge {:card card}
(if (:dynamic ab)
(select-keys ab [:dynamic :source :index])
{:ability i}))]
^{:key i}
[card-menu-item (render-icons (add-cost-to-label ab))
#(do (send-command command args)
(if (:keep-menu-open ab)
(swap! card-menu assoc :keep-menu-open (keyword (:keep-menu-open ab)))
(close-card-menu)))
(:playable ab)]))
abilities))
(doall
(map-indexed
(fn [i ab]
(let [command (case ab-type
:runner "runner-ability"
:corp "corp-ability"
:ability (if (:dynamic ab) "dynamic-ability" "ability"))
args (merge {:card card}
(if (:dynamic ab)
(select-keys ab [:dynamic :source :index])
{:ability i}))]
^{:key i}
[card-menu-item (render-icons (add-cost-to-label ab))
#(do (send-command command args)
(if (:keep-menu-open ab)
(swap! card-menu assoc :keep-menu-open (keyword (:keep-menu-open ab)))
(close-card-menu)))
(:playable ab)]))
abilities)))

(defn check-keep-menu-open
[card]
Expand Down Expand Up @@ -519,21 +521,22 @@
(close-card-menu))])]
(when (seq subroutines)
[:span.float-center (tr [:game.subs "Subroutines"]) ":"])
(map-indexed
(fn [i sub]
[:span {:style {:display "block"}
:key i}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine]" " " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]])
subroutines)]))
(doall
(map-indexed
(fn [i sub]
[:span {:style {:display "block"}
:key i}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine]" " " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]])
subroutines))]))

(defn corp-abs [card corp-abilities]
(when (= (:cid card) (:source @card-menu))
Expand Down Expand Up @@ -562,20 +565,21 @@
[:hr]
(when (seq subroutines)
[:span.float-center (tr [:game.subs "Subroutines"]) ":"])
(map-indexed
(fn [i sub]
[:div {:key i}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine] " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]])
subroutines)]))
(doall
(map-indexed
(fn [i sub]
[:div {:key i}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine] " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]])
subroutines))]))

(defn card-abilities [card abilities subroutines]
(let [actions (action-list card)]
Expand All @@ -594,22 +598,23 @@
[:span.float-center (tr [:game.actions "Actions"]) ":"])
(when (seq actions)
[:ul
(map-indexed
(fn [_ action]
(let [keep-menu-open (case action
"derez" false
"rez" :if-abilities-available
"trash" false
"advance" :for-agendas
"score" false
false)]
^{:key action}
[card-menu-item (capitalize (tr-game-prompt action))
#(do (send-command action {:card card})
(if keep-menu-open
(swap! card-menu assoc :keep-menu-open keep-menu-open)
(close-card-menu)))]))
actions)])
(doall
(map-indexed
(fn [_ action]
(let [keep-menu-open (case action
"derez" false
"rez" :if-abilities-available
"trash" false
"advance" :for-agendas
"score" false
false)]
^{:key action}
[card-menu-item (capitalize (tr-game-prompt action))
#(do (send-command action {:card card})
(if keep-menu-open
(swap! card-menu assoc :keep-menu-open keep-menu-open)
(close-card-menu)))]))
actions))])
(when (or (seq abilities)
(and (active? card)
(seq (remove #(or (:fired %) (:broken %)) subroutines))))
Expand All @@ -626,29 +631,30 @@
[:span.float-center (tr [:game.subs "Subroutines"]) ":"])
(when (seq subroutines)
[:ul
(map-indexed
(fn [i sub]
(let [fire-sub #(do (send-command "subroutine" {:card card
:subroutine i})
(close-card-menu))]
[:li {:key i
:tab-index 0
:on-click fire-sub
:on-key-down #(when (= "Enter" (.-key %))
(fire-sub))
:on-key-up #(when (= " " (.-key %))
(fire-sub))}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine] " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]]))
subroutines)])])))
(doall
(map-indexed
(fn [i sub]
(let [fire-sub #(do (send-command "subroutine" {:card card
:subroutine i})
(close-card-menu))]
[:li {:key i
:tab-index 0
:on-click fire-sub
:on-key-down #(when (= "Enter" (.-key %))
(fire-sub))
:on-key-up #(when (= " " (.-key %))
(fire-sub))}
[:span (cond (:broken sub)
{:class :disabled
:style {:font-style :italic}}
(false? (:resolve sub))
{:class :dont-resolve
:style {:text-decoration :line-through}})
(render-icons (str " [Subroutine] " (:label sub)))]
[:span.float-right
(cond (:broken sub) banned-span
(:fired sub) "✅")]]))
subroutines))])])))

(defn draw-facedown?
"Returns true if the installed card should be drawn face down."
Expand Down Expand Up @@ -827,19 +833,20 @@
(defn build-hand-card-view
[hand size wrapper-class]
[:div
(doall (map-indexed
(fn [i card]
[:div {:key (or (:cid card) i)
:class (str wrapper-class)
:style {:left (when (< 1 size) (* (/ 320 (dec size)) i))}}
(cond
(spectator-view-hidden?)
[card-view (dissoc card :new :selected)]
(:cid card)
[card-view card]
:else
[facedown-card (:side card)])])
hand))])
(doall
(map-indexed
(fn [i card]
[:div {:key (or (:cid card) i)
:class (str wrapper-class)
:style {:left (when (< 1 size) (* (/ 320 (dec size)) i))}}
(cond
(spectator-view-hidden?)
[card-view (dissoc card :new :selected)]
(:cid card)
[card-view card]
:else
[facedown-card (:side card)])])
hand))])

(defn hand-view []
(let [s (r/atom {})]
Expand Down Expand Up @@ -1728,12 +1735,13 @@
:style {:display "inline"}})
[:ul
(let [servers (get-in @game-state [:runner :runnable-list])]
(map-indexed (fn [_ label]
^{:key label}
[card-menu-item (tr-game-prompt label)
#(do (close-card-menu)
(send-command "run" {:server label}))])
servers))]]]])
(doall
(map-indexed (fn [_ label]
^{:key label}
[card-menu-item (tr-game-prompt label)
#(do (close-card-menu)
(send-command "run" {:server label}))])
servers)))]]]])
(when (= side :corp)
[cond-button (tr [:game.purge "Purge"])
(and (not (or @runner-phase-12 @corp-phase-12))
Expand Down
Loading