nandi/frq · a1cd517

nandi/frqpublic⑂ Fork 0

⑂ a1cd517

Say who reacted, when the pointer rests on a pill

A count says three people; it does not say which three, which is the thing
a room is read for. Resting on a pill raises the names beside it, the way
resting on a face raises the profile card — one card at a time, hung on the
hovered pill alone, and only where there is a pointer to hover with.

The pins move with it: the chip learned its hover in jolt-native, so the
build takes both libraries and glimmer-vidya from the commit that has it.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

nandi committed 2026-08-31T18:14:41-07:00 Browse files

a1cd517 parent: ae207b8

modified deps.edn +1 -1 Viewed

@@ -13,7 +13,7 @@
13	13	:deps {jolt-lang/glimmer {:git/url "https://gitlab.com/nandithebull/glimmer"
14	14	:git/sha "399df371c790d690fb6e4560c3d4d7f838502857"}
15	15	nandi/glimmer-vidya {:git/url "https://gitlab.com/nandithebull/jolt-native"
16		- :git/sha "70072e8e48ad396caeab6f6bd18b999cf449ec8f"
	16	+ :git/sha "c71fc595f031aaa5cb461735af1865146f7b42ec"
17	17	:deps/root "jolt/glimmer-vidya"}}
18	18
19	19	;; Both objects come from gitlab.com/nandithebull/jolt-native, one crate each,

   :deps {jolt-lang/glimmer   {:git/url "https://gitlab.com/nandithebull/glimmer"
                               :git/sha "399df371c790d690fb6e4560c3d4d7f838502857"}
          nandi/glimmer-vidya {:git/url "https://gitlab.com/nandithebull/jolt-native"
--                             :git/sha "70072e8e48ad396caeab6f6bd18b999cf449ec8f"
++                             :git/sha "c71fc595f031aaa5cb461735af1865146f7b42ec"
                               :deps/root "jolt/glimmer-vidya"}}
   ;; Both objects come from gitlab.com/nandithebull/jolt-native, one crate each,

modified justfile +1 -1 Viewed

