From ec8bec32ba97be29062a9ca29672354af2969a0b Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 20 Mar 2023 13:56:03 -0700
Subject: [PATCH] Fix request creation priority

---
 src-tauri/icons/icon.icns            | Bin 616124 -> 616124 bytes
 src-web/components/Sidebar.tsx       |  12 ++++++------
 src-web/components/core/Dropdown.tsx |   2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
index 77fe12513efbd506dbdb7aef411b282a4913235d..93c6f651f25bb86312db5ee06a62c1b47e04d887 100644
GIT binary patch
delta 98
zcmdmUR&~!=Ri4b`ykZ8<v^|;01{NE6a_4SOQ)Xpn*<Mn`&S|reyI}5iX>L|;iT0EG
z*|(qE&+&O#JHHw0c78LqZ_BpVY-9K5Y_6W$UOkr)h?#(xd3*I-mU+3`bJbZF@c{r^
CKqiy`

delta 97
zcmdmUR&~!=Ri4b`ykZ8<v^|;0hQ=Fta_6>Jy<!1kRv=~rV)pG-uQ(RuZvS4z=qs_g
zaxOc|cBu%?MSSh%R?OSYtysP-+sKtacXPu+PMhs|4_W*;+ubHJZg-o^^l=#g?vN<F

diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index 799e8fe7..61f77aa2 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -31,10 +31,14 @@ enum ItemTypes {
 export const Sidebar = memo(function Sidebar({ className }: Props) {
   const [isResizing, setIsResizing] = useState<boolean>(false);
   const sidebarRef = useRef<HTMLDivElement>(null);
-  const requests = useRequests();
+  const unorderedRequests = useRequests();
   const activeRequest = useActiveRequest();
   const createRequest = useCreateRequest({ navigateAfter: true });
   const width = useSidebarWidth();
+  const requests = useMemo(
+    () => [...unorderedRequests].sort((a, b) => a.sortPriority - b.sortPriority),
+    [unorderedRequests],
+  );
 
   const moveState = useRef<{ move: (e: MouseEvent) => void; up: () => void } | null>(null);
   const unsub = () => {
@@ -124,7 +128,7 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
 });
 
 function SidebarItems({
-  requests: unorderedRequests,
+  requests,
   activeRequestId,
   sidebarWidth,
 }: {
@@ -134,10 +138,6 @@ function SidebarItems({
 }) {
   const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
   const updateRequest = useUpdateAnyRequest();
-  const requests = useMemo(
-    () => [...unorderedRequests].sort((a, b) => a.sortPriority - b.sortPriority),
-    [unorderedRequests],
-  );
 
   const handleMove = useCallback<DraggableSidebarItemProps['onMove']>(
     (id, side) => {
diff --git a/src-web/components/core/Dropdown.tsx b/src-web/components/core/Dropdown.tsx
index 56dd7679..8582c30c 100644
--- a/src-web/components/core/Dropdown.tsx
+++ b/src-web/components/core/Dropdown.tsx
@@ -29,7 +29,7 @@ export function Dropdown({ children, items }: DropdownProps) {
     () =>
       cloneElement(Children.only(children) as never, {
         ref,
-        'aria-has-popup': 'true',
+        'aria-haspopup': 'true',
         onClick: (e: MouseEvent<HTMLButtonElement>) => {
           e.preventDefault();
           e.stopPropagation();