Revize 9814562f

re #10895: NoteViewPage: Sort refactor

src/pages/NotesViewPage.tsx

@@ -30 +30 @@
   const toast = useToast();
 
   useEffect(() => {
-      if (lastError) {
-          toast.closeAll()
-          toast.show({
-              render: ({
-                  id
-              }) => {
-                  return <ErrorToast headerText={"Error"} text={lastError} onClose={() => toast.close(id)} />;
-              },
-              duration: 3000
-          });
-      }
+    if (lastError) {
+      toast.closeAll()
+      toast.show({
+        render: ({
+          id
+        }) => {
+          return <ErrorToast headerText={"Error"} text={lastError} onClose={() => toast.close(id)} />;
+        },
+        duration: 3000
+      });
+    }
   }, [lastError])
 
   const [sortSettings, setSortSettings] = useState({
@@ -48 +48 @@
     date: SortOptions.None
   });
 
+  console.log(sortSettings)
+
   const handleSortChanged = useCallback((key: "items" | "date", sortSettings: any) => {
     let currentState = sortSettings[key];
+    let otherKey = "items"
+
+    if (key == "items") {
+      otherKey = "date"
+    }
+
     if (currentState == SortOptions.None) {
       setSortSettings({
         ...sortSettings,
-        [key]: SortOptions.Asc
+        [key]: SortOptions.Asc,
+        [otherKey]: SortOptions.None
       })
     }
     else if (currentState == SortOptions.Asc) {
       setSortSettings({
         ...sortSettings,
-        [key]: SortOptions.Desc
+        [key]: SortOptions.Desc,
+        [otherKey]: SortOptions.None
       })
     }
     else {
       setSortSettings({
         ...sortSettings,
-        [key]: SortOptions.None
+        [key]: SortOptions.None,
+        [otherKey]: SortOptions.None
       })
     }
   }, [setSortSettings]);
 
-  const getSortIcon = (sortOption: SortOptions, size: string) => {
+  const getSortIcon = (sortOption: SortOptions, size: string, color?: string) => {
     switch (sortOption) {
       case SortOptions.Asc:
-        return <ChevronUpIcon size={size} />;
+        return <ChevronUpIcon size={size} color={color} />;
       case SortOptions.Desc:
-        return <ChevronDownIcon size={size} />;
+        return <ChevronDownIcon size={size} color={color} />;
       default:
-        return <MinusIcon size={size} />;
+        return <MinusIcon size={size} color={color} />;
     }
   };
 
@@ -112 +123 @@
       // creating new comment
       toast.show({
         render: ({
-            id
+          id
         }) => {
-            return <InfoToast  text={"Adding note"} onClose={() => toast.close(id)} />;
+          return <InfoToast text={"Adding note"} onClose={() => toast.close(id)} />;
         },
         duration: 2000
-    });
+      });
       if (replyingTo != null) {
         dispatch(createNote({
           newNote: { note: newComment, reply_to: replyingTo.messageId } as Note
@@ -134 +145 @@
 
 
   return (
-    <Box marginLeft={2.5} marginRight={2.5} marginTop={2.5}>
+    <Box>
       <VStack>
-        <HStack height={75} justifyContent="space-between">
+        <HStack height={75} justifyContent="space-between" paddingLeft={2.5} paddingRight={2.5} marginTop={2.5}>
           <Box justifyContent={"center"}>
             <Popover // @ts-ignore
               trigger={triggerProps => {
-                return <Button colorScheme="primary" {...triggerProps} onPress={() => setIsSortOpen(true)}>
-                  Sort Options
+                return <Button width={150} backgroundColor="#F4DFAB" {...triggerProps} onPress={() => setIsSortOpen(true)}
+                  borderRadius={7}
+                  rightIcon={(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (getSortIcon(sortSettings.date != SortOptions.None ? sortSettings.date : sortSettings.items, "xs", "#654B07")) : undefined}
+                >
+                  <Text fontSize={14} color="#654B07">
+                    Sort {(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (sortSettings.date != SortOptions.None ? "by date" : "by items") : ""}
+                  </Text>
                 </Button>;
               }} isOpen={isSortOpen} onClose={() => setIsSortOpen(!isSortOpen)}>
               <Popover.Content w="48">
                 <Popover.Arrow />
                 <Popover.CloseButton onPress={() => setIsSortOpen(false)} />
-                <Popover.Header>Sort Options</Popover.Header>
+                <Popover.Header><Text fontSize={"md"} color="#654B07">Sort Options</Text></Popover.Header>
                 <Popover.Body>
                   <VStack>
                     <Button size="md" variant="outline" onPress={() => handleSortChanged("items", sortSettings)}
-                      rightIcon={getSortIcon(sortSettings.items, "sm")}
+                      rightIcon={getSortIcon(sortSettings.items, "sm", "#654B07")}
                     >
                       Items</Button>
                     <Button size="md" variant="outline" marginTop={"5%"} onPress={() => handleSortChanged("date", sortSettings)}
-                      rightIcon={getSortIcon(sortSettings.date, "sm")}>
+                      rightIcon={getSortIcon(sortSettings.date, "sm", "#654B07")}>
                       Date</Button>
                   </VStack>
                 </Popover.Body>
@@ -164 +180 @@
                     <Button colorScheme="coolGray" variant="ghost" onPress={() => setIsSortOpen(false)}>
                       Cancel
                     </Button>
-                    <Button colorScheme="success" onPress={() => { setIsSortOpen(false); getNotes() }}>
-                      Save
+                    <Button backgroundColor={"#F4DFAB"} onPress={() => { setIsSortOpen(false); getNotes() }}>
+                      <Text color="#654B07">
+                        Save
+                      </Text>
                     </Button>
                   </Button.Group>
                 </Popover.Footer>