From 721772b08f74de8d09e1f4a9c8a85faed0ee0e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 17 May 2022 15:09:53 +0200
Subject: [PATCH] Fix hotkey navigation?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/scrollable_list.tsx    |   3 +++
 app/soapbox/components/status.tsx             |   8 +++-----
 app/soapbox/components/status_list.js         | Bin 7252 -> 7080 bytes
 .../components/conversations_list.js          | Bin 2311 -> 2134 bytes
 app/soapbox/features/notifications/index.js   | Bin 7382 -> 7272 bytes
 app/soapbox/features/status/index.tsx         |   2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/components/scrollable_list.tsx b/app/soapbox/components/scrollable_list.tsx
index cc4b55867c..c7a93a8802 100644
--- a/app/soapbox/components/scrollable_list.tsx
+++ b/app/soapbox/components/scrollable_list.tsx
@@ -42,6 +42,7 @@ interface IScrollableList extends VirtuosoProps<any, any> {
   onRefresh?: () => Promise<any>,
   className?: string,
   itemClassName?: string,
+  id?: string,
 }
 
 /** Legacy ScrollableList with Virtuoso for backwards-compatibility */
@@ -58,6 +59,7 @@ const ScrollableList = React.forwardRef<VirtuosoHandle, IScrollableList>(({
   onLoadMore,
   className,
   itemClassName,
+  id,
   hasMore,
   placeholderComponent: Placeholder,
   placeholderCount = 0,
@@ -130,6 +132,7 @@ const ScrollableList = React.forwardRef<VirtuosoHandle, IScrollableList>(({
     <Virtuoso
       ref={ref}
       useWindowScroll
+      id={id}
       className={className}
       data={data}
       startReached={onScrollToTop}
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index f2b804fbe3..57b3bbc6f8 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -282,13 +282,11 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
   }
 
   handleHotkeyMoveUp = (e?: KeyboardEvent): void => {
-    // FIXME: what's going on here?
-    // this.props.onMoveUp(this.props.status.id, e?.target?.getAttribute('data-featured'));
+    this.props.onMoveUp(this.props.status.id, this.props.featured);
   }
 
   handleHotkeyMoveDown = (e?: KeyboardEvent): void => {
-    // FIXME: what's going on here?
-    // this.props.onMoveDown(this.props.status.id, e?.target?.getAttribute('data-featured'));
+    this.props.onMoveDown(this.props.status.id, this.props.featured);
   }
 
   handleHotkeyToggleHidden = (): void => {
@@ -601,7 +599,7 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
     return (
       <HotKeys handlers={handlers} data-testid='status'>
         <div
-          className='status cursor-pointer'
+          className={classNames('status cursor-pointer', { focusable: this.props.focusable })}
           tabIndex={this.props.focusable && !this.props.muted ? 0 : undefined}
           data-featured={featured ? 'true' : null}
           aria-label={textForScreenReader(intl, status, rebloggedByText)}
diff --git a/app/soapbox/components/status_list.js b/app/soapbox/components/status_list.js
index 7df03f365a60c565fc1b0c63c32230ec704219fb..bfc90869e3c87747c3f450eebda00c2e97b10bea 100644
GIT binary patch
delta 284
zcmca&vBG@AQLcJTg=#JZASlVmEY{1*Pf67)PA<yN$??o9$q&m+E!TiZD=1{<rKDEq
zfYmA}B&B8~mSyG_St+O&=jP{^WT?YrQu6astrRpg6>ROGCWA~*&d)0@QAo{6%}vcK
zQLt4=$xki?G4<jKOH+#~gMl*1CHX}f3ChJKi6y1Qx;dFZ_0cJbC5gIVi*1!us=<s}
zrC0^MG@$n4#H5_m1Wju$sFQ#$OjFQ+S^@Lb<Qg7nF^~glp{i;j?yS|c-aLcHhgTpo
P#a123O7+dRB`cW#>AO}H

delta 468
zcma)&u};G<5QZhjRBSBW4hdC`LL)IzQD6p%4a7=~du}WlJJ=UNRYiFKMqYvusn5U@
z&<Db4lPE$Ac(}p$Ti^Hl<8(9m{EDh$;94!r1KB)=RRrM(YdqDHxH9PA0w_~HHFl2M
zG3}*L;}aSRnJ%9`7wDF^VI#;oHsg+z(0FDj8(TT1WsdA<rOX^(Avu7PGKN%IQF#8S
zaTZUb=>2Ultds=SsljN}19;)A)^|3COK1dAE2T#YcWsNhNxR%VxHe?(6}~WX1qM!?
z04PJsBh<LV9<TZvnDjJ+R-yV8szpX{-oZK(NPgYzqW=(-T*tnr*r>L3w!g)i2IcyD
LaI?Rj4D-Do6nva}

diff --git a/app/soapbox/features/conversations/components/conversations_list.js b/app/soapbox/features/conversations/components/conversations_list.js
index 95629045d3aaf85c6d35d4cd7ff29ae1bc3b50f6..6e2f751a963292a759e985f599703f49e6e3fdba 100644
GIT binary patch
delta 286
zcmZn{x+bu}n0c}#bIs&E%rf<w3e{W+Kv0sAS*(|rpOUIqoLrQjljE6Jk{_0tTCM?+
zR#3>yOG&NJ0jpI|NJ`B}EX&L<vQkhl&dtv+$xw&Mq~zzNS}AB~D%jdVO$M2soS#=*
zqL7-Cnwy$eqF}3#lAl}(V(PgUmZla}1_Nc1OY(~}5|mRii-1hsoJ^ql=#<2gL|w4O
zwn{41U`DM{tb$$|P<wG=Qch}urZpGXNt3f#BqvW~l@tTnRtt4yEyPi^n%0|Fv#w<n
Z$V{<SM>1c1vOl{t2UM-X<}CKPi~z%qRIdO4

delta 510
zcma)(!AiqG5QZr&6>^f|Mes0!v<Ynk(wnuO6_1Kn8`If#Vco5}6ExJ2W6zSak01&?
z`67aE<EBkR5D)HQ4m1DqfB($a?y~hUs5g5+I>KyFf8OZ<3xvV!y?&7PAP{^iZ%NHP
zSU6x`sHCC1Qoto@7y-?=@uiyJx(q8S6nKx4tftia4-xA4%1%O3+8qa)cqs5h(yXso
zpW->XM++_|_ypZOI8Hq9nF=El+zA|eL&wQp8v7|{;Ff66ZdVLUsFe`cY7S>m0QibA
zgJgT#6nT>EaP#3plDgse=;n*CKDh!Qu_}X*+Z|T?(!UM66^u}D8~q&lbVhJmnw2Eb
v{ngt@{{d*v<CzL#fx3;e-j-V=NLJsCw_0lx@e<=vXTr5zeP{LAe69Te>qM$a

diff --git a/app/soapbox/features/notifications/index.js b/app/soapbox/features/notifications/index.js
index 69c18799e69c1d2704c2111c022694d994b31bc8..05fed79a78b66b373efb8c58f96fe44de79c2ede 100644
GIT binary patch
delta 265
zcmca+`NCquR{`aq)HDTKg=7U=JB4a41t2KN$Sl^&%TGxK30nh&YA3%Fcrf{j;I_#V
zg=CU6(Us{HCl}@C<ap+l<cDRZmTN#vQBcUtOG&NJ0UN2Hkd&H{SeBVzWTl{9oSUCt
zlA#WhNy*PkwNlW~L^xpb9wGI~_l0z|qf-(~5_Q4m*ea=1gBi6-u?l)=`N^fliAg!B
z37XbiU>hde3QJB-7LgPK`JfhRX)VN#T21TCwIUkKf<>umw$)(o6{nT}{aw3xmbeWo
E0Lal#W&i*H

delta 432
zcmaE1am{kWSAog$f;ZW86iSLpQz!or+{Uh>kd~NJoH}`(kPN?$LSjy4dR}}<eu1V!
zHP>VvVfD%3!kUJOMJ1WZIjL58B^kQ;X}Tqq1*sY;)tPxIsTB&^3Wl|s3VLbz$)&}K
zNja$rn$}!glUEB%)@P<EXu!==P*YP#&d)1J%*;zI(ko6b%FoFO$uCf_Q%KE8%}vcK
z(aTRuD^4u|ih-<FfC88#M1yBuNq$&nYPkl;^+0<difVyI6sIbHtW!j?uO7RF+DOhw
z&dCJY?2($8o>8J;gXt2W=U@(ixDKL}2nPbg)UX)IiBPA)Oaq6O2Gj?&K*?GzATfC%
QpVVei5jN({=HiB|0PvQLCjbBd

diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 33666c56b0..ac6b855393 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -715,7 +715,7 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
         <HotKeys handlers={handlers}>
           <div
             ref={this.setStatusRef}
-            className={classNames('detailed-status__wrapper')}
+            className='detailed-status__wrapper focusable'
             tabIndex={0}
             // FIXME: no "reblogged by" text is added for the screen reader
             aria-label={textForScreenReader(intl, status)}