@@ -13,7 +13,7 @@ checkout := parent_directory(`git rev-parse --path-format=absolute --git-common-
13	13	# gets a clone of the gitlab repo under .jolt-native, pinned to the same commit
14	14	# deps.edn takes glimmer-vidya from.
15	15	jolt_native_url := "https://gitlab.com/nandithebull/jolt-native.git"
16		-jolt_native_sha := "70072e8e48ad396caeab6f6bd18b999cf449ec8f"
	16	+jolt_native_sha := "c71fc595f031aaa5cb461735af1865146f7b42ec"
17	17	jolt_native := `
18	18	checkout="$(dirname "$(git rev-parse --path-format=absolute --git-common-dir)")"
19	19	if [ -d "$checkout/../jolt-native" ]; then

  # gets a clone of the gitlab repo under .jolt-native, pinned to the same commit
  # deps.edn takes glimmer-vidya from.
  jolt_native_url := "https://gitlab.com/nandithebull/jolt-native.git"
--jolt_native_sha := "70072e8e48ad396caeab6f6bd18b999cf449ec8f"
++jolt_native_sha := "c71fc595f031aaa5cb461735af1865146f7b42ec"
  jolt_native := `
      checkout="$(dirname "$(git rev-parse --path-format=absolute --git-common-dir)")"
      if [ -d "$checkout/../jolt-native" ]; then

modified src/frq/app.jolt +35 -6 Viewed

@@ -329,6 +329,24 @@
329	329	:size pill-size
330	330	:on-click #(s/reply-to! m)}]])
331	331
	332	+(defn- reactor-card
	333	+ "Who is on a reaction, beside the pointer resting on it.
	334	+
	335	+ The pill carries a number, and a number is the one thing about a reaction
	336	+ nobody wants: who it was is what a room is read for. Names, one to a line,
	337	+ with your own said as \"you\" — you are the one name in the list you cannot
	338	+ learn anything from."
	339	+ [emoji nicks]
	340	+ [:vbox {:spacing 4}
	341	+ [:hbox {:spacing 6}
	342	+ [:reaction {:key :glyph :emoji emoji :size pill-size}]
	343	+ [:dim-label {:label (str (count nicks)
	344	+ (if (= 1 (count nicks)) " reaction" " reactions"))}]]
	345	+ [:vbox {:key :who :spacing 2}
	346	+ (for [nick (sort nicks)]
	347	+ [:label {:key nick
	348	+ :label (if (= nick @s/form-nick) "you" nick)}])]])
	349	+
332	350	(defn- reaction-row
333	351	"What people have put on a message, under it.
334	352
@@ -340,12 +358,23 @@
340	358	(let [reactions (:reactions m)]
341	359	[:hbox {:key :pills :spacing 4}
342	360	(for [emoji (sort (keys reactions))]
343		- [:reaction {:key emoji
344		- :emoji emoji
345		- :size pill-size
346		- :count (count (get reactions emoji))
347		- :mine (s/my-reaction? m emoji)
348		- :on-click #(s/toggle-reaction! channel m emoji)}])]))
	361	+ [:reaction (cond-> {:key emoji
	362	+ :emoji emoji
	363	+ :size pill-size
	364	+ :count (count (get reactions emoji))
	365	+ :mine (s/my-reaction? m emoji)
	366	+ :on-click #(s/toggle-reaction! channel m emoji)}
	367	+ ;; Where there is a pointer to ask with, resting on a pill
	368	+ ;; says who put it there. On a phone the pill is a button
	369	+ ;; and nothing more: there is no hover to answer.
	370	+ (platform/desktop?)
	371	+ (assoc :on-hover #(s/hover-reaction! (:id m) emoji)
	372	+ :on-unhover #(s/unhover-reaction! (:id m) emoji)))
	373	+ ;; Only the hovered pill carries a card: the panel is painted from
	374	+ ;; whatever children the node has, and a channel's worth of unseen
	375	+ ;; lists is a tree nobody looks at.
	376	+ (when (and (platform/desktop?) (s/hovering-reaction? (:id m) emoji))
	377	+ [reactor-card emoji (get reactions emoji)])])]))
349	378
350	379	(def ^:private picker-columns
351	380	"Emoji to a row, at the picker's own size. Narrow enough that the grid fits a

                 :size pill-size
                 :on-click #(s/reply-to! m)}]])
++(defn- reactor-card
++  "Who is on a reaction, beside the pointer resting on it.
++
++  The pill carries a number, and a number is the one thing about a reaction
++  nobody wants: who it was is what a room is read for. Names, one to a line,
++  with your own said as \"you\" — you are the one name in the list you cannot
++  learn anything from."
++  [emoji nicks]
++  [:vbox {:spacing 4}
++   [:hbox {:spacing 6}
++    [:reaction {:key :glyph :emoji emoji :size pill-size}]
++    [:dim-label {:label (str (count nicks)
++                             (if (= 1 (count nicks)) " reaction" " reactions"))}]]
++   [:vbox {:key :who :spacing 2}
++    (for [nick (sort nicks)]
++      [:label {:key nick
++               :label (if (= nick @s/form-nick) "you" nick)}])]])
++
  (defn- reaction-row
    "What people have put on a message, under it.
    (let [reactions (:reactions m)]
      [:hbox {:key :pills :spacing 4}
       (for [emoji (sort (keys reactions))]
--       [:reaction {:key emoji
++       [:reaction (cond-> {:key emoji
--                   :emoji emoji
++                           :emoji emoji
--                   :size pill-size
++                           :size pill-size
--                   :count (count (get reactions emoji))
++                           :count (count (get reactions emoji))
--                   :mine (s/my-reaction? m emoji)
++                           :mine (s/my-reaction? m emoji)
--                   :on-click #(s/toggle-reaction! channel m emoji)}])]))
++                           :on-click #(s/toggle-reaction! channel m emoji)}
++                    ;; Where there is a pointer to ask with, resting on a pill
++                    ;; says who put it there. On a phone the pill is a button
++                    ;; and nothing more: there is no hover to answer.
++                    (platform/desktop?)
++                    (assoc :on-hover #(s/hover-reaction! (:id m) emoji)
++                           :on-unhover #(s/unhover-reaction! (:id m) emoji)))
++        ;; Only the hovered pill carries a card: the panel is painted from
++        ;; whatever children the node has, and a channel's worth of unseen
++        ;; lists is a tree nobody looks at.
++        (when (and (platform/desktop?) (s/hovering-reaction? (:id m) emoji))
++          [reactor-card emoji (get reactions emoji)])])]))
  (def ^:private picker-columns
    "Emoji to a row, at the picker's own size. Narrow enough that the grid fits a

modified src/frq/state.jolt +23 -0 Viewed

@@ -1149,6 +1149,29 @@
1149	1149	[m emoji]
1150	1150	(boolean (some #{@form-nick} (get (:reactions m) emoji))))
1151	1151
	1152	+;; The pill the pointer is resting on, or nil — `{:id msgid :emoji glyph}`.
	1153	+;; One at a time, and named by the message as well as the glyph: the same emoji
	1154	+;; is a pill under many messages, and only the one under the pointer carries a
	1155	+;; card.
	1156	+(defonce reaction-hover (atom nil))
	1157	+
	1158	+(defn hover-reaction!
	1159	+ "The pointer has come to rest on a pill."
	1160	+ [msgid emoji]
	1161	+ (reset! reaction-hover {:id msgid :emoji emoji}))
	1162	+
	1163	+(defn unhover-reaction!
	1164	+ "The pointer has left that pill. Guarded by which one is being left, so
	1165	+ crossing straight from one pill to the next — both edges in a frame — cannot
	1166	+ take down the card that has just been raised."
	1167	+ [msgid emoji]
	1168	+ (swap! reaction-hover #(when-not (= {:id msgid :emoji emoji} %) %)))
	1169	+
	1170	+(defn hovering-reaction?
	1171	+ "Whether this is the pill the card belongs to."
	1172	+ [msgid emoji]
	1173	+ (= {:id msgid :emoji emoji} @reaction-hover))
	1174	+
1152	1175	(defn toggle-reaction!
1153	1176	"Put my emoji on a message, or take it off if it is already mine.
1154	1177

    [m emoji]
    (boolean (some #{@form-nick} (get (:reactions m) emoji))))
++;; The pill the pointer is resting on, or nil — `{:id msgid :emoji glyph}`.
++;; One at a time, and named by the message as well as the glyph: the same emoji
++;; is a pill under many messages, and only the one under the pointer carries a
++;; card.
++(defonce reaction-hover (atom nil))
++
++(defn hover-reaction!
++  "The pointer has come to rest on a pill."
++  [msgid emoji]
++  (reset! reaction-hover {:id msgid :emoji emoji}))
++
++(defn unhover-reaction!
++  "The pointer has left that pill. Guarded by which one is being left, so
++  crossing straight from one pill to the next — both edges in a frame — cannot
++  take down the card that has just been raised."
++  [msgid emoji]
++  (swap! reaction-hover #(when-not (= {:id msgid :emoji emoji} %) %)))
++
++(defn hovering-reaction?
++  "Whether this is the pill the card belongs to."
++  [msgid emoji]
++  (= {:id msgid :emoji emoji} @reaction-hover))
++
  (defn toggle-reaction!
    "Put my emoji on a message, or take it off if it is already mine.