feat: sort string in list

TexteaInc · Dec 23, 2023 · 1b667b2 · 1b667b2
1 parent 63eb95d
commit 1b667b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -51,7 +51,6 @@ import MuiAppBar, { AppBarProps as MuiAppBarProps } from "@mui/material/AppBar";
 import MuiPaper, { PaperProps as MuiPaperProps } from "@mui/material/Paper";
 import HistoryDialog from "./components/History/HistoryDialog";
 import HistoryList from "./components/History/HistoryList";
-import MarkdownDiv from "./components/Common/MarkdownDiv";
 import InlineBox from "./components/Common/InlineBox";
 import useFunixHistory from "./shared/useFunixHistory";
 
@@ -450,10 +449,7 @@ const App = () => {
             {theme?.direction === "ltr" ? <ArrowBack /> : <ArrowForward />}
           </IconButton>
           <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
-            <MarkdownDiv
-              markdown={selectedFunction?.name || "Funix"}
-              isRenderInline={true}
-            />
+            {selectedFunction?.name || "Funix"}
           </Typography>
           {selectedFunction && selectedFunction.secret && (
             <IconButton

diff --git a/frontend/src/components/FunixFunctionList.tsx b/frontend/src/components/FunixFunctionList.tsx
@@ -11,7 +11,6 @@ import { useAtom } from "jotai";
 import { FunctionPreview, getList, objArraySort } from "../shared";
 import { useNavigate, useLocation } from "react-router-dom";
 import { ExpandLess, ExpandMore } from "@mui/icons-material";
-import MarkdownDiv from "./Common/MarkdownDiv";
 
 export type FunctionListProps = {
   backend: URL;
@@ -215,25 +214,19 @@ const FunixFunctionList: React.FC<FunctionListProps> = ({ backend }) => {
   if (!isTree) {
     return (
       <FunixList functionLength={state.length}>
-        {state.map((functionPreview) => (
-          <ListItemButton
-            onClick={() => {
-              changeRadioGroupValueById(functionPreview.id);
-            }}
-            key={functionPreview.name}
-            selected={radioGroupValue === functionPreview.path}
-          >
-            <ListItemText
-              primary={
-                <MarkdownDiv
-                  markdown={functionPreview.name}
-                  isRenderInline={true}
-                />
-              }
-              disableTypography
-            />
-          </ListItemButton>
-        ))}
+        {state
+          .sort((a, b) => a.name.localeCompare(b.name))
+          .map((functionPreview) => (
+            <ListItemButton
+              onClick={() => {
+                changeRadioGroupValueById(functionPreview.id);
+              }}
+              key={functionPreview.name}
+              selected={radioGroupValue === functionPreview.path}
+            >
+              <ListItemText primary={functionPreview.name} disableTypography />
+            </ListItemButton>
+          ))}
       </FunixList>
     );
   }
@@ -265,7 +258,7 @@ const FunixFunctionList: React.FC<FunctionListProps> = ({ backend }) => {
         }}
       >
         <ListItemText
-          primary={<MarkdownDiv markdown={name} isRenderInline={true} />}
+          primary={name}
           sx={{
             wordWrap: "break-word",
           }}
@@ -299,7 +292,7 @@ const FunixFunctionList: React.FC<FunctionListProps> = ({ backend }) => {
           }}
         >
           <ListItemText
-            primary={<MarkdownDiv markdown={k} isRenderInline={true} />}
+            primary={k}
             sx={{
               wordWrap: "break-word",
             }}